anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #11 from matiu/guga1

Browse source 
refactor fix
This commit is contained in:
Gustavo Maximiliano Cortez 2015-05-15 19:39:05 -03:00
commit ece6124a6c
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/js/routes.js
View file

@ -384,6 +384,8 @@ angular
var pageWeight = { var pageWeight = {
walletHome: 0, walletHome: 0,
copayers: -1, copayers: -1,
cordova: -1,
uri-payment: -1,
preferences: 11, preferences: 11,
preferencesColor: 12, preferencesColor: 12,
@ -466,7 +468,7 @@ angular
function animateTransition(fromState, toState, event) { function animateTransition(fromState, toState, event) {
if (isaosp || toState.name == 'cordova' || toState.name == 'uri-payment') if (isaosp)
return true; return true;
// Animation in progress? // Animation in progress?
@ -488,19 +490,27 @@ angular
var entering = null, var entering = null,
leaving = null; leaving = null;
// Horizontal Slide Animation?
if (fromWeight && toWeight) { if (fromWeight && toWeight) {
if (fromWeight > toWeight) { if (fromWeight > toWeight) {
leaving = 'CslideOutRight'; leaving = 'CslideOutRight';
} else { } else {
entering = 'CslideInRight'; entering = 'CslideInRight';
} }
// Vertical Slide Animation?
} else if (fromName && fromWeight >= 0 && toWeight >= 0) { } else if (fromName && fromWeight >= 0 && toWeight >= 0) {
if (toWeight) { if (toWeight) {
entering = 'CslideInUp'; entering = 'CslideInUp';
} else { } else {
leaving = 'CslideOutDown'; leaving = 'CslideOutDown';
} }
// no Animation ?
} else {
return true;
} }
var e = document.getElementById('mainSection'); var e = document.getElementById('mainSection');