nodebb-plugin-poll 2.0.3 → 2.0.6

package/lib/nodebb.js

@@ -11,7 +11,7 @@ module.exports = {
 	PluginSockets: require.main.require('./src/socket.io/plugins'),
 	AdminSockets: require.main.require('./src/socket.io/admin').plugins,
 	SocketIndex: require.main.require('./src/socket.io/index'),
-	Translator: require.main.require('./public/src/modules/translator'),
+	Translator: require.main.require('./src/translator'),
 	winston: require.main.require('winston'),
 	app: null,
 };

package/lib/serializer.js

@@ -1,3 +1,4 @@
 'use strict';
 
-module.exports = require('../public/js/poll/serializer');
+const utils = require.main.require('./src/utils');
+module.exports = require('../public/js/poll/serializer')(utils);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-poll",
-  "version": "2.0.3",
+  "version": "2.0.6",
   "description": "NodeBB Poll Plugin",
   "main": "library.js",
   "scripts": {
@@ -26,7 +26,7 @@
     "cron": "^1.8.2"
   },
   "nbbpm": {
-    "compatibility": "^1.17.0"
+    "compatibility": "^2.0.0"
   },
   "devDependencies": {
     "eslint": "^7.31.0",

package/plugin.json

@@ -34,13 +34,13 @@
   ],
   "scripts": [
     "public/js/poll/main.js",
-    "public/js/poll/serializer.js",
     "public/js/poll/sockets.js",
     "public/js/poll/creator.js",
     "public/js/poll/view.js"
   ],
   "modules": {
     "../admin/plugins/poll.js": "public/js/admin.js",
+    "poll/serializer.js": "public/js/poll/serializer.js",
     "dayjs.js": "vendor/dayjs.min.js",
     "flatpickr.js": "vendor/flatpickr.min.js",
     "flatpickr.i10n.js": "vendor/flatpickr.l10n.js"

package/public/js/poll/main.js

@@ -1,8 +1,9 @@
 'use strict';
 
-var Poll = {};
+window.Poll = {};
 
 (function () {
+	require('poll/serializer')(window.utils);
 	$(window).on('action:topic.loading', function () {
 		if (ajaxify.data.posts.length > 0 && ajaxify.data.posts[0].hasOwnProperty('pollId')) {
 			getPoll(ajaxify.data.posts[0].pollId);

package/public/js/poll/serializer.js

@@ -1,15 +1,8 @@
 'use strict';
 
-(function (module) {
-	var utils;
+module.exports = function (utils) {
 	var Serializer = {};
 
-	if (typeof window === 'undefined') {
-		utils 	= require.main.require('./src/utils');
-	} else {
-		utils = window.utils;
-	}
-
 	var pollRegex = /(?:(?:\[poll(?<settings>.*?)\])(?:\\n|\n|<br \/>)(?<content>(?:-.+?(?:\\n|\n|<br \/>))+)(?:\[\/poll\]))/g;
 	var settingsRegex = /(?<key>.+?)=(?:"|&quot;|&#92;)(?<value>.+?)(?:"|&quot;|&#92;)/g;
 	var settingsValidators = {
@@ -165,13 +158,8 @@
 		return deserialized;
 	}
 
-	module.exports = Serializer;
-
 	if (typeof window !== 'undefined') {
-		window.Poll.serializer = module.exports;
+		window.Poll.serializer = Serializer;
 	}
-}(typeof module === 'undefined' ? {
-	module: {
-		exports: {},
-	},
-} : module));
+	return Serializer;
+};