From d7bf7c6ed57b1dea3069db43cd7722defb1e1bd6 Mon Sep 17 00:00:00 2001
From: Arjun Roychowdhury <pliablepixels@gmail.com>
Date: Thu, 24 Dec 2015 18:29:31 -0500
Subject: #122 - make the text clickable to cancel too

Former-commit-id: 0abbb5240d566848f8b0197173042d552e90cb74
---
 www/js/LoginCtrl.js       | 2 +-
 www/js/PortalLoginCtrl.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'www/js')

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>&nbsp;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>&nbsp;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>&nbsp;authenticating...</button>")
                 .then(function (data) // success
                     {
                         EventServer.refresh();
-- 
cgit v1.2.3