nodebb-plugin-poll 3.2.8 → 3.2.9

package/README.md

@@ -1,32 +1,31 @@
-# NodeBB Poll plugin
-
-This NodeBB plugin will allow you to add polls to the first post of a topic with the following markup:
-
-    [poll <settings>]
-    - Poll option
-    - Another option
-    [/poll]
-
-Currently supported settings:
-
-    maxvotes="1" //Max number of votes per user. If larger than 1, a multiple choice poll will be created
-    disallowVoteUpdate="0" //if set, users won't be able to update/remove their vote
-    allowAnonVoting="0" // if set to 1, users will be able to vote anonymously
-    title="Poll title" //Poll title
-
-There's also a helpful modal available that will allow you to easily create a poll:
-![](https://i.imgur.com/2fPnWLb.png)
-
-## Todo
-
-- Add the ability to edit a poll
-- Anonymous voting
-- A lot more...
-
-If you're willing to help, please make any improvements you want and submit a PR.
-
-## Installation
-
-Either through the NodeBB ACP or:
-
-    npm install nodebb-plugin-poll
+# NodeBB Poll plugin
+
+This NodeBB plugin will allow you to add polls to the first post of a topic with the following markup:
+
+    [poll <settings>]
+    - Poll option
+    - Another option
+    [/poll]
+
+Currently supported settings:
+
+    maxvotes="1" //Max number of votes per user. If larger than 1, a multiple choice poll will be created
+    disallowVoteUpdate="0" //if set, users won't be able to update/remove their vote
+    allowAnonVoting="0" // if set to 1, users will be able to vote anonymously
+    title="Poll title" //Poll title
+
+There's also a helpful modal available that will allow you to easily create a poll:
+![](https://i.imgur.com/2fPnWLb.png)
+
+## Todo
+
+- Add the ability to edit a poll
+- A lot more...
+
+If you're willing to help, please make any improvements you want and submit a PR.
+
+## Installation
+
+Either through the NodeBB ACP or:
+
+    npm install nodebb-plugin-poll

package/lib/hooks.js

@@ -98,6 +98,7 @@ async function canCreate(cid, uid) {
 	}
 }
 
+// called from filter:post.edit and filter:post.create
 async function savePoll(obj) {
 	const postobj = obj.post ? obj.post : obj;
 	const pollData = Serializer.serialize(postobj.content, Config.settings.get());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-poll",
-  "version": "3.2.8",
+  "version": "3.2.9",
   "description": "NodeBB Poll Plugin",
   "main": "library.js",
   "scripts": {

package/public/js/poll/creator.js

@@ -136,14 +136,12 @@
 					buttons: {
 						cancel: {
 							label: '[[modules:bootbox.cancel]]',
-							className: 'btn-default',
 							callback: function () {
 								return true;
 							},
 						},
 						save: {
 							label: '[[modules:bootbox.confirm]]',
-							className: 'btn-primary',
 							callback: function (e) {
 								clearErrors();
 								var form = $(e.currentTarget).parents('.bootbox').find('#pollCreator');
@@ -189,11 +187,6 @@
 							prevOption.clone().val('').insertBefore(el).focus();
 						}
 					});
-
-				if (poll.settings && poll.settings.end) {
-
-					// flatpickrInstance.setDate(poll.settings.end);
-				}
 			});
 		});
 	};

package/templates/poll/view/voting.tpl

@@ -1,10 +1,10 @@
 <form role="form" class="poll-voting-form mb-3 d-flex flex-column gap-3">
     <!-- BEGIN poll.options -->
     <div class="poll-view-option {poll.optionType}" data-poll-option-id="{poll.options.id}">
-        <label>
-            <input type="{poll.optionType}" name="pollVoteSelection" value="{poll.options.id}">
-            {poll.options.title}
-        </label>
+        <div class="form-check">
+            <input class="form-check-input" type="{poll.optionType}" name="pollVoteSelection" value="{poll.options.id}" id="poll-{poll.info.pollId}-option-id-{poll.options.id}">
+            <label class="form-check-label" for="poll-{poll.info.pollId}-option-id-{poll.options.id}">{poll.options.title}</label>
+        </div>
     </div>
     <!-- END poll.options -->
 </form>