From 21eb5a9efd4cb7e9baa4658ebd7ed2086665e344 Mon Sep 17 00:00:00 2001
From: pliablepixels <pliablepixels@gmail.com>
Date: Wed, 9 Mar 2016 13:35:54 -0500
Subject: #185 - while in full screen, drag screen right to expose menu

Former-commit-id: 852486653e915e3005f19126a982d38c13a1f670
---
 www/js/MontageCtrl.js      | 2 +-
 www/templates/montage.html | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'www')

diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index 6039d9ee..29e77d53 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -83,7 +83,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
     var modalIntervalHandle;
 
 
-    $ionicSideMenuDelegate.canDragContent(false);
+    $ionicSideMenuDelegate.canDragContent($scope.minimal? true: false);
 
     
     $rootScope.authSession = "undefined";
diff --git a/www/templates/montage.html b/www/templates/montage.html
index 59fc2747..efb853e8 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -21,7 +21,7 @@
 
     </ion-nav-buttons>
 
-    <ion-content ng-cloak has-bouncing="false" style="background-color:#444444">
+    <ion-content ng-cloak has-bouncing="false" style="background-color:#444444" >
 
         <!--<ion-refresher pulling-text="Pull to reload Monitors..." spinner="bubbles" on-refresh="doRefresh()">
         </ion-refresher>-->
@@ -110,7 +110,8 @@
             <button mfb-button icon="ion-close" label="exit full screen" ng-click="switchMinimal()">
             </button>
         </nav>
-
+        
+        
         <span class="modal-alarm-badge">
             <a data-badge="{{$root.alarmCount}}" class="animated infinite tada button icon  ion-ios-bell notification-badge button-assertive" 
                     ng-click="handleAlarmsWhileMinimized();" ng-if="$root.isAlarm"></a>
-- 
cgit v1.2.3