diff options
| author | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-12-05 15:44:27 -0500 |
|---|---|---|
| committer | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-12-05 15:44:27 -0500 |
| commit | c76ead47d1b4474e8cef477a918639fa44d835f1 (patch) | |
| tree | 3e4c03e08590ce9d5d7e6a412d1a90f4f67229ff /www/js/LoginCtrl.js | |
| parent | 3f9daea7bb0fa25eb894bbc068b8ccbc1397c8a5 (diff) | |
scoped all alerts to zmPopupalert so I can kill them if moved to background and resumed. show dialogs were already scoped
Former-commit-id: d32398cee403f515eb593921f266abf229aa3780
Diffstat (limited to 'www/js/LoginCtrl.js')
| -rw-r--r-- | www/js/LoginCtrl.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js index 5616615d..7a58b43f 100644 --- a/www/js/LoginCtrl.js +++ b/www/js/LoginCtrl.js @@ -420,7 +420,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r .success(function (data) { ZMDataModel.zmDebug("Urk! cgi-path returned success, but it should not have come here"); loginStatus = "Login validated, but could not validate cgi-path. If live streams don't work please check your cgi-bin path"; - $ionicPopup.alert({ + $rootScope.zmPopup = $ionicPopup.alert({ title: 'Login validated', template: loginStatus }).then(function (res) { @@ -437,7 +437,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r loginStatus = "The cgi-bin path you entered may be wrong. I can't make sure, but if your live views don't work, please review your cgi path."; } - $ionicPopup.alert({ + $rootScope.zmPopup = $ionicPopup.alert({ title: 'Login validated', template: loginStatus }).then(function (res) { @@ -456,7 +456,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r .error(function (error) { ZMDataModel.displayBanner('error', ['ZoneMinder API check failed', 'Please check API settings']); ZMDataModel.zmLog("API login error " + JSON.stringify(error)); - $ionicPopup.alert({ + $rootScope.zmPopup= $ionicPopup.alert({ title: 'Login validated but API failed', template: 'Please check your API settings' }); @@ -470,7 +470,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r $scope.saveItems = function () { if (!$scope.loginData.serverName) { - $ionicPopup.alert({ + $rootScope.zmPopup = $ionicPopup.alert({ title: 'Error', template: 'Server Name cannot be empty', }) |