From 4df224bb79b0e04f28729e39cea2cfdeaf57fd4f Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Thu, 16 Jun 2016 16:35:23 +0800
Subject: [PATCH] FIX: Trim whitespaces and do a global replace.

---
 .../assets/javascripts/controllers/poll-ui-builder.js.es6 | 2 +-
 .../javascripts/controllers/poll-ui-builder-test.js.es6   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6 b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
index b8fa691cd87..3bb34f21d91 100644
--- a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
+++ b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
@@ -91,7 +91,7 @@ export default Ember.Controller.extend({
     let pollHeader = '[poll';
     let output = '';
 
-    if (pollName) pollHeader += ` name=${pollName.replace(' ', '-')}`;
+    if (pollName) pollHeader += ` name=${pollName.trim().replace(/\s/g, '-')}`;
     if (pollType) pollHeader += ` type=${pollType}`;
     if (pollMin && showMinMax) pollHeader += ` min=${pollMin}`;
     if (pollMax) pollHeader += ` max=${pollMax}`;
diff --git a/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6 b/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6
index fb4941838e3..ccbeb20e95f 100644
--- a/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6
+++ b/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6
@@ -169,17 +169,17 @@ test("number pollOutput", function() {
 
   equal(controller.get("pollOutput"), "[poll name=test type=number min=1 max=20 step=1]\n[/poll]", "it should return the right output");
 
-  controller.set("pollName", 'test poll');
+  controller.set("pollName", ' test poll more ');
 
-  equal(controller.get("pollOutput"), "[poll name=test-poll type=number min=1 max=20 step=1]\n[/poll]", "it should return the right output");
+  equal(controller.get("pollOutput"), "[poll name=test-poll-more type=number min=1 max=20 step=1]\n[/poll]", "it should return the right output");
 
   controller.set("pollStep", 2);
 
-  equal(controller.get("pollOutput"), "[poll name=test-poll type=number min=1 max=20 step=2]\n[/poll]", "it should return the right output");
+  equal(controller.get("pollOutput"), "[poll name=test-poll-more type=number min=1 max=20 step=2]\n[/poll]", "it should return the right output");
 
   controller.set("publicPoll", true);
 
-  equal(controller.get("pollOutput"), "[poll name=test-poll type=number min=1 max=20 step=2 public=true]\n[/poll]", "it should return the right output");
+  equal(controller.get("pollOutput"), "[poll name=test-poll-more type=number min=1 max=20 step=2 public=true]\n[/poll]", "it should return the right output");
 });
 
 test("regular pollOutput", function() {