public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed merge conflicts

iframes-must-die
Peter 'Pita' Martischka 2015-04-12 19:24:02 +01:00
parent b2c312e72e 06aa9e4db6
commit bf352ffcca
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/static/css/pad.css
View File

@ -54,6 +54,9 @@ a img {
width: 100%; width: 100%;
white-space: nowrap; white-space: nowrap;
height: 32px; height: 32px;
position:fixed;
top:0;
z-index:9;
} }
.toolbar ul { .toolbar ul {
position: absolute; position: absolute;

6
src/static/js/ace2_inner.js
View File

@ -373,7 +373,7 @@ function Ace2Inner(editorInfo){
if (currentCallStack) 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; var profiling = false;
@ -3335,10 +3335,6 @@ function Ace2Inner(editorInfo){
evt.preventDefault(); evt.preventDefault();
} }
} }
//hide the dropdownso
if(window.padeditbar){ // required in case its in an iframe should probably use parent.. See Issue 327 https://github.com/ether/etherpad-lite/issues/327
window.padeditbar.toggleDropDown("none");
}
} }
function doReturnKey() function doReturnKey()