nodebb-plugin-composer-default 10.3.4 → 10.3.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-composer-default",
-  "version": "10.3.4",
+  "version": "10.3.6",
   "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

@@ -226,23 +226,24 @@ define('composer', [
 		if (data.body) {
 			data.body = '> ' + data.body.replace(/\n/g, '\n> ') + '\n\n';
 		}
-		var link = '[' + escapedTitle + '](' + config.relative_path + '/post/' + encodeURIComponent(data.selectedPid || data.toPid) + ')';
+
+		const composerTid = data.uuid ? composer.posts[data.uuid].tid : data.tid;
+		const inDifferentTopic = parseInt(data.tid, 10) !== parseInt(composerTid, 10);
+		const useTopicLink = data.title && (data.selectedPid || data.toPid) && inDifferentTopic;
+		const postHref = `${config.relative_path}/post/${encodeURIComponent(data.selectedPid || data.toPid)}`;
+		const topicLink = `[${escapedTitle}](${postHref})`;
+
+		const quoteKey = useTopicLink ?
+			'> [[modules:composer.user-said-in, ' + data.username + ', ' + topicLink + ']]\n>\n' :
+			'> [[modules:composer.user-said, ' + data.username + ', ' + postHref + ']]\n>\n';
+
 		if (data.uuid === undefined) {
-			if (data.title && (data.selectedPid || data.toPid)) {
-				composer.newReply({
-					tid: data.tid,
-					toPid: data.toPid,
-					title: data.title,
-					body: '[[modules:composer.user-said-in, ' + data.username + ', ' + link + ']]\n' + data.body,
-				});
-			} else {
-				composer.newReply({
-					tid: data.tid,
-					toPid: data.toPid,
-					title: data.title,
-					body: '[[modules:composer.user-said, ' + data.username + ']]\n' + data.body,
-				});
-			}
+			composer.newReply({
+				tid: data.tid,
+				toPid: data.toPid,
+				title: data.title,
+				body: quoteKey + data.body,
+			});
 			return;
 		} else if (data.uuid !== composer.active) {
 			// If the composer is not currently active, activate it
@@ -252,18 +253,13 @@ define('composer', [
 		var postContainer = $('.composer[data-uuid="' + data.uuid + '"]');
 		var bodyEl = postContainer.find('textarea');
 		var prevText = bodyEl.val();
-		if (data.title && (data.selectedPid || data.toPid)) {
-			translator.translate('[[modules:composer.user-said-in, ' + data.username + ', ' + link + ']]\n', config.defaultLang, onTranslated);
-		} else {
-			translator.translate('[[modules:composer.user-said, ' + data.username + ']]\n', config.defaultLang, onTranslated);
-		}
 
-		function onTranslated(translated) {
+		translator.translate(quoteKey, config.defaultLang, function (translated) {
 			composer.posts[data.uuid].body = (prevText.length ? prevText + '\n\n' : '') + translated + data.body;
 			bodyEl.val(composer.posts[data.uuid].body);
 			focusElements(postContainer);
 			preview.render(postContainer);
-		}
+		});
 	};
 
 	composer.newReply = function (data) {
@@ -871,6 +867,7 @@ define('composer', [
 			post_uuid: post_uuid,
 		});
 
+		postContainer.trigger('composer.minimize');
 		onHide();
 	};