diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-02-26 13:02:08 -0500 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-02-26 13:02:08 -0500 |
| commit | 05e699b433ff4b9df9f6927c12a4950f379bb5a8 (patch) | |
| tree | c0d4cd77751eb7682eb48c36683bbe7b818f94be /www/js/DevOptionsCtrl.js | |
| parent | 896ef6436276ddeed166909a917801f97c06ead1 (diff) | |
#174 - multiple popups will stack now, each can exit
Former-commit-id: 1ddeec063ed71650338c725bfa58f8a65bddaa4f
Diffstat (limited to 'www/js/DevOptionsCtrl.js')
| -rw-r--r-- | www/js/DevOptionsCtrl.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/www/js/DevOptionsCtrl.js b/www/js/DevOptionsCtrl.js index 5cb6e1d4..9a42ce45 100644 --- a/www/js/DevOptionsCtrl.js +++ b/www/js/DevOptionsCtrl.js @@ -2,7 +2,7 @@ /* jslint browser: true*/ /* global cordova,StatusBar,angular,console */ -angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope', '$rootScope', '$ionicModal', 'zm', 'ZMDataModel', '$ionicSideMenuDelegate', '$ionicPopup', '$http', '$q', '$ionicLoading', '$ionicHistory','$state', function ($scope, $rootScope, $ionicModal, zm, ZMDataModel, $ionicSideMenuDelegate, $ionicPopup, $http, $q, $ionicLoading, $ionicHistory, $state) { +angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope', '$rootScope', '$ionicModal', 'zm', 'ZMDataModel', '$ionicSideMenuDelegate', '$ionicPopup', '$http', '$q', '$ionicLoading', '$ionicHistory','$state', 'SecuredPopups', function ($scope, $rootScope, $ionicModal, zm, ZMDataModel, $ionicSideMenuDelegate, $ionicPopup, $http, $q, $ionicLoading, $ionicHistory, $state, SecuredPopups) { $scope.openMenu = function () { @@ -57,7 +57,7 @@ angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope' ZMDataModel.zmDebug("SaveDevOptions: called"); if (parseInt($scope.loginData.maxMontage) > zm.safeMontageLimit) { - $rootScope.zmPopup= $ionicPopup.alert({ + $rootScope.zmPopup= SecuredPopups.show('alert',{ title: 'Note', template: 'You have selected to view more than 10 monitors in the Montage screen. Note that this is very resource intensive and may load the server or cause issues in the application. If you are not sure, please consider limiting this value to 10' }); @@ -99,7 +99,8 @@ angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope' $scope.saveDevOptions = function () { saveDevOptions(); - $rootScope.zmPopup= $ionicPopup.alert({ + $rootScope.zmPopup.close(); + $rootScope.zmPopup= SecuredPopups.show('alert',{ title: 'Settings Saved', template: 'Please explore the menu and enjoy zmNinja!' }).then(function (res) { |