diff options
Diffstat (limited to 'www/js')
| -rwxr-xr-x | www/js/DataModel.js | 2 | ||||
| -rw-r--r-- | www/js/LoginCtrl.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index f63e6c8a..8aa3e6ea 100755 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -103,7 +103,7 @@ angular.module('zmApp.controllers') 'singleImageQuality': "100", // event single streaming quality in % 'monSingleImageQuality': "100", // live view quality 'montageHistoryQuality': "50", - 'useSSL': false, // "1" if HTTPS + 'useSSL': false, // "1" if HTTPS --> not used #589 'keepAwake': true, // don't dim/dim during live view 'isUseAuth': true, // true if user wants ZM auth 'isUseEventServer': false, // true if you configure the websocket event server diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js index 7956950b..36c139b1 100644 --- a/www/js/LoginCtrl.js +++ b/www/js/LoginCtrl.js @@ -593,7 +593,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r $scope.loginData.streamingurl = addhttp($scope.loginData.streamingurl); $scope.loginData.eventServer = addWsOrWss($scope.loginData.eventServer); - if ($scope.loginData.useSSL) + /* if ($scope.loginData.useSSL) { // replace all http with https $scope.loginData.url = $scope.loginData.url.replace("http:", "https:"); @@ -609,7 +609,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r $scope.loginData.apiurl = $scope.loginData.apiurl.replace("https:", "http:"); $scope.loginData.streamingurl = $scope.loginData.streamingurl.replace("https:", "http:"); // don't do it for WSS - lets mandate that - } + }*/ var apiurl = $scope.loginData.apiurl + '/host/getVersion.json'; var portalurl = $scope.loginData.url + '/index.php'; |