Skip to content

Commit 46e1613

Browse files
committed
Handle ./ paths in the browser when relative correctly. Fixes less#1238
1 parent 5d102d5 commit 46e1613

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

lib/less/browser.js

+8
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,14 @@ function extractUrlParts(url, baseUrl) {
223223
if (urlParts[3]) {
224224
directories = urlParts[3].replace("\\", "/").split("/");
225225

226+
// extract out . before .. so .. doesn't absorb a non-directory
227+
for(i = 0; i < directories.length; i++) {
228+
if (directories[i] === ".") {
229+
directories.splice(i, 1);
230+
i -= 1;
231+
}
232+
}
233+
226234
for(i = 0; i < directories.length; i++) {
227235
if (directories[i] === ".." && i > 0) {
228236
directories.splice(i-1, 2);

test/browser/less/relative-urls/urls.less

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import "../imports/urls.less";
1+
@import ".././imports/urls.less";
22
@import "http://localhost:8081/browser/less/imports/urls2.less";
33
@font-face {
44
src: url(http://github.com/%3Cspan%20class=%22pl-s%22%3E%3Cspan%20class=%22pl-pds%22%3E"%3C/span%3E/fonts/garamond-pro.ttf%3Cspan%20class=%22pl-pds%22%3E"%3C/span%3E%3C/span%3E);

0 commit comments

Comments
 (0)