diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2016-07-13 12:39:00 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2016-07-13 12:39:00 -0400 |
| commit | 1c667b86832b91cfcd9cf4eff8bf6459d172db97 (patch) | |
| tree | 23e0ccad2fb2147525b1234787c6631f0d8ddbc3 | |
| parent | b993f108c1f798f50deac3e8e41a8fc3f002dce9 (diff) | |
slightly cleaner url guessing between api/streaming/portal
Former-commit-id: e0f190985ed843785dca9087adbe992e063caa88
| -rw-r--r-- | www/js/LoginCtrl.js | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js index e67867fe..5c81b102 100644 --- a/www/js/LoginCtrl.js +++ b/www/js/LoginCtrl.js @@ -332,10 +332,21 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r if (/^https:\/\//i.test($scope.loginData.url)) { $scope.loginData.useSSL = true; } + else + {$scope.loginData.useSSL = false;} - $scope.loginData.streamingurl = $scope.loginData.url; - - $scope.loginData.apiurl = $scope.loginData.url + "/api"; + if ($scope.loginData.url.slice(-1)=='/') + { + $scope.loginData.apiurl = $scope.loginData.url + "api"; + $scope.loginData.streamingurl = $scope.loginData.url + "cgi-bin"; + } + else + { + $scope.loginData.apiurl = $scope.loginData.url + "/api"; + $scope.loginData.streamingurl = $scope.loginData.url + "/cgi-bin"; + } + + }; //------------------------------------------------------------------------------- // Adds http to url if not present |