github/less.js
1
1
Fork 0
mirror of https://github.com/less/less.js.git synced 2026-01-22 13:48:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

do not divide by 100 when doing maths and keeping the %. Fixes #1069

Browse Source
This commit is contained in:
Luke Page
2012-12-11 20:47:17 +00:00
parent abb6b999c6
commit 033abfd8be
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/less/functions.js
View File

@@ -214,25 +214,19 @@ tree.functions = {
},
round: function (n, f) {
var fraction = typeof(f) === "undefined" ? 0 : f.value;
if (n instanceof tree.Dimension) {
return new(tree.Dimension)(number(n).toFixed(fraction), n.unit);
} else if (typeof(n) === 'number') {
return n.toFixed(fraction);
} else {
throw { type: "Argument", message: "argument must be a number" };
}
return this._math(function(num) { return num.toFixed(fraction); }, n);
},
ceil: function (n) {
return this._math('ceil', n);
return this._math(Math.ceil, n);
},
floor: function (n) {
return this._math('floor', n);
return this._math(Math.floor, n);
},
_math: function (fn, n) {
if (n instanceof tree.Dimension) {
return new(tree.Dimension)(Math[fn](number(n)), n.unit);
return new(tree.Dimension)(fn(parseFloat(n.value)), n.unit);
} else if (typeof(n) === 'number') {
return Math[fn](n);
return fn(n);
} else {
throw { type: "Argument", message: "argument must be a number" };
}

3
test/css/functions.css
View File

@@ -54,6 +54,9 @@
rounded-two: 10.67;
roundedpx: 3px;
roundedpx-three: 3.333px;
rounded-percentage: 10%;
ceil: 11px;
floor: 12px;
percentage: 20%;
color: #ff0011;
tint: #898989;

3
test/less/functions.less
View File

@@ -60,6 +60,9 @@
rounded-two: round(@r/3, 2);
roundedpx: round(10px / 3);
roundedpx-three: round(10px / 3, 3);
rounded-percentage: round(10.2%);
ceil: ceil(10.1px);
floor: floor(12.9px);
percentage: percentage(10px / 50);
color: color("#ff0011");
tint: tint(#777777, 13);