diff options
| author | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-10-26 16:22:30 -0400 |
|---|---|---|
| committer | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-10-26 16:22:30 -0400 |
| commit | 65d4b815354a1d17107a931fa20672498f30a7dd (patch) | |
| tree | f96dacf63c00e75e6b895188673b2fb4e9a844b8 /www/js/EventServerSettingsCtrl.js | |
| parent | 69ee97c77a431ac06532dbf247a3436d57e8b449 (diff) | |
Crafts a new notification icon so that Lollipop++ does not show a white block. What a moronic design imposition by Google. Resolves https://github.com/pliablepixels/zmNinja/issues/50
Diffstat (limited to 'www/js/EventServerSettingsCtrl.js')
| -rw-r--r-- | www/js/EventServerSettingsCtrl.js | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/www/js/EventServerSettingsCtrl.js b/www/js/EventServerSettingsCtrl.js index 7816d932..f6d9599a 100644 --- a/www/js/EventServerSettingsCtrl.js +++ b/www/js/EventServerSettingsCtrl.js @@ -113,7 +113,27 @@ angular.module('zmApp.controllers').controller('zmApp.EventServerSettingsCtrl', ZMDataModel.displayBanner('info', ['settings saved']); } - + //---------------------------------------------------------------- + // returns domain name in string - + // http://stackoverflow.com/questions/8498592/extract-root-domain-name-from-string + //---------------------------------------------------------------- + function extractDomain(url) { + var domain; + //find & remove protocol (http, ftp, etc.) and get domain + if (url.indexOf("://") > -1) { + domain = url.split('/')[2]; + } + else { + domain = url.split('/')[0]; + } + + //find & remove port number + domain = domain.split(':')[0]; + + return domain; +} + + //---------------------------------------------------------------- // returns reporting interval for monitor ID //---------------------------------------------------------------- @@ -157,6 +177,12 @@ angular.module('zmApp.controllers').controller('zmApp.EventServerSettingsCtrl', $scope.monitors = message; $scope.loginData = ZMDataModel.getLogin(); + + if ($scope.loginData.eventServer == "") + { + $scope.loginData.eventServer = "wss://"+extractDomain($scope.loginData.url)+":9000"; + } + $scope.check = { isUseEventServer: "" |
