[SplitView] Removed unused vars

Marcel Gerber · Marcel Gerber · commit f8a27496dc5c · 2014-09-05T17:18:47.000+02:00
diff --git a/src/document/DocumentManager.js b/src/document/DocumentManager.js
@@ -87,8 +87,6 @@ define(function (require, exports, module) {
         DocumentModule      = require("document/Document"),
         DeprecationWarning  = require("utils/DeprecationWarning"),
         MainViewManager     = require("view/MainViewManager"),
-        ProjectManager      = require("project/ProjectManager"),
-        EditorManager       = require("editor/EditorManager"),
         FileSyncManager     = require("project/FileSyncManager"),
         FileSystem          = require("filesystem/FileSystem"),
         PreferencesManager  = require("preferences/PreferencesManager"),
@@ -281,20 +279,6 @@ define(function (require, exports, module) {
         MainViewManager.endTraversal();
     }
     
-    /**
-     * Get the next or previous file in the working set, in MRU order (relative to currentDocument). May
-     * return currentDocument itself if working set is length 1.
-     * @deprecated use MainViewManager.traverseToNextViewByMRU() instead
-     */
-    function getNextPrevFile(inc) {
-        DeprecationWarning.deprecationWarning("Use MainViewManager.traverseToNextViewByMRU() instead of DocumentManager.getNextPrevFile()", true);
-        var result = MainViewManager.traverseToNextViewByMRU(inc);
-        if (result) {
-            return result.file;
-        }
-        return null;
-    }
-    
     /**
      * Cleans up any loose Documents whose only ref is its own master Editor, and that Editor is not
      * rooted in the UI anywhere. This can happen if the Editor is auto-created via Document APIs that
diff --git a/src/editor/EditorManager.js b/src/editor/EditorManager.js
@@ -57,8 +57,7 @@ define(function (require, exports, module) {
     "use strict";
     
     // Load dependent modules
-    var _                   = require("thirdparty/lodash"),
-        Commands            = require("command/Commands"),
+    var Commands            = require("command/Commands"),
         WorkspaceManager    = require("view/WorkspaceManager"),
         PreferencesManager  = require("preferences/PreferencesManager"),
         CommandManager      = require("command/CommandManager"),
diff --git a/src/extensions/default/CloseOthers/main.js b/src/extensions/default/CloseOthers/main.js
@@ -30,7 +30,6 @@ define(function (require, exports, module) {
     var Menus                   = brackets.getModule("command/Menus"),
         CommandManager          = brackets.getModule("command/CommandManager"),
         Commands                = brackets.getModule("command/Commands"),
-        DocumentManager         = brackets.getModule("document/DocumentManager"),
         MainViewManager         = brackets.getModule("view/MainViewManager"),
         Strings                 = brackets.getModule("strings"),
         workingSetListCmenu       = Menus.getContextMenu(Menus.ContextMenuIds.WORKING_SET_CONTEXT_MENU),
diff --git a/src/extensions/default/RecentProjects/main.js b/src/extensions/default/RecentProjects/main.js
@@ -35,7 +35,6 @@ define(function (require, exports, module) {
         CommandManager          = brackets.getModule("command/CommandManager"),
         KeyBindingManager       = brackets.getModule("command/KeyBindingManager"),
         Menus                   = brackets.getModule("command/Menus"),
-        EditorManager           = brackets.getModule("editor/EditorManager"),
         MainViewManager         = brackets.getModule("view/MainViewManager"),
         ExtensionUtils          = brackets.getModule("utils/ExtensionUtils"),
         FileSystem              = brackets.getModule("filesystem/FileSystem"),
diff --git a/src/extensions/samples/BracketsConfigCentral/main.js b/src/extensions/samples/BracketsConfigCentral/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, $, Mustache, navigator */
+/*global define, brackets, $, Mustache */
 
 define(function (require, exports, module) {
     "use strict";
diff --git a/src/project/FileSyncManager.js b/src/project/FileSyncManager.js
@@ -46,7 +46,6 @@ define(function (require, exports, module) {
     var ProjectManager      = require("project/ProjectManager"),
         DocumentManager     = require("document/DocumentManager"),
         MainViewManager     = require("view/MainViewManager"),
-        EditorManager       = require("editor/EditorManager"),
         Async               = require("utils/Async"),
         Dialogs             = require("widgets/Dialogs"),
         DefaultDialogs      = require("widgets/DefaultDialogs"),
diff --git a/src/project/FileViewController.js b/src/project/FileViewController.js
@@ -52,7 +52,6 @@ define(function (require, exports, module) {
     var DocumentManager     = require("document/DocumentManager"),
         MainViewManager     = require("view/MainViewManager"),
         CommandManager      = require("command/CommandManager"),
-        EditorManager       = require("editor/EditorManager"),
         PerfUtils           = require("utils/PerfUtils"),
         Commands            = require("command/Commands"),
         DeprecationWarning  = require("utils/DeprecationWarning");
diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js
@@ -76,8 +76,7 @@ define(function (require, exports, module) {
         Urls                = require("i18n!nls/urls"),
         KeyEvent            = require("utils/KeyEvent"),
         Async               = require("utils/Async"),
-        FileSyncManager     = require("project/FileSyncManager"),
-        EditorManager       = require("editor/EditorManager");
+        FileSyncManager     = require("project/FileSyncManager");
     
     
     // Define the preference to decide how to sort the Project Tree files
diff --git a/src/project/WorkingSetSort.js b/src/project/WorkingSetSort.js
@@ -74,8 +74,6 @@ define(function (require, exports, module) {
     };
     
     /**
-<<<<<<< HEAD
-=======
      * Events which the sort command will listen for to trigger a sort
      * @constant {string} 
      * @private
@@ -97,7 +95,6 @@ define(function (require, exports, module) {
     var _LEGACY_SORT_PREF = "currentSort";
     
     /**
->>>>>>> upstream/master
      * Retrieves a Sort object by id
      * @param {(string|Command)} command A command ID or a command object.
      * @return {?Sort}
diff --git a/src/project/WorkingSetView.js b/src/project/WorkingSetView.js
@@ -39,7 +39,6 @@ define(function (require, exports, module) {
         CommandManager        = require("command/CommandManager"),
         Commands              = require("command/Commands"),
         Menus                 = require("command/Menus"),
-        DefaultMenus          = require("command/DefaultMenus"),
         FileViewController    = require("project/FileViewController"),
         ViewUtils             = require("utils/ViewUtils"),
         paneListTemplate      = require("text!htmlContent/working-set.html"),
@@ -661,7 +660,7 @@ define(function (require, exports, module) {
         var file = MainViewManager.getCurrentlyViewedFile(this.paneId);
             
         // Iterate through working set list and update the selection on each
-        var items = this.$openFilesContainer.find("ul").children().each(function () {
+        this.$openFilesContainer.find("ul").children().each(function () {
             _updateListItemSelection(this, file);
         });
 
@@ -788,9 +787,6 @@ define(function (require, exports, module) {
      * Initializes the WorkingSetView object
      */
     WorkingSetView.prototype.init = function () {
-        // Init DOM element
-        var self = this;
-        
         this.$openFilesContainer = this.$el.find(".open-files-container");
         this.$workingSetListViewHeader = this.$el.find(".working-set-header");
         this.$gearMenu = this.$el.find(".working-set-option-btn");
diff --git a/src/search/FindBar.js b/src/search/FindBar.js
@@ -32,7 +32,6 @@ define(function (require, exports, module) {
     
     var _                  = require("thirdparty/lodash"),
         Commands           = require("command/Commands"),
-        EditorManager      = require("editor/EditorManager"),
         KeyBindingManager  = require("command/KeyBindingManager"),
         KeyEvent           = require("utils/KeyEvent"),
         ModalBar           = require("widgets/ModalBar").ModalBar,
diff --git a/src/search/FindReplace.js b/src/search/FindReplace.js
@@ -36,9 +36,7 @@ define(function (require, exports, module) {
 
     var CommandManager      = require("command/CommandManager"),
         Commands            = require("command/Commands"),
-        DocumentManager     = require("document/DocumentManager"),
         MainViewManager     = require("view/MainViewManager"),
-        ProjectManager      = require("project/ProjectManager"),
         Strings             = require("strings"),
         StringUtils         = require("utils/StringUtils"),
         Editor              = require("editor/Editor"),
@@ -47,9 +45,6 @@ define(function (require, exports, module) {
         FindUtils           = require("search/FindUtils"),
         FindInFilesUI       = require("search/FindInFilesUI"),
         ScrollTrackMarkers  = require("search/ScrollTrackMarkers"),
-        Resizer             = require("utils/Resizer"),
-        StatusBar           = require("widgets/StatusBar"),
-        PreferencesManager  = require("preferences/PreferencesManager"),
         _                   = require("thirdparty/lodash"),
         CodeMirror          = require("thirdparty/CodeMirror2/lib/codemirror");
     
@@ -65,12 +60,6 @@ define(function (require, exports, module) {
      */
     var FIND_HIGHLIGHT_MAX  = 2000;
 
-    /**
-     * Instance of the currently opened document when replaceAllPanel is visible
-     * @type {?Document}
-     */
-    var currentDocument = null;
-
     /**
      * Currently open Find or Find/Replace bar, if any
      * @type {?FindBar} 
diff --git a/src/utils/DragAndDrop.js b/src/utils/DragAndDrop.js
@@ -37,7 +37,6 @@ define(function (require, exports, module) {
         MainViewFactory = require("view/MainViewFactory"),
         LanguageManager = require("language/LanguageManager"),
         FileSystem      = require("filesystem/FileSystem"),
-        EditorManager   = require("editor/EditorManager"),
         ProjectManager  = require("project/ProjectManager"),
         Strings         = require("strings"),
         StringUtils     = require("utils/StringUtils");
diff --git a/src/utils/ExtensionLoader.js b/src/utils/ExtensionLoader.js
@@ -220,38 +220,6 @@ define(function (require, exports, module) {
 
         return promise;
     }
-    
-    /**
-     * Loads the extension that lives at baseUrl into its own Require.js context
-     *
-     * @param {!string} name, used to identify the extension
-     * @param {!{baseUrl: string}} config object with baseUrl property containing absolute path of extension
-     * @param {!string} entryPoint, name of the main js file to load
-     * @return {!$.Promise} A promise object that is resolved when the extension is loaded, or rejected
-     *              if the extension fails to load or throws an exception immediately when loaded.
-     *              (Note: if extension contains a JS syntax error, promise is resolved not rejected).
-     */
-    function loadExtension(name, config, entryPoint) {
-        var promise = new $.Deferred();
-
-        // Try to load the package.json to figure out if we are loading a theme.
-        ExtensionUtils.loadPackageJson(config.baseUrl).always(promise.resolve);
-
-        return promise
-            .then(function (metadata) {
-                // No special handling for themes... Let the promise propagate into the ExtensionManager
-                if (metadata && metadata.hasOwnProperty("theme")) {
-                    return;
-                }
-
-                return loadExtensionModule(name, config, entryPoint);
-            })
-            .then(function () {
-                $(exports).triggerHandler("load", config.baseUrl);
-            }, function (err) {
-                $(exports).triggerHandler("loadFailed", config.baseUrl);
-            });
-    }
 
     /**
      * Loads the extension that lives at baseUrl into its own Require.js context
diff --git a/src/view/MainViewFactory.js b/src/view/MainViewFactory.js
@@ -22,7 +22,7 @@
  */
 
 /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, window, $, brackets */
+/*global define */
 
 /**
  * MainViewFactory is a singleton for managing view factories.
diff --git a/src/view/MainViewManager.js b/src/view/MainViewManager.js
@@ -22,7 +22,7 @@
  */
 
 /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, window, $, brackets */
+/*global define, $ */
 
 /**
  * MainViewManager Manages the arrangement of all open panes as well as provides the controller
@@ -84,15 +84,12 @@ define(function (require, exports, module) {
         MainViewFactory     = require("view/MainViewFactory"),
         ViewStateManager    = require("view/ViewStateManager"),
         Menus               = require("command/Menus"),
-        Commands            = require("command/Commands"),
         EditorManager       = require("editor/EditorManager"),
-        FileSystem          = require("filesystem/FileSystem"),
         FileSystemError     = require("filesystem/FileSystemError"),
         DocumentManager     = require("document/DocumentManager"),
         PreferencesManager  = require("preferences/PreferencesManager"),
         ProjectManager      = require("project/ProjectManager"),
         WorkspaceManager    = require("view/WorkspaceManager"),
-        InMemoryFile        = require("document/InMemoryFile"),
         AsyncUtils          = require("utils/Async"),
         ViewUtils           = require("utils/ViewUtils"),
         Pane                = require("view/Pane").Pane;
@@ -352,9 +349,7 @@ define(function (require, exports, module) {
      * @private
      */
     function _makePaneMostRecent(paneId) {
-        var index,
-            entry,
-            pane = _getPane(paneId);
+        var pane = _getPane(paneId);
 
         if (pane.getCurrentlyViewedFile()) {
             _makeFileMostRecent(paneId, pane.getCurrentlyViewedFile());
@@ -932,8 +927,7 @@ define(function (require, exports, module) {
      * @return {Pane} - the pane object of the pane 
      */
     function _createPaneIfNecessary(paneId) {
-        var currentPane,
-            pane;
+        var pane;
         
         if (!_panes.hasOwnProperty(paneId)) {
             pane = new Pane(paneId, _$el);
@@ -987,9 +981,7 @@ define(function (require, exports, module) {
      * @private
      */
     function _edit(paneId, doc) {
-        var currentPaneId = _getPaneIdForPath(doc.file.fullPath),
-            oldPane = _getPane(ACTIVE_PANE),
-            oldFile = oldPane.getCurrentlyViewedFile();
+        var currentPaneId = _getPaneIdForPath(doc.file.fullPath);
             
         if (currentPaneId) {
             // If the doc is open in another pane
@@ -1023,9 +1015,7 @@ define(function (require, exports, module) {
      *                           rejects with a File error or string
      */
     function _open(paneId, file) {
-        var oldPane = _getPane(ACTIVE_PANE),
-            oldFile = oldPane.getCurrentlyViewedFile(),
-            result = new $.Deferred();
+        var result = new $.Deferred();
         
         if (!file || !_getPane(paneId)) {
             throw new Error("bad argument");
@@ -1044,8 +1034,7 @@ define(function (require, exports, module) {
         }
         
         // See if there is already a view for the file
-        var pane = _getPane(paneId),
-            view = pane.getViewForPath(file.fullPath);
+        var pane = _getPane(paneId);
 
         // See if there is a factory to create a view for this file
         //  we want to do this first because, we don't want our internal 
@@ -1238,9 +1227,6 @@ define(function (require, exports, module) {
     function _loadViewState(e) {
         // file root is appended for each project
         var panes,
-            filesToOpen,
-            viewStates,
-            activeFile,
             promises = [],
             context = { location : { scope: "user",
                                      layer: "project" } },
diff --git a/src/view/Pane.js b/src/view/Pane.js
@@ -23,7 +23,7 @@
 
 
 /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, $, window, Mustache */
+/*global define, $, Mustache */
 
  /**
   * Pane objects host views of files, editors, etc... Clients cannot access
@@ -153,7 +153,6 @@ define(function (require, exports, module) {
         
     var _                   = require("thirdparty/lodash"),
         FileSystem          = require("filesystem/FileSystem"),
-        File                = require("filesystem/File"),
         InMemoryFile        = require("document/InMemoryFile"),
         ViewStateManager    = require("view/ViewStateManager"),
         MainViewManager     = require("view/MainViewManager"),
@@ -1043,8 +1042,7 @@ define(function (require, exports, module) {
      * @return {!Object} state - the state to save 
      */
     Pane.prototype.saveState = function () {
-        var view,
-            result = [],
+        var result = [],
             currentlyViewedPath = this.getCurrentlyViewedPath();
 
         // Save the current view state first
diff --git a/src/view/PanelManager.js b/src/view/PanelManager.js
@@ -22,7 +22,7 @@
  */
 
 /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, window, $ */
+/*global define */
 
 /**
  * @deprecated This module provided for backwards compatibility.  Use WorkspaceManager instead.  
diff --git a/src/view/ViewStateManager.js b/src/view/ViewStateManager.js
@@ -21,7 +21,7 @@
  *
  */
 /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, $, window */
+/*global define */
 
 /**
  * ViewStateManager is a singleton for views to park their global viwe state. The state is saved
diff --git a/src/view/WorkspaceManager.js b/src/view/WorkspaceManager.js
@@ -22,7 +22,7 @@
  */
 
 /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
-/*global define, window, $, brackets */
+/*global define, window, $ */
 
 /**
 * Manages layout of panels surrounding the editor area, and size of the editor area (but not its contents).
diff --git a/src/widgets/ModalBar.js b/src/widgets/ModalBar.js
@@ -32,8 +32,7 @@
 define(function (require, exports, module) {
     "use strict";
     
-    var EditorManager    = require("editor/EditorManager"),
-        MainViewManager  = require("view/MainViewManager"),
+    var MainViewManager  = require("view/MainViewManager"),
         KeyEvent         = require("utils/KeyEvent"),
         AnimationUtils   = require("utils/AnimationUtils"),
         WorkspaceManager = require("view/WorkspaceManager");
diff --git a/src/widgets/StatusBar.js b/src/widgets/StatusBar.js
@@ -36,7 +36,6 @@ define(function (require, exports, module) {
     
     var AppInit          = require("utils/AppInit"),
         StatusBarHTML    = require("text!widgets/StatusBar.html"),
-        EditorManager    = require("editor/EditorManager"),
         Strings          = require("strings"),
         WorkspaceManager = require("view/WorkspaceManager");
 
diff --git a/test/spec/DocumentManager-test.js b/test/spec/DocumentManager-test.js
diff --git a/test/spec/EditorManager-test.js b/test/spec/EditorManager-test.js
diff --git a/test/spec/EditorRedraw-test.js b/test/spec/EditorRedraw-test.js
diff --git a/test/spec/LanguageManager-test.js b/test/spec/LanguageManager-test.js
diff --git a/test/spec/MainViewFactory-test.js b/test/spec/MainViewFactory-test.js
diff --git a/test/spec/MainViewManager-test.js b/test/spec/MainViewManager-test.js
diff --git a/test/spec/Pane-test.js b/test/spec/Pane-test.js
diff --git a/test/spec/ViewFactory-test.js b/test/spec/ViewFactory-test.js
diff --git a/test/spec/WorkingSetSort-test.js b/test/spec/WorkingSetSort-test.js
