nodebb-plugin-composer-default 10.2.35 → 10.2.37

package/package.json

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

package/static/lib/composer/tags.js

@@ -71,37 +71,40 @@ define('composer/tags', ['alerts'], function (alerts) {
 				} else if (reachedMaxTags) {
 					return alerts.error('[[error:too-many-tags, ' + maxTags + ']]');
 				}
+				var cid = postData.hasOwnProperty('cid') ? postData.cid : ajaxify.data.cid;
+				$(window).trigger('action:tag.beforeAdd', {
+					cid,
+					tagEl,
+					tag: event.item,
+					event,
+					inputAutocomplete: input,
+				});
 				if (different) {
 					tagEl.tagsinput('add', cleanTag);
 				}
+				if (event.cancel && input.length) {
+					input.autocomplete('close');
+				}
 			});
 
-			var skipAddCheck = false;
-			var skipRemoveCheck = false;
 			tagEl.on('itemRemoved', function (event) {
-				if (skipRemoveCheck) {
-					skipRemoveCheck = false;
+				if (!event.item || (event.options && event.options.skipRemoveCheck)) {
 					return;
 				}
 
-				if (!event.item) {
-					return;
-				}
 				socket.emit('topics.canRemoveTag', { tag: event.item }, function (err, allowed) {
 					if (err) {
 						return alerts.error(err);
 					}
 					if (!allowed) {
 						alerts.error('[[error:cant-remove-system-tag]]');
-						skipAddCheck = true;
-						tagEl.tagsinput('add', event.item);
+						tagEl.tagsinput('add', event.item, { skipAddCheck: true });
 					}
 				});
 			});
 
 			tagEl.on('itemAdded', function (event) {
-				if (skipAddCheck) {
-					skipAddCheck = false;
+				if (event.options && event.options.skipAddCheck) {
 					return;
 				}
 				var cid = postData.hasOwnProperty('cid') ? postData.cid : ajaxify.data.cid;
@@ -110,10 +113,14 @@ define('composer/tags', ['alerts'], function (alerts) {
 						return alerts.error(err);
 					}
 					if (!allowed) {
-						skipRemoveCheck = true;
-						return tagEl.tagsinput('remove', event.item);
+						return tagEl.tagsinput('remove', event.item, { skipRemoveCheck: true });
 					}
-					$(window).trigger('action:tag.added', { cid: cid, tagEl: tagEl, tag: event.item });
+					$(window).trigger('action:tag.added', {
+						cid,
+						tagEl,
+						tag: event.item,
+						inputAutocomplete: input,
+					});
 					if (input.length) {
 						input.autocomplete('close');
 					}

package/static/lib/composer.js

@@ -411,6 +411,9 @@ define('composer', [
 			preview.matchScroll(postContainer);
 		});
 
+		if (!utils.isNumber(postData.pid)) {
+			handleRemotePid(postContainer);
+		}
 		handleHelp(postContainer);
 		handleSearch(postContainer);
 		focusElements(postContainer);
@@ -579,6 +582,16 @@ define('composer', [
 		}, path, `${config.relative_path}/${returnPath}`);
 	}
 
+	function handleRemotePid(postContainer) {
+		alerts.alert({
+			title: '[[modules:composer.remote-pid-editing]]',
+			message: '[[modules:composer.remote-pid-content-immutable]]',
+			timeout: 15000,
+		});
+		var container = postContainer.find('.write-container');
+		container.addClass('hidden');
+	}
+
 	function handleHelp(postContainer) {
 		const helpBtn = postContainer.find('[data-action="help"]');
 		helpBtn.on('click', async function () {
@@ -731,7 +744,7 @@ define('composer', [
 			};
 		} else if (action === 'posts.edit') {
 			method = 'put';
-			route = `/posts/${postData.pid}`;
+			route = `/posts/${encodeURIComponent(postData.pid)}`;
 			composerData = {
 				...composerData,
 				pid: postData.pid,
@@ -873,17 +886,11 @@ define('composer', [
 				calls.push(topicThumbs.getByPid(composerObj.pid));
 			}
 			Promise.all(calls).then((thumbs) => {
-				thumbs = thumbs.reduce((memo, cur) => {
-					memo = memo.concat(cur);
-					return memo;
-				});
-
-				if (thumbs.length) {
-					const formatEl = postContainer.find('[data-format="thumbs"]');
-					formatEl.find('.badge')
-						.text(thumbs.length)
-						.toggleClass('hidden', !thumbs.length);
-				}
+				const thumbCount = thumbs.flat().length;
+				const formatEl = postContainer.find('[data-format="thumbs"]');
+				formatEl.find('.badge')
+					.text(thumbCount)
+					.toggleClass('hidden', !thumbCount);
 			});
 		}
 	};