From 8623646c266eb9e99103c9696c09456a42ac0060 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Wed, 10 Jan 2018 14:34:56 -0500 Subject: #499 iOS related changes, also handled case where push broadcast can be called before PortalLogin is done - needs to be handled _after_ auth --- www/js/app.js | 3 +++ 1 file changed, 3 insertions(+) (limited to 'www/js/app.js') diff --git a/www/js/app.js b/www/js/app.js index 765b765e..469c1db6 100755 --- a/www/js/app.js +++ b/www/js/app.js @@ -915,6 +915,7 @@ angular.module('zmApp', [ NVRDataModel.log("Came via push tap. onTapScreen=" + ld.onTapScreen); + $rootScope.pushOverride = true; //console.log ("***** NOTIFICATION TAPPED "); $rootScope.tappedNotification = 0; $ionicHistory.nextViewOptions( @@ -1984,6 +1985,8 @@ angular.module('zmApp', [ NVRDataModel.setBackground(true); NVRDataModel.setJustResumed(true); // used for window stop + EventServer.disconnect(); + NVRDataModel.log("ROOT APP:App is going into background"); $interval.cancel($rootScope.eventQueryInterval); -- cgit v1.2.3