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

FIX: simplify keyboard handling

This commit is contained in:
Joffrey JAFFEUX 2017-11-22 11:29:30 +01:00 committed by GitHub
parent b2b565c2fb
commit a3b511f4f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -218,12 +218,12 @@ export default SelectKitComponent.extend({
}, },
didSelect() { didSelect() {
this.focus(); this.focusFilterOrHeader();
this.autoHighlight(); this.autoHighlight();
}, },
didDeselect() { didDeselect() {
this.focus(); this.focusFilterOrHeader();
this.autoHighlight(); this.autoHighlight();
}, },

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

@ -66,10 +66,8 @@ export default Ember.Mixin.create({
Ember.run.schedule("afterRender", () => this.$header().focus()); Ember.run.schedule("afterRender", () => this.$header().focus());
}, },
expand() { // try to focus filter and fallback to header if not present
if (this.get("isExpanded") === true) return; focusFilterOrHeader() {
this.setProperties({ isExpanded: true, renderedBodyOnce: true, isFocused: true });
Ember.run.schedule("afterRender", () => { Ember.run.schedule("afterRender", () => {
if (this.$filterInput().is(":visible")) { if (this.$filterInput().is(":visible")) {
this.$filterInput().focus(); this.$filterInput().focus();
@ -77,7 +75,12 @@ export default Ember.Mixin.create({
this.$header().focus(); this.$header().focus();
} }
}); });
},
expand() {
if (this.get("isExpanded") === true) return;
this.setProperties({ isExpanded: true, renderedBodyOnce: true, isFocused: true });
this.focusFilterOrHeader();
this.autoHighlight(); this.autoHighlight();
}, },

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

@ -21,8 +21,8 @@ export default Ember.Mixin.create({
if (this.$header()) { if (this.$header()) {
this.$header() this.$header()
.off("focus.select-kit")
.off("blur.select-kit") .off("blur.select-kit")
.off("focus.select-kit")
.off("keypress.select-kit") .off("keypress.select-kit")
.off("keydown.select-kit"); .off("keydown.select-kit");
} }
@ -31,9 +31,7 @@ export default Ember.Mixin.create({
this.$filterInput() this.$filterInput()
.off("change.select-kit") .off("change.select-kit")
.off("keydown.select-kit") .off("keydown.select-kit")
.off("keypress.select-kit") .off("keypress.select-kit");
.off("focus.select-kit")
.off("focusin.select-kit");
} }
}, },
@ -74,6 +72,7 @@ export default Ember.Mixin.create({
const keyCode = event.keyCode || event.which; const keyCode = event.keyCode || event.which;
if (keyCode === this.keys.ENTER) { return true; } if (keyCode === this.keys.ENTER) { return true; }
if (keyCode === this.keys.TAB) { return true; }
this.expand(event); this.expand(event);
@ -81,21 +80,13 @@ export default Ember.Mixin.create({
this.set("renderedFilterOnce", true); this.set("renderedFilterOnce", true);
} }
Ember.run.schedule("afterRender", () => { if (keyCode >= 65 && keyCode <= 122) {
let newVal = this.$filterInput().val(); Ember.run.schedule("afterRender", () => {
this.$filterInput()
const start = this.$filterInput()[0].selectionStart; .focus()
const end = this.$filterInput()[0].selectionEnd; .val(this.$filterInput().val() + String.fromCharCode(keyCode));
if (!Ember.isNone(start) && !Ember.isNone(end)) { });
newVal = newVal.substr(0, start) + }
String.fromCharCode(keyCode) +
newVal.substr(end, newVal.length);
} else {
newVal = newVal + String.fromCharCode(keyCode);
}
this.$filterInput().focus().val(newVal);
});
return false; return false;
}); });
@ -104,10 +95,6 @@ export default Ember.Mixin.create({
.on("change.select-kit", (event) => { .on("change.select-kit", (event) => {
this.send("onFilter", $(event.target).val()); this.send("onFilter", $(event.target).val());
}) })
.on("focus.select-kit focusin.select-kit", (event) => {
this.set("isFocused", true);
this._destroyEvent(event);
})
.on("keypress.select-kit", (event) => { .on("keypress.select-kit", (event) => {
event.stopPropagation(); event.stopPropagation();
}) })