Skip to content
This repository was archived by the owner on Sep 6, 2021. It is now read-only.

Commit 070c42e

Browse files
author
Marcel Gerber
committed
[SplitView] Removed unused vars
1 parent 98a79c1 commit 070c42e

31 files changed

+30
-133
lines changed

‎src/document/DocumentManager.js

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@ define(function (require, exports, module) {
8787
DocumentModule = require("document/Document"),
8888
DeprecationWarning = require("utils/DeprecationWarning"),
8989
MainViewManager = require("view/MainViewManager"),
90-
ProjectManager = require("project/ProjectManager"),
91-
EditorManager = require("editor/EditorManager"),
9290
FileSyncManager = require("project/FileSyncManager"),
9391
FileSystem = require("filesystem/FileSystem"),
9492
PreferencesManager = require("preferences/PreferencesManager"),
@@ -281,20 +279,6 @@ define(function (require, exports, module) {
281279
MainViewManager.endTraversal();
282280
}
283281

284-
/**
285-
* Get the next or previous file in the working set, in MRU order (relative to currentDocument). May
286-
* return currentDocument itself if working set is length 1.
287-
* @deprecated use MainViewManager.traverseToNextViewByMRU() instead
288-
*/
289-
function getNextPrevFile(inc) {
290-
DeprecationWarning.deprecationWarning("Use MainViewManager.traverseToNextViewByMRU() instead of DocumentManager.getNextPrevFile()", true);
291-
var result = MainViewManager.traverseToNextViewByMRU(inc);
292-
if (result) {
293-
return result.file;
294-
}
295-
return null;
296-
}
297-
298282
/**
299283
* Cleans up any loose Documents whose only ref is its own master Editor, and that Editor is not
300284
* rooted in the UI anywhere. This can happen if the Editor is auto-created via Document APIs that

‎src/editor/EditorManager.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ define(function (require, exports, module) {
5757
"use strict";
5858

5959
// Load dependent modules
60-
var _ = require("thirdparty/lodash"),
61-
Commands = require("command/Commands"),
60+
var Commands = require("command/Commands"),
6261
WorkspaceManager = require("view/WorkspaceManager"),
6362
PreferencesManager = require("preferences/PreferencesManager"),
6463
CommandManager = require("command/CommandManager"),

‎src/extensions/default/CloseOthers/main.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ define(function (require, exports, module) {
3030
var Menus = brackets.getModule("command/Menus"),
3131
CommandManager = brackets.getModule("command/CommandManager"),
3232
Commands = brackets.getModule("command/Commands"),
33-
DocumentManager = brackets.getModule("document/DocumentManager"),
3433
MainViewManager = brackets.getModule("view/MainViewManager"),
3534
Strings = brackets.getModule("strings"),
3635
workingSetListCmenu = Menus.getContextMenu(Menus.ContextMenuIds.WORKING_SET_CONTEXT_MENU),

‎src/extensions/default/RecentProjects/main.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ define(function (require, exports, module) {
3535
CommandManager = brackets.getModule("command/CommandManager"),
3636
KeyBindingManager = brackets.getModule("command/KeyBindingManager"),
3737
Menus = brackets.getModule("command/Menus"),
38-
EditorManager = brackets.getModule("editor/EditorManager"),
3938
MainViewManager = brackets.getModule("view/MainViewManager"),
4039
ExtensionUtils = brackets.getModule("utils/ExtensionUtils"),
4140
FileSystem = brackets.getModule("filesystem/FileSystem"),

‎src/extensions/samples/BracketsConfigCentral/main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323

2424
/*jslint vars: true, plusplus: true, devel: true, nomen: true, regexp: true, indent: 4, maxerr: 50 */
25-
/*global define, brackets, window, $, Mustache, navigator */
25+
/*global define, brackets, $, Mustache */
2626

2727
define(function (require, exports, module) {
2828
"use strict";

‎src/project/FileSyncManager.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ define(function (require, exports, module) {
4646
var ProjectManager = require("project/ProjectManager"),
4747
DocumentManager = require("document/DocumentManager"),
4848
MainViewManager = require("view/MainViewManager"),
49-
EditorManager = require("editor/EditorManager"),
5049
Async = require("utils/Async"),
5150
Dialogs = require("widgets/Dialogs"),
5251
DefaultDialogs = require("widgets/DefaultDialogs"),

‎src/project/FileViewController.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ define(function (require, exports, module) {
5252
var DocumentManager = require("document/DocumentManager"),
5353
MainViewManager = require("view/MainViewManager"),
5454
CommandManager = require("command/CommandManager"),
55-
EditorManager = require("editor/EditorManager"),
5655
PerfUtils = require("utils/PerfUtils"),
5756
Commands = require("command/Commands"),
5857
DeprecationWarning = require("utils/DeprecationWarning");

‎src/project/ProjectManager.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,7 @@ define(function (require, exports, module) {
7676
Urls = require("i18n!nls/urls"),
7777
KeyEvent = require("utils/KeyEvent"),
7878
Async = require("utils/Async"),
79-
FileSyncManager = require("project/FileSyncManager"),
80-
EditorManager = require("editor/EditorManager");
79+
FileSyncManager = require("project/FileSyncManager");
8180

8281

8382
// Define the preference to decide how to sort the Project Tree files

‎src/project/WorkingSetSort.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@ define(function (require, exports, module) {
7474
};
7575

7676
/**
77-
<<<<<<< HEAD
78-
=======
7977
* Events which the sort command will listen for to trigger a sort
8078
* @constant {string}
8179
* @private
@@ -97,7 +95,6 @@ define(function (require, exports, module) {
9795
var _LEGACY_SORT_PREF = "currentSort";
9896

9997
/**
100-
>>>>>>> upstream/master
10198
* Retrieves a Sort object by id
10299
* @param {(string|Command)} command A command ID or a command object.
103100
* @return {?Sort}

‎src/project/WorkingSetView.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ define(function (require, exports, module) {
3939
CommandManager = require("command/CommandManager"),
4040
Commands = require("command/Commands"),
4141
Menus = require("command/Menus"),
42-
DefaultMenus = require("command/DefaultMenus"),
4342
FileViewController = require("project/FileViewController"),
4443
ViewUtils = require("utils/ViewUtils"),
4544
paneListTemplate = require("text!htmlContent/working-set.html"),
@@ -661,7 +660,7 @@ define(function (require, exports, module) {
661660
var file = MainViewManager.getCurrentlyViewedFile(this.paneId);
662661

663662
// Iterate through working set list and update the selection on each
664-
var items = this.$openFilesContainer.find("ul").children().each(function () {
663+
this.$openFilesContainer.find("ul").children().each(function () {
665664
_updateListItemSelection(this, file);
666665
});
667666

@@ -788,9 +787,6 @@ define(function (require, exports, module) {
788787
* Initializes the WorkingSetView object
789788
*/
790789
WorkingSetView.prototype.init = function () {
791-
// Init DOM element
792-
var self = this;
793-
794790
this.$openFilesContainer = this.$el.find(".open-files-container");
795791
this.$workingSetListViewHeader = this.$el.find(".working-set-header");
796792
this.$gearMenu = this.$el.find(".working-set-option-btn");

‎src/search/FindBar.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ define(function (require, exports, module) {
3232

3333
var _ = require("thirdparty/lodash"),
3434
Commands = require("command/Commands"),
35-
EditorManager = require("editor/EditorManager"),
3635
KeyBindingManager = require("command/KeyBindingManager"),
3736
KeyEvent = require("utils/KeyEvent"),
3837
ModalBar = require("widgets/ModalBar").ModalBar,

‎src/search/FindReplace.js

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,7 @@ define(function (require, exports, module) {
3636

3737
var CommandManager = require("command/CommandManager"),
3838
Commands = require("command/Commands"),
39-
DocumentManager = require("document/DocumentManager"),
4039
MainViewManager = require("view/MainViewManager"),
41-
ProjectManager = require("project/ProjectManager"),
4240
Strings = require("strings"),
4341
StringUtils = require("utils/StringUtils"),
4442
Editor = require("editor/Editor"),
@@ -47,9 +45,6 @@ define(function (require, exports, module) {
4745
FindUtils = require("search/FindUtils"),
4846
FindInFilesUI = require("search/FindInFilesUI"),
4947
ScrollTrackMarkers = require("search/ScrollTrackMarkers"),
50-
Resizer = require("utils/Resizer"),
51-
StatusBar = require("widgets/StatusBar"),
52-
PreferencesManager = require("preferences/PreferencesManager"),
5348
_ = require("thirdparty/lodash"),
5449
CodeMirror = require("thirdparty/CodeMirror2/lib/codemirror");
5550

@@ -65,12 +60,6 @@ define(function (require, exports, module) {
6560
*/
6661
var FIND_HIGHLIGHT_MAX = 2000;
6762

68-
/**
69-
* Instance of the currently opened document when replaceAllPanel is visible
70-
* @type {?Document}
71-
*/
72-
var currentDocument = null;
73-
7463
/**
7564
* Currently open Find or Find/Replace bar, if any
7665
* @type {?FindBar}

‎src/utils/DragAndDrop.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ define(function (require, exports, module) {
3737
MainViewFactory = require("view/MainViewFactory"),
3838
LanguageManager = require("language/LanguageManager"),
3939
FileSystem = require("filesystem/FileSystem"),
40-
EditorManager = require("editor/EditorManager"),
4140
ProjectManager = require("project/ProjectManager"),
4241
Strings = require("strings"),
4342
StringUtils = require("utils/StringUtils");

‎src/utils/ExtensionLoader.js

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -220,38 +220,6 @@ define(function (require, exports, module) {
220220

221221
return promise;
222222
}
223-
224-
/**
225-
* Loads the extension that lives at baseUrl into its own Require.js context
226-
*
227-
* @param {!string} name, used to identify the extension
228-
* @param {!{baseUrl: string}} config object with baseUrl property containing absolute path of extension
229-
* @param {!string} entryPoint, name of the main js file to load
230-
* @return {!$.Promise} A promise object that is resolved when the extension is loaded, or rejected
231-
* if the extension fails to load or throws an exception immediately when loaded.
232-
* (Note: if extension contains a JS syntax error, promise is resolved not rejected).
233-
*/
234-
function loadExtension(name, config, entryPoint) {
235-
var promise = new $.Deferred();
236-
237-
// Try to load the package.json to figure out if we are loading a theme.
238-
ExtensionUtils.loadPackageJson(config.baseUrl).always(promise.resolve);
239-
240-
return promise
241-
.then(function (metadata) {
242-
// No special handling for themes... Let the promise propagate into the ExtensionManager
243-
if (metadata && metadata.hasOwnProperty("theme")) {
244-
return;
245-
}
246-
247-
return loadExtensionModule(name, config, entryPoint);
248-
})
249-
.then(function () {
250-
$(exports).triggerHandler("load", config.baseUrl);
251-
}, function (err) {
252-
$(exports).triggerHandler("loadFailed", config.baseUrl);
253-
});
254-
}
255223

256224
/**
257225
* Loads the extension that lives at baseUrl into its own Require.js context
@@ -272,7 +240,7 @@ define(function (require, exports, module) {
272240
return promise
273241
.then(function (metadata) {
274242
// No special handling for themes... Let the promise propagate into the ExtensionManager
275-
if (metadata && metadata.theme) {
243+
if (metadata && metadata.hasOwnProperty("theme")) {
276244
return;
277245
}
278246

‎src/view/MainViewFactory.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323

2424
/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
25-
/*global define, window, $, brackets */
25+
/*global define */
2626

2727
/**
2828
* MainViewFactory is a singleton for managing view factories.

‎src/view/MainViewManager.js

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323

2424
/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
25-
/*global define, window, $, brackets */
25+
/*global define, $ */
2626

2727
/**
2828
* MainViewManager Manages the arrangement of all open panes as well as provides the controller
@@ -84,15 +84,12 @@ define(function (require, exports, module) {
8484
MainViewFactory = require("view/MainViewFactory"),
8585
ViewStateManager = require("view/ViewStateManager"),
8686
Menus = require("command/Menus"),
87-
Commands = require("command/Commands"),
8887
EditorManager = require("editor/EditorManager"),
89-
FileSystem = require("filesystem/FileSystem"),
9088
FileSystemError = require("filesystem/FileSystemError"),
9189
DocumentManager = require("document/DocumentManager"),
9290
PreferencesManager = require("preferences/PreferencesManager"),
9391
ProjectManager = require("project/ProjectManager"),
9492
WorkspaceManager = require("view/WorkspaceManager"),
95-
InMemoryFile = require("document/InMemoryFile"),
9693
AsyncUtils = require("utils/Async"),
9794
ViewUtils = require("utils/ViewUtils"),
9895
Pane = require("view/Pane").Pane;
@@ -352,9 +349,7 @@ define(function (require, exports, module) {
352349
* @private
353350
*/
354351
function _makePaneMostRecent(paneId) {
355-
var index,
356-
entry,
357-
pane = _getPane(paneId);
352+
var pane = _getPane(paneId);
358353

359354
if (pane.getCurrentlyViewedFile()) {
360355
_makeFileMostRecent(paneId, pane.getCurrentlyViewedFile());
@@ -932,8 +927,7 @@ define(function (require, exports, module) {
932927
* @return {Pane} - the pane object of the pane
933928
*/
934929
function _createPaneIfNecessary(paneId) {
935-
var currentPane,
936-
pane;
930+
var pane;
937931

938932
if (!_panes.hasOwnProperty(paneId)) {
939933
pane = new Pane(paneId, _$el);
@@ -987,9 +981,7 @@ define(function (require, exports, module) {
987981
* @private
988982
*/
989983
function _edit(paneId, doc) {
990-
var currentPaneId = _getPaneIdForPath(doc.file.fullPath),
991-
oldPane = _getPane(ACTIVE_PANE),
992-
oldFile = oldPane.getCurrentlyViewedFile();
984+
var currentPaneId = _getPaneIdForPath(doc.file.fullPath);
993985

994986
if (currentPaneId) {
995987
// If the doc is open in another pane
@@ -1023,9 +1015,7 @@ define(function (require, exports, module) {
10231015
* rejects with a File error or string
10241016
*/
10251017
function _open(paneId, file) {
1026-
var oldPane = _getPane(ACTIVE_PANE),
1027-
oldFile = oldPane.getCurrentlyViewedFile(),
1028-
result = new $.Deferred();
1018+
var result = new $.Deferred();
10291019

10301020
if (!file || !_getPane(paneId)) {
10311021
throw new Error("bad argument");
@@ -1044,8 +1034,7 @@ define(function (require, exports, module) {
10441034
}
10451035

10461036
// See if there is already a view for the file
1047-
var pane = _getPane(paneId),
1048-
view = pane.getViewForPath(file.fullPath);
1037+
var pane = _getPane(paneId);
10491038

10501039
// See if there is a factory to create a view for this file
10511040
// we want to do this first because, we don't want our internal
@@ -1238,9 +1227,6 @@ define(function (require, exports, module) {
12381227
function _loadViewState(e) {
12391228
// file root is appended for each project
12401229
var panes,
1241-
filesToOpen,
1242-
viewStates,
1243-
activeFile,
12441230
promises = [],
12451231
context = { location : { scope: "user",
12461232
layer: "project" } },

‎src/view/Pane.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424

2525
/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
26-
/*global define, $, window, Mustache */
26+
/*global define, $, Mustache */
2727

2828
/**
2929
* Pane objects host views of files, editors, etc... Clients cannot access
@@ -153,7 +153,6 @@ define(function (require, exports, module) {
153153

154154
var _ = require("thirdparty/lodash"),
155155
FileSystem = require("filesystem/FileSystem"),
156-
File = require("filesystem/File"),
157156
InMemoryFile = require("document/InMemoryFile"),
158157
ViewStateManager = require("view/ViewStateManager"),
159158
MainViewManager = require("view/MainViewManager"),
@@ -1043,8 +1042,7 @@ define(function (require, exports, module) {
10431042
* @return {!Object} state - the state to save
10441043
*/
10451044
Pane.prototype.saveState = function () {
1046-
var view,
1047-
result = [],
1045+
var result = [],
10481046
currentlyViewedPath = this.getCurrentlyViewedPath();
10491047

10501048
// Save the current view state first

‎src/view/PanelManager.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323

2424
/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
25-
/*global define, window, $ */
25+
/*global define */
2626

2727
/**
2828
* @deprecated This module provided for backwards compatibility. Use WorkspaceManager instead.

‎src/view/ViewStateManager.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*
2222
*/
2323
/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
24-
/*global define, $, window */
24+
/*global define */
2525

2626
/**
2727
* ViewStateManager is a singleton for views to park their global viwe state. The state is saved

‎src/view/WorkspaceManager.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323

2424
/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
25-
/*global define, window, $, brackets */
25+
/*global define, window, $ */
2626

2727
/**
2828
* Manages layout of panels surrounding the editor area, and size of the editor area (but not its contents).

‎src/widgets/ModalBar.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@
3232
define(function (require, exports, module) {
3333
"use strict";
3434

35-
var EditorManager = require("editor/EditorManager"),
36-
MainViewManager = require("view/MainViewManager"),
35+
var MainViewManager = require("view/MainViewManager"),
3736
KeyEvent = require("utils/KeyEvent"),
3837
AnimationUtils = require("utils/AnimationUtils"),
3938
WorkspaceManager = require("view/WorkspaceManager");

0 commit comments

Comments
 (0)