nodebb-plugin-composer-default 10.3.6 → 10.3.8

package/library.js

@@ -45,19 +45,22 @@ plugin.addAdminNavigation = async function (header) {
 };
 
 plugin.addPrefetchTags = async function (hookData) {
-	const prefetch = [
-		'/assets/src/modules/composer.js', '/assets/src/modules/composer/uploads.js', '/assets/src/modules/composer/drafts.js',
-		'/assets/src/modules/composer/tags.js', '/assets/src/modules/composer/categoryList.js', '/assets/src/modules/composer/resize.js',
-		'/assets/src/modules/composer/autocomplete.js', '/assets/templates/composer.tpl',
-		`/assets/language/${meta.config.defaultLang || 'en-GB'}/topic.json`,
-		`/assets/language/${meta.config.defaultLang || 'en-GB'}/modules.json`,
-		`/assets/language/${meta.config.defaultLang || 'en-GB'}/tags.json`,
-	];
-
-	hookData.links = hookData.links.concat(prefetch.map(path => ({
-		rel: 'prefetch',
-		href: `${nconf.get('relative_path') + path}?${meta.config['cache-buster']}`,
-	})));
+	const { req } = hookData;
+	if (req.uid > 0) {
+		const prefetch = [
+			'/assets/src/modules/composer.js', '/assets/src/modules/composer/uploads.js', '/assets/src/modules/composer/drafts.js',
+			'/assets/src/modules/composer/tags.js', '/assets/src/modules/composer/categoryList.js', '/assets/src/modules/composer/resize.js',
+			'/assets/src/modules/composer/autocomplete.js', '/assets/templates/composer.tpl',
+			`/assets/language/${meta.config.defaultLang || 'en-GB'}/topic.json`,
+			`/assets/language/${meta.config.defaultLang || 'en-GB'}/modules.json`,
+			`/assets/language/${meta.config.defaultLang || 'en-GB'}/tags.json`,
+		];
+
+		hookData.links = hookData.links.concat(prefetch.map(path => ({
+			rel: 'prefetch',
+			href: `${nconf.get('relative_path') + path}?${meta.config['cache-buster']}`,
+		})));
+	}
 
 	return hookData;
 };
@@ -178,7 +181,9 @@ plugin.filterComposerBuild = async function (hookData) {
 	}
 	globalPrivileges['topics:tag'] = canTagTopics;
 	const cid = parseInt(req.query.cid, 10);
-	const topicTitle = topicData && topicData.title ? topicData.title.replace(/%/g, '%').replace(/,/g, ',') : validator.escape(String(req.query.title || ''));
+	const topicTitle = topicData && topicData.title ?
+		topicData.title :
+		validator.escape(String(req.query.title || ''));
 	return {
 		req: req,
 		res: res,
@@ -197,6 +202,13 @@ plugin.filterComposerBuild = async function (hookData) {
 			// can't use title property as that is used for page title
 			topicTitle: topicTitle,
 			titleLength: topicTitle ? topicTitle.length : 0,
+			titleLabel: translator.compile(
+				isEditing ?
+					'topic:composer.editing-in' :
+					'topic:composer.replying-to',
+				`"${topicTitle}"`
+			),
+
 			topic: topicData,
 			thumb: topicData ? topicData.thumb : '',
 			body: body,

package/package.json

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

package/static/lib/composer.js

@@ -444,18 +444,19 @@ define('composer', [
 		var isGuestPost = postData ? parseInt(postData.uid, 10) === 0 : false;
 		const isScheduled = postData.timestamp > Date.now();
 
-		// see
-		// https://github.com/NodeBB/NodeBB/issues/2994 and
-		// https://github.com/NodeBB/NodeBB/issues/1951
-		// remove when 1951 is resolved
-
-		var title = postData.title.replace(/%/g, '%').replace(/,/g, ',');
 		postData.category = await getSelectedCategory(postData);
 		const privileges = postData.category ? postData.category.privileges : ajaxify.data.privileges;
 		const topicTemplate = isTopic && postData.category ? postData.category.topicTemplate : '';
-		var data = {
-			topicTitle: title,
-			titleLength: title.length,
+
+		let data = {
+			topicTitle: postData.title,
+			titleLength: postData.title.length,
+			titleLabel: translator.compile(
+				isEditing ?
+					'topic:composer.editing-in' :
+					'topic:composer.replying-to',
+				`"${postData.title}"`
+			),
 			body: utils.escapeHTML(translator.escape(postData.body) || topicTemplate),
 			mobile: composer.bsEnvironment === 'xs' || composer.bsEnvironment === 'sm',
 			resizable: true,

package/static/templates/composer.tpl

@@ -12,7 +12,7 @@
 			</div>
 			{{{ end }}}
 			{{{ if !isTopicOrMain }}}
-			<h4 class="title text-bg-primary">{{{ if isEditing }}}[[topic:composer.editing-in, "{topicTitle}"]]{{{ else }}}[[topic:composer.replying-to, "{topicTitle}"]]{{{ end }}}</h4>
+			<h4 class="title text-bg-primary">{titleLabel}</h4>
 			{{{ end }}}
 			<div class="display-scheduler p-2 {{{ if !canSchedule }}} hidden{{{ end }}}">
 				<i class="fa fa-clock-o"></i>

package/static/templates/partials/composer-title-container.tpl

@@ -15,7 +15,7 @@
 		{{{ if isTopicOrMain }}}
 		<input class="title form-control h-100 rounded-1 shadow-none" type="text" placeholder="[[topic:composer.title-placeholder]]" value="{topicTitle}" />
 		{{{ else }}}
-		<span class="{{{ if !template.compose }}}d-none d-md-block{{{ else }}}d-block{{{ end }}} title h-100 text-truncate">{{{ if isEditing }}}[[topic:composer.editing-in, "{topicTitle}"]]{{{ else }}}[[topic:composer.replying-to, "{topicTitle}"]]{{{ end }}}</span>
+		<span class="{{{ if !template.compose }}}d-none d-md-block{{{ else }}}d-block{{{ end }}} title h-100 text-truncate">{titleLabel}</span>
 		{{{ end }}}
 		<div id="quick-search-container" class="quick-search-container mt-2 dropdown-menu d-block p-2 hidden">
 			<div class="text-center loading-indicator"><i class="fa fa-spinner fa-spin"></i></div>