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

Merge pull request #3344 from matiu/v1.4

Browse source 
V1.4
This commit is contained in:
Gustavo Maximiliano Cortez 2015-10-26 12:25:42 -03:00
commit 8cd4430479
2 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -45,6 +45,8 @@ android-prod:
cordova/build.sh ANDROID --clear cordova/build.sh ANDROID --clear
cp ./etc/beep.ogg ./cordova/project/plugins/phonegap-plugin-barcodescanner/src/android/LibraryProject/res/raw/beep.ogg cp ./etc/beep.ogg ./cordova/project/plugins/phonegap-plugin-barcodescanner/src/android/LibraryProject/res/raw/beep.ogg
cd cordova/project && cordova build android --release cd cordova/project && cordova build android --release
jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../copay.keystore -signedjar cordova/project/platforms/android/build/outputs/apk/android-release-signed.apk cordova/project/platforms/android/build/outputs/apk/android-release-unsigned.apk copay_play
android-debug: android-debug:
cordova/build.sh ANDROID --dbgjs --clear cordova/build.sh ANDROID --dbgjs --clear

17
src/js/services/animationService.js
View file

@ -7,10 +7,10 @@ angular.module('copayApp.services').factory('animationService', function(isCordo
// DISABLE ANIMATION ON DESKTOP // DISABLE ANIMATION ON DESKTOP
root.modalAnimated = { root.modalAnimated = {
slideUp : isCordova ? 'full animated slideInUp' : 'full', slideUp: isCordova ? 'full animated slideInUp' : 'full',
slideRight : isCordova ? 'full animated slideInRight' : 'full', slideRight: isCordova ? 'full animated slideInRight' : 'full',
slideOutDown : isCordova ? 'slideOutDown' : 'hideModal', slideOutDown: isCordova ? 'slideOutDown' : 'hideModal',
slideOutRight : isCordova ? 'slideOutRight' : 'hideModal', slideOutRight: isCordova ? 'slideOutRight' : 'hideModal',
}; };
var pageWeight = { var pageWeight = {
@ -34,7 +34,7 @@ angular.module('copayApp.services').factory('animationService', function(isCordo
preferencesUnit: 12, preferencesUnit: 12,
preferencesFee: 12, preferencesFee: 12,
preferencesAltCurrency: 12, preferencesAltCurrency: 12,
preferencesBwsUrl: 12, preferencesBwsUrl: 13,
preferencesAlias: 12, preferencesAlias: 12,
preferencesEmail: 12, preferencesEmail: 12,
export: 13, export: 13,
@ -51,7 +51,8 @@ angular.module('copayApp.services').factory('animationService', function(isCordo
}; };
function cleanUpLater(e, e2) { function cleanUpLater(e, e2) {
var cleanedUp = false, timeoutID; var cleanedUp = false,
timeoutID;
var cleanUp = function() { var cleanUp = function() {
if (cleanedUp) return; if (cleanedUp) return;
cleanedUp = true; cleanedUp = true;
@ -72,7 +73,7 @@ angular.module('copayApp.services').factory('animationService', function(isCordo
timeoutID = setTimeout(cleanUp, 500); timeoutID = setTimeout(cleanUp, 500);
}; };
root.transitionAnimated = function (fromState, toState, event) { root.transitionAnimated = function(fromState, toState, event) {
if (isaosp) if (isaosp)
return true; return true;
@ -94,7 +95,7 @@ angular.module('copayApp.services').factory('animationService', function(isCordo
var entering = null, var entering = null,
leaving = null; leaving = null;
// Horizontal Slide Animation? // Horizontal Slide Animation?
if (isCordova && fromWeight && toWeight) { if (isCordova && fromWeight && toWeight) {