nodebb-plugin-composer-default 9.1.1 → 9.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-composer-default",
-  "version": "9.1.1",
+  "version": "9.2.0",
   "description": "Default composer for NodeBB",
   "main": "library.js",
   "repository": {

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/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,
+							handle: app.user && app.user.uid ? undefined : utils.escapeHTML(draft.handle),
 							title: utils.escapeHTML(draft.title),
-							body: draft.text,
-							tags: [],
+							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">