Commitc8a168b

committed

Merge pull requestvuejs#376 from xrado/dev

fixed currency filter for negative numbers

2 parents8e9cbad +81e9edf commitc8a168bCopy full SHA for c8a168b

File tree

+11

-2

lines changed

+11

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,11 +38,11 @@ filters.currency = function (value, sign) {`
`38`	`38`	`value=parseFloat(value)`
`39`	`39`	`if(!value&&value!==0)return''`
`40`	`40`	`sign=sign\|\|'$'`
`41`		`-vars=Math.floor(value).toString(),`
	`41`	`+vars=Math.floor(Math.abs(value)).toString(),`
`42`	`42`	`i=s.length%3,`
`43`	`43`	`h=i>0 ?(s.slice(0,i)+(s.length>3 ?',' :'')) :'',`
`44`	`44`	`f='.'+value.toFixed(2).slice(-2)`
`45`		`-returnsign+h+s.slice(i).replace(/(\d{3})(?=\d)/g,'$1,')+f`
	`45`	`+return(value<0 ?'-' :'')+sign+h+s.slice(i).replace(/(\d{3})(?=\d)/g,'$1,')+f`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`/**`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,15 @@ describe('Filters', function () {`
`82`	`82`	`assert.strictEqual(res3,'$123,443,434.43')`
`83`	`83`	`})`
`84`	`84`
	`85`	`+it('should format a negative number correctly',function(){`
	`86`	`+varres1=filter(-50),`
	`87`	`+res2=filter(-150.43),`
	`88`	`+res3=filter(-1500.4343434)`
	`89`	`+assert.strictEqual(res1,'-$50.00')`
	`90`	`+assert.strictEqual(res2,'-$150.43')`
	`91`	`+assert.strictEqual(res3,'-$1,500.43')`
	`92`	`+})`
	`93`	`+`
`85`	`94`	`it('should use the arg for the currency sign',function(){`
`86`	`95`	`varres=filter(2134,'@')`
`87`	`96`	`assert.strictEqual(res,'@2,134.00')`

Comments

(0)