[Pkg-javascript-commits] [less.js] 39/285: Merge branch 'whitespace' of github.com:XhmikosR/less.js into 2_0_0
Jonas Smedegaard
dr at jones.dk
Mon Oct 26 23:23:35 UTC 2015
This is an automated email from the git hooks/post-receive script.
js pushed a commit to annotated tag v2.0.0
in repository less.js.
commit 7dfc0cf9b05357a21c3b7eaf60bd076866f13054
Merge: 7f34acd 9fe311b
Author: Luke Page <luke.a.page at gmail.com>
Date: Sun Mar 2 12:36:49 2014 +0000
Merge branch 'whitespace' of github.com:XhmikosR/less.js into 2_0_0
Conflicts:
lib/less/functions.js
lib/less/index.js
lib/less/tree/anonymous.js
lib/less/tree/media.js
lib/less/tree/mixin.js
.jshintrc | 1 +
CHANGELOG.md | 4 +--
CONTRIBUTING.md | 16 +++++------
benchmark/benchmark.less | 18 ++++++------
build.gradle | 28 +++++++++---------
build/build.yml | 2 +-
build/rhino-modules.js | 6 ++--
lib/less/functions.js | 40 +++++++++++++-------------
lib/less/parser.js | 48 +++++++++++++++----------------
lib/less/rhino.js | 10 +++----
lib/less/source-map-output.js | 2 +-
lib/less/tree/anonymous.js | 8 +++---
lib/less/tree/call.js | 2 +-
lib/less/tree/color.js | 4 +--
lib/less/tree/dimension.js | 4 +--
lib/less/tree/import.js | 4 +--
lib/less/tree/media.js | 10 +++----
lib/less/tree/quoted.js | 6 ++--
lib/less/tree/rule.js | 4 +--
lib/less/tree/ruleset.js | 26 ++++++++---------
lib/less/tree/selector.js | 6 ++--
lib/less/tree/url.js | 2 +-
lib/less/tree/variable.js | 6 ++--
lib/less/visitor/import-visitor.js | 6 ++--
lib/source-map/source-map-footer.js | 4 +--
lib/source-map/source-map-header.js | 2 +-
test/browser/jasmine.js | 16 +++++------
test/index.js | 6 ++--
test/less/colors.less | 2 +-
test/less/comments.less | 10 +++----
test/less/css-escapes.less | 20 ++++++-------
test/less/css.less | 2 +-
test/less/errors/import-missing.less | 2 +-
test/less/extend-selector.less | 2 +-
test/less/extract-and-length.less | 12 ++++----
test/less/functions.less | 6 ++--
test/less/globalVars/simple.json | 2 +-
test/less/import/imports/font.less | 6 ++--
test/less/media.less | 4 +--
test/less/merge.less | 2 +-
test/less/mixins-closure.less | 8 +++---
test/less/mixins-guards-default-func.less | 6 ++--
test/less/mixins-guards.less | 22 +++++++-------
test/less/mixins-important.less | 2 +-
test/less/mixins-named-args.less | 4 +--
test/less/mixins-nested.less | 4 +--
test/less/mixins.less | 2 +-
test/less/property-name-interp.less | 4 +--
test/less/scope.less | 2 +-
test/less/selectors.less | 8 +++---
test/less/sourcemaps/basic.json | 2 +-
test/less/variables.less | 20 ++++++-------
test/less/whitespace.less | 10 +++----
53 files changed, 228 insertions(+), 227 deletions(-)
diff --cc lib/less/functions.js
index c5acad1,0a30e10..3eef3f1
--- a/lib/less/functions.js
+++ b/lib/less/functions.js
@@@ -659,26 -697,26 +659,26 @@@ tree.defaultFunc =
};
function initFunctions() {
- var f, tf = tree.functions;
+ var f;
-
+
// math
for (f in mathFunctions) {
if (mathFunctions.hasOwnProperty(f)) {
- tf[f] = _math.bind(null, Math[f], mathFunctions[f]);
+ functions[f] = _math.bind(null, Math[f], mathFunctions[f]);
}
}
-
+
// color blending
for (f in colorBlendMode) {
if (colorBlendMode.hasOwnProperty(f)) {
- tf[f] = colorBlend.bind(null, colorBlendMode[f]);
+ functions[f] = colorBlend.bind(null, colorBlendMode[f]);
}
}
-
+
// default
f = tree.defaultFunc;
- tf["default"] = f.eval.bind(f);
+ functions["default"] = f.eval.bind(f);
-
+
} initFunctions();
function hsla(color) {
diff --cc lib/less/tree/anonymous.js
index e6be3f0,bd9f32a..b81b351
--- a/lib/less/tree/anonymous.js
+++ b/lib/less/tree/anonymous.js
@@@ -6,10 -6,10 +6,10 @@@ var Anonymous = function (string, index
this.mapLines = mapLines;
this.currentFileInfo = currentFileInfo;
};
-tree.Anonymous.prototype = {
+Anonymous.prototype = {
type: "Anonymous",
- eval: function () {
+ eval: function () {
- return new tree.Anonymous(this.value, this.index, this.currentFileInfo, this.mapLines);
+ return new Anonymous(this.value, this.index, this.currentFileInfo, this.mapLines);
},
compare: function (x) {
if (!x.toCSS) {
diff --cc lib/less/tree/color.js
index ffe9dfb,38f4ff9..bbeb542
--- a/lib/less/tree/color.js
+++ b/lib/less/tree/color.js
@@@ -186,7 -183,7 +186,7 @@@ function toHex(v)
}
function clamp(v, max) {
- return Math.min(Math.max(v, 0), max);
+ return Math.min(Math.max(v, 0), max);
}
-
-})(require('../tree'));
+return Color;
+};
diff --cc lib/less/tree/dimension.js
index b74becc,71bf98e..2b24a8c
--- a/lib/less/tree/dimension.js
+++ b/lib/less/tree/dimension.js
@@@ -88,10 -88,10 +88,10 @@@ Dimension.prototype =
},
compare: function (other) {
- if (other instanceof tree.Dimension) {
+ if (other instanceof Dimension) {
var a, b,
aValue, bValue;
-
+
if (this.unit.isEmpty() || other.unit.isEmpty()) {
a = this;
b = other;
diff --cc lib/less/tree/media.js
index 34c07bb,0a95bef..494e229
--- a/lib/less/tree/media.js
+++ b/lib/less/tree/media.js
@@@ -31,8 -31,8 +31,8 @@@ Media.prototype =
env.mediaBlocks = [];
env.mediaPath = [];
}
-
+
- var media = new(tree.Media)(null, [], this.index, this.currentFileInfo);
+ var media = new(Media)(null, [], this.index, this.currentFileInfo);
if(this.debugInfo) {
this.rules[0].debugInfo = this.debugInfo;
media.debugInfo = this.debugInfo;
diff --cc lib/less/tree/variable.js
index 1e152e4,94795a8..71c373f
--- a/lib/less/tree/variable.js
+++ b/lib/less/tree/variable.js
@@@ -11,9 -11,9 +11,9 @@@ Variable.prototype =
var variable, name = this.name;
if (name.indexOf('@@') === 0) {
- name = '@' + new(tree.Variable)(name.slice(1)).eval(env).value;
+ name = '@' + new(Variable)(name.slice(1)).eval(env).value;
}
-
+
if (this.evaluating) {
throw { type: 'Name',
message: "Recursive variable definition for " + name,
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/less.js.git
More information about the Pkg-javascript-commits
mailing list