Permalink
Browse files

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.
  • Loading branch information...
1 parent 3ceb511 commit 010bc625b8dd5970f40f5118b7b8ceb6dbb53f20 @njx njx committed Oct 28, 2013
View
5 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");
View
2 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"),
View
2 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,
View
2 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");
View
2 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,
View
2 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"),
View
2 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"),
View
2 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"),
View
2 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"),
View
2 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"),
View
2 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"),
View
2 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");
View
2 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"),
View
2 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"),
View
2 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"),
View
2 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"),
View
2 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"),
View
2 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");
View
2 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"),
View
0 src/thirdparty/lodash.custom.min.js → src/thirdparty/lodash.js
File renamed without changes.
View
2 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
View
2 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");
View
2 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.
View
2 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.
View
2 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.
View
2 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");
View
5 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"),
View
2 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,
View
2 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");

0 comments on commit 010bc62

Please sign in to comment.