Merge branch 'lessmaster' into 1.5.0-wip

This commit is contained in:
Luke Page
2013-07-20 22:17:39 +01:00
14 changed files with 5879 additions and 15 deletions

View File

@@ -202,7 +202,7 @@ function extractUrlParts(url, baseUrl) {
// urlParts[4] = filename
// urlParts[5] = parameters
var urlPartsRegex = /^((?:[a-z-]+:)?\/+?(?:[^\/\?#]*\/)|([\/\\]))?((?:[^\/\\\?#]*[\/\\])*)([^\/\\\?#]*)([#\?].*)?$/,
var urlPartsRegex = /^((?:[a-z-]+:)?\/+?(?:[^\/\?#]*\/)|([\/\\]))?((?:[^\/\\\?#]*[\/\\])*)([^\/\\\?#]*)([#\?].*)?$/i,
urlParts = url.match(urlPartsRegex),
returner = {}, directories = [], i, baseUrlParts;
@@ -223,7 +223,7 @@ function extractUrlParts(url, baseUrl) {
}
if (urlParts[3]) {
directories = urlParts[3].replace("\\", "/").split("/");
directories = urlParts[3].replace(/\\/g, "/").split("/");
// extract out . before .. so .. doesn't absorb a non-directory
for(i = 0; i < directories.length; i++) {