mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-20 15:36:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #3182 from storytouch/fix/do_not_hide_force_reconnect_modal

Browse source 
Improvements on modals and "force reconnect" messages
This commit is contained in:
Luiza Pagliari 2017-05-29 11:05:37 -03:00 • committed by GitHub
commit b6cb46271b
4 changed files with 180 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/static/js/ace2_inner.js
View file

@ -3367,7 +3367,12 @@ function Ace2Inner(){
evt.preventDefault();
}
}
//hide the dropdownso
hideEditBarDropdowns();
}
function hideEditBarDropdowns()
{
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");
}
@ -4984,6 +4989,8 @@ function Ace2Inner(){
$(document).on("keypress", handleKeyEvent);
$(document).on("keyup", handleKeyEvent);
$(document).on("click", handleClick);
// dropdowns on edit bar need to be closed on clicks on both pad inner and pad outer
$(outerWin.document).on("click", hideEditBarDropdowns);
// Disabled: https://github.com/ether/etherpad-lite/issues/2546
// Will break OL re-numbering: https://github.com/ether/etherpad-lite/pull/2533
// $(document).on("cut", handleCut);