Merge pull request less#1278 from losnir/master

lukeapage · lukeapage · commit 1ba5e1edb614 · 2013-04-24T05:29:50.000-07:00
Better fix for local path (cross-platform)
diff --git a/lib/less/browser.js b/lib/less/browser.js
@@ -214,7 +214,7 @@ function extractUrlParts(url, baseUrl) {
         if (!baseUrlParts) {
             throw new Error("Could not parse page url - '"+baseUrl+"'");
         }
-        urlParts[1] = baseUrlParts[1] || "";
+        urlParts[1] = urlParts[1] || baseUrlParts[1] || "";
         if (!urlParts[2]) {
             urlParts[3] = baseUrlParts[3] + urlParts[3];
         }

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ function extractUrlParts(url, baseUrl) {`
`214`	`214`	`if (!baseUrlParts) {`
`215`	`215`	`throw new Error("Could not parse page url - '"+baseUrl+"'");`
`216`	`216`	`}`
`217`		`- urlParts[1] = baseUrlParts[1] \|\| "";`
	`217`	`+ urlParts[1] = urlParts[1] \|\| baseUrlParts[1] \|\| "";`
`218`	`218`	`if (!urlParts[2]) {`
`219`	`219`	`urlParts[3] = baseUrlParts[3] + urlParts[3];`
`220`	`220`	`}`