From 1a12e26804decbadee1aca3f2cec666eac18de0a Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sat, 10 Oct 2020 19:09:22 -0400 Subject: add promise to loadMore and add app version --- www/js/EventServer.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'www/js/EventServer.js') diff --git a/www/js/EventServer.js b/www/js/EventServer.js index 8dac402e..8b1ceb01 100644 --- a/www/js/EventServer.js +++ b/www/js/EventServer.js @@ -45,7 +45,8 @@ angular.module('zmApp.controllers') user: loginData.username, password: loginData.password, monlist: loginData.eventServerMonitors, - intlist: loginData.eventServerInterval + intlist: loginData.eventServerInterval, + appversion: NVR.getAppVersion() }); @@ -633,7 +634,7 @@ angular.module('zmApp.controllers') NVR.debug("push: EventSever: received push notification with payload:"+JSON.stringify(message)); - if ($rootScope.platformOS == 'ios') { + if ($rootScope.platformOS != 'desktop') { NVR.debug ("push: clearing badge"); window.FirebasePlugin.setBadgeNumber(0); } -- cgit v1.2.3