discourse/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-07-23 01:03:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: fires onExpand/onCollapse when using arrows

Browse Source
This commit is contained in:
Joffrey JAFFEUX 2018-03-22 18:35:46 +01:00 committed by GitHub
parent 841e2ba723
commit cbbeedf53b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -359,10 +359,8 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi
this.clearHighlightSelection(); this.clearHighlightSelection();
if (this.get("isExpanded")) { if (this.get("isExpanded")) {
this._boundaryActionHandler("onCollapse", this);
this.collapse(); this.collapse();
} else { } else {
this._boundaryActionHandler("onExpand", this);
this.expand(); this.expand();
} }
}, },

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

@ -84,11 +84,13 @@ export default Ember.Mixin.create({
this.setProperties({ isExpanded: true, renderedBodyOnce: true, isFocused: true }); this.setProperties({ isExpanded: true, renderedBodyOnce: true, isFocused: true });
this.focusFilterOrHeader(); this.focusFilterOrHeader();
this.autoHighlight(); this.autoHighlight();
this._boundaryActionHandler("onExpand", this);
}, },
collapse() { collapse() {
this.set("isExpanded", false); this.set("isExpanded", false);
Ember.run.schedule("afterRender", () => this._removeFixedPosition() ); Ember.run.schedule("afterRender", () => this._removeFixedPosition() );
this._boundaryActionHandler("onCollapse", this);
}, },
// lose focus of the component in two steps // lose focus of the component in two steps

6
app/assets/javascripts/select-kit/mixins/events.js.es6
View File

@ -193,9 +193,7 @@ export default Ember.Mixin.create({
const keyCode = event.keyCode || event.which; const keyCode = event.keyCode || event.which;
const $rows = this.$rows(); if (!this.get("isExpanded")) {
if (this.get("isExpanded") === false) {
this.expand(event); this.expand(event);
if (this.$selectedRow().length === 1) { if (this.$selectedRow().length === 1) {
@ -206,6 +204,8 @@ export default Ember.Mixin.create({
return; return;
} }
const $rows = this.$rows();
if (!$rows.length) { return; } if (!$rows.length) { return; }
if ($rows.length === 1) { if ($rows.length === 1) {