nodebb-plugin-composer-default 7.0.20 → 8.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-composer-default",
-  "version": "7.0.20",
+  "version": "8.0.0",
   "description": "Default composer for NodeBB",
   "main": "library.js",
   "repository": {
@@ -26,7 +26,7 @@
   },
   "readmeFilename": "README.md",
   "nbbpm": {
-    "compatibility": "^1.18.6"
+    "compatibility": "^2.0.0"
   },
   "dependencies": {
     "screenfull": "^5.0.2",

package/plugin.json

@@ -27,10 +27,8 @@
 		"composer/scheduler.js": "./static/lib/composer/scheduler.js",
 		"composer/tags.js": "./static/lib/composer/tags.js",
 		"composer/uploads.js": "./static/lib/composer/uploads.js",
-		"composer/autocomplete.js": "./static/lib/composer/autocomplete.js"
+		"composer/autocomplete.js": "./static/lib/composer/autocomplete.js",
+		"../admin/plugins/composer-default.js": "./static/lib/admin.js"
 	},
-	"acpScripts": [
-		"./static/lib/admin.js"
-	],
 	"templates": "static/templates"
 }

package/static/less/composer.less

@@ -527,8 +527,8 @@
 @media (min-width: @screen-md-max) {
 	html.composing {
 		.composer {
-			left: 10%;
-			width: 80%;
+			left: 15%;
+			width: 70%;
 		}
 	}
 }

package/static/lib/composer/autocomplete.js

@@ -1,6 +1,8 @@
 'use strict';
 
-define('composer/autocomplete', ['composer/preview'], function (preview) {
+define('composer/autocomplete', [
+	'composer/preview', 'textcomplete', 'textcomplete.contenteditable'
+], function (preview, TextComplete, TextCompleteContentEditable) {
 	var autocomplete = {
 		_active: {},
 	};
@@ -42,12 +44,14 @@ define('composer/autocomplete', ['composer/preview'], function (preview) {
 			clearTimeout(timer);
 			timer = setTimeout(function () {
 				var dropdown = document.querySelector('.' + dropdownClass);
-				var pos = dropdown.getBoundingClientRect();
+				if (dropdown) {
+					var pos = dropdown.getBoundingClientRect();
 
-				var margin = parseFloat(dropdown.style.marginTop, 10) || 0;
+					var margin = parseFloat(dropdown.style.marginTop, 10) || 0;
 
-				var offset = window.innerHeight + margin - 10 - pos.bottom;
-				dropdown.style.marginTop = Math.min(offset, 0) + 'px';
+					var offset = window.innerHeight + margin - 10 - pos.bottom;
+					dropdown.style.marginTop = Math.min(offset, 0) + 'px';
+				}
 			}, 0);
 		});
 
@@ -68,17 +72,16 @@ define('composer/autocomplete', ['composer/preview'], function (preview) {
 		}
 		var editor;
 		if (element.nodeName === 'TEXTAREA') {
-			var Textarea = window.Textcomplete.editors.Textarea;
-			editor = new Textarea(element);
+			editor = new TextComplete.Textarea(element);
 		} else if (element.nodeName === 'DIV' && element.getAttribute('contenteditable') === 'true') {
-			var ContentEditable = window.Textcomplete.editors.ContentEditable;
+			var ContentEditable = TextCompleteContentEditable.default;
 			editor = new ContentEditable(element);
 		}
 
 		// yuku-t/textcomplete inherits directionality from target element itself
 		element.setAttribute('dir', document.querySelector('html').getAttribute('data-dir'));
 
-		var textcomplete = new window.Textcomplete(editor, {
+		var textcomplete = new TextComplete.Textcomplete(editor, {
 			dropdown: data.options,
 		});
 		textcomplete.register(data.strategies);

package/static/lib/composer/formatting.js

@@ -1,8 +1,8 @@
 'use strict';
 
-/* globals screenfull */
-
-define('composer/formatting', ['composer/preview', 'composer/resize', 'topicThumbs'], function (preview, resize, topicThumbs) {
+define('composer/formatting', [
+	'composer/preview', 'composer/resize', 'topicThumbs', 'screenfull',
+], function (preview, resize, topicThumbs, screenfull) {
 	var formatting = {};
 
 	var formattingDispatchTable = {

package/static/lib/composer.js

@@ -1,7 +1,5 @@
 'use strict';
 
-/* globals screenfull */
-
 define('composer', [
 	'taskbar',
 	'translator',
@@ -22,10 +20,10 @@ define('composer', [
 	'hooks',
 	'messages',
 	'search',
+	'screenfull',
 ], function (taskbar, translator, uploads, formatting, drafts, tags,
 	categoryList, preview, resize, autocomplete, scheduler, scrollStop,
-	topicThumbs, api, bootbox, alerts, hooks, messagesModule, search
-) {
+	topicThumbs, api, bootbox, alerts, hooks, messagesModule, search, screenfull) {
 	var composer = {
 		active: undefined,
 		posts: {},
@@ -175,7 +173,7 @@ define('composer', [
 		if (showAlert) {
 			alerts.alert({
 				type: 'danger',
-				timeout: 3000,
+				timeout: 10000,
 				title: '',
 				message: message,
 				alert_id: 'post_error',
@@ -198,7 +196,7 @@ define('composer', [
 		formatting.addButton(iconClass, onClick, title);
 	};
 
-	composer.newTopic = function (data) {
+	composer.newTopic = async (data) => {
 		var pushData = {
 			action: 'topics.post',
 			cid: data.cid,
@@ -209,10 +207,10 @@ define('composer', [
 			isMain: true,
 		};
 
-		$(window).trigger('filter:composer.topic.push', {
+		({ pushData } = await hooks.fire('filter:composer.topic.push', {
 			data: data,
 			pushData: pushData,
-		});
+		}));
 
 		push(pushData);
 	};
@@ -794,7 +792,7 @@ define('composer', [
 					removeComposerHistory();
 				}
 
-				$(window).trigger('action:composer.' + action, { composerData: composerData, data: data });
+				hooks.fire('action:composer.' + action, { composerData: composerData, data: data });
 			})
 			.catch((err) => {
 				// Restore composer on error