From 5a0c1417d47b1e38f8a479254e07a69caa29c903 Mon Sep 17 00:00:00 2001 From: Sam Cheng Hung Date: Tue, 31 Jul 2018 15:44:59 +0800 Subject: [PATCH 1/3] Prevents reassignment of bound attribute size-equal --- src/js/directives/amount.js | 2 +- www/views/includes/amount.html | 2 +- www/views/tab-home.html | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/js/directives/amount.js b/src/js/directives/amount.js index a23069157..f991f0a28 100644 --- a/src/js/directives/amount.js +++ b/src/js/directives/amount.js @@ -23,7 +23,7 @@ angular.module('bitcoincom.directives') }, templateUrl: 'views/includes/amount.html', controller: ['$scope', function($scope) { - if (typeof $scope.sizeEqual == 'undefined') $scope.sizeEqual = false; + $scope.displaySizeEqual = typeof $scope.sizeEqual == 'undefined' ? false : true; var decimalPlaces = { '0': ['BIF', 'CLP', 'DJF', 'GNF', 'ILS', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'UGX', 'VND', 'VUV', 'XAF', 'XOF', 'XPF'], diff --git a/www/views/includes/amount.html b/www/views/includes/amount.html index 4cf2807ad..361dededc 100644 --- a/www/views/includes/amount.html +++ b/www/views/includes/amount.html @@ -1,4 +1,4 @@
+ ng-class="{ 'size-equal': displaySizeEqual }"> {{start}}{{middle}}{{end}}{{currency}}
\ No newline at end of file diff --git a/www/views/tab-home.html b/www/views/tab-home.html index 8df176a56..77ecbfefe 100644 --- a/www/views/tab-home.html +++ b/www/views/tab-home.html @@ -21,6 +21,12 @@ Download +
+ +
From 8dc1e060481e01d92f319bf66ac948b342273ff2 Mon Sep 17 00:00:00 2001 From: Sam Cheng Hung Date: Tue, 31 Jul 2018 15:46:12 +0800 Subject: [PATCH 2/3] Removes dummy values on home tab --- www/views/tab-home.html | 6 ------ 1 file changed, 6 deletions(-) diff --git a/www/views/tab-home.html b/www/views/tab-home.html index 77ecbfefe..8df176a56 100644 --- a/www/views/tab-home.html +++ b/www/views/tab-home.html @@ -21,12 +21,6 @@ Download
-
- -
From 1895e0dbeb3fbee50bb2e7141d1d2b26edabd260 Mon Sep 17 00:00:00 2001 From: Sam Cheng Hung Date: Tue, 31 Jul 2018 16:23:45 +0800 Subject: [PATCH 3/3] Adds watcher for changes to value or currency scope variables --- src/js/directives/amount.js | 65 ++++++++++++++++++++----------------- 1 file changed, 36 insertions(+), 29 deletions(-) diff --git a/src/js/directives/amount.js b/src/js/directives/amount.js index f991f0a28..9622ca09d 100644 --- a/src/js/directives/amount.js +++ b/src/js/directives/amount.js @@ -48,37 +48,44 @@ angular.module('bitcoincom.directives') return '2'; }; - switch (getDecimalPlaces($scope.currency)) { - case '0': - var valueFormatted = numberWithCommas(Math.round(parseFloat($scope.value))); - buildAmount(valueFormatted, '', ''); - break; - - case '2': - var valueProcessing = parseFloat(parseFloat($scope.value).toFixed(2)); - var valueFormatted = numberWithCommas(valueProcessing); - buildAmount(valueFormatted, '', ''); - break; - - case '3': - var valueProcessing = parseFloat(parseFloat($scope.value).toFixed(3)); - var valueFormatted = numberWithCommas(valueProcessing); - buildAmount(valueFormatted, '', ''); - break; - - case '8': - var valueFormatted = parseFloat($scope.value).toFixed(8); - if (parseFloat($scope.value) == 0) { - buildAmount('0', '', ''); - } else { + var formatNumbers = function(currency, value) { + switch (getDecimalPlaces(currency)) { + case '0': + var valueFormatted = numberWithCommas(Math.round(parseFloat(value))); buildAmount(valueFormatted, '', ''); - var start = numberWithCommas(valueFormatted.slice(0, -5)); - var middle = valueFormatted.slice(-5, -2); - var end = valueFormatted.substr(valueFormatted.length - 2); - buildAmount(start, middle, end); - } - break; + break; + + case '2': + var valueProcessing = parseFloat(parseFloat(value).toFixed(2)); + var valueFormatted = numberWithCommas(valueProcessing); + buildAmount(valueFormatted, '', ''); + break; + + case '3': + var valueProcessing = parseFloat(parseFloat(value).toFixed(3)); + var valueFormatted = numberWithCommas(valueProcessing); + buildAmount(valueFormatted, '', ''); + break; + + case '8': + var valueFormatted = parseFloat(value).toFixed(8); + if (parseFloat(value) == 0) { + buildAmount('0', '', ''); + } else { + buildAmount(valueFormatted, '', ''); + var start = numberWithCommas(valueFormatted.slice(0, -5)); + var middle = valueFormatted.slice(-5, -2); + var end = valueFormatted.substr(valueFormatted.length - 2); + buildAmount(start, middle, end); + } + break; + } } + + formatNumbers($scope.currency, $scope.value); + $scope.$watchGroup(['currency', 'value'], function() { + formatNumbers($scope.currency, $scope.value); + }); }] }; }