From 06aa9e4db680ea339f6594b2a40c764f216e83bd Mon Sep 17 00:00:00 2001 From: John McLear Date: Sun, 12 Apr 2015 19:02:49 +0100 Subject: [PATCH] fix editbar position, stop popups from closing on open --- src/static/css/pad.css | 3 +++ src/static/js/ace2_inner.js | 6 +----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/static/css/pad.css b/src/static/css/pad.css index de314e172..b56e41f1d 100644 --- a/src/static/css/pad.css +++ b/src/static/css/pad.css @@ -54,6 +54,9 @@ a img { width: 100%; white-space: nowrap; height: 32px; + position:fixed; + top:0; + z-index:9; } .toolbar ul { position: absolute; diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js index deb8d5c94..f650e34bb 100644 --- a/src/static/js/ace2_inner.js +++ b/src/static/js/ace2_inner.js @@ -373,7 +373,7 @@ function Ace2Inner(editorInfo){ if (currentCallStack) { - console.error("Can't enter callstack " + type + ", already in " + currentCallStack.type); + console.log("Can't enter callstack " + type + ", already in " + currentCallStack.type); } var profiling = false; @@ -3335,10 +3335,6 @@ function Ace2Inner(editorInfo){ evt.preventDefault(); } } - //hide the dropdownso - if(window.parent.parent.padeditbar){ // required in case its in an iframe should probably use parent.. See Issue 327 https://github.com/ether/etherpad-lite/issues/327 - window.parent.parent.padeditbar.toggleDropDown("none"); - } } function doReturnKey()