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

revert removal of jshint boss flag, see #2957 #3099

Merged
merged 2 commits into from
Mar 12, 2013
Merged

revert removal of jshint boss flag, see #2957 #3099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
857f897
revert removal of jshint boss flag, see #2957
jasonsanjose Mar 11, 2013
081af79
fix broken key binding collision unit test
jasonsanjose Mar 11, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/command/KeyBindingManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
*/


/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50, regexp: true */
/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50, regexp: true, boss: true */
/*global define, $, brackets, window */

/**
Expand Down
4 changes: 2 additions & 2 deletions test/spec/KeyBindingManager-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,12 +186,12 @@ define(function (require, exports, module) {
expect(KeyBindingManager.getKeymap()).toEqual(expected);
});

it("should allow a generic key binding to be replaced", function () {
it("should not allow a generic key binding to be replaced with another generic binding", function () {
KeyBindingManager.addBinding("test.foo", "Ctrl-A");
KeyBindingManager.addBinding("test.bar", "Ctrl-A");

var expected = keyMap([
keyBinding("Ctrl-A", "test.bar")
keyBinding("Ctrl-A", "test.foo")
]);

expect(KeyBindingManager.getKeymap()).toEqual(expected);
Expand Down