diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2016-09-04 10:56:42 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2016-09-04 10:56:42 -0400 |
| commit | 85eb606c1069213bb25feaf887bed81981d9fdf9 (patch) | |
| tree | cce3e1a80cef9d4128efceecedf8f6f4cc4dbfec /www/js | |
| parent | 1649d8a03c8fdd8d9e9491e5c06233f4c15f35a0 (diff) | |
#320 - save items on menu tap, remove state transition prevention code
Former-commit-id: 624d8a79c1ffc70cac8cddff9c7f4ec9b313518c
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/LoginCtrl.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js index 11a9699a..df85651e 100644 --- a/www/js/LoginCtrl.js +++ b/www/js/LoginCtrl.js @@ -4,7 +4,10 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$rootScope', 'zm', '$ionicModal', 'NVRDataModel', '$ionicSideMenuDelegate', '$ionicPopup', '$http', '$q', '$ionicLoading', 'zmAutoLogin', '$cordovaPinDialog', 'EventServer', '$ionicHistory', '$state', '$ionicActionSheet', 'SecuredPopups', '$stateParams', '$translate', function ($scope, $rootScope, zm, $ionicModal, NVRDataModel, $ionicSideMenuDelegate, $ionicPopup, $http, $q, $ionicLoading, zmAutoLogin, $cordovaPinDialog, EventServer, $ionicHistory, $state, $ionicActionSheet, SecuredPopups, $stateParams, $translate) { $scope.openMenu = function () { + + saveItems(false); $ionicSideMenuDelegate.toggleLeft(); + }; @@ -289,6 +292,8 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r //---------------------------------------------------------------- // credit: http://stackoverflow.com/questions/33385610/ionic-prevent-navigation-on-leave + /* Disabled - seems to crash with native transitions + $scope.$on('$stateChangeStart', function (event, toState, toParams, fromState, fromParams) { NVRDataModel.setAwake(false); var ld = NVRDataModel.getLogin(); @@ -305,7 +310,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r }); } - }); + });*/ $rootScope.$on('$stateChangeSuccess', function () { $scope.ignoreDirty = false; |
