Merge branch 'dev'

Author: freearhey

README.md

@@ -117,21 +117,55 @@ module.exports = {
 
 + Arguments:
   * `{String} [symbol] - default: '$'`
-  * `{Number} [decimal places] - default: 2`
+  * `{Number} [decimalDigits] - default: 2`
+  * `{Object} [options] - default: {}`
+
++ Options:
+  * `{String} [thousandsSeparator] - default: ','`
+  * `{String} [decimalSeparator] - default: '.'`
+  * `{Boolean} [symbolOnLeft] - default: true`
+  * `{Boolean} [spaceBetweenAmountAndSymbol] - default: false`
 
 + Example:
 
   ```js
   {{ amount | currency }} // 12345 => $12,345.00
   ```
   Use a different symbol:
+
   ```js
   {{ amount | currency('£') }} // 12345 => £12,345.00
   ```
   Use a different number decimal places:
+
   ```js
   {{ amount | currency('₽', 0) }} // 12345 => ₽12,345
   ```
+  Use a different thousands separator:
+
+  ```js
+  {{ amount | currency('$', 0, { thousandsSeparator: '.' }) }} // 12345 => $12.345
+  ```
+  Use a different decimal separator:
+
+  ```js
+  {{ amount | currency('$', 2, { decimalSeparator: ',' }) }} // 12345 => $12,345,00
+  ```
+  Use symbol on right:
+
+  ```js
+  {{ amount | currency('$', 0, { symbolOnLeft: false }) }} // 12345 => 12,345$
+  ```
+  Add space between amound and symbol:
+
+  ```js
+  {{ amount | currency('$', 0, { spaceBetweenAmountAndSymbol: true }) }} // 12345 => $ 12,345
+  ```
+  Use multiple options:
+
+  ```js
+  {{ amount | currency('kr', 2, { symbolOnLeft: false, spaceBetweenAmountAndSymbol: true }) }} // 12345 => 12,345.00 kr
+  ```
 
 #### pluralize
 

dist/vue2-filters.js

@@ -605,31 +605,46 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
  * 
  * 12345 => $12,345.00
  *
- * @param {String} sign
+ * @param {String} symbol
  * @param {Number} decimals Decimal places
+ * @param {Object} options
  */
 
-function currency (value, currency, decimals) {
+function currency (value, symbol, decimals, options) {
+  var thousandsSeparator, symbolOnLeft, spaceBetweenAmountAndSymbol
   var digitsRE = /(\d{3})(?=\d)/g
+  options = options || {}
   value = parseFloat(value)
   if (!isFinite(value) || (!value && value !== 0)) return ''
-  currency = currency != null ? currency : '$'
+  symbol = symbol != null ? symbol : '$'
   decimals = decimals != null ? decimals : 2
+  thousandsSeparator = options.thousandsSeparator != null ? options.thousandsSeparator : ','
+  symbolOnLeft = options.symbolOnLeft != null ? options.symbolOnLeft : true
+  spaceBetweenAmountAndSymbol = options.spaceBetweenAmountAndSymbol != null ? options.spaceBetweenAmountAndSymbol : false
   var stringified = Math.abs(value).toFixed(decimals)
+  stringified = options.decimalSeparator
+    ? stringified.replace('.', options.decimalSeparator)
+    : stringified
   var _int = decimals
     ? stringified.slice(0, -1 - decimals)
     : stringified
   var i = _int.length % 3
   var head = i > 0
-    ? (_int.slice(0, i) + (_int.length > 3 ? ',' : ''))
+    ? (_int.slice(0, i) + (_int.length > 3 ? thousandsSeparator : ''))
     : ''
   var _float = decimals
     ? stringified.slice(-1 - decimals)
     : ''
+  symbol = spaceBetweenAmountAndSymbol
+    ? (symbolOnLeft ? symbol + ' ' : ' ' + symbol)
+    : symbol
+  symbol = symbolOnLeft
+    ? symbol + head +
+      _int.slice(i).replace(digitsRE, '$1' + thousandsSeparator) + _float
+    : head +
+      _int.slice(i).replace(digitsRE, '$1' + thousandsSeparator) + _float + symbol
   var sign = value < 0 ? '-' : ''
-  return sign + currency + head +
-    _int.slice(i).replace(digitsRE, '$1,') +
-    _float
+  return sign + symbol
 }
 
 /* harmony default export */ __webpack_exports__["a"] = (currency);

dist/vue2-filters.min.js

@@ -1,6 +1,6 @@
 {
   "name": "vue2-filters",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "description": "The list of standard filters Vue.js 1.* adapted for use in Vue.js 2.*",
   "main": "dist/vue2-filters.js",
   "scripts": {

package.json

@@ -2,31 +2,46 @@
  * 
  * 12345 => $12,345.00
  *
- * @param {String} sign
+ * @param {String} symbol
  * @param {Number} decimals Decimal places
+ * @param {Object} options
  */
 
-function currency (value, currency, decimals) {
+function currency (value, symbol, decimals, options) {
+  var thousandsSeparator, symbolOnLeft, spaceBetweenAmountAndSymbol
   var digitsRE = /(\d{3})(?=\d)/g
+  options = options || {}
   value = parseFloat(value)
   if (!isFinite(value) || (!value && value !== 0)) return ''
-  currency = currency != null ? currency : '$'
+  symbol = symbol != null ? symbol : '$'
   decimals = decimals != null ? decimals : 2
+  thousandsSeparator = options.thousandsSeparator != null ? options.thousandsSeparator : ','
+  symbolOnLeft = options.symbolOnLeft != null ? options.symbolOnLeft : true
+  spaceBetweenAmountAndSymbol = options.spaceBetweenAmountAndSymbol != null ? options.spaceBetweenAmountAndSymbol : false
   var stringified = Math.abs(value).toFixed(decimals)
+  stringified = options.decimalSeparator
+    ? stringified.replace('.', options.decimalSeparator)
+    : stringified
   var _int = decimals
     ? stringified.slice(0, -1 - decimals)
     : stringified
   var i = _int.length % 3
   var head = i > 0
-    ? (_int.slice(0, i) + (_int.length > 3 ? ',' : ''))
+    ? (_int.slice(0, i) + (_int.length > 3 ? thousandsSeparator : ''))
     : ''
   var _float = decimals
     ? stringified.slice(-1 - decimals)
     : ''
+  symbol = spaceBetweenAmountAndSymbol
+    ? (symbolOnLeft ? symbol + ' ' : ' ' + symbol)
+    : symbol
+  symbol = symbolOnLeft
+    ? symbol + head +
+      _int.slice(i).replace(digitsRE, '$1' + thousandsSeparator) + _float
+    : head +
+      _int.slice(i).replace(digitsRE, '$1' + thousandsSeparator) + _float + symbol
   var sign = value < 0 ? '-' : ''
-  return sign + currency + head +
-    _int.slice(i).replace(digitsRE, '$1,') +
-    _float
+  return sign + symbol
 }
 
 export default currency

src/other/currency.js

@@ -71,6 +71,13 @@ describe('Filters', function() {
     expect(filter(-50)).toBe('-$50.00')
     expect(filter(-150.43)).toBe('-$150.43')
     expect(filter(-1500.4343434)).toBe('-$1,500.43')
+    // options
+    expect(filter(1234, '@', 0, {thousandsSeparator: ','})).toBe('@1,234')
+    expect(filter(1234, '', 2, {decimalSeparator: '|'})).toBe('1,234|00')
+    expect(filter(1234, '$', 2, {symbolOnLeft: false})).toBe('1,234.00$')
+    expect(filter(1234, '$', 0, {spaceBetweenAmountAndSymbol: true})).toBe('$ 1,234')
+    expect(filter(1234, '$', 0, {symbolOnLeft: false,spaceBetweenAmountAndSymbol: true})).toBe('1,234 $')
+    expect(filter(-12345, 'VND', 0, {symbolOnLeft: true})).toBe('-VND12,345')
   })
 
   it('pluralize', function() {