BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3344 from matiu/v1.4 

V1.4
This commit is contained in:
Gustavo Maximiliano Cortez 2015-10-26 12:25:42 -03:00
parent 81e82c8371 e8f5334901
commit 8cd4430479
2 changed files with 13 additions and 10 deletions
Show Stats 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
cp ./etc/beep.ogg ./cordova/project/plugins/phonegap-plugin-barcodescanner/src/android/LibraryProject/res/raw/beep.ogg
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:
cordova/build.sh ANDROID --dbgjs --clear

15
src/js/services/animationService.js
View File

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