summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2019-05-10 11:36:53 -0400
committerPliable Pixels <pliablepixels@gmail.com>2019-05-10 11:36:53 -0400
commitbe54fb1534f20ff0cc622ff2e7f8734a5fc22752 (patch)
tree56f59448fe94c141d16a4ba72352ac4937d6fafb
parentb327c9d59af37ae87be4f2fb344e185d683b49a0 (diff)
tried to explore desktop push, did not work
-rw-r--r--www/js/EventServer.js7
1 files changed, 4 insertions, 3 deletions
diff --git a/www/js/EventServer.js b/www/js/EventServer.js
index 6343cd0a..7dcb6937 100644
--- a/www/js/EventServer.js
+++ b/www/js/EventServer.js
@@ -520,10 +520,11 @@ angular.module('zmApp.controllers')
var media;
var ld = NVR.getLogin();
- var plat = $ionicPlatform.is('ios') ? 'ios' : 'android';
+ //var plat = $ionicPlatform.is('ios') ? 'ios' : 'android';
+ var plat = $rootScope.platformOS;
if ($rootScope.platformOS == 'desktop') {
- NVR.log("Desktop instance, not setting up push. Websockets only, I hope");
+ NVR.log ('Not setting up push as this is desktop.');
return;
}
@@ -573,7 +574,7 @@ angular.module('zmApp.controllers')
NVR.debug("EventSever: Push Notification registration ID received: " + JSON.stringify(data));
$rootScope.apnsToken = data.registrationId;
- var plat = $ionicPlatform.is('ios') ? 'ios' : 'android';
+ var plat = $rootScope.platformOS;
var ld = NVR.getLogin();
var pushstate = "enabled";
if (ld.disablePush == true)