nodebb-plugin-composer-default 10.3.3 → 10.3.5

package/package.json

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

package/static/lib/composer/drafts.js

@@ -27,6 +27,7 @@ define('composer/drafts', ['api', 'alerts'], function (api, alerts) {
 		postContainer.on('click', '[component="category/list"] [data-cid]', utils.debounce(doSaveDraft, draftSaveDelay));
 		postContainer.on('itemAdded', '.tags', utils.debounce(doSaveDraft, draftSaveDelay));
 		postContainer.on('thumb.uploaded', doSaveDraft);
+		postContainer.on('composer.minimize', doSaveDraft);
 
 		draftIconEl.on('animationend', function () {
 			$(this).toggleClass('active', false);
@@ -84,48 +85,45 @@ define('composer/drafts', ['api', 'alerts'], function (api, alerts) {
 			const raw = postContainer.find('textarea').val();
 			const storage = getStorage(app.user.uid);
 
-			if (raw.length || (title && title.length)) {
-				const draftData = {
-					save_id: postData.save_id,
-					action: postData.action,
-					text: raw,
-					uuid: postContainer.attr('data-uuid'),
-					timestamp: Date.now(),
-				};
-
-				if (postData.action === 'topics.post') {
-					// New topic only
-					const tags = postContainer.find('input.tags').val();
-					draftData.tags = tags;
-					draftData.title = title;
-					draftData.cid = postData.cid;
-					draftData.thumbs = postData.thumbs || [];
-				} else if (postData.action === 'posts.reply') {
-					// new reply only
-					draftData.title = postData.title;
-					draftData.tid = postData.tid;
-					draftData.toPid = postData.toPid;
-				} else if (postData.action === 'posts.edit') {
-					draftData.pid = postData.pid;
-					draftData.title = title || postData.title;
-					draftData.thumbs = postData.thumbs || [];
-				}
-				if (!app.user.uid) {
-					draftData.handle = postContainer.find('input.handle').val();
-				}
+			const draftData = {
+				save_id: postData.save_id,
+				action: postData.action,
+				text: raw,
+				uuid: postContainer.attr('data-uuid'),
+				timestamp: Date.now(),
+			};
+
+			if (postData.action === 'topics.post') {
+				// New topic only
+				const tags = postContainer.find('input.tags').val();
+				draftData.tags = tags;
+				draftData.title = title;
+				draftData.cid = postData.cid;
+				draftData.thumbs = postData.thumbs || [];
+			} else if (postData.action === 'posts.reply') {
+				// new reply only
+				draftData.title = postData.title;
+				draftData.tid = postData.tid;
+				draftData.toPid = postData.toPid;
+			} else if (postData.action === 'posts.edit') {
+				draftData.pid = postData.pid;
+				draftData.title = title || postData.title;
+				draftData.thumbs = postData.thumbs || [];
+			}
+			if (!app.user.uid) {
+				draftData.handle = postContainer.find('input.handle').val();
+			}
 
-				// save all draft data into single item as json
-				storage.setItem(postData.save_id, JSON.stringify(draftData));
+			// save all draft data into single item as json
+			storage.setItem(postData.save_id, JSON.stringify(draftData));
+
+			$(window).trigger('action:composer.drafts.save', {
+				storage: storage,
+				postData: postData,
+				postContainer: postContainer,
+			});
+			draftIconEl.toggleClass('active', true);
 
-				$(window).trigger('action:composer.drafts.save', {
-					storage: storage,
-					postData: postData,
-					postContainer: postContainer,
-				});
-				draftIconEl.toggleClass('active', true);
-			} else {
-				drafts.removeDraft(postData.save_id);
-			}
 		}
 	}
 

package/static/lib/composer.js

@@ -460,7 +460,7 @@ define('composer', [
 		var data = {
 			topicTitle: title,
 			titleLength: title.length,
-			body: translator.escape(utils.escapeHTML(postData.body || topicTemplate)),
+			body: utils.escapeHTML(translator.escape(postData.body) || topicTemplate),
 			mobile: composer.bsEnvironment === 'xs' || composer.bsEnvironment === 'sm',
 			resizable: true,
 			thumb: postData.thumb,
@@ -871,6 +871,7 @@ define('composer', [
 			post_uuid: post_uuid,
 		});
 
+		postContainer.trigger('composer.minimize');
 		onHide();
 	};