Skip to content

Commit ab96e71

Browse files
committed
Merge remote-tracking branch 'sommeri/import-refence-directives-2008'
Conflicts: test/css/import-reference.css test/less/import-reference.less test/less/import/import-reference.less
2 parents 10586f0 + ed9b6ef commit ab96e71

File tree

4 files changed

+31
-3
lines changed

4 files changed

+31
-3
lines changed

lib/less/tree/directive.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
var Node = require("./node"),
22
Ruleset = require("./ruleset");
33

4-
var Directive = function (name, value, rules, index, currentFileInfo, debugInfo) {
4+
var Directive = function (name, value, rules, index, currentFileInfo, debugInfo, isReferenced) {
55
this.name = name;
66
this.value = value;
77
if (rules) {
@@ -11,6 +11,7 @@ var Directive = function (name, value, rules, index, currentFileInfo, debugInfo)
1111
this.index = index;
1212
this.currentFileInfo = currentFileInfo;
1313
this.debugInfo = debugInfo;
14+
this.isReferenced = isReferenced;
1415
};
1516

1617
Directive.prototype = new Node();
@@ -56,7 +57,7 @@ Directive.prototype.eval = function (context) {
5657
rules.root = true;
5758
}
5859
return new Directive(this.name, value, rules,
59-
this.index, this.currentFileInfo, this.debugInfo);
60+
this.index, this.currentFileInfo, this.debugInfo, this.isReferenced);
6061
};
6162
Directive.prototype.variable = function (name) { if (this.rules) return Ruleset.prototype.variable.call(this.rules, name); };
6263
Directive.prototype.find = function () { if (this.rules) return Ruleset.prototype.find.apply(this.rules, arguments); };

test/css/import-reference.css

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,3 +80,14 @@ div#id.class[a=1][b=2].class:not(1) {
8080
.test:first-child {
8181
color: blue;
8282
}
83+
@keyframes some-name {
84+
property: value;
85+
}
86+
@supports (animation-name: test) {
87+
@keyframes some-name {
88+
property: value;
89+
}
90+
.selector {
91+
color: red;
92+
}
93+
}

test/less/import-reference.less

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@
1919

2020
.class:extend(.class all) {
2121
}
22-
.mixin-with-nested-selectors();
22+
.mixin-with-nested-selectors();
23+
.mixin-with-directives(some-name);

test/less/import/import-reference.less

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,19 @@
7171
color: blue;
7272
}
7373
}
74+
}
75+
.mixin-with-directives(@keyframeName) {
76+
@keyframes @keyframeName {
77+
@rules1();
78+
}
79+
@supports (animation-name: test) {
80+
@keyframes @keyframeName {
81+
@rules2();
82+
}
83+
.selector {
84+
color: red;
85+
}
86+
}
87+
@rules1: {property: value;};
88+
@rules2: {property: value;};
7489
}

0 commit comments

Comments
 (0)