codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2025-02-17 04:01:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4328 from dachary/wip-poll-empty-lines

Browse source 
FIX: poll builder should ignore empty lines
This commit is contained in:
Guo Xiang Tan 2016-07-17 09:24:36 +08:00 committed by GitHub
commit 5f481ec097
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
View file

@ -112,7 +112,9 @@ export default Ember.Controller.extend({
output += `${pollHeader}\n`; output += `${pollHeader}\n`;
if (pollOptions.length > 0 && !isNumber) { if (pollOptions.length > 0 && !isNumber) {
output += `${pollOptions.split("\n").map(option => `* ${option}`).join("\n")}\n`; pollOptions.split("\n").forEach(option => {
if (option.length !== 0) output += `* ${option}\n`;
});
} }
output += '[/poll]'; output += '[/poll]';

2
plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6
View file

@ -210,7 +210,7 @@ test("multiple pollOutput", function() {
isMultiple: true, isMultiple: true,
pollType: controller.get("multiplePollType"), pollType: controller.get("multiplePollType"),
pollMin: 1, pollMin: 1,
pollOptions: "1\n2" pollOptions: "\n\n1\n\n2"
}); });
equal(controller.get("pollOutput"), "[poll type=multiple min=1 max=2]\n* 1\n* 2\n[/poll]", "it should return the right output"); equal(controller.get("pollOutput"), "[poll type=multiple min=1 max=2]\n* 1\n* 2\n[/poll]", "it should return the right output");