diff options
Diffstat (limited to 'www/lib/ionic-native-transitions/test')
| -rw-r--r-- | www/lib/ionic-native-transitions/test/config.js | 72 | ||||
| -rw-r--r-- | www/lib/ionic-native-transitions/test/controller.js | 50 | ||||
| -rw-r--r-- | www/lib/ionic-native-transitions/test/index.html | 11 |
3 files changed, 101 insertions, 32 deletions
diff --git a/www/lib/ionic-native-transitions/test/config.js b/www/lib/ionic-native-transitions/test/config.js index 2aa38109..35aa240b 100644 --- a/www/lib/ionic-native-transitions/test/config.js +++ b/www/lib/ionic-native-transitions/test/config.js @@ -1,4 +1,4 @@ -export default function($ionicNativeTransitionsProvider, $stateProvider, $urlRouterProvider, $ionicConfigProvider) { +export default function ($ionicNativeTransitionsProvider, $stateProvider, $urlRouterProvider, $ionicConfigProvider) { 'ngInject'; $ionicNativeTransitionsProvider.setDefaultOptions({ duration: 500, @@ -34,6 +34,30 @@ export default function($ionicNativeTransitionsProvider, $stateProvider, $urlRou } } }) + .state('tabs.about', { + url: "/about", + nativeTransitions: { + type: "fade" + }, + views: { + 'about-tab': { + templateUrl: "templates/about.html" + } + } + }) + .state('tabs.contact', { + url: "/contact", + nativeTransitions: { + type: "slide", + direction: "left", + fixedPixelsTop: 93 + }, + views: { + 'contact-tab': { + templateUrl: "templates/contact.html" + } + } + }) .state('one', { url: "/one", nativeTransitions: { @@ -45,8 +69,8 @@ export default function($ionicNativeTransitionsProvider, $stateProvider, $urlRou "direction": "right" }, nativeTransitionsBackAndroid: { - "type": "flip", - "direction": "left" + "type": "slide", + "direction": "down" }, nativeTransitionsIOS: { "type": "flip", @@ -63,6 +87,7 @@ export default function($ionicNativeTransitionsProvider, $stateProvider, $urlRou nativeTransitions: { type: "fade" }, + nativeTransitionsBack: null, nativeTransitionsIOS: { "type": "flip", "direction": "down" // 'left|right|up|down', default 'right' (Android currently only supports left and right) @@ -80,7 +105,7 @@ export default function($ionicNativeTransitionsProvider, $stateProvider, $urlRou }, nativeTransitionsBackAndroid: { "type": "slide", - "direction": "down" // 'left|right|up|down', default 'right' (Android currently only supports left and right) + "direction": "up" // 'left|right|up|down', default 'right' (Android currently only supports left and right) }, templateUrl: "templates/three.html" }) @@ -90,27 +115,32 @@ export default function($ionicNativeTransitionsProvider, $stateProvider, $urlRou test: null }, templateUrl: "templates/four.html", - controller: function($stateParams){ + controller: function ($stateParams) { 'ngInject'; console.log('$stateParams', $stateParams); } }) - .state('tabs.about', { - url: "/about", - nativeTransitions: null, - views: { - 'about-tab': { - templateUrl: "templates/about.html" - } - } - }) - .state('tabs.contact', { - url: "/contact", - nativeTransitions: null, - views: { - 'contact-tab': { - templateUrl: "templates/contact.html" - } + .state('five', { + url: "/five", + templateUrl: "templates/five.html", + controller: function ($stateParams) { + 'ngInject'; + console.log('$stateParams', $stateParams); + }, + resolve: function ($timeout, $q, $ionicPopup) { + 'ngInject'; + var deferred = $q.defer(); + $timeout(function () { + $ionicPopup.show({ + template: '', + title: 'A popup', + buttons: [ + { text: 'Cancel' } + ] + }); + deferred.reject(); + }, 1000) + return deferred.promise; } }); diff --git a/www/lib/ionic-native-transitions/test/controller.js b/www/lib/ionic-native-transitions/test/controller.js index a994d5ff..a951d5f9 100644 --- a/www/lib/ionic-native-transitions/test/controller.js +++ b/www/lib/ionic-native-transitions/test/controller.js @@ -1,4 +1,4 @@ -export default function( +export default function ( $scope, $rootScope, $log, @@ -16,19 +16,34 @@ export default function( vm.enable = enable; vm.disable = disable; vm.stateGo = stateGo; + vm.sameStateGo = sameStateGo; vm.locationUrl = locationUrl; vm.disableWithoutDisablingIonicTransitions = disableWithoutDisablingIonicTransitions; + vm.enableBothTransitions = enableBothTransitions; vm.openModal = openModal; vm.goBack = goBack; + vm.stateError = stateError; - $rootScope.$on('ionicNativeTransitions.success', function() { + $scope.$on('$ionicView.loaded', function (event, data) { + console.log('$ionicView.loaded'); + }); + + $scope.$on('$ionicView.enter', function (event, data) { + console.log('$ionicView.enter'); + }); + + $rootScope.$on('ionicNativeTransitions.success', function () { $log.info('yeah!'); }); - $rootScope.$on('ionicNativeTransitions.error', function() { + $rootScope.$on('ionicNativeTransitions.error', function () { $log.info(':('); }); + $rootScope.$on('ionicNativeTransitions.beforeTransition', function () { + $log.info('Transition is about to happen'); + }); + function openModal() { if (vm.modal) { vm.modal.show(); @@ -47,8 +62,8 @@ export default function( </ion-content> </ion-modal-view> `, { - scope: $rootScope.$new(), - }); + scope: $rootScope.$new(), + }); vm.modal.show(); vm.modal.scope.close = () => { console.log('modal close', JSON.stringify($ionicPlatform.$backButtonActions)) @@ -72,17 +87,26 @@ export default function( vm.isEnable = $ionicNativeTransitions.isEnabled(); } + function enableBothTransitions() { + $ionicNativeTransitions.enable(true, false); + vm.isEnable = $ionicNativeTransitions.isEnabled(); + } + + function sameStateGo(reload = false) { + $ionicNativeTransitions.stateGo('tabs.home', {}, { reload }); + } + function stateGo() { $ionicNativeTransitions.stateGo('four', { test: 'buyakacha!', testParamUrl: 'hihi' }, { - "type": "slide", - "direction": "up", // 'left|right|up|down', default 'left' (which is like 'next') - "duration": 1500, // in milliseconds (ms), default 400 - }, { - reload: true - }); + "type": "slide", + "direction": "up", // 'left|right|up|down', default 'left' (which is like 'next') + "duration": 1500, // in milliseconds (ms), default 400 + }, { + reload: true + }); } function locationUrl() { @@ -93,4 +117,8 @@ export default function( console.log('count', count, $ionicHistory.viewHistory()) $rootScope.$ionicGoBack(count); } + + function stateError() { + $ionicNativeTransitions.stateGo('five'); + } } diff --git a/www/lib/ionic-native-transitions/test/index.html b/www/lib/ionic-native-transitions/test/index.html index 64c84fc5..9be76370 100644 --- a/www/lib/ionic-native-transitions/test/index.html +++ b/www/lib/ionic-native-transitions/test/index.html @@ -61,6 +61,7 @@ <a class="button button-full button-large icon icon-right ion-chevron-right" ng-click="main.enable()">Enable plugin</a> <a class="button button-full button-large icon icon-right ion-chevron-right" ng-click="main.disable()">Disable plugin</a> + <a class="button button-full button-large icon icon-right ion-chevron-right" ng-click="main.enableBothTransitions()">Enable both transitions</a> <a class="button button-full button-large icon icon-right ion-chevron-right" ng-click="main.disableWithoutDisablingIonicTransitions()">Disable plugin and ionic transitions</a> <a class="button button-full button-large icon icon-right ion-chevron-right" ng-click="main.stateGo()">StateGo</a> <button class="button button-full button-large icon icon-right ion-chevron-right" native-ui-sref="four({test: 'buyakacha2!', testParamUrl: 'haha'})" native-ui-sref-opts="{inherit:false}" native-options="{type: 'slide', direction:'down'}"> @@ -70,6 +71,9 @@ StateGo via directive without native-options </button> <a class="button button-full button-large icon icon-right ion-chevron-right" ng-click="main.locationUrl()">LocationUrl</a> + <a class="button button-full button-large icon icon-right ion-chevron-right" ng-click="main.sameStateGo()">sameStateGo</a> + <a class="button button-full button-large icon icon-right ion-chevron-right" ng-click="main.sameStateGo(true)">sameStateGo with reload</a> + <a class="button button-full button-large icon icon-right ion-chevron-right" ng-click="main.stateError()">State on error</a> </ion-content> </ion-view> </script> @@ -120,6 +124,13 @@ </ion-content> </ion-view> </script> + + <script id="templates/five.html" type="text/ng-template"> + <ion-view view-title="Five"> + <ion-content class=""> + </ion-content> + </ion-view> + </script> <script id="templates/about.html" type="text/ng-template"> <ion-view view-title="About"> |