From 4aa040a356e57ecb8cd33bb50ac351ed3fffcee9 Mon Sep 17 00:00:00 2001 From: Oliver Becker Date: Fri, 8 Nov 2013 18:53:03 +0100 Subject: [PATCH] renamed path implementation in less for rhino to _path --- build/rhino-path.js | 2 +- lib/less/rhino.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/rhino-path.js b/build/rhino-path.js index 263198f1..f79b0654 100644 --- a/build/rhino-path.js +++ b/build/rhino-path.js @@ -1,4 +1,4 @@ -less.path = { +less._path = { join: function() { var parts = []; for (i in arguments) { diff --git a/lib/less/rhino.js b/lib/less/rhino.js index aea6731a..62ca62b1 100644 --- a/lib/less/rhino.js +++ b/lib/less/rhino.js @@ -89,12 +89,12 @@ function loadStyleSheet(sheet, callback, reload, remaining) { less.Parser.fileLoader = function (originalHref, currentFileInfo, callback, env, newVars) { if (currentFileInfo && currentFileInfo.currentDirectory && !/^\//.test(originalHref)) { - originalHref = less.path.join(currentFileInfo.currentDirectory, originalHref); + originalHref = less._path.join(currentFileInfo.currentDirectory, originalHref); } var href = originalHref; - var path = less.path.dirname(href); + var path = less._path.dirname(href); var newFileInfo = { currentDirectory: path + '/', @@ -116,7 +116,7 @@ less.Parser.fileLoader = function (originalHref, currentFileInfo, callback, env, try { var data = readFile(href); } catch (e) { - callback({ type: 'File', message: "'" + less.path.basename(href) + "' wasn't found" }); + callback({ type: 'File', message: "'" + less._path.basename(href) + "' wasn't found" }); return; } @@ -338,7 +338,7 @@ function writeFile(filename, content) { return; } options.sourceMapFullFilename = options.sourceMapOutputFilename + ".map"; - options.sourceMap = less.path.basename(options.sourceMapFullFilename); + options.sourceMap = less._path.basename(options.sourceMapFullFilename); } if (!name) {