diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2020-10-10 19:09:22 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2020-10-10 19:09:22 -0400 |
| commit | 1a12e26804decbadee1aca3f2cec666eac18de0a (patch) | |
| tree | b7d1b7467ad168ce28c7499c673c4e27d65287da /www/js/EventServer.js | |
| parent | 0711179c6e1104f4e1954c7a0685f40ed25c0851 (diff) | |
add promise to loadMore and add app version
Diffstat (limited to 'www/js/EventServer.js')
| -rw-r--r-- | www/js/EventServer.js | 5 |
1 files changed, 3 insertions, 2 deletions
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); } |