nodebb-plugin-composer-default 10.2.12 → 10.2.14

package/package.json

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

package/static/lib/composer/drafts.js

@@ -107,7 +107,7 @@ define('composer/drafts', ['api', 'alerts'], function (api, alerts) {
 					draftData.toPid = postData.toPid;
 				} else if (postData.action === 'posts.edit') {
 					draftData.pid = postData.pid;
-					draftData.title = title;
+					draftData.title = title || postData.title;
 				}
 				if (!app.user.uid) {
 					draftData.handle = postContainer.find('input.handle').val();
@@ -284,7 +284,7 @@ define('composer/drafts', ['api', 'alerts'], function (api, alerts) {
 					cid: draft.cid,
 					handle: app.user && app.user.uid ? undefined : utils.escapeHTML(draft.handle),
 					title: utils.escapeHTML(draft.title),
-					body: utils.escapeHTML(draft.text),
+					body: draft.text,
 					tags: String(draft.tags || '').split(','),
 				});
 			} else if (draft.action === 'posts.reply') {
@@ -298,7 +298,7 @@ define('composer/drafts', ['api', 'alerts'], function (api, alerts) {
 						tid: draft.tid,
 						toPid: draft.toPid,
 						title: topicObj.title,
-						body: utils.escapeHTML(draft.text),
+						body: draft.text,
 					});
 				});
 			} else if (draft.action === 'posts.edit') {
@@ -306,7 +306,7 @@ define('composer/drafts', ['api', 'alerts'], function (api, alerts) {
 					save_id: draft.save_id,
 					pid: draft.pid,
 					title: draft.title ? utils.escapeHTML(draft.title) : undefined,
-					body: utils.escapeHTML(draft.text),
+					body: draft.text,
 				});
 			}
 		});

package/static/lib/composer/formatting.js

@@ -75,7 +75,8 @@ define('composer/formatting', [
 	};
 
 	formatting.addComposerButtons = function () {
-		const fileForm = $('.formatting-bar .formatting-group #fileForm');
+		const formattingBarEl = $('.formatting-bar');
+		const fileForm = formattingBarEl.find('.formatting-group #fileForm');
 		buttons.forEach((btn) => {
 			let markup = ``;
 			if (Array.isArray(btn.dropdownItems) && btn.dropdownItems.length) {
@@ -89,6 +90,12 @@ define('composer/formatting', [
 			}
 			fileForm.before(markup);
 		});
+		formattingBarEl.tooltip({
+			selector: '.formatting-group>li',
+			container: '#content',
+			animation: false,
+			trigger: 'hover',
+		});
 	};
 
 	function generateFormattingDropdown(btn) {
@@ -107,8 +114,8 @@ define('composer/formatting', [
 			`;
 		});
 		return `
-			<li class="dropdown bottom-sheet" tab-index="-1">
-				<button class="btn btn-sm btn-link text-reset" data-bs-toggle="dropdown" title="${btn.title}">
+			<li class="dropdown bottom-sheet" tab-index="-1" title="${btn.title}">
+				<button class="btn btn-sm btn-link text-reset" data-bs-toggle="dropdown" >
 					<i class="${btn.iconClass}"></i>
 				</button>
 				<ul class="dropdown-menu p-1">

package/static/templates/partials/composer-formatting.tpl

@@ -6,8 +6,8 @@
 			{{{ else }}}
 			{{{ if (./visibility.desktop && ((isTopicOrMain && ./visibility.main) || (!isTopicOrMain && ./visibility.reply))) }}}
 			{{{ if ./dropdownItems.length }}}
-			<li class="dropdown bottom-sheet" tabindex="-1">
-				<button class="btn btn-sm btn-link text-reset" data-bs-toggle="dropdown" title="{./title}">
+			<li class="dropdown bottom-sheet" tabindex="-1" title="{./title}">
+				<button class="btn btn-sm btn-link text-reset" data-bs-toggle="dropdown">
 					<i class="{./className}"></i>
 				</button>
 				<ul class="dropdown-menu p-1">