nodebb-plugin-composer-default 9.0.0 → 9.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-composer-default",
-  "version": "9.0.0",
+  "version": "9.2.0",
   "description": "Default composer for NodeBB",
   "main": "library.js",
   "repository": {
@@ -29,6 +29,9 @@
     "compatibility": "^2.5.0"
   },
   "dependencies": {
+    "@textcomplete/contenteditable": "^0.1.12",
+    "@textcomplete/core": "^0.1.12",
+    "@textcomplete/textarea": "^0.1.12",
     "screenfull": "^5.0.2",
     "validator": "^13.7.0"
   },

package/static/less/composer.less

@@ -570,3 +570,4 @@
 
 @import './zen-mode.less';
 @import './page-compose.less';
+@import './textcomplete.less';

package/static/less/textcomplete.less

@@ -0,0 +1,24 @@
+.textcomplete-dropdown {
+	border: 1px solid #ddd;
+	background-color: white;
+	list-style: none;
+	padding: 0;
+	margin: 0;
+
+	li {
+		margin: 0;
+	}
+
+	.textcomplete-footer, .textcomplete-item {
+		border-top: 1px solid #ddd;
+	}
+
+	.textcomplete-item {
+		padding: 2px 5px;
+		cursor: pointer;
+
+		&:hover, &.active {
+			background-color: rgb(110, 183, 219);
+		}
+	}
+}

package/static/lib/client.js

