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

Uses object for level options

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2015-07-30 15:26:16 -03:00
commit 458a17e0be
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/views/preferences.html
View file

@ -81,7 +81,7 @@
<span translate>Bitcoin Network Fee Policy</span> <span translate>Bitcoin Network Fee Policy</span>
<span class="right text-gray"> <span class="right text-gray">
<i class="icon-arrow-right3 size-24 right"></i> <i class="icon-arrow-right3 size-24 right"></i>
<span class="text-capitalize">{{index.currentFeeLevel|translate}}</span> <span class="text-capitalize">{{index.feeOpts[index.currentFeeLevel]|translate}}</span>
</span> </span>
</li> </li>
<li class="line-b p20" ng-click="$root.go('preferencesBwsUrl')"> <li class="line-b p20" ng-click="$root.go('preferencesBwsUrl')">

2
public/views/preferencesFee.html
View file

@ -7,7 +7,7 @@
<ul class="no-bullet m0 size-14"> <ul class="no-bullet m0 size-14">
<li ng-repeat="fee in (index.network == 'livenet' ? index.feeLevels.livenet : index.feeLevels.testnet)" <li ng-repeat="fee in (index.network == 'livenet' ? index.feeLevels.livenet : index.feeLevels.testnet)"
ng-click="prefFee.save(fee.level)" class="line-b p20"> ng-click="prefFee.save(fee.level)" class="line-b p20">
<span class="text-capitalize">{{fee.level|translate}}</span> <span class="text-capitalize">{{index.feeOpts[fee.level]|translate}}</span>
<i class="fi-check size-16 right" ng-show="index.currentFeeLevel == fee.level"></i> <i class="fi-check size-16 right" ng-show="index.currentFeeLevel == fee.level"></i>
</li> </li>
</ul> </ul>

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

@ -10,12 +10,10 @@ angular.module('copayApp.controllers').controller('indexController', function($r
return (parseFloat(number.toPrecision(12))); return (parseFloat(number.toPrecision(12)));
}; };
self.goHome = function() { self.goHome = function() {
go.walletHome(); go.walletHome();
}; };
self.menu = [{ self.menu = [{
'title': gettext('Home'), 'title': gettext('Home'),
'icon': 'icon-home', 'icon': 'icon-home',
@ -66,6 +64,8 @@ angular.module('copayApp.controllers').controller('indexController', function($r
isoCode: 'ja', isoCode: 'ja',
}]; }];
self.feeOpts = feeService.feeOpts;
self.setOngoingProcess = function(processName, isOn) { self.setOngoingProcess = function(processName, isOn) {
$log.debug('onGoingProcess', processName, isOn); $log.debug('onGoingProcess', processName, isOn);
self[processName] = isOn; self[processName] = isOn;

10
src/js/services/feeService.js
View file

@ -4,11 +4,11 @@ angular.module('copayApp.services').factory('feeService', function($log, profile
var root = {}; var root = {};
// Constant fee options to translate // Constant fee options to translate
var feeOpts = [ root.feeOpts = {
gettextCatalog.getString('priority'), priority: gettextCatalog.getString('Priority'),
gettextCatalog.getString('normal'), normal: gettextCatalog.getString('Normal'),
gettextCatalog.getString('economy') economy: gettextCatalog.getString('Economy')
]; };
root.getCurrentFeeValue = function(cb) { root.getCurrentFeeValue = function(cb) {
var fc = profileService.focusedClient; var fc = profileService.focusedClient;