nodebb-plugin-poll 3.1.8 → 3.2.1

package/library.js

@@ -8,10 +8,9 @@ const Scheduler = require('./lib/scheduler');
 
 const Plugin = module.exports;
 
-
 Plugin.hooks = Hooks;
 
-Plugin.load = function (params, callback) {
+Plugin.load = async function (params) {
 	const routeHelpers = require.main.require('./src/routes/helpers');
 	const { router } = params;
 
@@ -27,27 +26,25 @@ Plugin.load = function (params, callback) {
 	NodeBB.app = params.app;
 	Scheduler.start();
 
-	Config.init(callback);
+	await Config.init();
 };
 
-Plugin.addAdminNavigation = function (adminHeader, callback) {
+Plugin.addAdminNavigation = function (adminHeader) {
 	adminHeader.plugins.push({
 		route: `/plugins/${Config.plugin.id}`,
 		icon: Config.plugin.icon,
 		name: Config.plugin.name,
 	});
-
-	callback(null, adminHeader);
+	return adminHeader;
 };
 
-Plugin.registerFormatting = function (payload, callback) {
+Plugin.registerFormatting = function (payload) {
 	payload.options.push({
 		name: 'poll',
 		className: `fa ${Config.plugin.icon}`,
 		title: '[[poll:creator_title]]',
 	});
-
-	callback(null, payload);
+	return payload;
 };
 
 Plugin.addPrivilege = function (hookData) {
@@ -56,7 +53,7 @@ Plugin.addPrivilege = function (hookData) {
 	);
 };
 
-Plugin.copyPrivilegesFrom = function (data, callback) {
+Plugin.copyPrivilegesFrom = function (data) {
 	if (data.privileges.indexOf('poll:create') === -1) {
 		data.privileges.push('poll:create');
 	}
@@ -64,5 +61,5 @@ Plugin.copyPrivilegesFrom = function (data, callback) {
 	if (data.privileges.indexOf('groups:poll:create') === -1) {
 		data.privileges.push('groups:poll:create');
 	}
-	callback(null, data);
+	return data;
 };

package/package.json

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

package/plugin.json

@@ -20,10 +20,6 @@
     { "hook": "action:topic.delete", "method": "hooks.action.topicDelete" },
     { "hook": "action:topic.restore", "method": "hooks.action.topicRestore" }
   ],
-  "staticDirs": {
-    "public": "public",
-    "vendor": "vendor"
-  },
   "scss": [
     "public/scss/style.scss"
   ],
@@ -37,9 +33,6 @@
     "../admin/plugins/poll.js": "public/js/admin.js",
     "poll/serializer.js": "public/js/poll/serializer.js"
   },
-  "css": [
-    "vendor/flatpickr.min.css"
-  ],
   "templates": "templates",
   "languages": "languages",
   "upgrades": [

package/public/js/poll/creator.js

@@ -80,7 +80,7 @@
 
 				Poll.sockets.getConfig(null, function (err, config) {
 					if (err) {
-						console.error(err);
+						return alerts.error(err);
 					}
 
 					var poll = {};

package/public/js/poll/serializer.js

@@ -85,7 +85,7 @@ module.exports = function (utils) {
 
 		rawOptions.forEach(function (option) {
 			if (option.length) {
-				option = option.split('-').slice(1).join('-').trim()
+				option = option.split('-').slice(1).join('-').trim();
 
 				if (option.length) {
 					pollOptions.push(option);

package/public/scss/style.scss

@@ -2,28 +2,3 @@
 .composer.reply .poll, .composer.reply .ql-poll {
   display: none;
 }
-
-.poll-view {
-  h2, h3 {
-    margin-top: 0;
-  }
-
-  .card-title {
-    display: inline-block;
-  }
-
-  .btn-group {
-    display: block;
-    a {
-      color: inherit;
-    }
-  }
-}
-
-.poll-result-details:hover {
-  text-decoration: none;
-}
-
-.poll-creator {
-  z-index: 11000 !important;
-}

package/templates/poll/view.tpl

@@ -1,12 +1,11 @@
 <div class="poll-view mb-3" data-poll-id="{poll.info.pollId}">
     <div class="card">
-        <div class="card-header">
+        <div class="card-header d-flex justify-content-between align-items-center">
             <h5 class="card-title mb-0">{poll.settings.title}</h5>
-            <div class="btn-group float-end hidden">
-                <a href="#" class="poll-button-edit">
-                    <span class="fa fa-pencil"></span>
-                </a>
-            </div>
+
+            <a href="#" class="btn btn-sm btn-light border poll-button-edit hidden">
+                <span class="fa fa-pencil"></span>
+            </a>
         </div>
         <div class="card-body">
             <div class="poll-view-messages hidden"></div>