diff options
| author | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-10-28 14:58:49 -0400 |
|---|---|---|
| committer | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-10-28 14:58:49 -0400 |
| commit | 19516d1bbc79ca331210aea22289215eff73412a (patch) | |
| tree | 6c3300cab18771b1a384cf8f08efdf6088ea7b3f /www/js/PortalLoginCtrl.js | |
| parent | 50ea96b8ef90ab49aabdf67450496eeaf738c226 (diff) | |
new option to select either montage or event screen on tapping notifications #47
Diffstat (limited to 'www/js/PortalLoginCtrl.js')
| -rw-r--r-- | www/js/PortalLoginCtrl.js | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/www/js/PortalLoginCtrl.js b/www/js/PortalLoginCtrl.js index 1dc9c8b5..f828a0df 100644 --- a/www/js/PortalLoginCtrl.js +++ b/www/js/PortalLoginCtrl.js @@ -92,11 +92,25 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic if ($rootScope.tappedNotification) { - console.log ("***** NOTIFICATION TAPPED GOING TO EVENTS "); + var ld = ZMDataModel.getLogin(); + + console.log ("***** NOTIFICATION TAPPED "); $rootScope.tappedNotification = 0; - $ionicHistory.nextViewOptions({disableBack: true}); - $state.go("events", {"id": 0}, { reload: true }); - return; + $ionicHistory.nextViewOptions({disableBack: true}); + + if (ld.onTapScreen == 'montage' ) + { + ZMDataModel.zmDebug("Going to montage"); + $state.go("montage", {}, { reload: true }); + + return; + } + else + { + ZMDataModel.zmDebug("Going to events"); + $state.go("events", {"id": 0}, { reload: true }); + return; + } } $state.go($rootScope.lastState ? $rootScope.lastState : 'montage', $rootScope.lastStateParam); |