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

Toggle Block Comment #2080

Merged
merged 11 commits into from
Nov 12, 2012
Merged

Toggle Block Comment #2080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1c1d5cd
Adding block-commenting
TomMalbran Nov 8, 2012
32c88f3
Description fix
TomMalbran Nov 8, 2012
b1e356c
Description fix
TomMalbran Nov 8, 2012
f68324d
Description fix
TomMalbran Nov 8, 2012
af27a6f
Merge remote-tracking branch 'upstream/master' into tom/block-comment
TomMalbran Nov 9, 2012
2c2df20
Code change to use TokenUtils
TomMalbran Nov 9, 2012
7c926c4
Fixing a particular case
TomMalbran Nov 9, 2012
6abb018
More bugs fixed
TomMalbran Nov 11, 2012
cd2f5c5
Fixes after initial review
TomMalbran Nov 11, 2012
9bbf542
Typo and return fixed
TomMalbran Nov 12, 2012
8928049
Do nothing on invalid selections
TomMalbran Nov 12, 2012
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
1 change: 1 addition & 0 deletions src/command/Commands.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ define(function (require, exports, module) {
exports.EDIT_DUPLICATE = "edit.duplicate";
exports.EDIT_DELETE_LINES = "edit.deletelines";
exports.EDIT_LINE_COMMENT = "edit.lineComment";
exports.EDIT_BLOCK_COMMENT = "edit.blockComment";
exports.EDIT_LINE_UP = "edit.lineUp";
exports.EDIT_LINE_DOWN = "edit.lineDown";

Expand Down
35 changes: 18 additions & 17 deletions src/command/Menus.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -904,31 +904,32 @@ define(function (require, exports, module) {
menu.addMenuItem(Commands.EDIT_REPLACE, [{key: "Ctrl-H", platform: "win"},
{key: "Cmd-Alt-F", platform: "mac"}]);
menu.addMenuDivider();
menu.addMenuItem(Commands.EDIT_INDENT, [{key: "Indent", displayKey: "Tab"}]);
menu.addMenuItem(Commands.EDIT_UNINDENT, [{key: "Unindent", displayKey: "Shift-Tab"}]);
menu.addMenuItem(Commands.EDIT_DUPLICATE, "Ctrl-D");
menu.addMenuItem(Commands.EDIT_DELETE_LINES, "Ctrl-Shift-D");
menu.addMenuItem(Commands.EDIT_LINE_UP, [{key: "Ctrl-Shift-Up", displayKey: "Ctrl-Shift-\u2191",
platform: "win"},
{key: "Cmd-Ctrl-Up", displayKey: "Cmd-Ctrl-\u2191",
platform: "mac"}]);
menu.addMenuItem(Commands.EDIT_LINE_DOWN, [{key: "Ctrl-Shift-Down", displayKey: "Ctrl-Shift-\u2193",
platform: "win"},
{key: "Cmd-Ctrl-Down", displayKey: "Cmd-Ctrl-\u2193",
platform: "mac"}]);
menu.addMenuItem(Commands.EDIT_INDENT, [{key: "Indent", displayKey: "Tab"}]);
menu.addMenuItem(Commands.EDIT_UNINDENT, [{key: "Unindent", displayKey: "Shift-Tab"}]);
menu.addMenuItem(Commands.EDIT_DUPLICATE, "Ctrl-D");
menu.addMenuItem(Commands.EDIT_DELETE_LINES, "Ctrl-Shift-D");
menu.addMenuItem(Commands.EDIT_LINE_UP, [{key: "Ctrl-Shift-Up", displayKey: "Ctrl-Shift-\u2191",
platform: "win"},
{key: "Cmd-Ctrl-Up", displayKey: "Cmd-Ctrl-\u2191",
platform: "mac"}]);
menu.addMenuItem(Commands.EDIT_LINE_DOWN, [{key: "Ctrl-Shift-Down", displayKey: "Ctrl-Shift-\u2193",
platform: "win"},
{key: "Cmd-Ctrl-Down", displayKey: "Cmd-Ctrl-\u2193",
platform: "mac"}]);
menu.addMenuDivider();
menu.addMenuItem(Commands.EDIT_LINE_COMMENT, "Ctrl-/");
menu.addMenuItem(Commands.EDIT_LINE_COMMENT, "Ctrl-/");
menu.addMenuItem(Commands.EDIT_BLOCK_COMMENT, "Ctrl-Shift-/");

/*
* View menu
*/
menu = addMenu(Strings.VIEW_MENU, AppMenuBar.VIEW_MENU);
menu.addMenuItem(Commands.VIEW_HIDE_SIDEBAR, "Ctrl-Shift-H");
menu.addMenuDivider();
menu.addMenuItem(Commands.VIEW_INCREASE_FONT_SIZE, [{key: "Ctrl-=", displayKey: "Ctrl-+"},
{key: "Ctrl-+", displayKey: "Ctrl-+"}]);
menu.addMenuItem(Commands.VIEW_DECREASE_FONT_SIZE, [{key: "Ctrl--", displayKey: "Ctrl-\u2212"}]);
menu.addMenuItem(Commands.VIEW_RESTORE_FONT_SIZE, "Ctrl-0");
menu.addMenuItem(Commands.VIEW_INCREASE_FONT_SIZE, [{key: "Ctrl-=", displayKey: "Ctrl-+"},
{key: "Ctrl-+", displayKey: "Ctrl-+"}]);
menu.addMenuItem(Commands.VIEW_DECREASE_FONT_SIZE, [{key: "Ctrl--", displayKey: "Ctrl-\u2212"}]);
menu.addMenuItem(Commands.VIEW_RESTORE_FONT_SIZE, "Ctrl-0");
menu.addMenuDivider();
menu.addMenuItem(Commands.TOGGLE_JSLINT);

Expand Down
Loading