Merge branch 'pr/121' into develop

Conflicts: min/numeral.min.js
Addepar · Dec 25, 2013 · 9fa07e3 · 9fa07e3
2 parents c90d4d8 + e9d57a6
commit 9fa07e3
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/numeral.js b/numeral.js
@@ -126,8 +126,11 @@
     }
 
     function formatCurrency (n, format, roundingFunction) {
-        var prependSymbol = format.indexOf('$') <= 1 ? true : false,
+        var symbolIndex = format.indexOf('$'),
+            openParenIndex = format.indexOf('('),
+            minusSignIndex = format.indexOf('-'),
             space = '',
+            spliceIndex,
             output;
 
         // check for space before or after currency
@@ -145,10 +148,15 @@
         output = formatNumber(n._value, format, roundingFunction);
 
         // position the symbol
-        if (prependSymbol) {
+        if (symbolIndex <= 1) {
             if (output.indexOf('(') > -1 || output.indexOf('-') > -1) {
                 output = output.split('');
-                output.splice(1, 0, languages[currentLanguage].currency.symbol + space);
+                spliceIndex = 1;
+                if (symbolIndex < openParenIndex || symbolIndex < minusSignIndex){
+                    // the symbol appears before the "(" or "-"
+                    spliceIndex = 0;
+                }
+                output.splice(spliceIndex, 0, languages[currentLanguage].currency.symbol + space);
                 output = output.join('');
             } else {
                 output = languages[currentLanguage].currency.symbol + space + output;

diff --git a/tests/numeral/format.js b/tests/numeral/format.js
@@ -91,7 +91,24 @@ exports.format = {
                 [-1000.234,'($0,0)','($1,000)'],
                 [-1000.234,'(0,0$)','(1,000$)'],
                 [-1000.234,'$0.00','-$1000.23'],
-                [1230974,'($0.00 a)','$1.23 m']
+                [1230974,'($0.00 a)','$1.23 m'],
+
+                // test symbol position before negative sign / open parens
+                [-1000.234,'$ (0,0)','$ (1,000)'],
+                [-1000.234,'$(0,0)','$(1,000)'],
+                [-1000.234,'$ (0,0.00)','$ (1,000.23)'],
+                [-1000.234,'$(0,0.00)','$(1,000.23)'],
+                [-1000.238,'$(0,0.00)','$(1,000.24)'],
+                [-1000.234,'$-0,0','$-1,000'],
+                [-1000.234,'$ -0,0','$ -1,000'],
+
+                [1000.234,'$ (0,0)','$ 1,000'],
+                [1000.234,'$(0,0)','$1,000'],
+                [1000.234,'$ (0,0.00)','$ 1,000.23'],
+                [1000.234,'$(0,0.00)','$1,000.23'],
+                [1000.238,'$(0,0.00)','$1,000.24'],
+                [1000.234,'$-0,0)','$1,000'],
+                [1000.234,'$ -0,0','$ 1,000']
             ],
             i;