+
+
diff --git a/plugins/poll/assets/javascripts/initializers/add-poll-ui-builder.js.es6 b/plugins/poll/assets/javascripts/initializers/add-poll-ui-builder.js.es6
new file mode 100644
index 00000000000..e1d88715ab0
--- /dev/null
+++ b/plugins/poll/assets/javascripts/initializers/add-poll-ui-builder.js.es6
@@ -0,0 +1,30 @@
+import { withPluginApi } from 'discourse/lib/plugin-api';
+import showModal from 'discourse/lib/show-modal';
+
+function initializePollUIBuilder(api) {
+ const ComposerController = api.container.lookup("controller:composer");
+
+ ComposerController.reopen({
+ actions: {
+ showPollBuilder() {
+ showModal("poll-ui-builder").set("toolbarEvent", this.get("toolbarEvent"));
+ }
+ }
+ });
+
+ api.addToolbarPopupMenuOptionsCallback(function() {
+ return {
+ action: 'showPollBuilder',
+ icon: 'bar-chart-o',
+ label: 'poll.ui_builder.title'
+ };
+ });
+}
+
+export default {
+ name: "add-poll-ui-builder",
+
+ initialize() {
+ withPluginApi('0.1', initializePollUIBuilder);
+ }
+};
diff --git a/plugins/poll/assets/javascripts/views/poll-ui-builder.js.es6 b/plugins/poll/assets/javascripts/views/poll-ui-builder.js.es6
new file mode 100644
index 00000000000..6ce0bf58203
--- /dev/null
+++ b/plugins/poll/assets/javascripts/views/poll-ui-builder.js.es6
@@ -0,0 +1,8 @@
+import ModalBodyView from "discourse/views/modal-body";
+
+export default ModalBodyView.extend({
+ needs: ['modal'],
+
+ templateName: 'modals/poll-ui-builder',
+ title: I18n.t("poll.ui_builder.title")
+});
diff --git a/plugins/poll/assets/javascripts/views/poll.js.es6 b/plugins/poll/assets/javascripts/views/poll.js.es6
index ac739b3f429..c9d6e632e34 100644
--- a/plugins/poll/assets/javascripts/views/poll.js.es6
+++ b/plugins/poll/assets/javascripts/views/poll.js.es6
@@ -1,5 +1,3 @@
-import { on } from "ember-addons/ember-computed-decorators";
-
export default Em.View.extend({
templateName: "poll",
classNames: ["poll"],
diff --git a/plugins/poll/assets/stylesheets/common/poll-ui-builder.scss b/plugins/poll/assets/stylesheets/common/poll-ui-builder.scss
new file mode 100644
index 00000000000..a8467a3abbd
--- /dev/null
+++ b/plugins/poll/assets/stylesheets/common/poll-ui-builder.scss
@@ -0,0 +1,18 @@
+.poll-ui-builder-form {
+ .input-group {
+ padding: 10px;
+ }
+
+ label {
+ font-weight: bold;
+ display: inline;
+ }
+
+ .combobox {
+ margin-right: 5px;
+ }
+
+ .poll-options-min, .poll-options-max, .poll-options-step {
+ width: 70px !important;
+ }
+}
diff --git a/plugins/poll/config/locales/client.en.yml b/plugins/poll/config/locales/client.en.yml
index 4344b85bd13..7113b022d74 100644
--- a/plugins/poll/config/locales/client.en.yml
+++ b/plugins/poll/config/locales/client.en.yml
@@ -68,3 +68,26 @@ en:
error_while_toggling_status: "There was an error while toggling the status of this poll."
error_while_casting_votes: "There was an error while casting your votes."
error_while_fetching_voters: "There was an error while displaying the voters."
+
+ ui_builder:
+ title: Poll Builder
+ insert: Insert Poll
+ reset: Reset Poll
+ help:
+ options_count: You must provide a minimum of 2 options.
+ poll_name:
+ label: Poll Name
+ placeholder: Enter Poll Name
+ poll_type:
+ label: Poll Type
+ regular: regular
+ multiple: multiple
+ number: number
+ poll_config:
+ max: Max
+ min: Min
+ step: Step
+ poll_public:
+ label: Make Public Poll
+ poll_options:
+ label: "Poll Choices: (one option per line)"
diff --git a/plugins/poll/plugin.rb b/plugins/poll/plugin.rb
index 075be098317..da979c275ba 100644
--- a/plugins/poll/plugin.rb
+++ b/plugins/poll/plugin.rb
@@ -7,6 +7,7 @@
enabled_site_setting :poll_enabled
register_asset "stylesheets/common/poll.scss"
+register_asset "stylesheets/common/poll-ui-builder.scss"
register_asset "stylesheets/desktop/poll.scss", :desktop
register_asset "stylesheets/mobile/poll.scss", :mobile
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
new file mode 100644
index 00000000000..fb4941838e3
--- /dev/null
+++ b/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6
@@ -0,0 +1,225 @@
+moduleFor("controller:poll-ui-builder", "controller:poll-ui-builder", {
+ needs: ['controller:modal']
+});
+
+test("isMultiple", function() {
+ const controller = this.subject();
+
+ controller.setProperties({
+ pollType: I18n.t("poll.ui_builder.poll_type.multiple"),
+ pollOptionsCount: 1
+ });
+
+ equal(controller.get("isMultiple"), true, "it should be true");
+
+ controller.set("pollOptionsCount", 0);
+
+ equal(controller.get("isMultiple"), false, "it should be false");
+
+ controller.setProperties({ pollType: "random", pollOptionsCount: 1 });
+
+ equal(controller.get("isMultiple"), false, "it should be false");
+});
+
+test("isNumber", function() {
+ const controller = this.subject();
+ controller.siteSettings = Discourse.SiteSettings;
+
+ controller.set("pollType", "random");
+
+ equal(controller.get("isNumber"), false, "it should be false");
+
+ controller.set("pollType", I18n.t("poll.ui_builder.poll_type.number"));
+
+ equal(controller.get("isNumber"), true, "it should be true");
+});
+
+test("showMinMax", function() {
+ const controller = this.subject();
+ controller.siteSettings = Discourse.SiteSettings;
+
+ controller.setProperties({
+ isNumber: true,
+ isMultiple: false
+ });
+
+ equal(controller.get("showMinMax"), true, "it should be true");
+
+ controller.setProperties({
+ isNumber: false,
+ isMultiple: true
+ });
+
+ equal(controller.get("showMinMax"), true, "it should be true");
+});
+
+test("pollOptionsCount", function() {
+ const controller = this.subject();
+ controller.siteSettings = Discourse.SiteSettings;
+
+ controller.set("pollOptions", "1\n2\n")
+
+ equal(controller.get("pollOptionsCount"), 2, "it should equal 2");
+
+ controller.set("pollOptions", "")
+
+ equal(controller.get("pollOptionsCount"), 0, "it should equal 0");
+});
+
+test("pollMinOptions", function() {
+ const controller = this.subject();
+ controller.siteSettings = Discourse.SiteSettings;
+
+ controller.setProperties({
+ isMultiple: true,
+ pollOptionsCount: 1
+ });
+
+ deepEqual(controller.get("pollMinOptions"), [{ name: 1, value: 1 }], "it should return the right options");
+
+ controller.set("pollOptionsCount", 2);
+
+ deepEqual(controller.get("pollMinOptions"), [
+ { name: 1, value: 1 }, { name: 2, value: 2 }
+ ], "it should return the right options");
+
+ controller.set("isNumber", true);
+ controller.siteSettings.poll_maximum_options = 2;
+
+ deepEqual(controller.get("pollMinOptions"), [
+ { name: 1, value: 1 }, { name: 2, value: 2 }
+ ], "it should return the right options");
+});
+
+test("pollMaxOptions", function() {
+ const controller = this.subject();
+ controller.siteSettings = Discourse.SiteSettings;
+
+ controller.setProperties({ isMultiple: true, pollOptionsCount: 1, pollMin: 1 });
+
+ deepEqual(controller.get("pollMaxOptions"), [], "it should return the right options");
+
+ controller.set("pollOptionsCount", 2);
+
+ deepEqual(controller.get("pollMaxOptions"), [
+ { name: 2, value: 2 }
+ ], "it should return the right options");
+
+ controller.siteSettings.poll_maximum_options = 3;
+ controller.setProperties({ isMultiple: false, isNumber: true, pollStep: 2, pollMin: 1 });
+
+ deepEqual(controller.get("pollMaxOptions"), [
+ { name: 2, value: 2 },
+ { name: 3, value: 3 },
+ { name: 4, value: 4 },
+ { name: 5, value: 5 },
+ { name: 6, value: 6 }
+ ], "it should return the right options");
+});
+
+test("pollStepOptions", function() {
+ const controller = this.subject();
+ controller.siteSettings = Discourse.SiteSettings;
+ controller.siteSettings.poll_maximum_options = 3;
+
+ controller.set("isNumber", false);
+
+ equal(controller.get("pollStepOptions"), null, "is should return null");
+
+ controller.setProperties({ isNumber: true });
+
+ deepEqual(controller.get("pollStepOptions"), [
+ { name: 1, value: 1 },
+ { name: 2, value: 2 },
+ { name: 3, value: 3 }
+ ], "it should return the right options");
+});
+
+test("disableInsert", function() {
+ const controller = this.subject();
+ controller.siteSettings = Discourse.SiteSettings;
+
+ controller.setProperties({ isNumber: true });
+
+ equal(controller.get("disableInsert"), false, "it should be false");
+
+ controller.setProperties({ isNumber: false, pollOptionsCount: 3 });
+
+ equal(controller.get("disableInsert"), false, "it should be false");
+
+ controller.setProperties({ isNumber: false, pollOptionsCount: 1 });
+
+ equal(controller.get("disableInsert"), true, "it should be true");
+});
+
+test("number pollOutput", function() {
+ const controller = this.subject();
+ controller.siteSettings = Discourse.SiteSettings;
+ controller.siteSettings.poll_maximum_options = 20;
+
+ controller.setProperties({
+ isNumber: true,
+ pollType: I18n.t("poll.ui_builder.poll_type.number"),
+ pollMin: 1
+ });
+
+ equal(controller.get("pollOutput"), "[poll type=number min=1 max=20 step=1]\n[/poll]", "it should return the right output");
+
+ controller.set("pollName", 'test');
+
+ 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');
+
+ equal(controller.get("pollOutput"), "[poll name=test-poll 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");
+
+ 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");
+});
+
+test("regular pollOutput", function() {
+ const controller = this.subject();
+ controller.siteSettings = Discourse.SiteSettings;
+ controller.siteSettings.poll_maximum_options = 20;
+
+ controller.set("pollOptions", "1\n2");
+
+ equal(controller.get("pollOutput"), "[poll]\n* 1\n* 2\n[/poll]", "it should return the right output");
+
+ controller.set("pollName", "test");
+
+ equal(controller.get("pollOutput"), "[poll name=test]\n* 1\n* 2\n[/poll]", "it should return the right output");
+
+ controller.set("publicPoll", "true");
+
+ equal(controller.get("pollOutput"), "[poll name=test public=true]\n* 1\n* 2\n[/poll]", "it should return the right output");
+});
+
+
+test("multiple pollOutput", function() {
+ const controller = this.subject();
+ controller.siteSettings = Discourse.SiteSettings;
+ controller.siteSettings.poll_maximum_options = 20;
+
+ controller.setProperties({
+ isMultiple: true,
+ pollType: I18n.t("poll.ui_builder.poll_type.multiple"),
+ pollMin: 1,
+ pollOptions: "1\n2"
+ });
+
+ equal(controller.get("pollOutput"), "[poll type=multiple min=1 max=2]\n* 1\n* 2\n[/poll]", "it should return the right output");
+
+ controller.set("pollName", "test");
+
+ equal(controller.get("pollOutput"), "[poll name=test type=multiple min=1 max=2]\n* 1\n* 2\n[/poll]", "it should return the right output");
+
+ controller.set("publicPoll", "true");
+
+ equal(controller.get("pollOutput"), "[poll name=test type=multiple min=1 max=2 public=true]\n* 1\n* 2\n[/poll]", "it should return the right output");
+});