Skip to content

EspoCRM – Open Source CRM Application

dropdown up

Yuri Kuznetsova1dd70731569
diff --git a/client/src/ui/app-init.js b/client/src/ui/app-init.js
index 7648df9afc..857e234391 100644
--- a/client/src/ui/app-init.js
+++ b/client/src/ui/app-init.js
@@ -49,79 +49,113 @@ function uiAppInit() {
e.preventDefault();
});
+ $document.on('hidden.bs.dropdown', e => {
+ $(e.target).removeClass('dropup');
+ });
+
$document.on('show.bs.dropdown', e => {
- if (!e.target.parentElement.classList.contains('fix-overflow')) {
- return;
- }
+ let isUp;
- const isRight = e.target.classList.contains('pull-right');
+ const target = e.target;
+ const $dropdown = $(e.target).find('.dropdown-menu');
- const $ul = $(e.target.parentElement).find('.dropdown-menu');
+ const height = $dropdown.outerHeight();
- const rect = e.target.getBoundingClientRect();
+ {
+ const windowHeight = $(window).height();
+ const top = e.target.getBoundingClientRect().bottom;
- const parent = $ul.offsetParent().get(0);
+ const spaceBelow = windowHeight - (top + height);
- if (!parent) {
- return;
+ isUp = spaceBelow < 0 && top > height;
+
+ if (isUp) {
+ $(target).addClass('dropup');
+ } else {
+ $(target).removeClass('dropup');
+ }
}
- const scrollTop = parent === window.document.documentElement ?
- (document.documentElement.scrollTop || document.body.scrollTop) :
- parent.scrollTop;
+ const $dashletBody = $(target).closest('.dashlet-body');
- const top = rect.top + scrollTop + e.target.getBoundingClientRect().height;
+ if ($dashletBody.length) {
+ const $body = $dashletBody;
- const left = isRight ?
- rect.left - $ul.outerWidth() + rect.width:
- rect.left
+ $(target).removeClass('dropup');
- $ul.css({
- top: top,
- left: left,
- right: 'auto',
- });
- });
+ const $group = $(target);
- $document.on('show.bs.dropdown', e => {
- const $body = $(e.target).closest('.dashlet-body');
+ const rect = target.getBoundingClientRect();
+ const $ul = $group.find('.dropdown-menu');
+ const isRight = target.classList.contains('pull-right');
+
+ const $toggle = $group.find('.dropdown-toggle');
+
+ $body.on('scroll.dd', () => {
+ if ($group.hasClass('open')) {
+ // noinspection JSUnresolvedReference
+ $toggle.dropdown('toggle');
+ $body.off('scroll.dd');
+ }
+ })
+
+ $group.one('hidden.bs.dropdown', () => {
+ $body.off('scroll.dd');
+ });
+
+ const left = isRight ?
+ rect.left - $ul.outerWidth() + rect.width:
+ rect.left
+
+ const top = isUp ?
+ rect.top - height :
+ rect.top + target.getBoundingClientRect().height;
+
+ $ul.css({
+ position: 'fixed',
+ top: top,
+ left: left,
+ right: 'auto',
+ });
- if (!$body.length) {
return;
}
- const $group = $(e.target);
+ if (e.target.parentElement.classList.contains('fix-overflow')) {
+ console.log(1);
- const rect = e.target.getBoundingClientRect();
- const $ul = $group.find('.dropdown-menu');
- const isRight = e.target.classList.contains('pull-right');
+ $(target).removeClass('dropup');
- const $toggle = $group.find('.dropdown-toggle');
+ const isRight = e.target.classList.contains('pull-right');
- $body.on('scroll.dd', () => {
- if ($group.hasClass('open')) {
- // noinspection JSUnresolvedReference
- $toggle.dropdown('toggle');
- $body.off('scroll.dd');
+ const $ul = $(e.target.parentElement).find('.dropdown-menu');
+
+ const rect = e.target.getBoundingClientRect();
+
+ const parent = $ul.offsetParent().get(0);
+
+ if (!parent) {
+ return;
}
- })
- $group.one('hide.bs.dropdown', () => {
- $body.off('scroll.dd');
- });
+ const scrollTop = parent === window.document.documentElement ?
+ (document.documentElement.scrollTop || document.body.scrollTop) :
+ parent.scrollTop;
- const left = isRight ?
- rect.left - $ul.outerWidth() + rect.width:
- rect.left
+ const top = isUp ?
+ rect.top + scrollTop - height :
+ rect.top + scrollTop + e.target.getBoundingClientRect().height;
- const top = rect.top + e.target.getBoundingClientRect().height;
+ const left = isRight ?
+ rect.left - $ul.outerWidth() + rect.width:
+ rect.left
- $ul.css({
- position: 'fixed',
- top: top,
- left: left,
- right: 'auto',
- });
+ $ul.css({
+ top: top,
+ left: left,
+ right: 'auto',
+ });
+ }
});
}
diff --git a/frontend/less/espo/bootstrap/dropdowns.less b/frontend/less/espo/bootstrap/dropdowns.less
index 2f097c00ae..46618ace66 100644
--- a/frontend/less/espo/bootstrap/dropdowns.less
+++ b/frontend/less/espo/bootstrap/dropdowns.less
@@ -173,13 +173,6 @@
// TODO: abstract this so that the navbar fixed styles are not placed here?
.dropup {
- // Reverse the caret
- .caret {
- border-top: 0;
- border-bottom: @caret-width-base dashed;
- border-bottom: @caret-width-base solid ~"\9"; // IE8
- content: "";
- }
// Different positioning for bottom up menu
.dropdown-menu {
top: auto;