libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix alt and focus issues

Browse source
This commit is contained in:
John McLear 2015-03-31 14:06:02 +01:00
parent ef38bcad9f
commit 3126d7196e
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/static/js/ace2_inner.js
View file

@ -3708,13 +3708,12 @@ function Ace2Inner(){
evt:evt evt:evt
}); });
specialHandled = (specialHandledInHook&&specialHandledInHook.length>0)?specialHandledInHook[0]:specialHandled; specialHandled = (specialHandledInHook&&specialHandledInHook.length>0)?specialHandledInHook[0]:specialHandled;
if ((!specialHandled) && isTypeForSpecialKey && keyCode == 120){ if ((!specialHandled) && altKey && isTypeForSpecialKey && keyCode == 120){
// Alt F9 focuses on the File Menu and/or editbar. // Alt F9 focuses on the File Menu and/or editbar.
// Note that while most editors use Alt F10 this is not desirable // Note that while most editors use Alt F10 this is not desirable
// As ubuntu cannot use Alt F10.... // As ubuntu cannot use Alt F10....
// Focus on the editbar. -- TODO: Move Focus back to previous state (we know it so we can use it) // 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(); var firstEditbarElement = parent.parent.$('#editbar').children("ul").first().children().first().children().first().children().first();
// top.console.log("fEE", firstEditbarElement);
$(this).blur(); $(this).blur();
firstEditbarElement.focus(); firstEditbarElement.focus();
evt.preventDefault(); evt.preventDefault();
@ -4960,7 +4959,6 @@ function Ace2Inner(){
function focus() function focus()
{ {
top.console.log("window.focus there is a bug with me in FF");
window.focus(); window.focus();
} }

1
src/static/js/pad_editbar.js
View file

@ -320,6 +320,7 @@ var padeditbar = (function()
padeditor.ace.focus(); // Sends focus back to pad padeditor.ace.focus(); // Sends focus back to pad
// The above focus doesn't always work in FF, you have to hit enter afterwards // The above focus doesn't always work in FF, you have to hit enter afterwards
// This still needs fixing cake // This still needs fixing cake
evt.preventDefault();
} }
// On arrow keys go to next/previous button item in editbar // On arrow keys go to next/previous button item in editbar