Rename lodash.custom.min.js to lodash.js so our JS code hinting finds…

… it. Remove the special path for it so it's more consistent with other require paths that have to be relative to src.

src/brackets.js

@@ -28,8 +28,7 @@
 require.config({
     paths: {
         "text"      : "thirdparty/text/text",
-        "i18n"      : "thirdparty/i18n/i18n",
-        "lodash"    : "thirdparty/lodash.custom.min"
+        "i18n"      : "thirdparty/i18n/i18n"
     },
     // Use custom brackets property until CEF sets the correct navigator.language
     // NOTE: When we change to navigator.language here, we also should change to
@@ -100,7 +99,7 @@ define(function (require, exports, module) {
         ColorUtils              = require("utils/ColorUtils"),
         CodeInspection          = require("language/CodeInspection"),
         NativeApp               = require("utils/NativeApp"),
-        _                       = require("lodash");
+        _                       = require("thirdparty/lodash");
 
     // Load modules that self-register and just need to get included in the main project
     require("command/DefaultMenus");

src/command/Menus.js

@@ -28,7 +28,7 @@
 define(function (require, exports, module) {
     "use strict";
 
-    var _ = require("lodash");
+    var _ = require("thirdparty/lodash");
 
     // Load dependent modules
     var Global              = require("utils/Global"),

src/document/DocumentManager.js

@@ -88,7 +88,7 @@
 define(function (require, exports, module) {
     "use strict";
 
-    var _ = require("lodash");
+    var _ = require("thirdparty/lodash");
 
     var DocumentModule      = require("document/Document"),
         NativeFileSystem    = require("file/NativeFileSystem").NativeFileSystem,

src/editor/CSSInlineEditor.js

@@ -42,7 +42,7 @@ define(function (require, exports, module) {
         MultiRangeInlineEditor  = require("editor/MultiRangeInlineEditor"),
         PopUpManager            = require("widgets/PopUpManager"),
         Strings                 = require("strings"),
-        _                       = require("lodash");
+        _                       = require("thirdparty/lodash");
 
     var StylesheetsMenuTemplate = require("text!htmlContent/stylesheets-menu.html");
 

src/editor/MultiRangeInlineEditor.js

@@ -39,7 +39,7 @@
 define(function (require, exports, module) {
     "use strict";
 
-    var _ = require("lodash");
+    var _ = require("thirdparty/lodash");
 
     // Load dependent modules
     var TextRange           = require("document/TextRange").TextRange,

src/extensibility/ExtensionManagerViewModel.js

@@ -28,7 +28,7 @@
 define(function (require, exports, module) {
     "use strict";
 
-    var _ = require("lodash");
+    var _ = require("thirdparty/lodash");
 
     var ExtensionManager = require("extensibility/ExtensionManager"),
         Package          = require("extensibility/Package"),

src/extensions/default/DebugCommands/main.js

@@ -28,7 +28,7 @@
 define(function (require, exports, module) {
     "use strict";
 
-    var _ = brackets.getModule("lodash");
+    var _ = brackets.getModule("thirdparty/lodash");
 
     var Commands               = brackets.getModule("command/Commands"),
         CommandManager         = brackets.getModule("command/CommandManager"),

src/extensions/default/JavaScriptCodeHints/ParameterHintManager.js

@@ -27,7 +27,7 @@
 define(function (require, exports, module) {
     "use strict";
 
-    var _ = brackets.getModule("lodash");
+    var _ = brackets.getModule("thirdparty/lodash");
 
     var Commands        = brackets.getModule("command/Commands"),
         CommandManager  = brackets.getModule("command/CommandManager"),

src/extensions/default/JavaScriptCodeHints/ScopeManager.js

@@ -34,7 +34,7 @@
 define(function (require, exports, module) {
     "use strict";
 
-    var _ = brackets.getModule("lodash");
+    var _ = brackets.getModule("thirdparty/lodash");
 
     var DocumentManager     = brackets.getModule("document/DocumentManager"),
         LanguageManager     = brackets.getModule("language/LanguageManager"),

src/extensions/default/JavaScriptCodeHints/main.js

@@ -27,7 +27,7 @@
 define(function (require, exports, module) {
     "use strict";
 
-    var _ = brackets.getModule("lodash");
+    var _ = brackets.getModule("thirdparty/lodash");
 
     var CodeHintManager      = brackets.getModule("editor/CodeHintManager"),
         EditorManager        = brackets.getModule("editor/EditorManager"),

src/language/JSUtils.js

@@ -30,7 +30,7 @@
 define(function (require, exports, module) {
     "use strict";
 
-    var _ = require("lodash");
+    var _ = require("thirdparty/lodash");
 
     // Load brackets modules
     var Async                   = require("utils/Async"),

src/preferences/PreferenceStorage.js

@@ -31,7 +31,7 @@
 define(function (require, exports, module) {
     "use strict";
 
-    var _ = require("lodash");
+    var _ = require("thirdparty/lodash");
 
     var PreferencesManager = require("preferences/PreferencesManager");
 

src/preferences/PreferencesManager.js

@@ -32,7 +32,7 @@
 define(function (require, exports, module) {
     "use strict";
 
-    var _ = require("lodash");
+    var _ = require("thirdparty/lodash");
 
     var PreferenceStorage = require("preferences/PreferenceStorage").PreferenceStorage,
         FileUtils         = require("file/FileUtils"),

src/project/FileIndexManager.js

@@ -39,7 +39,7 @@
 define(function (require, exports, module) {
     "use strict";
 
-    var _ = require("lodash");
+    var _ = require("thirdparty/lodash");
 
     var PerfUtils           = require("utils/PerfUtils"),
         ProjectManager      = require("project/ProjectManager"),

src/project/ProjectManager.js

@@ -49,7 +49,7 @@ define(function (require, exports, module) {
     // Load dependent non-module scripts
     require("thirdparty/jstree_pre1.0_fix_1/jquery.jstree");
 
-    var _ = require("lodash");
+    var _ = require("thirdparty/lodash");
 
     // Load dependent modules
     var AppInit             = require("utils/AppInit"),

src/project/WorkingSetView.js

@@ -33,7 +33,7 @@
 define(function (require, exports, module) {
     "use strict";
 
-    var _ = require("lodash");
+    var _ = require("thirdparty/lodash");
 
     // Load dependent modules
     var DocumentManager       = require("document/DocumentManager"),

src/search/FindInFiles.js

@@ -42,7 +42,7 @@
 define(function (require, exports, module) {
     "use strict";
 
-    var _ = require("lodash");
+    var _ = require("thirdparty/lodash");
 
     var Async                 = require("utils/Async"),
         Resizer               = require("utils/Resizer"),

src/search/ScrollTrackMarkers.js

@@ -33,7 +33,7 @@
 define(function (require, exports, module) {
     "use strict";
 
-    var _ = require("lodash");
+    var _ = require("thirdparty/lodash");
 
     var Editor              = require("editor/Editor"),
         EditorManager       = require("editor/EditorManager");

src/strings.js

@@ -33,7 +33,7 @@
 define(function (require, exports, module) {
     "use strict";
 
-    var _ = require("lodash");
+    var _ = require("thirdparty/lodash");
 
     var strings         = require("i18n!nls/strings"),
         urls            = require("i18n!nls/urls"),

src/utils/CollectionUtils.js

@@ -30,7 +30,7 @@
 define(function (require, exports, module) {
     "use strict";
 
-    var _ = require("lodash");
+    var _ = require("thirdparty/lodash");
 
     /**
      * Returns the first index in 'array' for which isMatch() returns true, or -1 if none

src/utils/PerfUtils.js

@@ -30,7 +30,7 @@
 define(function (require, exports, module) {
     "use strict";
 
-    var _ = require("lodash");
+    var _ = require("thirdparty/lodash");
 
     var Global = require("utils/Global");
 

src/utils/StringMatch.js

@@ -28,7 +28,7 @@
 define(function (require, exports, module) {
     "use strict";
 
-    var _ = require("lodash");
+    var _ = require("thirdparty/lodash");
 
     /*
      * Performs matching that is useful for QuickOpen and similar searches.

src/utils/StringUtils.js

@@ -31,7 +31,7 @@
 define(function (require, exports, module) {
     "use strict";
 
-    var _ = require("lodash");
+    var _ = require("thirdparty/lodash");
 
     /**
      * Format a string by replacing placeholder symbols with passed in arguments.

src/utils/UrlParams.js

@@ -28,7 +28,7 @@
 define(function (require, exports, module) {
     "use strict";
 
-    var _ = require("lodash");
+    var _ = require("thirdparty/lodash");
 
     /**
      * Convert between URL querystring and name/value pairs. Decodes and encodes URL parameters.

test/BootstrapReporterView.js

@@ -26,7 +26,7 @@
 define(function (require, exports, module) {
     'use strict';
 
-    var _ = require("lodash");
+    var _ = require("thirdparty/lodash");
 
     var UrlParams       = require("utils/UrlParams").UrlParams,
         SpecRunnerUtils = require("spec/SpecRunnerUtils");

test/SpecRunner.js

@@ -32,15 +32,14 @@ require.config({
         "perf"      : "../test/perf",
         "spec"      : "../test/spec",
         "text"      : "thirdparty/text/text",
-        "i18n"      : "thirdparty/i18n/i18n",
-        "lodash"    : "thirdparty/lodash.custom.min"
+        "i18n"      : "thirdparty/i18n/i18n"
     }
 });
 
 define(function (require, exports, module) {
     'use strict';
 
-    var _ = require("lodash");
+    var _ = require("thirdparty/lodash");
 
     // Utility dependency
     var AppInit                 = require("utils/AppInit"),

test/spec/ExtensionManager-test.js

@@ -33,7 +33,7 @@ define(function (require, exports, module) {
 
     require("thirdparty/jquery.mockjax.js");
 
-    var _ = require("lodash");
+    var _ = require("thirdparty/lodash");
 
     var ExtensionManager          = require("extensibility/ExtensionManager"),
         ExtensionManagerView      = require("extensibility/ExtensionManagerView").ExtensionManagerView,

test/spec/StringMatch-test.js

@@ -29,7 +29,7 @@
 define(function (require, exports, module) {
     'use strict';
 
-    var _ = require("lodash");
+    var _ = require("thirdparty/lodash");
 
     var StringMatch = require("utils/StringMatch");