Merge pull request #10596 from MarcelGerber/brackets-js-dependencies

busykai · busykai · commit 19f9b437433b · 2015-05-20T01:08:57.000-03:00
Clean up dependencies in brackets.js
diff --git a/src/brackets.js b/src/brackets.js
@@ -39,60 +39,51 @@ 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");
-    require("thirdparty/path-utils/path-utils.min");
 
-    // Load CodeMirror add-ons--these attach themselves to the CodeMirror module    
-    require("thirdparty/CodeMirror2/addon/fold/xml-fold");
-    require("thirdparty/CodeMirror2/addon/edit/matchtags");
-    require("thirdparty/CodeMirror2/addon/edit/matchbrackets");
+    // Load CodeMirror add-ons--these attach themselves to the CodeMirror module
     require("thirdparty/CodeMirror2/addon/edit/closebrackets");
     require("thirdparty/CodeMirror2/addon/edit/closetag");
-    require("thirdparty/CodeMirror2/addon/scroll/scrollpastend");
-    require("thirdparty/CodeMirror2/addon/selection/active-line");
-    require("thirdparty/CodeMirror2/addon/selection/mark-selection");
+    require("thirdparty/CodeMirror2/addon/edit/matchbrackets");
+    require("thirdparty/CodeMirror2/addon/edit/matchtags");
+    require("thirdparty/CodeMirror2/addon/fold/xml-fold");
     require("thirdparty/CodeMirror2/addon/mode/multiplex");
     require("thirdparty/CodeMirror2/addon/mode/overlay");
+    require("thirdparty/CodeMirror2/addon/scroll/scrollpastend");
     require("thirdparty/CodeMirror2/addon/search/match-highlighter");
     require("thirdparty/CodeMirror2/addon/search/searchcursor");
+    require("thirdparty/CodeMirror2/addon/selection/active-line");
+    require("thirdparty/CodeMirror2/addon/selection/mark-selection");
     require("thirdparty/CodeMirror2/keymap/sublime");
 
     // Load dependent modules
-    var AppInit                 = require("utils/AppInit"),
-        LanguageManager         = require("language/LanguageManager"),
-        ProjectManager          = require("project/ProjectManager"),
-        DocumentManager         = require("document/DocumentManager"),
-        EditorManager           = require("editor/EditorManager"),
-        JSUtils                 = require("language/JSUtils"),
-        WorkingSetView          = require("project/WorkingSetView"),
-        DocumentCommandHandlers = require("document/DocumentCommandHandlers"),
-        FileViewController      = require("project/FileViewController"),
-        FileSyncManager         = require("project/FileSyncManager"),
-        KeyBindingManager       = require("command/KeyBindingManager"),
-        Commands                = require("command/Commands"),
-        CommandManager          = require("command/CommandManager"),
-        CodeHintManager         = require("editor/CodeHintManager"),
-        PerfUtils               = require("utils/PerfUtils"),
-        FileSystem              = require("filesystem/FileSystem"),
-        Menus                   = require("command/Menus"),
-        MainViewHTML            = require("text!htmlContent/main-view.html"),
-        Strings                 = require("strings"),
-        Dialogs                 = require("widgets/Dialogs"),
-        DefaultDialogs          = require("widgets/DefaultDialogs"),
-        ExtensionLoader         = require("utils/ExtensionLoader"),
-        Async                   = require("utils/Async"),
-        UpdateNotification      = require("utils/UpdateNotification"),
-        UrlParams               = require("utils/UrlParams").UrlParams,
-        PreferencesManager      = require("preferences/PreferencesManager"),
-        ExtensionUtils          = require("utils/ExtensionUtils"),
-        DragAndDrop             = require("utils/DragAndDrop"),
-        CodeInspection          = require("language/CodeInspection"),
-        NativeApp               = require("utils/NativeApp"),
-        DeprecationWarning      = require("utils/DeprecationWarning"),
-        ViewCommandHandlers     = require("view/ViewCommandHandlers"),
-        MainViewManager         = require("view/MainViewManager");
+    var AppInit             = require("utils/AppInit"),
+        LanguageManager     = require("language/LanguageManager"),
+        ProjectManager      = require("project/ProjectManager"),
+        FileViewController  = require("project/FileViewController"),
+        FileSyncManager     = require("project/FileSyncManager"),
+        Commands            = require("command/Commands"),
+        CommandManager      = require("command/CommandManager"),
+        PerfUtils           = require("utils/PerfUtils"),
+        FileSystem          = require("filesystem/FileSystem"),
+        Strings             = require("strings"),
+        Dialogs             = require("widgets/Dialogs"),
+        DefaultDialogs      = require("widgets/DefaultDialogs"),
+        ExtensionLoader     = require("utils/ExtensionLoader"),
+        Async               = require("utils/Async"),
+        UpdateNotification  = require("utils/UpdateNotification"),
+        UrlParams           = require("utils/UrlParams").UrlParams,
+        PreferencesManager  = require("preferences/PreferencesManager"),
+        DragAndDrop         = require("utils/DragAndDrop"),
+        NativeApp           = require("utils/NativeApp"),
+        DeprecationWarning  = require("utils/DeprecationWarning"),
+        ViewCommandHandlers = require("view/ViewCommandHandlers"),
+        MainViewManager     = require("view/MainViewManager");
+
+    var MainViewHTML        = require("text!htmlContent/main-view.html");
 
     // load modules for later use
     require("utils/Global");
