From a15b2fdecaa2cb9da3e172ca795ac385bbd7a063 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Sun, 4 Mar 2018 13:47:25 +0100 Subject: [PATCH] FIX: make it possible to edit tags on topics on mobile --- app/assets/javascripts/discourse/templates/topic.hbs | 2 +- .../select-kit/components/mini-tag-chooser.js.es6 | 1 + .../javascripts/select-kit/components/select-kit.js.es6 | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs index f0796dbc6d5..4223c7cdd4b 100644 --- a/app/assets/javascripts/discourse/templates/topic.hbs +++ b/app/assets/javascripts/discourse/templates/topic.hbs @@ -22,7 +22,7 @@ {{/if}} {{#if canEditTags}} - {{mini-tag-chooser tags=buffered.tags categoryId=buffered.category_id}} + {{mini-tag-chooser filterable=true tags=buffered.tags categoryId=buffered.category_id}} {{/if}} {{plugin-outlet name="edit-topic" args=(hash model=model buffered=buffered)}} diff --git a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6 b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6 index de9b0661f6d..5478097d75f 100644 --- a/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6 +++ b/app/assets/javascripts/select-kit/components/mini-tag-chooser.js.es6 @@ -17,6 +17,7 @@ export default ComboBox.extend(Tags, { caretUpIcon: Ember.computed.alias("caretIcon"), caretDownIcon: Ember.computed.alias("caretIcon"), isAsync: true, + fullWidthOnMobile: true, init() { this._super(); diff --git a/app/assets/javascripts/select-kit/components/select-kit.js.es6 b/app/assets/javascripts/select-kit/components/select-kit.js.es6 index 061d6bee1f2..6f14d71b39c 100644 --- a/app/assets/javascripts/select-kit/components/select-kit.js.es6 +++ b/app/assets/javascripts/select-kit/components/select-kit.js.es6 @@ -80,7 +80,10 @@ export default Ember.Component.extend(UtilsMixin, PluginApiMixin, DomHelpersMixi this.set("computedContent", []); if (this.site && this.site.isMobileDevice) { - this.setProperties({ filterable: false, autoFilterable: false }); + this.setProperties({ + filterable: isNone(this.get("filterable")) ? false : this.get("filterable"), + autoFilterable: isNone(this.get("autoFilterable")) ? false : this.get("filterable") + }); } if (this.get("nameChanges")) {