@@ -3,6 +3,7 @@
 $(document).ready(function () {
 	$(window).on('action:app.load', function () {
 		require(['composer/drafts'], function (drafts) {
+			drafts.migrateGuest();
 			drafts.loadOpen();
 		});
 	});

package/static/lib/composer/autocomplete.js

@@ -65,23 +65,23 @@ define('composer/autocomplete', [
 	};
 
 	// This is a generic method that is also used by the chat
-	autocomplete.setup = function (data) {
-		var element = data.element.get(0);
-		if (!element) {
+	autocomplete.setup = function ({ element, strategies, options }) {
+		const targetEl = element.get(0);
+		if (!targetEl) {
 			return;
 		}
 		var editor;
-		if (element.nodeName === 'TEXTAREA') {
-			editor = new TextareaEditor(element);
-		} else if (element.nodeName === 'DIV' && element.getAttribute('contenteditable') === 'true') {
-			editor = new ContenteditableEditor(element);
+		if (targetEl.nodeName === 'TEXTAREA') {
+			editor = new TextareaEditor(targetEl);
+		} else if (targetEl.nodeName === 'DIV' && targetEl.getAttribute('contenteditable') === 'true') {
+			editor = new ContenteditableEditor(targetEl);
 		}
 
 		// yuku-t/textcomplete inherits directionality from target element itself
-		element.setAttribute('dir', document.querySelector('html').getAttribute('data-dir'));
+		targetEl.setAttribute('dir', document.querySelector('html').getAttribute('data-dir'));
 
-		var textcomplete = new Textcomplete(editor, data.strategies, {
-			dropdown: data.options,
+		var textcomplete = new Textcomplete(editor, strategies, {
+			dropdown: options,
 		});
 		textcomplete.on('rendered', function () {
 			if (textcomplete.dropdown.items.length) {

package/static/lib/composer/drafts.js

@@ -191,6 +191,10 @@ define('composer/drafts', ['api', 'alerts'], function (api, alerts) {
 	};
 
 	drafts.migrateThumbs = function (postContainer, postData) {
+		if (!app.uid) {
+			return;
+		}
+
 		// If any thumbs were uploaded, migrate them to this new composer's uuid
 		const newUUID = postContainer.attr('data-uuid');
 		const draft = drafts.get(postData.save_id);
@@ -224,7 +228,7 @@ define('composer/drafts', ['api', 'alerts'], function (api, alerts) {
 			open = [];
 		}
 
-		if (available.length && app.user && app.user.uid !== 0) {
+		if (available.length) {
 			// Deconstruct each save_id and open up composer
 			available.forEach(function (save_id) {
 				if (!save_id) {
@@ -256,16 +260,17 @@ define('composer/drafts', ['api', 'alerts'], function (api, alerts) {
 					if (type === 'cid') {
 						composer.newTopic({
 							cid: id,
-							title: draft.title,
-							body: draft.text,
-							tags: [],
+							handle: app.user && app.user.uid ? undefined : utils.escapeHTML(draft.handle),
+							title: utils.escapeHTML(draft.title),
+							body: utils.escapeHTML(draft.text),
+							tags: String(draft.tags || '').split(','),
 						});
 					} else if (type === 'tid') {
 						api.get('/topics/' + id, {}, function (err, topicObj) {
 							if (err) {
 								return alerts.error(err);
 							}
-							composer.newReply(id, undefined, topicObj.title, draft.text);
+							composer.newReply(id, undefined, topicObj.title, utils.escapeHTML(draft.text));
 						});
 					} else if (type === 'pid') {
 						composer.editPost(id);

package/static/lib/composer.js

@@ -200,6 +200,7 @@ define('composer', [
 		var pushData = {
 			action: 'topics.post',
 			cid: data.cid,
+			handle: data.handle,
 			title: data.title || '',
 			body: data.body || '',
 			tags: data.tags || [],
@@ -317,9 +318,6 @@ define('composer', [
 			postContainer.attr('data-uuid', post_uuid);
 		}
 
-		var titleEl = postContainer.find('input.title');
-		var handleEl = postContainer.find('input.handle');
-		var tagsEl = postContainer.find('input.tags');
 		var bodyEl = postContainer.find('textarea');
 		var submitBtn = postContainer.find('.composer-submit');
 
@@ -394,21 +392,7 @@ define('composer', [
 		});
 
 		drafts.init(postContainer, postData);
-
-		var draft = drafts.get(postData.save_id);
-		if (draft && draft.title) {
-			titleEl.val(draft.title);
-		}
-		if (draft && draft.handle) {
-			handleEl.val(draft.handle);
-		}
-		if (draft && draft.tags) {
-			const tags = draft.tags.split(',');
-			tags.forEach(function (tag) {
-				tagsEl.tagsinput('add', tag);
-			});
-		}
-		bodyEl.val(draft.text ? draft.text : postData.body);
+		const draft = drafts.get(postData.save_id);
 
 		preview.render(postContainer, function () {
 			preview.matchScroll(postContainer);
@@ -426,11 +410,7 @@ define('composer', [
 			$('[data-format="zen"]').addClass('hidden');
 		}
 
-		hooks.fire('action:composer.enhanced', {
-			postContainer: postContainer,
-			postData: postData,
-			draft: draft,
-		});
+		hooks.fire('action:composer.enhanced', { postContainer, postData, draft });
 	};
 
 	async function getSelectedCategory(postData) {
@@ -463,6 +443,7 @@ define('composer', [
 		var data = {
 			title: title,
 			titleLength: title.length,
+			body: postData.body,
 			mobile: composer.bsEnvironment === 'xs' || composer.bsEnvironment === 'sm',
 			resizable: true,
 			thumb: postData.thumb,

package/static/templates/composer.tpl

@@ -101,7 +101,7 @@
 					<span class="toggle-preview hide">[[modules:composer.show_preview]]</span>
 				</div>
 				<div class="pull-right draft-icon hidden-md hidden-lg"></div>
-				<textarea class="write" tabindex="4" placeholder="[[modules:composer.textarea.placeholder]]"></textarea>
+				<textarea class="write" tabindex="4" placeholder="[[modules:composer.textarea.placeholder]]">{body}</textarea>
 			</div>
 			<div class="hidden-sm hidden-xs preview-container">
 				<div class="help-text">