Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "DEV: Move popups left if application.hbs wrapper is moved by theme" (#11184) 

This reverts commit 95c871be3e.
This commit is contained in:
Mark VanLandingham 2020-11-10 10:14:04 -06:00 committed by GitHub
parent 5ae82c0492
commit 47a91742b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/discourse/app/components/share-popup.js
View File

@ -69,10 +69,7 @@ export default Component.extend({
} }
const shareLinkWidth = $this.width(); const shareLinkWidth = $this.width();
const pageLeftOffset = document.querySelector( let x = $currentTargetOffset.left - shareLinkWidth / 2;
".ember-application > .ember-view"
).offsetLeft;
let x = $currentTargetOffset.left - pageLeftOffset - shareLinkWidth / 2;
if (x < 25) { if (x < 25) {
x = 25; x = 25;
} }

5
app/assets/javascripts/discourse/app/mixins/card-contents-base.js
View File

@ -201,10 +201,7 @@ export default Mixin.create({
} }
} else { } else {
// The site direction is ltr // The site direction is ltr
const pageLeftOffset = document.querySelector( position.left += target.width() + 10;
".ember-application > .ember-view"
).offsetLeft;
position.left += target.width() - pageLeftOffset + 10;
let overage = $(window).width() - 50 - (position.left + width); let overage = $(window).width() - 50 - (position.left + width);
if (overage < 0) { if (overage < 0) {