diff options
| author | Pliable Pixels <pliablepixels@users.noreply.github.com> | 2018-10-15 10:42:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-15 10:42:02 -0400 |
| commit | 7d696e85cbe7112ebc2a1b49ee957e42209a404c (patch) | |
| tree | ff8135ee4b1ffeac839c8f3365d5d82e29760d77 /www/js/EventServerSettingsCtrl.js | |
| parent | 1cd6c1ba5f1944b411f871bedeb65e93c9530bc4 (diff) | |
| parent | fb73ec7092b1763c4d64148dd8230751e10eec68 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'www/js/EventServerSettingsCtrl.js')
| -rw-r--r-- | www/js/EventServerSettingsCtrl.js | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/www/js/EventServerSettingsCtrl.js b/www/js/EventServerSettingsCtrl.js index c5857369..6b04eefa 100644 --- a/www/js/EventServerSettingsCtrl.js +++ b/www/js/EventServerSettingsCtrl.js @@ -207,36 +207,36 @@ EventServer.disconnect(); EventServer.init() .then(function (data) { - // console.log("Sending control filter"); - NVRDataModel.debug("Sending Control message 'filter' with monlist=" + monstring + " and interval=" + intervalstring); - EventServer.sendMessage("control", { - type: 'filter', - monlist: monstring, - intlist: intervalstring, - token: $rootScope.apnsToken - }, 1); - - if ($rootScope.apnsToken != "") - // if its defined then this is post init work - // so lets transmit state here - - { - // we need to disable the token - NVRDataModel.debug("Sending token state " + pushstate); - EventServer.sendMessage('push', { - type: 'token', - platform: plat, - token: $rootScope.apnsToken, - state: pushstate + // console.log("Sending control filter"); + NVRDataModel.debug("Sending Control message 'filter' with monlist=" + monstring + " and interval=" + intervalstring); + EventServer.sendMessage("control", { + type: 'filter', + monlist: monstring, + intlist: intervalstring, + token: $rootScope.apnsToken }, 1); + if ($rootScope.apnsToken != "") + // if its defined then this is post init work + // so lets transmit state here + + { + // we need to disable the token + NVRDataModel.debug("Sending token state " + pushstate); + EventServer.sendMessage('push', { + type: 'token', + platform: plat, + token: $rootScope.apnsToken, + state: pushstate + }, 1); + + } + + }, + function (err) { + NVRDataModel.debug("Event Server init failed"); } - }, - function (err) { - NVRDataModel.debug("Event Server init failed"); - } - ); } // no event server configured/enabled |