lib/less/js/lib/less/tree/quoted.js in less-2.3.3 vs lib/less/js/lib/less/tree/quoted.js in less-2.4.0
- old
+ new
@@ -1,14 +1,16 @@
(function (tree) {
-tree.Quoted = function (str, content, escaped, i) {
+tree.Quoted = function (str, content, escaped, index, currentFileInfo) {
this.escaped = escaped;
this.value = content || '';
this.quote = str.charAt(0);
- this.index = i;
+ this.index = index;
+ this.currentFileInfo = currentFileInfo;
};
tree.Quoted.prototype = {
+ type: "Quoted",
toCSS: function () {
if (this.escaped) {
return this.value;
} else {
return this.quote + this.value + this.quote;
@@ -17,10 +19,10 @@
eval: function (env) {
var that = this;
var value = this.value.replace(/`([^`]+)`/g, function (_, exp) {
return new(tree.JavaScript)(exp, that.index, true).eval(env).value;
}).replace(/@\{([\w-]+)\}/g, function (_, name) {
- var v = new(tree.Variable)('@' + name, that.index).eval(env);
+ var v = new(tree.Variable)('@' + name, that.index, that.currentFileInfo).eval(env, true);
return (v instanceof tree.Quoted) ? v.value : v.toCSS();
});
return new(tree.Quoted)(this.quote + value + this.quote, value, this.escaped, this.index);
},
compare: function (x) {