diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2016-07-04 17:27:18 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2016-07-04 17:27:18 -0400 |
| commit | 84b05d931168df5eade1a5ca3c9dc0b303d98384 (patch) | |
| tree | cab6a17d9f2f1eea4d6114a545759c05d9bb1851 /www/js/PortalLoginCtrl.js | |
| parent | c841472fd5b2b6cf038cfde02283239166f3b0a1 (diff) | |
#278 - go directly to live view via monitors (avoid packery jugglery in montage). Pending - set value of tappedMid
Former-commit-id: 7805e086656ae4f05ee4af97d325f0e2b87f999a
Diffstat (limited to 'www/js/PortalLoginCtrl.js')
| -rw-r--r-- | www/js/PortalLoginCtrl.js | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/www/js/PortalLoginCtrl.js b/www/js/PortalLoginCtrl.js index c202c20d..10dd30ce 100644 --- a/www/js/PortalLoginCtrl.js +++ b/www/js/PortalLoginCtrl.js @@ -165,6 +165,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic if ($rootScope.tappedNotification) { + var ld = ZMDataModel.getLogin(); ZMDataModel.zmLog ("Came via push tap. onTapScreen="+ld.onTapScreen); @@ -172,19 +173,25 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic $rootScope.tappedNotification = 0; $ionicHistory.nextViewOptions({disableBack: true}); - if (ld.onTapScreen == 'montage' ) + if (ld.onTapScreen == $translate.instant('kTapMontage') ) { ZMDataModel.zmDebug("Going to montage"); $state.go("montage", {}, { reload: true }); return; } - else + else if (ld.onTapScreen == $translate.instant ('kTapEvents')) { ZMDataModel.zmDebug("Going to events"); $state.go("events", {"id": 0}, { reload: true }); return; } + else // we go to live + { + ZMDataModel.zmDebug("Going to live view but Montage for now"); + $state.go("montage", {}, { reload: true }); + return; + } } ZMDataModel.zmDebug("Transitioning state to: " + $rootScope.lastState ? $rootScope.lastState : 'montage'); |