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

Adds btc values. Adds disclosure. Fix modals. Removes sandbox

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2015-10-05 12:20:00 -03:00
commit 20bb8680be
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
6 changed files with 30 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/js/controllers/glidera.js
View file

@ -1,9 +1,7 @@
'use strict';
angular.module('copayApp.controllers').controller('glideraController',
function($scope, $timeout, $modal, profileService, configService, storageService, glideraService, isChromeApp) {
var config = configService.getSync().wallet.settings;
function($scope, $timeout, $modal, profileService, configService, storageService, glideraService, isChromeApp, animationService) {
this.getAuthenticateUrl = function() {
return glideraService.getOauthCodeUrl();
@ -35,16 +33,9 @@ angular.module('copayApp.controllers').controller('glideraController',
}, 100);
};
// DISABLE ANIMATION ON CHROMEAPP
if (isChromeApp) {
var animatedSlideRight = 'full';
}
else {
var animatedSlideRight = 'full animated slideInRight';
}
this.openTxModal = function(token, tx) {
var self = this;
var config = configService.getSync().wallet.settings;
var fc = profileService.focusedClient;
var ModalInstanceCtrl = function($scope, $modalInstance) {
$scope.tx = tx;
@ -63,13 +54,13 @@ angular.module('copayApp.controllers').controller('glideraController',
var modalInstance = $modal.open({
templateUrl: 'views/modals/glidera-tx-details.html',
windowClass: animatedSlideRight,
windowClass: animationService.modalAnimated.slideRight,
controller: ModalInstanceCtrl,
});
modalInstance.result.finally(function() {
var m = angular.element(document.getElementsByClassName('reveal-modal'));
m.addClass('slideOutRight');
m.addClass(animationService.modalAnimated.slideOutRight);
});
};

11
src/js/controllers/index.js
View file

@ -110,8 +110,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.updateColor();
self.updateAlias();
// DISABLED
//self.initGlidera();
self.initGlidera();
if (fc.isPrivKeyExternal()) {
self.needsBackup = false;
@ -840,8 +839,10 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.initGlidera = function(accessToken) {
self.glideraEnabled = configService.getSync().glidera.enabled;
self.glideraTestnet = configService.getSync().glidera.testnet;
var network = self.glideraTestnet ? 'testnet' : 'livenet';
// self.glideraTestnet = configService.getSync().glidera.testnet;
// var network = self.glideraTestnet ? 'testnet' : 'livenet';
// Disabled for testnet
var network = 'livenet';
self.glideraToken = null;
self.glideraError = null;
@ -1164,4 +1165,4 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.setFocusedWallet();
});
});
});
});