mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-04-21 07:56:16 -04:00
css: Fix last commit overflow should not apply to inner-editors (#3914)
* css: Fix last commit overflow should not apply to inner-editors * css: hide toolbar popup and nice-select when clicking on pad
This commit is contained in:
parent
7ec3be640b
commit
51d924c1f8
3 changed files with 11 additions and 4 deletions
|
@ -217,6 +217,9 @@ var padeditbar = (function()
|
|||
return;
|
||||
}
|
||||
|
||||
$('.nice-select').removeClass('open');
|
||||
$('.toolbar-popup').removeClass("popup-show");
|
||||
|
||||
// hide all modules and remove highlighting of all buttons
|
||||
if(moduleName == "none")
|
||||
{
|
||||
|
@ -235,13 +238,12 @@ var padeditbar = (function()
|
|||
var isAForceReconnectMessage = module.find('button#forcereconnect:visible').length > 0;
|
||||
if(isAForceReconnectMessage)
|
||||
continue;
|
||||
|
||||
if(module.css('display') != "none")
|
||||
{
|
||||
if (module.hasClass('popup-show')) {
|
||||
$("li[data-key=" + thisModuleName + "] > a").removeClass("selected");
|
||||
module.removeClass("popup-show");
|
||||
}
|
||||
}
|
||||
|
||||
if(!returned && cb) return cb();
|
||||
}
|
||||
else
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue