Merge pull request #3557 from scossar/rtl-usercard
FIX: positioning of usercard in rtl layouts
This commit is contained in:
commit
a0e8bc2492
|
@ -84,19 +84,32 @@ export default Discourse.View.extend(CleansUp, {
|
||||||
},
|
},
|
||||||
|
|
||||||
_willShow(target) {
|
_willShow(target) {
|
||||||
|
const rtl = ($('html').css('direction')) === 'rtl';
|
||||||
if (!target) { return; }
|
if (!target) { return; }
|
||||||
const width = this.$().width();
|
const width = this.$().width();
|
||||||
|
|
||||||
Ember.run.schedule('afterRender', () => {
|
Ember.run.schedule('afterRender', () => {
|
||||||
if (target) {
|
if (target) {
|
||||||
let position = target.offset();
|
let position = target.offset();
|
||||||
if (position) {
|
if (position) {
|
||||||
|
|
||||||
|
if (rtl) { // The site direction is rtl
|
||||||
|
position.right = $(window).width() - position.left + 10;
|
||||||
|
position.left = 'auto';
|
||||||
|
let overage = ($(window).width() - 50) - (position.right + width);
|
||||||
|
if (overage < 0) {
|
||||||
|
position.right += overage;
|
||||||
|
position.top += target.height() + 48;
|
||||||
|
}
|
||||||
|
} else { // The site direction is ltr
|
||||||
position.left += target.width() + 10;
|
position.left += target.width() + 10;
|
||||||
|
|
||||||
const overage = ($(window).width() - 50) - (position.left + width);
|
let overage = ($(window).width() - 50) - (position.left + width);
|
||||||
if (overage < 0) {
|
if (overage < 0) {
|
||||||
position.left += overage;
|
position.left += overage;
|
||||||
position.top += target.height() + 48;
|
position.top += target.height() + 48;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
position.top -= $('#main-outlet').offset().top;
|
position.top -= $('#main-outlet').offset().top;
|
||||||
this.$().css(position);
|
this.$().css(position);
|
||||||
|
|
Loading…
Reference in New Issue