Merge pull request #7522 from adobe/zaggino/fix-less-loading

redmunds · redmunds · commit 8ab46c2aaad6 · 2014-04-17T09:41:02.000-07:00
fix loading of less imports on win, linux and mac
diff --git a/src/utils/ExtensionUtils.js b/src/utils/ExtensionUtils.js
@@ -31,6 +31,8 @@
 define(function (require, exports, module) {
     "use strict";
     
+    var FileSystem = require("filesystem/FileSystem");
+
     /**
      * Appends a <style> tag to the document's head.
      *
@@ -66,6 +68,18 @@ define(function (require, exports, module) {
         return $link[0];
     }
 
+    /**
+     * getModuleUrl returns different urls for win platform
+     * so that's why we need a different check here
+     * @see getModuleUrl()
+     * @param {!string} pathOrUrl that should be checked if it's absolute
+     * @return {!boolean} returns true if pathOrUrl is absolute url on win platform
+     *                    or when it's absolute path on other platforms
+     */
+    function isAbsolutePathOrUrl(pathOrUrl) {
+        return brackets.platform === "win" ? PathUtils.isAbsoluteUrl(pathOrUrl) : FileSystem.isAbsolutePath(pathOrUrl);
+    }
+
     /**
      * Parses LESS code and returns a promise that resolves with plain CSS code.
      *
@@ -91,7 +105,7 @@ define(function (require, exports, module) {
                 rootpath: dir
             };
 
-            if (PathUtils.isAbsoluteUrl(url)) {
+            if (isAbsolutePathOrUrl(url)) {
                 options.currentFileInfo = {
                     currentDirectory: dir,
                     entryPath: dir,
@@ -161,7 +175,7 @@ define(function (require, exports, module) {
      * @return {!$.Promise} A promise object that is resolved with the contents of the requested file
      **/
     function loadFile(module, path) {
-        var url     = PathUtils.isAbsoluteUrl(path) ? path : getModuleUrl(module, path),
+        var url     = isAbsolutePathOrUrl(path) ? path : getModuleUrl(module, path),
             promise = $.get(url);
 
         return promise;
