Revert "FIX: various select-kit corrections on mobile"
This reverts commit 78a2324c89
.
This commit is contained in:
parent
1e37395517
commit
5e521f8ce6
|
@ -92,6 +92,17 @@ export default Ember.Component.extend(
|
||||||
this.set("computedContent", []);
|
this.set("computedContent", []);
|
||||||
this.set("highlightedSelection", []);
|
this.set("highlightedSelection", []);
|
||||||
|
|
||||||
|
if (this.site && this.site.isMobileDevice) {
|
||||||
|
this.setProperties({
|
||||||
|
filterable: isNone(this.get("filterable"))
|
||||||
|
? false
|
||||||
|
: this.get("filterable"),
|
||||||
|
autoFilterable: isNone(this.get("autoFilterable"))
|
||||||
|
? false
|
||||||
|
: this.get("filterable")
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
if (this.get("nameChanges")) {
|
if (this.get("nameChanges")) {
|
||||||
this.addObserver(
|
this.addObserver(
|
||||||
`content.@each.${this.get("nameProperty")}`,
|
`content.@each.${this.get("nameProperty")}`,
|
||||||
|
|
|
@ -82,10 +82,8 @@ export default Ember.Mixin.create({
|
||||||
},
|
},
|
||||||
|
|
||||||
focus() {
|
focus() {
|
||||||
Ember.run.next(() => {
|
|
||||||
Ember.run.schedule("afterRender", () => {
|
Ember.run.schedule("afterRender", () => {
|
||||||
this.$filterInput().focus();
|
this.$header().focus();
|
||||||
});
|
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -95,7 +93,11 @@ export default Ember.Mixin.create({
|
||||||
// next so we are sure it finised expand/collapse
|
// next so we are sure it finised expand/collapse
|
||||||
Ember.run.next(() => {
|
Ember.run.next(() => {
|
||||||
Ember.run.schedule("afterRender", () => {
|
Ember.run.schedule("afterRender", () => {
|
||||||
if (!context.$filterInput() || !context.$filterInput().is(":visible")) {
|
if (
|
||||||
|
(this.site && this.site.isMobileDevice) ||
|
||||||
|
!context.$filterInput() ||
|
||||||
|
!context.$filterInput().is(":visible")
|
||||||
|
) {
|
||||||
context.$header().focus();
|
context.$header().focus();
|
||||||
} else {
|
} else {
|
||||||
context.$filterInput().focus();
|
context.$filterInput().focus();
|
||||||
|
|
|
@ -16,11 +16,11 @@ export default Ember.Mixin.create({
|
||||||
},
|
},
|
||||||
|
|
||||||
willDestroyElement() {
|
willDestroyElement() {
|
||||||
this._super(...arguments);
|
this._super();
|
||||||
|
|
||||||
$(document).off("mousedown.select-kit");
|
$(document).off("mousedown.select-kit");
|
||||||
|
|
||||||
if (this.$header().length) {
|
if (this.$header()) {
|
||||||
this.$header()
|
this.$header()
|
||||||
.off("blur.select-kit")
|
.off("blur.select-kit")
|
||||||
.off("focus.select-kit")
|
.off("focus.select-kit")
|
||||||
|
@ -28,7 +28,7 @@ export default Ember.Mixin.create({
|
||||||
.off("keydown.select-kit");
|
.off("keydown.select-kit");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.$filterInput().length) {
|
if (this.$filterInput()) {
|
||||||
this.$filterInput()
|
this.$filterInput()
|
||||||
.off("change.select-kit")
|
.off("change.select-kit")
|
||||||
.off("keydown.select-kit")
|
.off("keydown.select-kit")
|
||||||
|
@ -37,7 +37,7 @@ export default Ember.Mixin.create({
|
||||||
},
|
},
|
||||||
|
|
||||||
didInsertElement() {
|
didInsertElement() {
|
||||||
this._super(...arguments);
|
this._super();
|
||||||
|
|
||||||
$(document).on("mousedown.select-kit", event => {
|
$(document).on("mousedown.select-kit", event => {
|
||||||
if (!this.element || this.isDestroying || this.isDestroyed) {
|
if (!this.element || this.isDestroying || this.isDestroyed) {
|
||||||
|
|
|
@ -64,9 +64,9 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.choices {
|
.choices {
|
||||||
margin: 1px;
|
margin: 0;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
display: flex;
|
display: inline-flex;
|
||||||
justify-content: flex-start;
|
justify-content: flex-start;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
|
|
||||||
|
@ -79,7 +79,7 @@
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
margin: 1px;
|
margin: 2px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.filter {
|
.filter {
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
&.dropdown-select-box {
|
&.dropdown-select-box {
|
||||||
.select-kit-collection {
|
.select-kit-collection {
|
||||||
max-height: 200px;
|
max-height: 200px;
|
||||||
overflow-y: auto;
|
overflow-y: scroll;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue