duckduckgo
/
zeroclickinfo-goodies
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Calculator: Fix on percentages with 4+ decimal places (#4541) (#4558)

master
Pratheev 2018-01-30 09:29:03 +05:30 committed by Zaahir Moolla
parent 92a5c59213
commit c04f35cdbd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
share/goodie/calculator/calculator.js
View File

@ -88,9 +88,9 @@ DDH.calculator = DDH.calculator || {};
var expression = expression
// 1. handles +/- percentages
.replace(/(\+) (\d+(\.\d{1,2})?)%/g, PercentageNormalizer.addPercentage)
.replace(/(\d+(\.\d{1,2})?) - (\d+(\.\d{1,2})?)%/g, PercentageNormalizer.subtractPercentage)
.replace(/(\d+(\.\d{1,2})?)%/g, PercentageNormalizer.soloPercentage)
.replace(/(\+) (\d+(\.\d{1,})?)%/g, PercentageNormalizer.addPercentage)
.replace(/(\d+(\.\d{1,})?) - (\d+(\.\d{1,})?)%/g, PercentageNormalizer.subtractPercentage)
.replace(/(\d+(\.\d{1,})?)%/g, PercentageNormalizer.soloPercentage)
// 2. handles basic arithmetic
.replace(/×/g, '*')