From 881a3b160a1320f2318712c1063e40775236099f Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Mon, 8 Oct 2018 11:26:07 -0400 Subject: rework to use native browser websockets. angular-websocket doesn't seem to work with WK --- www/js/EventServerSettingsCtrl.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'www/js/EventServerSettingsCtrl.js') diff --git a/www/js/EventServerSettingsCtrl.js b/www/js/EventServerSettingsCtrl.js index 24928007..a4ce03b0 100644 --- a/www/js/EventServerSettingsCtrl.js +++ b/www/js/EventServerSettingsCtrl.js @@ -212,7 +212,8 @@ EventServer.sendMessage("control", { type: 'filter', monlist: monstring, - intlist: intervalstring + intlist: intervalstring, + token: $rootScope.apnsToken, }, 1); if ($rootScope.apnsToken != "") @@ -231,7 +232,12 @@ } - }); + }, + function (err) { + NVRDataModel.debug("Event Server init failed"); + } + + ); } // no event server configured/enabled else { -- cgit v1.2.3 From 2453cf21be3a283f2ee8ff4640762733c4b7b6b2 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Fri, 12 Oct 2018 09:54:00 -0400 Subject: meh don't think we need these --- www/js/EventServerSettingsCtrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'www/js/EventServerSettingsCtrl.js') diff --git a/www/js/EventServerSettingsCtrl.js b/www/js/EventServerSettingsCtrl.js index a4ce03b0..c5857369 100644 --- a/www/js/EventServerSettingsCtrl.js +++ b/www/js/EventServerSettingsCtrl.js @@ -213,7 +213,7 @@ type: 'filter', monlist: monstring, intlist: intervalstring, - token: $rootScope.apnsToken, + token: $rootScope.apnsToken }, 1); if ($rootScope.apnsToken != "") -- cgit v1.2.3