nodebb-plugin-composer-default 10.3.1 → 10.3.3

package/package.json

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

package/static/lib/composer/uploads.js

@@ -226,7 +226,7 @@ define('composer/uploads', [
 			'[[error:parse-error]]';
 
 		if (xhr && xhr.status === 413) {
-			msg = xhr.statusText || 'Request Entity Too Large';
+			msg = '[[error:api.413]]';
 		}
 		alerts.error(msg);
 		$(window).trigger('action:composer.uploadError', {

package/static/lib/composer.js

@@ -52,16 +52,14 @@ define('composer', [
 				return;
 			}
 
-			translator.translate('[[modules:composer.discard]]', function (translated) {
-				composer.discardConfirm = bootbox.confirm(translated, function (confirm) {
-					if (confirm) {
-						composer.discard(composer.active);
-					} else {
-						composer.posts[composer.active].modified = true;
-					}
-				});
-				composer.posts[composer.active].modified = false;
+			composer.discardConfirm = bootbox.confirm('[[modules:composer.discard]]', function (confirm) {
+				if (confirm) {
+					composer.discard(composer.active);
+				} else {
+					composer.posts[composer.active].modified = true;
+				}
 			});
+			composer.posts[composer.active].modified = false;
 		}
 	});
 
@@ -378,15 +376,13 @@ define('composer', [
 
 			formatting.exitFullscreen();
 
-			var btn = $(this).prop('disabled', true);
-			translator.translate('[[modules:composer.discard]]', function (translated) {
-				bootbox.confirm(translated, function (confirm) {
-					if (confirm) {
-						composer.discard(post_uuid);
-						removeComposerHistory();
-					}
-					btn.prop('disabled', false);
-				});
+			const btn = $(this).prop('disabled', true);
+			bootbox.confirm('[[modules:composer.discard]]', function (confirm) {
+				if (confirm) {
+					composer.discard(post_uuid);
+					removeComposerHistory();
+				}
+				btn.prop('disabled', false);
 			});
 		});
 
@@ -460,11 +456,11 @@ define('composer', [
 		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 : null;
+		const topicTemplate = isTopic && postData.category ? postData.category.topicTemplate : '';
 		var data = {
 			topicTitle: title,
 			titleLength: title.length,
-			body: translator.escape(utils.escapeHTML(topicTemplate || postData.body)),
+			body: translator.escape(utils.escapeHTML(postData.body || topicTemplate)),
 			mobile: composer.bsEnvironment === 'xs' || composer.bsEnvironment === 'sm',
 			resizable: true,
 			thumb: postData.thumb,