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

Prevent menus from stealing focus and enables indent/undent from menus #672

Merged
merged 11 commits into from Apr 19, 2012
Merged

Prevent menus from stealing focus and enables indent/undent from menus #672

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
3df6b61
Making indent and unindent work from menu and via both sets of key co…
tvoliter Apr 17, 2012
3b44f2f
Merge remote-tracking branch 'origin/master' into tvoliter/menus
tvoliter Apr 17, 2012
e90f798
Merge remote-tracking branch 'origin/master' into tvoliter/menus
tvoliter Apr 17, 2012
f5193ef
Merge remote-tracking branch 'origin/tvoliter/menus' into tvoliter/menus
tvoliter Apr 17, 2012
49a89ad
JSLint cleanup
tvoliter Apr 17, 2012
75d5d55
Make CodeMirror handle tab and shift tab internally so tab is overloa…
tvoliter Apr 19, 2012
7915881
Removed menus for Ctrl-[ and Ctrl-] since we really don't handling th…
tvoliter Apr 19, 2012
bc29d87
remove unused comment
tvoliter Apr 19, 2012
2b3a283
Merge remote-tracking branch 'origin/master' into tvoliter/menus
tvoliter Apr 19, 2012
ae5cdd6
revert _handleTabKey() to early version since only code mirror key ha…
tvoliter Apr 19, 2012
2e3d80e
Merge remote-tracking branch 'origin/master' into tvoliter/menus
tvoliter Apr 19, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/brackets.js
View file
Open in desktop
Expand Up @@ -172,8 +172,6 @@ define(function (require, exports, module) {
{"Shift-F3": Commands.EDIT_FIND_PREVIOUS, "platform": "win"}, {"Shift-F3": Commands.EDIT_FIND_PREVIOUS, "platform": "win"},
{"Ctrl-Alt-F": Commands.EDIT_REPLACE, "platform": "mac"}, {"Ctrl-Alt-F": Commands.EDIT_REPLACE, "platform": "mac"},
{"Ctrl-H": Commands.EDIT_REPLACE, "platform": "win"}, {"Ctrl-H": Commands.EDIT_REPLACE, "platform": "win"},
{"Ctrl-Tab": Commands.EDIT_INDENT},
{"Ctrl-Shift-Tab": Commands.EDIT_UNINDENT},


// VIEW // VIEW
{"Ctrl-Shift-H": Commands.VIEW_HIDE_SIDEBAR}, {"Ctrl-Shift-H": Commands.VIEW_HIDE_SIDEBAR},
Expand Down
3 changes: 3 additions & 0 deletions src/command/KeyMap.js
View file
Open in desktop
Expand Up @@ -204,6 +204,9 @@ define(function (require, exports, module) {
} }
} }


// Translate some keys to their common names }
if (key === "\t") { key = "Tab"; }

return _buildKeyDescriptor(hasCtrl, hasAlt, hasShift, key); return _buildKeyDescriptor(hasCtrl, hasAlt, hasShift, key);
} }


Expand Down
18 changes: 13 additions & 5 deletions src/command/Menus.js
View file
Open in desktop
Expand Up @@ -41,7 +41,6 @@ define(function (require, exports, module) {
"menu-edit-find-next": Commands.EDIT_FIND_NEXT, "menu-edit-find-next": Commands.EDIT_FIND_NEXT,
"menu-edit-find-previous": Commands.EDIT_FIND_PREVIOUS, "menu-edit-find-previous": Commands.EDIT_FIND_PREVIOUS,
"menu-edit-replace": Commands.EDIT_REPLACE, "menu-edit-replace": Commands.EDIT_REPLACE,



// View // View
"menu-view-hide-sidebar": Commands.VIEW_HIDE_SIDEBAR, "menu-view-hide-sidebar": Commands.VIEW_HIDE_SIDEBAR,
Expand Down Expand Up @@ -69,10 +68,8 @@ define(function (require, exports, module) {


function createExecFunc(commandStr) { function createExecFunc(commandStr) {
return function () { return function () {
// TODO TY: should flash menu here // TODO TY: should flash menu here on Mac
//console.log(commandStr); //console.log(commandStr);

EditorManager.focusEditor();
CommandManager.execute(commandStr); CommandManager.execute(commandStr);
}; };
} }
Expand Down Expand Up @@ -106,11 +103,22 @@ define(function (require, exports, module) {
shortcut = keyCmd.replace(/-/g, "+"); shortcut = keyCmd.replace(/-/g, "+");
} }


$("#" + menuID).append("<span class='menu-shortcut'>" + shortcut + "</span>"); var $menu = $("#" + menuID);
// Some commands have multiple key commands. Only add the first one.
if ($menu.find(".menu-shortcut").length === 0) {
$menu.append("<span class='menu-shortcut'>" + shortcut + "</span>");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like the code can exit the loop after the first shortcut string is added. Or at least, only build the "shortcut" string once you've determined that it's the first one.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that's the idea -- if there's more than one shortcut bound to the same menu item, we don't want to list all the shortcuts in the menu UI... just the first one we come across. There's no break or anything, so it won't actually exit the loop; it just won't add another shortcut label to the UI if one is already present.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Although, Ty, this does raise one issue: if there's more than one shortcut, the one that wins is completely arbitrary, not the first one listed in the code in brackets.js (because we're iterating a map here, not an ordered list).

Maybe because of this, for now we should print a warning to the console whenever a 2nd shortcut for the same menu is encountered? I think with the removal of the Tab bindings above, we no longer have any commands that would hit this caseat the moment...

}
} }
} }
} }


