fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix issue #485

This commit is contained in:
John McLear 2012-02-26 12:38:52 +00:00
parent 44ec2e148a
commit 681e8415b6
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
static/js/ace2_inner.js
View File

@ -3272,11 +3272,6 @@ function Ace2Inner(){
function handleClick(evt) function handleClick(evt)
{ {
//hide the dropdowns
if(window.top.padeditbar){ // required in case its in an iframe should probably use parent.. See Issue 327 https://github.com/Pita/etherpad-lite/issues/327
window.top.padeditbar.toogleDropDown("none");
}
inCallStack("handleClick", function() inCallStack("handleClick", function()
{ {
idleWorkTimer.atMost(200); idleWorkTimer.atMost(200);
@ -3291,9 +3286,6 @@ function Ace2Inner(){
if ((!evt.ctrlKey) && (evt.button != 2) && (evt.button != 3)) if ((!evt.ctrlKey) && (evt.button != 2) && (evt.button != 3))
{ {
// find A tag with HREF // find A tag with HREF
var n = evt.target; var n = evt.target;
while (n && n.parentNode && !isLink(n)) while (n && n.parentNode && !isLink(n))
{ {
@ -3313,6 +3305,10 @@ function Ace2Inner(){
evt.preventDefault(); evt.preventDefault();
} }
} }
//hide the dropdowns
if(window.top.padeditbar){ // required in case its in an iframe should probably use parent.. See Issue 327 https://github.com/Pita/etherpad-lite/issues/327
window.top.padeditbar.toogleDropDown("none");
}
} }
function doReturnKey() function doReturnKey()