@@ -125,20 +116,20 @@ define(function (require, exports, module) {
     // Load modules that self-register and just need to get included in the main project
     require("command/DefaultMenus");
     require("document/ChangedDocumentTracker");
-    require("editor/EditorStatusBar");
     require("editor/EditorCommandHandlers");
     require("editor/EditorOptionHandlers");
+    require("editor/EditorStatusBar");
+    require("editor/ImageViewer");
+    require("extensibility/InstallExtensionDialog");
+    require("extensibility/ExtensionManagerDialog");
     require("help/HelpCommandHandlers");
     require("search/FindInFilesUI");
     require("search/FindReplace");
-    require("extensibility/InstallExtensionDialog");
-    require("extensibility/ExtensionManagerDialog");
-    require("editor/ImageViewer");
     
     // Compatibility shims for filesystem API migration
-    require("project/FileIndexManager");
-    require("file/NativeFileSystem");
     require("file/NativeFileError");
+    require("file/NativeFileSystem");
+    require("project/FileIndexManager");
     
     // Compatibility shim for PanelManager to WorkspaceManager migration
     require("view/PanelManager");
@@ -162,50 +153,50 @@ define(function (require, exports, module) {
         // in the modules since they would run in context of the unit test window,
         // and would not have access to the app html/css.
         brackets.test = {
-            CodeHintManager         : CodeHintManager,
-            CodeInspection          : CodeInspection,
-            CommandManager          : CommandManager,
-            Commands                : Commands,
+            CodeHintManager         : require("editor/CodeHintManager"),
+            CodeInspection          : require("language/CodeInspection"),
+            CommandManager          : require("command/CommandManager"),
+            Commands                : require("command/Commands"),
             CSSUtils                : require("language/CSSUtils"),
-            DefaultDialogs          : DefaultDialogs,
-            Dialogs                 : Dialogs,
-            DocumentCommandHandlers : DocumentCommandHandlers,
-            DocumentManager         : DocumentManager,
+            DefaultDialogs          : require("widgets/DefaultDialogs"),
+            Dialogs                 : require("widgets/Dialogs"),
+            DocumentCommandHandlers : require("document/DocumentCommandHandlers"),
+            DocumentManager         : require("document/DocumentManager"),
             DocumentModule          : require("document/Document"),
             DOMAgent                : require("LiveDevelopment/Agents/DOMAgent"),
-            DragAndDrop             : DragAndDrop,
-            EditorManager           : EditorManager,
-            ExtensionLoader         : ExtensionLoader,
-            ExtensionUtils          : ExtensionUtils,
+            DragAndDrop             : require("utils/DragAndDrop"),
+            EditorManager           : require("editor/EditorManager"),
+            ExtensionLoader         : require("utils/ExtensionLoader"),
+            ExtensionUtils          : require("utils/ExtensionUtils"),
             File                    : require("filesystem/File"),
             FileFilters             : require("search/FileFilters"),
-            FileSyncManager         : FileSyncManager,
-            FileSystem              : FileSystem,
-            FileViewController      : FileViewController,
+            FileSyncManager         : require("project/FileSyncManager"),
+            FileSystem              : require("filesystem/FileSystem"),
             FileUtils               : require("file/FileUtils"),
+            FileViewController      : require("project/FileViewController"),
             FindInFiles             : require("search/FindInFiles"),
             FindInFilesUI           : require("search/FindInFilesUI"),
             HTMLInstrumentation     : require("language/HTMLInstrumentation"),
             Inspector               : require("LiveDevelopment/Inspector/Inspector"),
             InstallExtensionDialog  : require("extensibility/InstallExtensionDialog"),
-            JSUtils                 : JSUtils,
-            KeyBindingManager       : KeyBindingManager,
-            LanguageManager         : LanguageManager,
+            JSUtils                 : require("language/JSUtils"),
+            KeyBindingManager       : require("command/KeyBindingManager"),
+            LanguageManager         : require("language/LanguageManager"),
             LiveDevelopment         : require("LiveDevelopment/LiveDevelopment"),
             LiveDevMultiBrowser     : require("LiveDevelopment/LiveDevMultiBrowser"),
             LiveDevServerManager    : require("LiveDevelopment/LiveDevServerManager"),
-            MainViewManager         : MainViewManager,
             MainViewFactory         : require("view/MainViewFactory"),
-            Menus                   : Menus,
+            MainViewManager         : require("view/MainViewManager"),
+            Menus                   : require("command/Menus"),
             MultiRangeInlineEditor  : require("editor/MultiRangeInlineEditor").MultiRangeInlineEditor,
-            NativeApp               : NativeApp,
-            PerfUtils               : PerfUtils,
-            PreferencesManager      : PreferencesManager,
-            ProjectManager          : ProjectManager,
+            NativeApp               : require("utils/NativeApp"),
+            PerfUtils               : require("utils/PerfUtils"),
+            PreferencesManager      : require("preferences/PreferencesManager"),
+            ProjectManager          : require("project/ProjectManager"),
             RemoteAgent             : require("LiveDevelopment/Agents/RemoteAgent"),
             ScrollTrackMarkers      : require("search/ScrollTrackMarkers"),
             UpdateNotification      : require("utils/UpdateNotification"),
-            WorkingSetView          : WorkingSetView,
+            WorkingSetView          : require("project/WorkingSetView"),
             doneLoading             : false
         };
 
