IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: makes fixed positioning more resilient

Browse Source
This commit is contained in:
Joffrey JAFFEUX
2017-11-11 11:46:26 -08:00
committed by GitHub
parent 9219786a24
commit 0f0b2907a7
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/select-box-kit/components/select-box-kit.js.es6
View File

@@ -211,11 +211,6 @@ export default Ember.Component.extend(UtilsMixin, DomHelpersMixin, KeyboardMixin
});
},
@computed("scrollableParentSelector")
scrollableParent(scrollableParentSelector) {
return this.$().parents(scrollableParentSelector).first();
},
willFilterContent() {
this.expand();
this.set("highlightedValue", null);

21
app/assets/javascripts/select-box-kit/mixins/dom-helpers.js.es6
View File

@@ -176,14 +176,16 @@ export default Ember.Mixin.create({
_applyFixedPosition() {
if (this.get("isExpanded") !== true) { return; }
if (this.get("scrollableParent").length === 0) { return; }
const scrollableParent = this.$().parents(this.get("scrollableParentSelector"));
if (scrollableParent.length === 0) { return; }
const width = this.$().outerWidth(false);
const height = this.$().outerHeight(false);
const $placeholder = $(`<div class='select-box-kit-fixed-placeholder-${this.elementId}'></div>`);
this._previousScrollParentOverflow = this._previousScrollParentOverflow || this.get("scrollableParent").css("overflow");
this.get("scrollableParent").css({ overflow: "hidden" });
this._previousScrollParentOverflow = this._previousScrollParentOverflow || scrollableParent.css("overflow");
scrollableParent.css({ overflow: "hidden" });
this._previousCSSContext = {
minWidth: this.$().css("min-width"),
@@ -192,7 +194,7 @@ export default Ember.Mixin.create({
const componentStyles = {
position: "fixed",
"margin-top": -this.get("scrollableParent").scrollTop(),
"margin-top": -scrollableParent.scrollTop(),
width,
minWidth: "unset",
maxWidth: "unset"
@@ -212,12 +214,11 @@ export default Ember.Mixin.create({
_removeFixedPosition() {
$(`.select-box-kit-fixed-placeholder-${this.elementId}`).remove();
if (this.get("scrollableParent").length === 0) {
return;
}
if (!this.element || this.isDestroying || this.isDestroyed) { return; }
const scrollableParent = this.$().parents(this.get("scrollableParentSelector"));
if (scrollableParent.length === 0) { return; }
const css = jQuery.extend(
this._previousCSSContext,
{
@@ -231,9 +232,7 @@ export default Ember.Mixin.create({
);
this.$().css(css);
this.get("scrollableParent").css({
overflow: this._previousScrollParentOverflow
});
scrollableParent.css("overflow", this._previousScrollParentOverflow);
},
_positionWrapper() {