// Prevent clicks on the top-level menu bar from taking focus
// Note, bootstrap handles this already for the menu drop downs
$("#main-toolbar .dropdown").mousedown(function (e) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might want to add a note here that the only reason we don't also have to do this for top-level menu bar items is (I think) because Bootstrap already takes care of it in bootstrap-dropdown.js.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll add a note. Interestingly I don't see code that does this in bootstrap-dropdown.js that does this directly. The $.fn.dropdown returns false... I am not sure what that does or if it is related to focus.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's the "return false" in that click handler that does it -- that's an old-school equivalent to preventDefault().

e.preventDefault();
});




// Other debug menu items // Other debug menu items
// $("#menu-debug-wordwrap").click(function() { // $("#menu-debug-wordwrap").click(function() {
Expand Down
9 changes: 2 additions & 7 deletions src/editor/Editor.js
View file
Open in desktop
Expand Up @@ -47,8 +47,6 @@ define(function (require, exports, module) {
TextRange = require("document/TextRange").TextRange, TextRange = require("document/TextRange").TextRange,
ViewUtils = require("utils/ViewUtils"); ViewUtils = require("utils/ViewUtils");






/** /**
* @private * @private
Expand Down Expand Up @@ -191,7 +189,7 @@ define(function (require, exports, module) {
function _handleSelectAll() { function _handleSelectAll() {
var editor = EditorManager.getFocusedEditor(); var editor = EditorManager.getFocusedEditor();
if (editor) { if (editor) {
editor._codeMirror.execCommand("selectAll"); editor._selectAllVisible();
} }
} }


Expand Down Expand Up @@ -294,6 +292,7 @@ define(function (require, exports, module) {
// Editor supplies some standard keyboard behavior extensions of its own // Editor supplies some standard keyboard behavior extensions of its own
var codeMirrorKeyMap = { var codeMirrorKeyMap = {
"Tab" : _handleTabKey, "Tab" : _handleTabKey,

"Left" : function (instance) { "Left" : function (instance) {
if (!_handleSoftTabNavigation(instance, -1, "moveH")) { if (!_handleSoftTabNavigation(instance, -1, "moveH")) {
CodeMirror.commands.goCharLeft(instance); CodeMirror.commands.goCharLeft(instance);
Expand Down Expand Up @@ -971,10 +970,6 @@ define(function (require, exports, module) {
CommandManager.register(Commands.EDIT_FIND_PREVIOUS, _findPrevious); CommandManager.register(Commands.EDIT_FIND_PREVIOUS, _findPrevious);
CommandManager.register(Commands.EDIT_SELECT_ALL, _handleSelectAll); CommandManager.register(Commands.EDIT_SELECT_ALL, _handleSelectAll);


// TODO: code mirror handles
// CommandManager.register(Commands.EDIT_INDENT, _handleTabKey);
// CommandManager.register(Commands.EDIT_UNINDENT, _handleTabKey);

// Define public API // Define public API
exports.Editor = Editor; exports.Editor = Editor;
}); });
3 changes: 0 additions & 3 deletions src/index.html
View file
Open in desktop
Expand Up @@ -98,9 +98,6 @@
<li><a href="#" id="menu-edit-find-previous">Find Previous</a></li> <li><a href="#" id="menu-edit-find-previous">Find Previous</a></li>
<li><hr class="divider"></li> <li><hr class="divider"></li>
<li><a href="#" id="menu-edit-replace">Replace</a></li> <li><a href="#" id="menu-edit-replace">Replace</a></li>
<li><hr class="divider"></li>
<li><a href="#" id="menu-edit-indent">Indent</a></li>
<li><a href="#" id="menu-edit-unindent">Unindent</a></li>
</ul> </ul>
</li> </li>


Expand Down