nodebb-plugin-composer-default 10.2.28 → 10.2.30

package/library.js

@@ -236,16 +236,18 @@ function generateDiscardRoute(req, topicData) {
 }
 
 async function generateBody(req, postData) {
+	let body = '';
 	// Quoted reply
 	if (req.query.toPid && parseInt(req.query.quoted, 10) === 1 && postData) {
 		const username = await user.getUserField(postData.uid, 'username');
 		const translated = await translator.translate(`[[modules:composer.user-said, ${username}]]`);
-		return `${translated}\n` +
+		body = `${translated}\n` +
 			`> ${postData ? `${postData.content.replace(/\n/g, '\n> ')}\n\n` : ''}`;
 	} else if (req.query.body || req.query.content) {
-		return validator.escape(String(req.query.body || req.query.content));
+		body = validator.escape(String(req.query.body || req.query.content));
 	}
-	return postData ? postData.content : '';
+	body = postData ? postData.content : '';
+	return translator.escape(body);
 }
 
 async function getPostData(req) {

package/package.json

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

package/static/lib/composer/uploads.js

@@ -229,7 +229,8 @@ define('composer/uploads', [
 						}
 					}
 					preview.render(postContainer);
-					textarea.selectRange(cursorPosition + textarea.val().length - textLen);
+					textarea.prop('selectionEnd', cursorPosition + textarea.val().length - textLen);
+					textarea.focus();
 					postContainer.find('[data-action="post"]').prop('disabled', false);
 					$(window).trigger('action:composer.upload', {
 						post_uuid: post_uuid,