Mirrors/brackets
1
0
Fork 0
mirror of https://github.com/adobe/brackets.git synced 2024-11-20 09:53:00 +01:00
Code Issues Releases Activity

Fix unit test failures.

Browse Source
This commit is contained in:
abose 2015-09-24 11:55:32 +05:30
parent 03cabf9f83
commit cc58f2fcae
11 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/base-config/keyboard.json
View File

@ -217,7 +217,7 @@
"platform": "mac"
}
],
"view.hideSidebar": [
"view.toggleSidebar": [
{
"key" : "Ctrl-Alt-H"
},

4
test/perf/OpenFile-perf-files/brackets-concat.js
View File

@ -7276,7 +7276,7 @@ define('command/Commands',['require','exports','module'],function (require, expo
exports.TOGGLE_USE_TAB_CHARS = "debug.useTabChars";
// VIEW
exports.VIEW_HIDE_SIDEBAR = "view.hideSidebar";
exports.VIEW_HIDE_SIDEBAR = "view.toggleSidebar";
exports.VIEW_INCREASE_FONT_SIZE = "view.increaseFontSize";
exports.VIEW_DECREASE_FONT_SIZE = "view.decreaseFontSize";
exports.VIEW_RESTORE_FONT_SIZE = "view.restoreFontSize";
@ -45530,7 +45530,7 @@ define('command/Commands',['require','exports','module'],function (require, expo
exports.TOGGLE_USE_TAB_CHARS = "debug.useTabChars";
// VIEW
exports.VIEW_HIDE_SIDEBAR = "view.hideSidebar";
exports.VIEW_HIDE_SIDEBAR = "view.toggleSidebar";
exports.VIEW_INCREASE_FONT_SIZE = "view.increaseFontSize";
exports.VIEW_DECREASE_FONT_SIZE = "view.decreaseFontSize";
exports.VIEW_RESTORE_FONT_SIZE = "view.restoreFontSize";

6
test/spec/KeyBindingManager-test-files/duplicateShortcuts.json
View File

@ -3,7 +3,7 @@
"overrides": {
"ctrl-2": "file.openFolder",
"Ctrl-2": "file.openFolder",
"Ctrl-Alt-4": "view.hideSidebar",
"Alt-Ctrl-4": "view.hideSidebar"
"Ctrl-Alt-4": "view.toggleSidebar",
"Alt-Ctrl-4": "view.toggleSidebar"
}
}
}

6
test/spec/KeyBindingManager-test-files/invalidKeys.json
View File

@ -2,9 +2,9 @@
"documentation": "https://github.com/adobe/brackets/wiki/Key-Bindings",
"overrides": {
"command-2": "file.openFolder",
"Option-Cmd-Backspace": "view.hideSidebar",
"Option-Cmd-Backspace": "view.toggleSidebar",
"no_modifier_key": "file.openFolder",
"ctrl-kk": "file.openFolder",
"cmd-Del": "view.hideSidebar"
"cmd-Del": "view.toggleSidebar"
}
}
}

4
test/spec/KeyBindingManager-test-files/keymap.json
View File

@ -2,8 +2,8 @@
"documentation": "https://github.com/adobe/brackets/wiki/Key-Bindings",
"overrides": {
"ctrl-2": "file.openFolder",
"Alt-Ctrl-Backspace": "view.hideSidebar",
"Alt-Ctrl-Backspace": "view.toggleSidebar",
"ctrl-l": "navigate.gotoDefinition",
"Alt-Ctrl-L": null
}
}
}

4
test/spec/KeyBindingManager-test-files/keymap1.json
View File

@ -1,8 +1,8 @@
{
"documentation": "https://github.com/adobe/brackets/wiki/Key-Bindings",
"overrides": {
"ctrl-2": "view.hideSidebar",
"ctrl-2": "view.toggleSidebar",
"ctrl-l": "navigate.gotoDefinition",
"Alt-Ctrl-L": null
}
}
}

4
test/spec/KeyBindingManager-test-files/macKeymap.json
View File

@ -2,8 +2,8 @@
"documentation": "https://github.com/adobe/brackets/wiki/Key-Bindings",
"overrides": {
"ctrl-2": "file.openFolder",
"Alt-Cmd-Backspace": "view.hideSidebar",
"Alt-Cmd-Backspace": "view.toggleSidebar",
"ctrl-l": "navigate.gotoDefinition",
"Alt-Cmd-L": null
}
}
}

4
test/spec/KeyBindingManager-test-files/macKeymap1.json
View File

@ -1,8 +1,8 @@
{
"documentation": "https://github.com/adobe/brackets/wiki/Key-Bindings",
"overrides": {
"ctrl-2": "view.hideSidebar",
"ctrl-2": "view.toggleSidebar",
"ctrl-l": "navigate.gotoDefinition",
"Alt-Cmd-L": null
}
}
}

