summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/static/js/ace2_inner.js4
-rw-r--r--src/static/js/pad_editbar.js1
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