summaryrefslogtreecommitdiff
path: root/www/js/app.js
diff options
context:
space:
mode:
authorpliablepixels <pliablepixels@gmail.com>2016-03-16 09:57:05 -0400
committerpliablepixels <pliablepixels@gmail.com>2016-03-16 09:57:05 -0400
commitfcad5d2d8d654cd5dba9181a34f536da4aeb49ad (patch)
tree1e98fdc15434011b25b68337937a3e575b161650 /www/js/app.js
parenta6482370ef4b76920780433a94c9dd4fbae0cc9c (diff)
cleaning up portal login code
Former-commit-id: 34bde612d06495a041eb80ad934c90c6f858beaa
Diffstat (limited to 'www/js/app.js')
-rw-r--r--www/js/app.js9
1 files changed, 9 insertions, 0 deletions
diff --git a/www/js/app.js b/www/js/app.js
index d57b6ecf..e5100e05 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -1213,6 +1213,12 @@ angular.module('zmApp', [
$ionicHistory.currentView().stateParams;
ZMDataModel.zmDebug("Last State recorded:" +
JSON.stringify($ionicHistory.currentView()));
+
+ if ($rootScope.lastState == "zm-portal-login") {
+ ZMDataModel.zmDebug("Last state was portal-login, so forcing montage");
+ $rootScope.lastState = "montage";
+ }
+
ZMDataModel.zmDebug ("going to portal login");
$state.go("zm-portal-login");
} else {
@@ -1220,6 +1226,9 @@ angular.module('zmApp', [
$rootScope.lastStateParam = "";
ZMDataModel.zmDebug ("reset lastState to null");
}
+
+
+
//$ionicSideMenuDelegate.toggleLeft(false);
//ZMDataModel.validatePin()