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

Ref animations. Disabled for desktop

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2015-10-01 02:13:33 -03:00
commit 434a53ecdd
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
11 changed files with 203 additions and 207 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/js/controllers/buyGlidera.js
View file

@ -1,7 +1,7 @@
'use strict';
angular.module('copayApp.controllers').controller('buyGlideraController',
function($scope, $timeout, $modal, profileService, addressService, glideraService, bwsError, lodash, isChromeApp) {
function($scope, $timeout, $modal, profileService, addressService, glideraService, bwsError, lodash, isChromeApp, animationService) {
var self = this;
this.show2faCodeInput = null;
@ -9,13 +9,6 @@ angular.module('copayApp.controllers').controller('buyGlideraController',
this.success = null;
this.loading = null;
// DISABLE ANIMATION ON CHROMEAPP
if (isChromeApp) {
var animatedSlideUp = 'full';
} else {
var animatedSlideUp = 'full animated slideInUp';
}
this.otherWallets = function(testnet) {
var network = testnet ? 'testnet' : 'livenet';
return lodash.filter(profileService.getWallets(network), function(w) {
@ -57,13 +50,13 @@ angular.module('copayApp.controllers').controller('buyGlideraController',
var modalInstance = $modal.open({
templateUrl: 'views/modals/wallets.html',
windowClass: animatedSlideUp,
windowClass: animationService.modalAnimated.slideUp,
controller: ModalInstanceCtrl,
});
modalInstance.result.finally(function() {
var m = angular.element(document.getElementsByClassName('reveal-modal'));
m.addClass('slideOutDown');
m.addClass(animationService.modalAnimated.slideOutDown);
});
modalInstance.result.then(function(obj) {

10
src/js/controllers/copayers.js
View file

@ -1,7 +1,7 @@
'use strict';
angular.module('copayApp.controllers').controller('copayersController',
function($scope, $rootScope, $timeout, $log, $modal, profileService, go, notification, isCordova, gettext, gettextCatalog) {
function($scope, $rootScope, $timeout, $log, $modal, profileService, go, notification, isCordova, gettext, gettextCatalog, animationService) {
var self = this;
var delete_msg = gettextCatalog.getString('Are you sure you want to delete this wallet?');
@ -37,9 +37,15 @@ angular.module('copayApp.controllers').controller('copayersController',
var modalInstance = $modal.open({
templateUrl: 'views/modals/confirmation.html',
windowClass: 'full',
windowClass: animationService.modalAnimated.slideUp,
controller: ModalInstanceCtrl
});
modalInstance.result.finally(function() {
var m = angular.element(document.getElementsByClassName('reveal-modal'));
m.addClass(animationService.modalAnimated.slideOutDown);
});
modalInstance.result.then(function(ok) {
if (ok) {
_deleteWallet();

10
src/js/controllers/preferencesDelete.js
View file

@ -1,7 +1,7 @@
'use strict';
angular.module('copayApp.controllers').controller('preferencesDeleteWalletController',
function($scope, $rootScope, $filter, $timeout, $modal, $log, notification, profileService, isCordova, go, gettext, gettextCatalog) {
function($scope, $rootScope, $filter, $timeout, $modal, $log, notification, profileService, isCordova, go, gettext, gettextCatalog, animationService) {
this.isCordova = isCordova;
this.error = null;
@ -27,9 +27,15 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro
var modalInstance = $modal.open({
templateUrl: 'views/modals/confirmation.html',
windowClass: 'full',
windowClass: animationService.modalAnimated.slideUp,
controller: ModalInstanceCtrl
});
modalInstance.result.finally(function() {
var m = angular.element(document.getElementsByClassName('reveal-modal'));
m.addClass(animationService.modalAnimated.slideOutDown);
});
modalInstance.result.then(function(ok) {
if (ok) {
_deleteWallet();

14
src/js/controllers/preferencesGlidera.js
View file

@ -1,7 +1,7 @@
'use strict';
angular.module('copayApp.controllers').controller('preferencesGlideraController',
function($scope, $modal, $timeout, profileService, applicationService, glideraService, storageService, isChromeApp) {
function($scope, $modal, $timeout, profileService, applicationService, glideraService, storageService, isChromeApp, animationService) {
this.getEmail = function(token) {
var self = this;
@ -31,14 +31,6 @@ angular.module('copayApp.controllers').controller('preferencesGlideraController'
});
};
// DISABLE ANIMATION ON CHROMEAPP
if (isChromeApp) {
var animatedSlideRight = 'full';
}
else {
var animatedSlideRight = 'full animated slideInRight';
}
this.revokeToken = function(testnet) {
var network = testnet ? 'testnet' : 'livenet';
var ModalInstanceCtrl = function($scope, $modalInstance) {
@ -52,7 +44,7 @@ angular.module('copayApp.controllers').controller('preferencesGlideraController'
var modalInstance = $modal.open({
templateUrl: 'views/modals/glidera-confirmation.html',
windowClass: animatedSlideRight,
windowClass: animationService.modalAnimated.slideRight,
controller: ModalInstanceCtrl
});
@ -68,7 +60,7 @@ angular.module('copayApp.controllers').controller('preferencesGlideraController'
modalInstance.result.finally(function() {
var m = angular.element(document.getElementsByClassName('reveal-modal'));
m.addClass('slideOutRight');
m.addClass(animationService.modalAnimated.slideOutRight);
});
};

13
src/js/controllers/sellGlidera.js
View file

@ -1,7 +1,7 @@
'use strict';
angular.module('copayApp.controllers').controller('sellGlideraController',
function($scope, $timeout, $log, $modal, configService, profileService, addressService, feeService, glideraService, bwsError, lodash, isChromeApp) {
function($scope, $timeout, $log, $modal, configService, profileService, addressService, feeService, glideraService, bwsError, lodash, isChromeApp, animationService) {
var self = this;
var config = configService.getSync();
@ -14,13 +14,6 @@ angular.module('copayApp.controllers').controller('sellGlideraController',
this.currentFeeLevel = config.wallet.settings.feeLevel || 'normal';
var fc;
// DISABLE ANIMATION ON CHROMEAPP
if (isChromeApp) {
var animatedSlideUp = 'full';
} else {
var animatedSlideUp = 'full animated slideInUp';
}
this.otherWallets = function(testnet) {
var network = testnet ? 'testnet' : 'livenet';
return lodash.filter(profileService.getWallets(network), function(w) {
@ -53,13 +46,13 @@ angular.module('copayApp.controllers').controller('sellGlideraController',
var modalInstance = $modal.open({
templateUrl: 'views/modals/wallets.html',
windowClass: animatedSlideUp,
windowClass: animationService.modalAnimated.slideUp,
controller: ModalInstanceCtrl,
});
modalInstance.result.finally(function() {
var m = angular.element(document.getElementsByClassName('reveal-modal'));
m.addClass('slideOutDown');
m.addClass(animationService.modalAnimated.slideOutDown);
});
modalInstance.result.then(function(obj) {

2
src/js/controllers/topbar.js
View file

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.controllers').controller('topbarController', function($rootScope, go) {
angular.module('copayApp.controllers').controller('topbarController', function($scope, $rootScope, go) {
this.onQrCodeScanned = function(data) {
$rootScope.$emit('dataScanned', data);

35
src/js/controllers/walletHome.js
View file

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $timeout, $filter, $modal, $log, notification, txStatus, isCordova, profileService, lodash, configService, rateService, storageService, bitcore, isChromeApp, gettext, gettextCatalog, nodeWebkit, addressService, ledger, feeService, bwsError, confirmDialog, txFormatService) {
angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $timeout, $filter, $modal, $log, notification, txStatus, isCordova, profileService, lodash, configService, rateService, storageService, bitcore, isChromeApp, gettext, gettextCatalog, nodeWebkit, addressService, ledger, feeService, bwsError, confirmDialog, txFormatService, animationService) {
var self = this;
$rootScope.hideMenuBar = false;
@ -26,15 +26,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
this.isMobile = isMobile.any();
this.addr = {};
// DISABLE ANIMATION ON CHROMEAPP
if (isChromeApp) {
var animatedSlideUp = 'full';
var animatedSlideRight = 'full';
} else {
var animatedSlideUp = 'full animated slideInUp';
var animatedSlideRight = 'full animated slideInRight';
}
var disableScannerListener = $rootScope.$on('dataScanned', function(event, data) {
self.setForm(data);
$rootScope.$emit('Local/SetTab', 'send');
@ -117,7 +108,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
};
var modalInstance = $modal.open({
templateUrl: 'views/modals/copayers.html',
windowClass: animatedSlideUp,
windowClass: animationService.modalAnimated.slideUp,
controller: ModalInstanceCtrl,
});
@ -129,7 +120,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
$rootScope.modalOpened = false;
disableCloseModal();
var m = angular.element(document.getElementsByClassName('reveal-modal'));
m.addClass('slideOutDown');
m.addClass(animationService.modalAnimated.slideOutDown);
});
};
@ -166,7 +157,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
var modalInstance = $modal.open({
templateUrl: 'views/modals/wallets.html',
windowClass: animatedSlideUp,
windowClass: animationService.modalAnimated.slideUp,
controller: ModalInstanceCtrl,
});
@ -178,7 +169,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
$rootScope.modalOpened = false;
disableCloseModal();
var m = angular.element(document.getElementsByClassName('reveal-modal'));
m.addClass('slideOutDown');
m.addClass(animationService.modalAnimated.slideOutDown);
});
modalInstance.result.then(function(addr) {
@ -392,7 +383,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
var modalInstance = $modal.open({
templateUrl: 'views/modals/txp-details.html',
windowClass: animatedSlideRight,
windowClass: animationService.modalAnimated.slideRight,
controller: ModalInstanceCtrl,
});
@ -404,7 +395,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
$rootScope.modalOpened = false;
disableCloseModal();
var m = angular.element(document.getElementsByClassName('reveal-modal'));
m.addClass('slideOutRight');
m.addClass(animationService.modalAnimated.slideOutRight);
});
modalInstance.result.then(function(txp) {
@ -555,7 +546,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
var modalInstance = $modal.open({
templateUrl: 'views/modals/customized-amount.html',
windowClass: animatedSlideUp,
windowClass: animationService.modalAnimated.slideUp,
controller: ModalInstanceCtrl,
});
@ -567,7 +558,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
$rootScope.modalOpened = false;
disableCloseModal();
var m = angular.element(document.getElementsByClassName('reveal-modal'));
m.addClass('slideOutDown');
m.addClass(animationService.modalAnimated.slideOutDown);
});
};
@ -973,7 +964,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
};
var modalInstance = $modal.open({
templateUrl: 'views/modals/paypro.html',
windowClass: animatedSlideUp,
windowClass: animationService.modalAnimated.slideUp,
controller: ModalInstanceCtrl,
});
@ -985,7 +976,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
$rootScope.modalOpened = false;
disableCloseModal();
var m = angular.element(document.getElementsByClassName('reveal-modal'));
m.addClass('slideOutDown');
m.addClass(animationService.modalAnimated.slideOutDown);
});
};
@ -1162,7 +1153,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
var modalInstance = $modal.open({
templateUrl: 'views/modals/tx-details.html',
windowClass: animatedSlideRight,
windowClass: animationService.modalAnimated.slideRight,
controller: ModalInstanceCtrl,
});
@ -1174,7 +1165,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
$rootScope.modalOpened = false;
disableCloseModal();
var m = angular.element(document.getElementsByClassName('reveal-modal'));
m.addClass('slideOutRight');
m.addClass(animationService.modalAnimated.slideOutRight);
});
};