diff options
| author | John McLear <john@mclear.co.uk> | 2015-03-31 14:06:02 +0100 |
|---|---|---|
| committer | John McLear <john@mclear.co.uk> | 2015-03-31 14:06:02 +0100 |
| commit | 3126d7196ef97f4a2720a968d4ece405747655e4 (patch) | |
| tree | 007a2de131141fe9be4993ed8ede4438eb97814d /src/static | |
| parent | ef38bcad9ff6e929ad0aa87b260ca73154270774 (diff) | |
| download | etherpad-lite-3126d7196ef97f4a2720a968d4ece405747655e4.zip | |
fix alt and focus issues
Diffstat (limited to 'src/static')
| -rw-r--r-- | src/static/js/ace2_inner.js | 4 | ||||
| -rw-r--r-- | src/static/js/pad_editbar.js | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js index a5e53eec..32492e34 100644 --- a/src/static/js/ace2_inner.js +++ b/src/static/js/ace2_inner.js @@ -3708,13 +3708,12 @@ function Ace2Inner(){ evt:evt }); 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. // Note that while most editors use Alt F10 this is not desirable // 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) var firstEditbarElement = parent.parent.$('#editbar').children("ul").first().children().first().children().first().children().first(); - // top.console.log("fEE", firstEditbarElement); $(this).blur(); firstEditbarElement.focus(); evt.preventDefault(); @@ -4960,7 +4959,6 @@ function Ace2Inner(){ function focus() { - top.console.log("window.focus there is a bug with me in FF"); window.focus(); } diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js index 991c8594..75bf40f0 100644 --- a/src/static/js/pad_editbar.js +++ b/src/static/js/pad_editbar.js @@ -320,6 +320,7 @@ var padeditbar = (function() padeditor.ace.focus(); // Sends focus back to pad // The above focus doesn't always work in FF, you have to hit enter afterwards // This still needs fixing cake + evt.preventDefault(); } // On arrow keys go to next/previous button item in editbar |