-
Notifications
You must be signed in to change notification settings - Fork 7.6k
Conversation
@@ -31,8 +31,7 @@ define(function (require, exports, module) { | |||
var _ = require("thirdparty/lodash"); | |||
|
|||
// Load dependent modules | |||
var Global = require("utils/Global"), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Drive-by note: we can't just remove unused references to Globals, since this is used to ensure a load order that sets up the global brackets.*
members early enough. You'll have to change cases like this to a require() call that's not stored into a variable.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done (marcelgerber@5c44c87).
I didn't add it back to SidebarView
as it never uses brackets
.
Fixed the Travis build. |
@@ -23,15 +23,13 @@ | |||
|
|||
|
|||
/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */ | |||
/*global define, describe, it, xit, expect, beforeEach, afterEach, waitsFor, runs, $, brackets, waitsForDone */ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Because a test might have to be disabled at any time, perhaps xit
should be added to the globals
array in .jshintrc
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, but xit
should only be used as a temporary fix, so it's nice to get a warning from jslint as a reminder.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We actually have 28 calls to xit
in 10 files on current master.
a0891ba
to
3c2859a
Compare
Conflicts: src/brackets.js src/document/DocumentManager.js src/editor/EditorManager.js src/editor/ImageViewer.js src/extensions/default/JavaScriptQuickEdit/unittests.js src/extensions/default/UrlCodeHints/unittests.js src/language/CodeInspection.js src/project/WorkingSetSort.js src/project/WorkingSetView.js src/search/FindReplace.js src/search/ScrollTrackMarkers.js test/spec/FindReplace-test.js test/spec/LanguageManager-test.js
214ff25
to
070c42e
Compare
070c42e
to
f8a2749
Compare
Conflicts: src/search/FindReplace.js src/utils/ViewUtils.js
019eeb4
to
006967b
Compare
Conflicts: src/widgets/StatusBar.js
006967b
to
4b5eeb4
Compare
I'm done with my review. There is nothing that made me nervous and I'd like to merge this change. |
* @param {Object=} nodeMap If specified, a map of tag IDs to DOM nodes, used so we can indicate which tag name | ||
* the DOM thinks corresponds to the given mark. | ||
*/ | ||
function _dumpMarks(editor, nodeMap) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should not be removed. It's a handy debugging function.
Just did some other changes, mostly whitespace. |
Just double checked everything in this PR. All tests pass, JSHint doesn't complain, Travis succeeds. @ingorichter Please let me know whether I should stash the changes. |
(Didn't mean to close) |
@marcelgerber I'm aware that this will most likely to cause some of the existing PR's to choke. If we need to wait for a window where no PR is open and waiting to be merged, then we''l wait forever. :-) |
Conflicts: src/project/SidebarView.js
@ingorichter That's what I thought as well ;) |
Getting ready to rumble... |
Code cleanup for JSHint support
.jshintrc
config: Remove obsolete prefs, addunused: "vars"
(... will change our Travis results)/* globals */
(reported by JSHint)ExtensionLoader.js
pass JSLint