github/less.js
1
1
Fork 0
mirror of https://github.com/less/less.js.git synced 2026-04-09 03:00:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
cloudhead
2010-11-26 17:21:33 -05:00
parent 186f898a8e e24e16843f
commit e475b1da30
4 changed files with 53 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/less/browser.js
View File

@@ -113,7 +113,7 @@ function loadStyleSheets(callback, reload) {
}
function loadStyleSheet(sheet, callback, reload, remaining) {
var url = window.location.href;
var url = window.location.href.replace(/[#?].*$/, '');
var href = sheet.href.replace(/\?.*$/, '');
var css = cache && cache.getItem(href);
var timestamp = cache && cache.getItem(href + ':timestamp');

8
lib/less/parser.js
View File

@@ -661,7 +661,7 @@ less.Parser = function Parser(env) {
if (s !== '.' && s !== '#') { return }
while (e = $(/^[#.][\w-]+/)) {
while (e = $(/^[#.](?:[\w-]|\\(?:[a-fA-F0-9]{1,6} ?|[^a-fA-F0-9]))+/)) {
elements.push(new(tree.Element)(c, e));
c = $('>');
}
@@ -697,7 +697,7 @@ less.Parser = function Parser(env) {
if ((input.charAt(i) !== '.' && input.charAt(i) !== '#') ||
peek(/^[^{]*(;|})/)) return;
if (match = $(/^([#.][\w-]+)\s*\(/)) {
if (match = $(/^([#.](?:[\w-]|\\(?:[a-fA-F0-9]{1,6} ?|[^a-fA-F0-9]))+)\s*\(/)) {
name = match[1];
while (param = $(this.entities.variable) || $(this.entities.literal)
@@ -778,7 +778,7 @@ less.Parser = function Parser(env) {
var e, t;
c = $(this.combinator);
e = $(/^(?:[.#]?|:*)[\w-]+/) || $('*') || $(this.attribute) || $(/^\([^)@]+\)/);
e = $(/^(?:[.#]?|:*)(?:[\w-]|\\(?:[a-fA-F0-9]{1,6} ?|[^a-fA-F0-9]))+/) || $('*') || $(this.attribute) || $(/^\([^)@]+\)/);
if (e) { return new(tree.Element)(c, e) }
},
@@ -888,7 +888,7 @@ less.Parser = function Parser(env) {
}
},
rule: function () {
var value, c = input.charAt(i), important;
var name, value, c = input.charAt(i), important;
save();
if (c === '.' || c === '#' || c === '&') { return }

20
test/css/css-escapes.css Normal file
View File

@@ -0,0 +1,20 @@
.escape\|random\|char {
color: red;
}
.mixin\!tUp {
font-weight: bold;
}
.\34 04 {
background: red;
}
.\34 04 strong {
color: fuchsia;
font-weight: bold;
}
.trailingTest\+ {
color: red;
}
/* This hideous test of hideousness checks for the selector "blockquote" with various permutations of hex escapes */
\62\6c\6f \63 \6B \0071 \000075o\74 e {
color: silver;
}

28
test/less/css-escapes.less Normal file
View File

@@ -0,0 +1,28 @@
@ugly: fuchsia;
.escape\|random\|char {
color: red;
}
.mixin\!tUp {
font-weight: bold;
}
// class="404"
.\34 04 {
background: red;
strong {
color: @ugly;
.mixin\!tUp;
}
}
.trailingTest\+ {
color: red;
}
/* This hideous test of hideousness checks for the selector "blockquote" with various permutations of hex escapes */
\62\6c\6f \63 \6B \0071 \000075o\74 e {
color: silver;
}