diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2018-10-17 14:51:24 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2018-10-17 14:51:24 -0400 |
| commit | 3ce67b7a46785b15e31afb9c77af4524e3e576d4 (patch) | |
| tree | 49d734d441412f603a33f29594846df5c226a1f3 | |
| parent | f6a7d8699dfd0d821b66583bf6e4098c77a8250b (diff) | |
take out portal to screen animation
| -rw-r--r-- | package.json | 4 | ||||
| -rw-r--r-- | www/js/PortalLoginCtrl.js | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/package.json b/package.json index 312e6887..d5c68dd0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "zmninjapro", "description": "Home security mobile app for ZoneMinder", - "version":"1.3.026", + "version": "1.3.026", "displayName": "zmNinja", "author": "Pliable Pixels", "license": "custom see LICENSE.md", @@ -175,4 +175,4 @@ ] } } -} +}
\ No newline at end of file diff --git a/www/js/PortalLoginCtrl.js b/www/js/PortalLoginCtrl.js index 7fb4cc50..74ba806d 100644 --- a/www/js/PortalLoginCtrl.js +++ b/www/js/PortalLoginCtrl.js @@ -29,9 +29,12 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic loginData = NVRDataModel.getLogin(); $ionicHistory.nextViewOptions({ + disableAnimate:true, disableBack: true }); + + $scope.pindata = {}; if ($ionicSideMenuDelegate.isOpen()) { $ionicSideMenuDelegate.toggleLeft(); @@ -153,6 +156,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic disableAnimate: true, disableBack: true }); + $state.go("app.login", { "wizard": false }); |