diff options
Diffstat (limited to 'www/js')
| -rwxr-xr-x | www/js/app.js | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/www/js/app.js b/www/js/app.js index f6da56cd..c2cdf770 100755 --- a/www/js/app.js +++ b/www/js/app.js @@ -106,6 +106,7 @@ angular.module('zmApp', [ forceMontageReloadDelay: 4500000, // 1 hr 15m, thumbWidth:200, alarmStatusTime: 10000, + eventServerErrorDelay:5000, // time to wait till I report initial connect errors }) @@ -1772,10 +1773,7 @@ angular.module('zmApp', [ NVRDataModel.log("Language file loaded, continuing with rest"); NVRDataModel.init(); - // now do SSL check - //setSSLCerts(); - - //EventServer.init(); + zmCheckUpdates.start(); NVRDataModel.log("Setting up POST LOGIN timer"); zmAutoLogin.start(); @@ -1855,9 +1853,8 @@ angular.module('zmApp', [ NVRDataModel.setJustResumed(false); // NVRDataModel.setJustResumed(true); // used for window stop - EventServer.disconnect(); - NVRDataModel.log("ROOT APP:App is going into background"); + EventServer.disconnect(); $interval.cancel($rootScope.eventQueryInterval); $interval.cancel($rootScope.intervalHandle); @@ -1866,8 +1863,8 @@ angular.module('zmApp', [ $rootScope.zmPopup.close(); - NVRDataModel.log("ROOT APP: Stopping network "); - NVRDataModel.stopNetwork("called from app.js"); + // NVRDataModel.log("ROOT APP: Stopping network "); + //NVRDataModel.stopNetwork("called from app.js"); // dont call stopNetwork - we need to stop here |