Skip to content

Commit f0e9f67

Browse files
author
zhoraygevorgyan
committed
fix bugs and create 1.1 release
1 parent 4677bdd commit f0e9f67

File tree

7 files changed

+22
-22
lines changed

7 files changed

+22
-22
lines changed

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ Arguments:
125125
Example:
126126

127127
```javascript
128-
{{ users | implode('name') }} // [{id: 1, name:'Danny'}, {id: 2, name:'Bobby'}] => Danny, Bobby
129-
{{ users | implode('name', ' and ') }} // [{id: 1, name:'Danny'}, {id: 2, name:'Bobby'}] => Danny and Bobby
128+
{{ users | implodeObjects('name') }} // [{id: 1, name:'Danny'}, {id: 2, name:'Bobby'}] => Danny, Bobby
129+
{{ users | implodeObjects('name', ' and ') }} // [{id: 1, name:'Danny'}, {id: 2, name:'Bobby'}] => Danny and Bobby
130130
```
131131

132132
### search
@@ -154,7 +154,7 @@ This packages uses moment and if you want to change the locale you can do it lik
154154
moment.locale('en')
155155
```
156156

157-
### format
157+
### formatDate
158158

159159
Arguments:
160160

@@ -163,8 +163,8 @@ Arguments:
163163
Example:
164164

165165
```javascript
166-
{{ date | format('DD MMMM') }} // '2018-02-01' => '1 February'
167-
{{ date | format }} // '2018-02-01' => '1 February 2019'
166+
{{ date | formatDate('DD MMMM') }} // '2018-02-01' => '1 February'
167+
{{ date | formatDate }} // '2018-02-01' => '1 February 2019'
168168
```
169169

170170
### fromNow
@@ -197,7 +197,7 @@ Example:
197197
{{ date | to('2019-07-01') }} // '2019-06-01' => 'in 1 month'
198198
```
199199

200-
### add / substract
200+
### add / subtract
201201

202202
Arguments:
203203

@@ -208,7 +208,7 @@ Example:
208208

209209
```javascript
210210
{{ date | add(2, 'days') }} // '2019-06-01' => '2019-06-03'
211-
{{ date | substract(2, 'days') }} // '2019-06-03' => '2019-06-01'
211+
{{ date | subtract(2, 'days') }} // '2019-06-03' => '2019-06-01'
212212
```
213213

214214
## Number filters

config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"symbol": "$",
44
"decimalDigits": 2,
55
"symbolOnLeft": true,
6-
"spaceBetweenAmountAndSymbol": false
6+
"spaceBetweenAmountAndSymbol": true
77
},
88

99
"text": {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue-common-filters",
3-
"version": "1.0.2",
3+
"version": "1.1.0",
44
"description": "Collection of common filters used in projects",
55
"main": "index.js",
66
"scripts": {

src/filters.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { fromNow, format, to, from, add, substract } from './filters/datetime'
1+
import { fromNow, format, to, from, add, subtract } from './filters/datetime'
22
import { search, ats, aots } from './filters/array'
33
import { truncate, trim, capitalize, uppercase, lowercase, placeholder} from './filters/text'
44
import { currency, decimal } from './filters/numbers'
@@ -11,12 +11,12 @@ export default {
1111
"to": to,
1212
"from": from,
1313
"add": add,
14-
"substract": substract,
14+
"subtract": subtract,
1515

1616
// Array filters
1717
"search": search,
1818
"implode": ats,
19-
"implodeObject": aots,
19+
"implodeObjects": aots,
2020

2121
// Numbers
2222
"currency": currency,
@@ -27,7 +27,7 @@ export default {
2727
"trim": trim,
2828
"capitalize": capitalize,
2929
"uppercase": uppercase,
30-
"lowercast": lowercase,
30+
"lowercase": lowercase,
3131
"placeholder": placeholder
3232

3333
}

src/filters/array.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export function search(v, str) {
1313

1414
export function ats(v, delimiter = null) {
1515

16-
delimiter = delimiter || window.__vcf_settings.dates.implodeDelimiter
16+
delimiter = delimiter || window.__vcf_settings.array.implodeDelimiter
1717

1818
let result = ''
1919

@@ -30,7 +30,7 @@ export function ats(v, delimiter = null) {
3030
}
3131

3232
export function aots(v, key, delimiter = null) {
33-
delimiter = delimiter || window.__vcf_settings.dates.implodeDelimiter
33+
delimiter = delimiter || window.__vcf_settings.array.implodeDelimiter
3434
let result = ''
3535
for (const i in v) {
3636
if(v[i][key]){

src/filters/datetime.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ export const add = (v, number, type) => {
2323
return moment(v, window.__vcf_settings.dates.defaultFormat).add(number, type)
2424
}
2525

26-
export const substract = (v, number, type) => {
27-
return moment(v, window.__vcf_settings.dates.defaultFormat).substract(number, type)
26+
export const subtract = (v, number, type) => {
27+
return moment(v, window.__vcf_settings.dates.defaultFormat).subtract(number, type)
2828
}

src/filters/numbers.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
export const currency = (v, symbol = null, decimalDigits = null, symbolOnLeft = null, spaceBetweenAmountAndSymbol = null) => {
22
let settings = {...window.__vcf_settings.currency}
33

4-
if(symbol)
5-
settings.symbol = symbol
64
if(decimalDigits)
75
settings.decimalDigits = decimalDigits
86
if(symbolOnLeft)
97
settings.symbolOnLeft = symbolOnLeft
108

9+
let currency_symbol = symbol || settings.symbol;
1110
let space = spaceBetweenAmountAndSymbol || settings.spaceBetweenAmountAndSymbol ? ' ' : ''
1211
let amount = Number(v).toFixed(settings.decimalDigits)
1312

1413
if(symbolOnLeft){
15-
return `${symbol}${space}${amount}`
14+
return `${currency_symbol}${space}${amount}`
1615
} else {
17-
return `${amount}${space}${symbol}`
16+
return `${amount}${space}${currency_symbol}`
1817
}
1918
}
2019

20+
2121
export const decimal = (v, digits = null) => {
22-
let length = digits || window.__vcf_settings.numbers.formatDecimalDigits
22+
let length = digits || window.__vcf_settings.numbers.decimalDigits
2323
return Number(v).toFixed(length)
2424
}

0 commit comments

Comments
 (0)