Merge pull request #11734 from ficristo/import-path-utils

zaggino · zaggino · commit 784952a7a7b0 · 2015-09-24T07:36:06.000+10:00
Move PathUtils to Brackets core code
diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule "src/thirdparty/CodeMirror"]
 	path = src/thirdparty/CodeMirror
 	url = https://github.com/adobe/CodeMirror2.git
-[submodule "src/thirdparty/path-utils"]
-	path = src/thirdparty/path-utils
-	url = https://github.com/jblas/path-utils.git
 [submodule "src/thirdparty/mustache"]
 	path = src/thirdparty/mustache
 	url = https://github.com/janl/mustache.js.git
diff --git a/.jshintrc b/.jshintrc
@@ -62,7 +62,6 @@
         "define": false,
         "brackets": false,
         "$": false,
-        "PathUtils": false,
         "window": false,
         "navigator": false,
         "Mustache": false
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -275,7 +275,6 @@ module.exports = function (grunt) {
                     'src/thirdparty/CodeMirror/addon/edit/closetag.js',
                     'src/thirdparty/CodeMirror/addon/selection/active-line.js',
                     'src/thirdparty/mustache/mustache.js',
-                    'src/thirdparty/path-utils/path-utils.min',
                     'src/thirdparty/less-2.5.1.min.js'
                 ],
                 helpers : [
diff --git a/src/LiveDevelopment/Agents/CSSAgent.js b/src/LiveDevelopment/Agents/CSSAgent.js
@@ -23,7 +23,7 @@
 
 
 /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, forin: true, maxerr: 50, regexp: true */
-/*global define, $, PathUtils */
+/*global define, $ */
 
 /**
  * CSSAgent keeps track of loaded style sheets and allows reloading them
@@ -35,12 +35,11 @@
 define(function CSSAgent(require, exports, module) {
     "use strict";
 
-    require("thirdparty/path-utils/path-utils.min");
-
     var _ = require("thirdparty/lodash");
 
     var Inspector       = require("LiveDevelopment/Inspector/Inspector"),
-        EventDispatcher = require("utils/EventDispatcher");
+        EventDispatcher = require("utils/EventDispatcher"),
+        PathUtils       = require("utils/PathUtils");
 
     /**
      * Stylesheet details
diff --git a/src/brackets.js b/src/brackets.js
@@ -39,7 +39,6 @@ define(function (require, exports, module) {
     "use strict";
 
     // Load dependent non-module scripts
-    require("thirdparty/path-utils/path-utils.min");
     require("widgets/bootstrap-dropdown");
     require("widgets/bootstrap-modal");
     require("widgets/bootstrap-twipsy-mod");
@@ -115,6 +114,18 @@ define(function (require, exports, module) {
         }
     });
     
+    // DEPRECATED: In future we want to remove the global CodeMirror, but for now we
+    // expose our required CodeMirror globally so as to avoid breaking extensions in the
+    // interim.
+    var PathUtils = require("utils/PathUtils");
+
+    Object.defineProperty(window, "PathUtils", {
+        get: function () {
+            DeprecationWarning.deprecationWarning('Use brackets.getModule("utils/PathUtils") instead of global PathUtils.', true);
+            return PathUtils;
+        }
+    });
+    
     // Load modules that self-register and just need to get included in the main project
     require("command/DefaultMenus");
     require("document/ChangedDocumentTracker");
diff --git a/src/extensibility/Package.js b/src/extensibility/Package.js
@@ -24,7 +24,7 @@
 
 /*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, regexp: true,
 indent: 4, maxerr: 50 */
-/*global define, $, brackets, PathUtils */
+/*global define, $, brackets */
 
 /**
  * Functions for working with extension packages
@@ -39,6 +39,7 @@ define(function (require, exports, module) {
         Strings              = require("strings"),
         ExtensionLoader      = require("utils/ExtensionLoader"),
         NodeConnection       = require("utils/NodeConnection"),
+        PathUtils            = require("utils/PathUtils"),
         PreferencesManager   = require("preferences/PreferencesManager");
     
     PreferencesManager.definePreference("proxy", "string", undefined, {
diff --git a/src/extensions/default/QuickView/main.js b/src/extensions/default/QuickView/main.js
@@ -22,7 +22,7 @@
  */
 
 /*jslint vars: true, plusplus: true, devel: true, nomen: true,  regexp: true, indent: 4, maxerr: 50 */
-/*global define, brackets, $, window, PathUtils */
+/*global define, brackets, $, window */
 
 define(function (require, exports, module) {
     "use strict";
@@ -39,6 +39,7 @@ define(function (require, exports, module) {
         PreferencesManager  = brackets.getModule("preferences/PreferencesManager"),
         LanguageManager     = brackets.getModule("language/LanguageManager"),
         Strings             = brackets.getModule("strings"),
+        PathUtils           = brackets.getModule("utils/PathUtils"),
         ViewUtils           = brackets.getModule("utils/ViewUtils"),
         TokenUtils          = brackets.getModule("utils/TokenUtils");
    
diff --git a/src/extensions/default/UrlCodeHints/main.js b/src/extensions/default/UrlCodeHints/main.js
@@ -21,7 +21,7 @@
  */
 
 /*jslint vars: true, plusplus: true, devel: true, nomen: true,  regexp: true, indent: 4, maxerr: 50 */
-/*global define, brackets, $, window */
+/*global define, brackets, $ */
 
 
 define(function (require, exports, module) {
@@ -36,6 +36,7 @@ define(function (require, exports, module) {
         HTMLUtils           = brackets.getModule("language/HTMLUtils"),
         PreferencesManager  = brackets.getModule("preferences/PreferencesManager"),
         ProjectManager      = brackets.getModule("project/ProjectManager"),
+        PathUtils           = brackets.getModule("utils/PathUtils"),
         StringUtils         = brackets.getModule("utils/StringUtils"),
         Strings             = brackets.getModule("strings"),
         Data                = require("text!data.json"),
@@ -80,7 +81,7 @@ define(function (require, exports, module) {
         docDir = FileUtils.getDirectoryPath(doc.file.fullPath);
         
         // get relative path from query string
-        queryUrl = window.PathUtils.parseUrl(query.queryStr);
+        queryUrl = PathUtils.parseUrl(query.queryStr);
         if (queryUrl) {
             queryDir = queryUrl.directory;
         }
diff --git a/src/preferences/PreferencesDialogs.js b/src/preferences/PreferencesDialogs.js
@@ -23,19 +23,18 @@
 
 
 /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, PathUtils, Mustache */
+/*global define, Mustache */
 
 /**
  * PreferencesDialogs
  *
  */
 define(function (require, exports, module) {
     "use strict";
-    
-    require("thirdparty/path-utils/path-utils.min");
 
     var Dialogs                = require("widgets/Dialogs"),
         ProjectManager         = require("project/ProjectManager"),
+        PathUtils              = require("utils/PathUtils"),
         StringUtils            = require("utils/StringUtils"),
         Strings                = require("strings"),
         SettingsDialogTemplate = require("text!htmlContent/project-settings-dialog.html");
diff --git a/src/thirdparty/path-utils b/src/thirdparty/path-utils
diff --git a/src/utils/ExtensionUtils.js b/src/utils/ExtensionUtils.js
@@ -23,7 +23,7 @@
 
 
 /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, $, brackets, less, PathUtils */
+/*global define, $, brackets, less */
 
 /**
  * ExtensionUtils defines utility methods for implementing extensions.
@@ -32,6 +32,7 @@ define(function (require, exports, module) {
     "use strict";
     
     var Async      = require("utils/Async"),
+        PathUtils  = require("utils/PathUtils"),
         FileSystem = require("filesystem/FileSystem"),
         FileUtils  = require("file/FileUtils");
 
diff --git a/src/utils/PathUtils.js b/src/utils/PathUtils.js
diff --git a/test/SpecRunner.html b/test/SpecRunner.html
diff --git a/test/UnitTestSuite.js b/test/UnitTestSuite.js
diff --git a/test/spec/PathUtils-test.js b/test/spec/PathUtils-test.js
