diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-04-17 14:50:26 -0400 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-04-17 14:50:26 -0400 |
| commit | fb86cb075d5a075ce273588693fba57e4338b349 (patch) | |
| tree | c2b37ca28982aba8f689b6da088c2328f5c93bd2 /www/js/DataModel.js | |
| parent | 9b96991f06a11513b524e45d06dab0ebbbd26ea7 (diff) | |
#226 - kung-fu native transitions
Former-commit-id: 78e74ddfc0db6458a7dfd1af0fb5ca9acf3abacd
Diffstat (limited to 'www/js/DataModel.js')
| -rw-r--r-- | www/js/DataModel.js | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index ec2686b4..7f468990 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -11,11 +11,11 @@ angular.module('zmApp.controllers') .service('ZMDataModel', -['$http', '$q', '$ionicLoading', '$ionicBackdrop', '$fileLogger', 'zm','$rootScope','$ionicContentBanner', '$timeout','$cordovaPinDialog', '$ionicPopup', '$localstorage', +['$http', '$q', '$ionicLoading', '$ionicBackdrop', '$fileLogger', 'zm','$rootScope','$ionicContentBanner', '$timeout','$cordovaPinDialog', '$ionicPopup', '$localstorage', '$state', '$ionicNativeTransitions', function ($http, $q, $ionicLoading, $ionicBackdrop,$fileLogger, zm, $rootScope,$ionicContentBanner, $timeout, $cordovaPinDialog, - $ionicPopup, $localstorage) { + $ionicPopup, $localstorage, $state, $ionicNativeTransitions) { var zmAppVersion="unknown"; var isBackground = false; @@ -191,6 +191,14 @@ angular.module('zmApp.controllers') // from APIs, I don't have an option + zmStateGo: function(state,p1,p2) + { + if ($rootScope.platformOS == 'desktop') + $state.go(state,p1,p2); + else + $ionicNativeTransitions.stateGo(state,p1,p2); + }, + // used when an empty server profile is created getDefaultLoginObject: function() { |