dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove dropdown menus scrollbar when space is available

This commit is contained in:
yflory 2018-10-15 16:35:21 +02:00
parent 8261ad86ae
commit caa72ba949
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
www/common/common-ui-elements.js
View File

@ -1424,6 +1424,9 @@ define([
};
var show = function () {
var wh = $(window).height();
var topPos = $container[0].getBoundingClientRect().bottom;
$innerblock.css('max-height', Math.floor(wh - topPos - 1)+'px');
$innerblock.show();
$innerblock.find('.cp-dropdown-element-active').removeClass('cp-dropdown-element-active');
if (config.isSelect && value) {

2
www/common/toolbar3.js
View File

@ -931,7 +931,7 @@ Messenger, MessengerUI, Messages) {
var initClickEvents = function (toolbar) {
var removeDropdowns = function () {
window.setTimeout(function () {
toolbar.$toolbar.find('.cp-dropdown-content').hide();
$('body').find('.cp-dropdown-content').hide();
});
};
var cancelEditTitle = function (e) {

7
www/drive/inner.js
View File

@ -3011,13 +3011,15 @@ define([
$categories.scrollTop(s);
};
APP.hideMenu = function () {
APP.hideMenu = function (e) {
$contextMenu.hide();
$trashTreeContextMenu.hide();
$trashContextMenu.hide();
$contentContextMenu.hide();
$defaultContextMenu.hide();
$('.cp-dropdown-content').hide();
if (!e || !$(e.target).parents('.cp-dropdown')) {
$('.cp-dropdown-content').hide();
}
};
var stringifyPath = function (path) {
@ -3297,7 +3299,6 @@ define([
$appContainer.on('click', function (e) {
if (e.which !== 1) { return ; }
removeInput();
hideNewButton();
});
$appContainer.on('drag drop', function (e) {
removeInput();