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

Merge pull request #3151 from cmgustavo/ref/function-names-01

Browse source 
ref/functions-names-01
This commit is contained in:
Matias Alejo Garcia 2015-09-09 16:21:09 -03:00
commit 3d5124e18f
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,6 @@
'use strict'; 'use strict';
angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, lodash, go, profileService, configService, isCordova, rateService, storageService, addressService, gettextCatalog, gettext, amMoment, nodeWebkit, addonManager, feeService, isChromeApp, bwsError, utilService, $state, glideraService) { angular.module('copayApp.controllers').controller('indexController', function($rootScope, $scope, $log, $filter, $timeout, lodash, go, profileService, configService, isCordova, rateService, storageService, addressService, gettextCatalog, gettext, amMoment, nodeWebkit, addonManager, feeService, isChromeApp, bwsError, txFormatService, glideraService) {
var self = this; var self = this;
self.isCordova = isCordova; self.isCordova = isCordova;
self.onGoingProcess = {}; self.onGoingProcess = {};
@ -484,7 +484,7 @@ console.log('[index.js:395]',txps); //TODO
self.pendingTxProposalsCountForUs = 0; self.pendingTxProposalsCountForUs = 0;
lodash.each(txps, function(tx) { lodash.each(txps, function(tx) {
tx = utilService.processTx(tx); tx = txFormatService.processTx(tx);
var action = lodash.find(tx.actions, { var action = lodash.find(tx.actions, {
copayerId: self.copayerId copayerId: self.copayerId
@ -519,7 +519,7 @@ console.log('[index.js:395]',txps); //TODO
var c = 0; var c = 0;
self.txHistoryPaging = txs[self.limitHistory] ? true : false; self.txHistoryPaging = txs[self.limitHistory] ? true : false;
lodash.each(txs, function(tx) { lodash.each(txs, function(tx) {
tx = utilService.processTx(tx); tx = txFormatService.processTx(tx);
// no future transactions... // no future transactions...
if (tx.time > now) if (tx.time > now)

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

@ -1,6 +1,6 @@
'use strict'; '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, feeService, bwsError, utilService) { 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, feeService, bwsError, txFormatService) {
var self = this; var self = this;
$rootScope.hideMenuBar = false; $rootScope.hideMenuBar = false;
@ -222,7 +222,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
var action = lodash.find(tx.actions, { var action = lodash.find(tx.actions, {
copayerId: fc.credentials.copayerId copayerId: fc.credentials.copayerId
}); });
$scope.tx = utilService.processTx(tx); $scope.tx = txFormatService.processTx(tx);
if (!action && tx.status == 'pending') if (!action && tx.status == 'pending')
$scope.tx.pendingForUs = true; $scope.tx.pendingForUs = true;
$scope.updateCopayerList(); $scope.updateCopayerList();

2
src/js/services/utilService.js → src/js/services/txFormatService.js
View file

@ -1,6 +1,6 @@
'use strict'; 'use strict';
angular.module('copayApp.services').factory('utilService', function(profileService, rateService, configService, lodash) { angular.module('copayApp.services').factory('txFormatService', function(profileService, rateService, configService, lodash) {
var root = {}; var root = {};
var formatAmountStr = function(amount) { var formatAmountStr = function(amount) {