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

FIX: poll builder should ignore empty lines

Browse Source 
Although pollOptionsCount skips empty lines, pollOutput inserts empty
lines. Skip them instead.

Signed-off-by: Loic Dachary <loic@dachary.org>
This commit is contained in:
Loic Dachary
2016-07-14 09:10:31 +02:00
parent 304f7040a3
commit f152900969
2 changed files with 4 additions and 2 deletions
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

@ -111,7 +111,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");