diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2018-03-14 12:11:39 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2018-03-14 12:11:39 -0400 |
| commit | e30052fc3e1607af2e6161e87032a66a89c83ca5 (patch) | |
| tree | c66392ba24f080721b2b629605c52e4063ed1419 | |
| parent | 5b6d9b5796475bed4f8fdcb9380bd6bc8baed661 (diff) | |
#598 more tweaks
| -rw-r--r-- | www/js/RefreshCtrl.js | 28 | ||||
| -rwxr-xr-x | www/js/app.js | 17 |
2 files changed, 44 insertions, 1 deletions
diff --git a/www/js/RefreshCtrl.js b/www/js/RefreshCtrl.js new file mode 100644 index 00000000..43ef9ac6 --- /dev/null +++ b/www/js/RefreshCtrl.js @@ -0,0 +1,28 @@ +/* jshint -W041 */ +/* jslint browser: true*/ +/* global cordova,StatusBar,angular,console */ + +angular.module('zmApp.controllers').controller('zmApp.RefreshCtrl', ['$scope', '$ionicSideMenuDelegate', 'zm', '$stateParams', '$state', '$ionicHistory', function($scope, $ionicSideMenuDelegate, zm, $stateParams, $state, $ionicHistory) +{ + $scope.openMenu = function() + { + $ionicSideMenuDelegate.toggleLeft(); + }; + + //------------------------------------------------------------------------- + // Controller Main + //------------------------------------------------------------------------ + $scope.$on('$ionicView.afterEnter', function() + { + //console.log("**VIEW ** LowVersion Ctrl Entered"); + $ionicSideMenuDelegate.canDragContent(false); + console.log ("jumping to: "+$stateParams.view); + $ionicHistory.nextViewOptions({ + disableAnimate: true, + disableBack: true + }); + $state.go($stateParams.view); + return; + }); + +}]); diff --git a/www/js/app.js b/www/js/app.js index bc336353..36a730c1 100755 --- a/www/js/app.js +++ b/www/js/app.js @@ -1452,7 +1452,7 @@ angular.module('zmApp', [ //console.log("HERE"); - if ($rootScope.apiValid == false && toState.name != 'invalidapi' && toState.data.requireLogin == true) { + if ($rootScope.apiValid == false && toState.name != 'invalidapi' && toState.data.requireLogin == true) { event.preventDefault(); $state.transitionTo('app.invalidapi'); return; @@ -2087,6 +2087,20 @@ angular.module('zmApp', [ }) + + .state('app.refresh', { + data: { + requireLogin: false + }, + + url: "/refresh/:view", + cache: false, + nativeTransitions: null, + templateUrl: "templates/refresh.html", + controller: 'zmApp.RefreshCtrl', + + }) + .state('app.importantmessage', { data: { requireLogin: false @@ -2285,6 +2299,7 @@ angular.module('zmApp', [ }, url: "/montage", cache: false, + nativeTransitions: null, templateUrl: "templates/montage.html", controller: 'zmApp.MontageCtrl', params: { |
