mirror of
https://github.com/codeninjasllc/discourse.git
synced 2024-11-23 15:48:43 -05:00
FIX: Topic admin menu item not positioned properly on short topics. (#4284)
This commit is contained in:
parent
874c18cbc1
commit
0ed4d3d313
1 changed files with 10 additions and 2 deletions
|
@ -57,6 +57,7 @@ createWidget('topic-admin-menu-button', {
|
|||
const $button = $(e.target).closest('button');
|
||||
const position = $button.position();
|
||||
position.left = position.left;
|
||||
position.outerHeight = $button.outerHeight();
|
||||
|
||||
if (this.attrs.fixed) {
|
||||
position.left += $button.width() - 203;
|
||||
|
@ -69,11 +70,18 @@ export default createWidget('topic-admin-menu', {
|
|||
tagName: 'div.popup-menu.topic-admin-popup-menu',
|
||||
|
||||
buildAttributes(attrs) {
|
||||
const { top, left } = attrs.position;
|
||||
const { top, left, outerHeight } = attrs.position;
|
||||
const position = attrs.fixed ? 'fixed' : 'absolute';
|
||||
|
||||
if (attrs.openUpwards) {
|
||||
const bottom = $(document).height() - top - $('#main').offset().top;
|
||||
const documentHeight = $(document).height();
|
||||
const mainHeight = $('#main').height();
|
||||
let bottom = documentHeight - top - $('#main').offset().top;
|
||||
|
||||
if (documentHeight > mainHeight) {
|
||||
bottom = bottom - (documentHeight - mainHeight) - outerHeight;
|
||||
}
|
||||
|
||||
return { style: `position: ${position}; bottom: ${bottom}px; left: ${left}px;` };
|
||||
} else {
|
||||
return { style: `position: ${position}; top: ${top}px; left: ${left}px;` };
|
||||
|
|
Loading…
Reference in a new issue