4 files changed, 24 insertions, 3 deletions
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index e91bea99..a6dd87e8 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -1125,6 +1125,11 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
 
   });
 
+  $scope.$on('$ionicView.beforeLeave', function () {
+  document.removeEventListener("pause", onPause, false);
+  ddocument.removeEventListener("resume", onResume, false);
+  });
+
   $scope.showHideControls = function () {
 
     if (videoPlaybarClicked) {
diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js
index e64d7a6f..9ba5e8bc 100644
--- a/www/js/LoginCtrl.js
+++ b/www/js/LoginCtrl.js
@@ -328,6 +328,9 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
 
   $scope.$on('$ionicView.beforeLeave', function () {
     //console.log("**VIEW ** LoginCtrl  Entered");
+    document.removeEventListener("pause", onPause, false);
+    document.removeEventListener("resume", onResume, false);
+
     var newLoginData = JSON.stringify($scope.loginData);
     if ($scope.loginData.serverName && newLoginData != oldLoginData) {
       NVR.log("Login data changed, saving...");
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index 41b38e8c..8708970d 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -1734,7 +1734,11 @@ angular.module('zmApp.controllers')
         NVR.debug("Deregistering handlers for multi-window");
         window.MultiWindowPlugin.deregisterOnStop("montage-pause");
 
+      } else {
+        document.removeEventListener("pause", onPause, false);
+
       }
+     
       if ($scope.modal) $scope.modal.remove();
     });
 
@@ -2380,8 +2384,13 @@ angular.module('zmApp.controllers')
         $state.go(s[0],s[1],s[2]);
       });
 
-      window.addEventListener("resize", jiggleMontage, false);
-     
+      //window.addEventListener("resize", jiggleMontage, false);
+      $scope.$on('sizechanged', function() {
+        $timeout (function () {
+          jiggleMontage();
+        },10);
+    
+      });
 
       timeInMontage = new Date();
       broadcastHandles = [];
@@ -2632,7 +2641,7 @@ angular.module('zmApp.controllers')
    };
     $scope.$on('$ionicView.beforeLeave', function () {
 
-      window.removeEventListener("resize", jiggleMontage, false);
+     // window.removeEventListener("resize", jiggleMontage, false);
       currentStreamState = streamState.STOPPED;
       viewCleanup();
       viewCleaned = true;
diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js
index 53a27b3c..8915799e 100644
--- a/www/js/MontageHistoryCtrl.js
+++ b/www/js/MontageHistoryCtrl.js
@@ -1116,6 +1116,10 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
     viewCleanup();
     viewCleaned = true;
 
+    document.removeEventListener("pause", onPause, false);
+    document.removeEventListener("resume", onResume, false);
+
+
 
     // if ($scope.modal) $scope.modal.remove();
     NVR.log("Cancelling event query timer");