diff options
| -rw-r--r-- | www/js/EventModalCtrl.js | 2 | ||||
| -rw-r--r-- | www/js/PortalLoginCtrl.js | 4 | ||||
| -rwxr-xr-x | www/js/app.js | 13 |
3 files changed, 12 insertions, 7 deletions
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js index e782e670..e16e1830 100644 --- a/www/js/EventModalCtrl.js +++ b/www/js/EventModalCtrl.js @@ -959,7 +959,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro $scope.snapshotFrameId = m.snapshotId; isGlobalFid = true; } - else { $scope.snapshotFrameId = 1; isSnapShotEnabled = false} + else { $scope.snapshotFrameId = 1; isSnapShotEnabled = false;} eventId = m.eventId; $scope.eventId = m.eventId; diff --git a/www/js/PortalLoginCtrl.js b/www/js/PortalLoginCtrl.js index 180050c6..46d15e1f 100644 --- a/www/js/PortalLoginCtrl.js +++ b/www/js/PortalLoginCtrl.js @@ -239,7 +239,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic NVRDataModel.hrsSinceChecked("zmVersion") .then (function (val) { NVRDataModel.debug ("ZM Version nag: Checking "+val+" with "+zm.zmVersionCheckNag); - if (val >=zm.zmVersionCheckNag) { + if (val >=zm.zmVersionCheckNag && 0) { NVRDataModel.updateHrsSinceChecked("zmVersion"); $state.go('app.importantmessage', { @@ -449,7 +449,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic .then (function (val) { NVRDataModel.debug ("ZM Version nag: Checking "+val+" with "+zm.zmVersionCheckNag); - if (val >=zm.zmVersionCheckNag ) { + if (val >=zm.zmVersionCheckNag && 0 ) { //https://api.github.com/repos/zoneminder/zoneminder/releases/latest //tag_name NVRDataModel.updateHrsSinceChecked("zmVersion"); diff --git a/www/js/app.js b/www/js/app.js index 9a0b62a7..6f9569e5 100755 --- a/www/js/app.js +++ b/www/js/app.js @@ -103,6 +103,7 @@ angular.module('zmApp', [ quantSample: 15, hashSecret: 'unused at the moment', forceMontageReloadDelay: 4500000, // 1 hr 15m, + //forceMontageReloadDelay: 5000, // 1 hr 15m, thumbWidth:200, alarmStatusTime: 10000, eventServerErrorDelay:5000, // time to wait till I report initial connect errors @@ -1315,8 +1316,9 @@ angular.module('zmApp', [ // lets see if it really works $rootScope.online = navigator.onLine; - $window.addEventListener("offline", function () { - $rootScope.$apply(function () { + document.addEventListener("offline", function () { + //console.log ("OFFLINE------------------------------------"); + $timeout(function () { $rootScope.online = false; NVRDataModel.log("Your network went offline"); @@ -1325,8 +1327,11 @@ angular.module('zmApp', [ }); }, false); - $window.addEventListener("online", function () { - $rootScope.$apply(function () { + document.addEventListener("online", function () { + //console.log ("ONLINE------------------------------------"); + $timeout(function () { + NVRDataModel.log("Your network came back online"); + $rootScope.online = true; $timeout(function () { |