diff options
| author | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-12-24 18:29:31 -0500 |
|---|---|---|
| committer | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-12-24 18:29:31 -0500 |
| commit | d7bf7c6ed57b1dea3069db43cd7722defb1e1bd6 (patch) | |
| tree | e2e357bab60c13028db5280a450ff89472a651fe /www/js | |
| parent | 0ba8f03c52b0cd52d77f5d509bc463ed15510e1a (diff) | |
#122 - make the text clickable to cancel too
Former-commit-id: 0abbb5240d566848f8b0197173042d552e90cb74
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/LoginCtrl.js | 2 | ||||
| -rw-r--r-- | www/js/PortalLoginCtrl.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js index b72e00cb..ff24bc72 100644 --- a/www/js/LoginCtrl.js +++ b/www/js/LoginCtrl.js @@ -388,7 +388,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r - zmAutoLogin.doLogin("<button class='button button-clear' style='line-height: normal; min-height: 0; min-width: 0;' ng-click='$root.cancelAuth()'><i class='ion-close-circled'></i></button>authenticating...") + zmAutoLogin.doLogin("<button class='button button-clear' style='line-height: normal; min-height: 0; min-width: 0;' ng-click='$root.cancelAuth()'><i class='ion-close-circled'></i> authenticating...</button>") // Do the happy menu only if authentication works // if it does not work, there is an emitter for auth // fail in app.js that will be called to show an error diff --git a/www/js/PortalLoginCtrl.js b/www/js/PortalLoginCtrl.js index 61367742..ad064f38 100644 --- a/www/js/PortalLoginCtrl.js +++ b/www/js/PortalLoginCtrl.js @@ -69,7 +69,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic $rootScope.rand = Math.floor((Math.random() * 100000) + 1); zmAutoLogin.stop(); //safety zmAutoLogin.start(); - zmAutoLogin.doLogin("<button class='button button-clear' style='line-height: normal; min-height: 0; min-width: 0;' ng-click='$root.cancelAuth()'><i class='ion-close-circled'></i></button>authenticating...") + zmAutoLogin.doLogin("<button class='button button-clear' style='line-height: normal; min-height: 0; min-width: 0;' ng-click='$root.cancelAuth()'><i class='ion-close-circled'></i> authenticating...</button>") .then(function (data) // success { ZMDataModel.zmDebug("PortalLogin: auth success"); @@ -214,7 +214,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic $rootScope.rand = Math.floor((Math.random() * 100000) + 1); zmAutoLogin.stop(); //safety zmAutoLogin.start(); - zmAutoLogin.doLogin("<button class='button button-clear' style='line-height: normal; min-height: 0; min-width: 0;' ng-click='$root.cancelAuth()'><i class='ion-close-circled'></i></button>authenticating...") + zmAutoLogin.doLogin("<button class='button button-clear' style='line-height: normal; min-height: 0; min-width: 0;' ng-click='$root.cancelAuth()'><i class='ion-close-circled'></i> authenticating...</button>") .then(function (data) // success { EventServer.refresh(); |