github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-01 07:49:48 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Add default values when no value has been selected.

Browse Source
This commit is contained in:
Guo Xiang Tan
2016-06-15 12:54:52 +08:00
parent ba87181506
commit e1cfe7536c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
View File

@ -70,12 +70,12 @@ export default Ember.Controller.extend({
@computed("isMultiple", "isNumber", "pollOptionsCount", "pollMin", "pollStep") @computed("isMultiple", "isNumber", "pollOptionsCount", "pollMin", "pollStep")
pollMaxOptions(isMultiple, isNumber, count, pollMin, pollStep) { pollMaxOptions(isMultiple, isNumber, count, pollMin, pollStep) {
if (!isMultiple && !isNumber) return; if (!isMultiple && !isNumber) return;
const pollMinInt = parseInt(pollMin); const pollMinInt = parseInt(pollMin) || 1;
if (isMultiple) { if (isMultiple) {
return this._comboboxOptions(pollMinInt + 1, count + 1); return this._comboboxOptions(pollMinInt + 1, count + 1);
} else if (isNumber) { } else if (isNumber) {
const pollStepInt = parseInt(pollStep); const pollStepInt = parseInt(pollStep) || 1;
return this._comboboxOptions(pollMinInt + 1, pollMinInt + (this.siteSettings.poll_maximum_options * pollStepInt)); return this._comboboxOptions(pollMinInt + 1, pollMinInt + (this.siteSettings.poll_maximum_options * pollStepInt));
} }
}, },
@ -83,7 +83,7 @@ export default Ember.Controller.extend({
@computed("isNumber", "pollMax") @computed("isNumber", "pollMax")
pollStepOptions(isNumber, pollMax) { pollStepOptions(isNumber, pollMax) {
if (!isNumber) return; if (!isNumber) return;
return this._comboboxOptions(1, parseInt(pollMax) + 1); return this._comboboxOptions(1, (parseInt(pollMax) || 1) + 1);
}, },
@computed("isNumber", "showMinMax", "pollName", "pollType", "publicPoll", "pollOptions", "pollMin", "pollMax", "pollStep") @computed("isNumber", "showMinMax", "pollName", "pollType", "publicPoll", "pollOptions", "pollMin", "pollMax", "pollStep")