4
test/spec/KeyBindingManager-test-files/macRestrictedShortcut.json
View File

@ -2,7 +2,7 @@
"documentation": "https://github.com/adobe/brackets/wiki/Key-Bindings",
"overrides": {
"cmd-z": "edit.selectLine",
"Cmd-m": "view.hideSidebar",
"Cmd-m": "view.toggleSidebar",
"cmd-h": "navigate.quickOpen"
}
}
}

6
test/spec/KeyBindingManager-test-files/multipleShortcuts.json
View File

@ -3,7 +3,7 @@
"overrides": {
"ctrl-2": "file.openFolder",
"ctrl-3": "file.openFolder",
"ctrl-alt-4": "view.hideSidebar",
"ctrl-shift-4": "view.hideSidebar"
"ctrl-alt-4": "view.toggleSidebar",
"ctrl-shift-4": "view.toggleSidebar"
}
}
}

16
test/spec/KeyBindingManager-test.js
View File

@ -54,7 +54,7 @@ define(function (require, exports, module) {
"Alt-Shift-Up": "edit.addCursorToPrevLine",
"F8": "navigate.gotoFirstProblem",
"Ctrl-Alt-O": "file.openFolder",
"Ctrl-Alt-H": "view.hideSidebar",
"Ctrl-Alt-H": "view.toggleSidebar",
"Ctrl-Shift-O": "navigate.quickOpen",
"Ctrl-T": "navigate.gotoDefinition"
},
@ -65,7 +65,7 @@ define(function (require, exports, module) {
"Alt-Shift-Up": "edit.addCursorToPrevLine",
"Cmd-'": "navigate.gotoFirstProblem",
"Alt-Cmd-O": "file.openFolder",
"Shift-Cmd-H": "view.hideSidebar",
"Shift-Cmd-H": "view.toggleSidebar",
"Shift-Cmd-O": "navigate.quickOpen",
"Cmd-T": "navigate.gotoDefinition"
};
@ -116,7 +116,7 @@ define(function (require, exports, module) {
displayKey = KeyBindingManager._getDisplayKey(key);
if (platform === "mac") {
explicitPlatform = undefined;
if (commandID === "edit.selectLine" || commandID === "view.hideSidebar" ||
if (commandID === "edit.selectLine" || commandID === "view.toggleSidebar" ||
commandID === "navigate.gotoFirstProblem") {
explicitPlatform = "mac";
}
@ -586,7 +586,7 @@ define(function (require, exports, module) {
var msgPrefix = Strings.ERROR_MULTIPLE_SHORTCUTS.replace("{0}", "");
expect(message).toMatch(msgPrefix);
expect(message).toMatch("file.openFolder");
expect(message).toMatch("view.hideSidebar");
expect(message).toMatch("view.toggleSidebar");
return {done: function (callback) { callback(Dialogs.DIALOG_BTN_OK); } };
});
});
@ -654,7 +654,7 @@ define(function (require, exports, module) {
var msgPrefix = Strings.ERROR_NONEXISTENT_COMMANDS.replace("{0}", "");
expect(message).toMatch(msgPrefix);
expect(message).toMatch("file.openFolder");
expect(message).toMatch("view.hideSidebar");
expect(message).toMatch("view.toggleSidebar");
return {done: function (callback) { callback(Dialogs.DIALOG_BTN_OK); } };
});
});
@ -688,7 +688,7 @@ define(function (require, exports, module) {
expect(keymap["Alt-Cmd-O"]).toBeFalsy();
expect(keymap["Alt-Ctrl-O"]).toBeFalsy();
expect(keymap[reassignedKey1].commandID).toEqual("view.hideSidebar");
expect(keymap[reassignedKey1].commandID).toEqual("view.toggleSidebar");
expect(keymap["Shift-Cmd-H"]).toBeFalsy();
expect(keymap["Alt-Ctrl-H"]).toBeFalsy();
@ -729,9 +729,9 @@ define(function (require, exports, module) {
reassignedKey3 = (platform === "mac") ? "Cmd-T" : "Ctrl-T";
expect(Dialogs.showModalDialog).not.toHaveBeenCalled();
expect(keymap["Ctrl-2"].commandID).toEqual("view.hideSidebar");
expect(keymap["Ctrl-2"].commandID).toEqual("view.toggleSidebar");
// Previous user key binding to "view.hideSidebar" is gone.
// Previous user key binding to "view.toggleSidebar" is gone.
expect(keymap[reassignedKey1]).toBeFalsy();
// Default key binding for "file.openFolder" is restored.