github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-31 14:08:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

UX: Improve the way users set timers for TopicStatusUpdate.

Browse Source
This commit is contained in:
Guo Xiang Tan
2017-04-20 11:48:59 +08:00
parent 0f2e2ea175
commit 5c39c8f24b
23 changed files with 472 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/assets/javascripts/discourse-common/components/combo-box.js.es6
View File

@ -11,12 +11,14 @@ export default Ember.Component.extend(bufferedRender({
buildBuffer(buffer) {
const nameProperty = this.get('nameProperty');
const none = this.get('none');
let noneValue = null;
// Add none option if required
if (typeof none === "string") {
buffer.push('<option value="">' + I18n.t(none) + "</option>");
} else if (typeof none === "object") {
buffer.push("<option value=\"\">" + Em.get(none, nameProperty) + "</option>");
noneValue = Em.get(none, this.get('valueAttribute'));
buffer.push(`<option value="${noneValue}">${Em.get(none, nameProperty)}</option>`);
}
let selected = this.get('value');
@ -47,7 +49,7 @@ export default Ember.Component.extend(bufferedRender({
});
}
if (!selectedFound) {
if (!selectedFound && !noneValue) {
if (none) {
this.set('value', null);
} else {
@ -89,7 +91,8 @@ export default Ember.Component.extend(bufferedRender({
const $elem = this.$();
const caps = this.capabilities;
const minimumResultsForSearch = (caps && caps.isIOS) ? -1 : 5;
const minimumResultsForSearch = this.get('minimumResultsForSearch') || ((caps && caps.isIOS) ? -1 : 5);
if (!this.get("selectionTemplate") && this.get("selectionIcon")) {
this.selectionTemplate = (item) => {
let name = Em.get(item, 'text');
@ -97,13 +100,22 @@ export default Ember.Component.extend(bufferedRender({
return `<i class='fa fa-${this.get("selectionIcon")}'></i>${name}`;
};
}
$elem.select2({
formatResult: this.comboTemplate,
formatSelection: this.selectionTemplate,
const options = {
minimumResultsForSearch,
width: this.get('width') || 'resolve',
allowClear: true
});
};
if (this.comboTemplate) {
options.formatResult = this.comboTemplate.bind(this);
}
if (this.selectionTemplate) {
options.formatSelection = this.selectionTemplate.bind(this);
}
$elem.select2(options);
const castInteger = this.get('castInteger');
$elem.on("change", e => {