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

fixes one-page

Browse source
This commit is contained in:
Matias Alejo Garcia 2015-04-23 14:37:44 -03:00
commit 4f60626710
7 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -625,6 +625,12 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.updateTxHistory();
});
$rootScope.$on('Local/SetTab', function(event, tab) {
self.setTab(tab);
});
$rootScope.$on('Local/NeedsPassword', function(event, isSetup, cb) {
self.askPassword = {
isSetup: isSetup,

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

@ -21,7 +21,7 @@ angular.module('copayApp.controllers').controller('topbarController', function($
}, 100);
alert('Scanning error');
});
go.send();
$scope.$emit('Local/SetTab', 'send');
};
var modalOpenScanner = function() {
@ -79,7 +79,7 @@ angular.module('copayApp.controllers').controller('topbarController', function($
$scope.init = function() {
setScanner();
$timeout(function() {
go.send();
$scope.$emit('Local/SetTab', 'send');
canvas = document.getElementById('qr-canvas');
context = canvas.getContext('2d');

4
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, notification, txStatus, isCordova, profileService, lodash, configService, rateService, storageService) {
angular.module('copayApp.controllers').controller('walletHomeController', function($scope, $rootScope, $timeout, $filter, $modal, $log, notification, txStatus, isCordova, profileService, lodash, configService, rateService, storageService, bitcore, isChromeApp) {
var self = this;
$rootScope.hideMenuBar = false;
@ -25,11 +25,13 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
this.isMobile = isMobile.any();
var disableScannerListener = $rootScope.$on('dataScanned', function(event, data) {
$scope.$emit('Local/SetTab', 'send');
self.setForm(data);
});
var disablePaymentUriListener = $rootScope.$on('paymentUri', function(event, uri) {
$timeout(function() {
$scope.$emit('Local/SetTab', 'send');
self.setForm(uri);
}, 100);
});

4
src/js/services/go.js
View file

@ -66,10 +66,6 @@ angular.module('copayApp.services').factory('go', function($window, $rootScope,
$state.go('add');
};
root.send = function() {
$state.go('send');
};
root.preferences = function() {
$state.go('preferences');
};