nodebb-plugin-poll 3.0.2 → 3.0.4

package/lib/poll.js

@@ -132,6 +132,9 @@ const Scheduler = require('./scheduler');
 			if (err) {
 				return callback(err);
 			}
+			// sort options according to option id. option id are supposed to preseve the order as in Poll.add(),
+			// when the user create the poll
+			options.sort((a, b) => a - b);
 			async.map(options, (option, next) => {
 				Poll.getOption(pollId, option, withVotes, next);
 			}, callback);

package/package.json

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

package/public/js/poll/creator.js

@@ -61,18 +61,21 @@
 	}
 
 	function composerBtnHandle(composer, textarea) {
-		require(['composer/controls'], function (controls) {
+		require(['composer/controls', 'alerts'], function (controls, alerts) {
 			var post = composer.posts[composer.active];
 			if (!post || !post.isMain || (isNaN(parseInt(post.cid, 10)) && isNaN(parseInt(post.pid, 10)))) {
-				return app.alertError('[[poll:error.not_main]]');
+				return alerts.error('[[poll:error.not_main]]');
 			}
 			if (parseInt(post.cid, 10) === 0) {
-				return app.alertError('[[error:category-not-selected]]');
+				return alerts.error('[[error:category-not-selected]]');
 			}
 
 			Poll.sockets.canCreate({ cid: post.cid, pid: post.pid }, function (err, canCreate) {
-				if (err || !canCreate) {
-					return app.alertError(err.message);
+				if (err) {
+					return alerts.error(err.message);
+				}
+				if (!canCreate) {
+					return alerts.error('[[error:no-privileges]]');
 				}
 
 				Poll.sockets.getConfig(null, function (err, config) {
@@ -118,7 +121,7 @@
 
 	Creator.show = function (poll, config, callback) {
 		if (poll.hasOwnProperty('info')) {
-			return app.alertError('Editing not implemented.');
+			return Poll.alertError('Editing not implemented');
 		}
 
 		require(['flatpickr', 'flatpickr.i10n', 'bootbox', 'dayjs', 'translator'], function (flatpickr, flatpickrI10N, bootbox, dayjs, Translator) {

package/public/js/poll/main.js

@@ -3,6 +3,12 @@
 window.Poll = {};
 
 (function () {
+	window.Poll.alertError = function (message) {
+		require(['alerts'], function (alerts) {
+			alerts.error(message);
+		});
+	};
+
 	require('poll/serializer')(window.utils);
 	$(window).on('action:topic.loading', function () {
 		if (ajaxify.data.posts.length > 0 && ajaxify.data.posts[0].hasOwnProperty('pollId')) {
@@ -22,7 +28,7 @@ window.Poll = {};
 		if (!isNaN(pollId)) {
 			Poll.sockets.getPoll({ pollId: pollId }, function (err, pollData) {
 				if (err) {
-					return app.alertError(err.message);
+					return Poll.alertError(err.message);
 				}
 				Poll.view.load(pollData);
 			});

package/public/js/poll/view.js

@@ -28,7 +28,7 @@
 						}
 
 						if (err) {
-							return app.alertError(err.message);
+							return Poll.alertError(err.message);
 						}
 
 						view.showResultsPanel();
@@ -58,7 +58,7 @@
 
 					Poll.sockets.updateVote(voteData, function (err) {
 						if (err) {
-							return app.alertError(err.message);
+							return Poll.alertError(err.message);
 						}
 						view.showResultsPanel();
 					});
@@ -78,7 +78,7 @@
 
 				Poll.sockets.removeVote(voteData, function (err) {
 					if (err) {
-						return app.alertError(err.message);
+						return Poll.alertError(err.message);
 					}
 					view.showResultsPanel();
 				});
@@ -124,7 +124,7 @@
 					optionId: optionId,
 				}, function (err, details) {
 					if (err) {
-						return app.alertError(err.message);
+						return Poll.alertError(err.message);
 					}
 
 					view.showOptionDetails(details);