logic to send focus back to pad on Alt F9 when focus on editbar

pull/2566/head
John McLear 2015-03-25 15:38:19 +00:00
parent 0c902ced73
commit bc760e9494
2 changed files with 23 additions and 5 deletions

View File

@ -3712,12 +3712,9 @@ function Ace2Inner(){
// Note that while most editors use Alt F10 this is not desirable
// As ubuntu cannot use Alt F10....
evt.preventDefault();
// Focus on the editbar.
top.console.log("focusing on first child in menu");
// Focus on the editbar. -- TODO: Move Focus back to previous state (we know it so we can use it)
var firstEditbarElement = parent.parent.$('#editbar').children("ul").first().children().first().children().first().children().first();
firstEditbarElement.focus();
top.console.log(firstEditbarElement);
top.console.log(parent.parent.$(':focus'));
$(this).blur();
}
if ((!specialHandled) && isTypeForSpecialKey && keyCode == 8)

View File

@ -155,7 +155,7 @@ var padeditbar = (function()
});
});
$('#editbar').on("keyup", function(evt){
$('#editbar').on("keydown", function(evt){
editbarKeyEvent(evt);
});
@ -307,6 +307,13 @@ var padeditbar = (function()
var editbarPosition = 0;
function editbarKeyEvent(evt){
// If the event is Alt F9 (we're already in the editbar menu
// Send the users focus back to the pad
if(evt.keyCode === 120){
// If we're in the editbar already..
padeditor.ace.focus(); // Sends focus back
}
// On arrow keys go to next/previous button item in editbar
if(evt.keyCode !== 39 && evt.keyCode !== 37) return;
@ -338,6 +345,20 @@ var padeditbar = (function()
toolbar.registerDropdownCommand("import_export");
toolbar.registerDropdownCommand("embed");
toolbar.registerCommand("import_export", function () {
setTimeout(function(){
$('#importfileinput').focus();
},100);
toolbar.toggleDropDown("import_export");
});
toolbar.registerCommand("showusers", function () {
setTimeout(function(){
$('#myusernameedit').focus(); // TODO: Not working
},100);
toolbar.toggleDropDown("users");
});
toolbar.registerCommand("embed", function () {
toolbar.setEmbedLinks();
$('#linkinput').focus().select();