nodebb-plugin-composer-default 10.2.22 → 10.2.24

package/library.js

@@ -85,7 +85,7 @@ plugin.getFormattingOptions = async function () {
 			},
 			{
 				name: 'zen',
-				title: '[[modules:composer.zen_mode]]',
+				title: '[[modules:composer.zen-mode]]',
 				className: 'fa fa-arrows-alt',
 				visibility: defaultVisibility,
 			},
@@ -94,7 +94,7 @@ plugin.getFormattingOptions = async function () {
 	if (parseInt(meta.config.allowTopicsThumbnail, 10) === 1) {
 		payload.options.push({
 			name: 'thumbs',
-			title: '[[topic:composer.thumb_title]]',
+			title: '[[topic:composer.thumb-title]]',
 			className: 'fa fa-address-card-o',
 			badge: true,
 			visibility: {
@@ -239,7 +239,7 @@ async function generateBody(req, postData) {
 	// 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}]]`);
+		const translated = await translator.translate(`[[modules:composer.user-said, ${username}]]`);
 		return `${translated}\n` +
 			`> ${postData ? `${postData.content.replace(/\n/g, '\n> ')}\n\n` : ''}`;
 	} else if (req.query.body || req.query.content) {

package/package.json

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

package/static/lib/composer/categoryList.js

@@ -40,7 +40,7 @@ define('composer/categoryList', [
 
 		// this is the mobile category selector
 		postContainer.find('.category-name')
-			.translateText(selector.selectedCategory ? selector.selectedCategory.name : '[[modules:composer.select_category]]')
+			.translateText(selector.selectedCategory ? selector.selectedCategory.name : '[[modules:composer.select-category]]')
 			.on('click', function () {
 				categorySelector.modal({
 					privilege: 'topics:create',

package/static/lib/composer/formatting.js

@@ -90,11 +90,20 @@ define('composer/formatting', [
 			}
 			fileForm.before(markup);
 		});
-		formattingBarEl.tooltip({
-			selector: '.formatting-group>li',
+
+		const els = formattingBarEl.find('.formatting-group>li');
+		els.tooltip({
 			container: '#content',
 			animation: false,
-			trigger: 'hover',
+			trigger: 'manual',
+		}).on('mouseenter', function (ev) {
+			const target = $(ev.target);
+			const isDropdown = target.hasClass('dropdown-menu') || !!target.parents('.dropdown-menu').length;
+			if (!isDropdown) {
+				$(this).tooltip('show');
+			}
+		}).on('click mouseleave', function () {
+			$(this).tooltip('hide');
 		});
 	};
 

package/static/lib/composer.js

@@ -144,9 +144,9 @@ define('composer', [
 			return composer.load(existingUUID);
 		}
 
-		var actionText = '[[topic:composer.new_topic]]';
+		var actionText = '[[topic:composer.new-topic]]';
 		if (post.action === 'posts.reply') {
-			actionText = '[[topic:composer.replying_to]]';
+			actionText = '[[topic:composer.replying-to]]';
 		} else if (post.action === 'posts.edit') {
 			actionText = '[[topic:composer.editing-in]]';
 		}
@@ -234,14 +234,14 @@ define('composer', [
 					tid: data.tid,
 					toPid: data.toPid,
 					title: data.title,
-					body: '[[modules:composer.user_said_in, ' + data.username + ', ' + link + ']]\n' + data.body,
+					body: '[[modules:composer.user-said-in, ' + data.username + ', ' + link + ']]\n' + data.body,
 				});
 			} else {
 				composer.newReply({
 					tid: data.tid,
 					toPid: data.toPid,
 					title: data.title,
-					body: '[[modules:composer.user_said, ' + data.username + ']]\n' + data.body,
+					body: '[[modules:composer.user-said, ' + data.username + ']]\n' + data.body,
 				});
 			}
 			return;
@@ -254,9 +254,9 @@ define('composer', [
 		var bodyEl = postContainer.find('textarea');
 		var prevText = bodyEl.val();
 		if (data.title && (data.selectedPid || data.toPid)) {
-			translator.translate('[[modules:composer.user_said_in, ' + data.username + ', ' + link + ']]\n', config.defaultLang, onTranslated);
+			translator.translate('[[modules:composer.user-said-in, ' + data.username + ', ' + link + ']]\n', config.defaultLang, onTranslated);
 		} else {
-			translator.translate('[[modules:composer.user_said, ' + data.username + ']]\n', config.defaultLang, onTranslated);
+			translator.translate('[[modules:composer.user-said, ' + data.username + ']]\n', config.defaultLang, onTranslated);
 		}
 
 		function onTranslated(translated) {

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">{{{ if isEditing }}}[[topic:composer.editing-in, "{topicTitle}"]]{{{ else }}}[[topic:composer.replying-to, "{topicTitle}"]]{{{ end }}}</h4>
 			{{{ end }}}
 			<div class="display-scheduler p-2 {{{ if !canSchedule }}} hidden{{{ end }}}">
 				<i class="fa fa-clock-o"></i>
@@ -32,7 +32,7 @@
 			<!-- IMPORT partials/composer-tags.tpl -->
 			{{{ end }}}
 
-			<div class="imagedrop"><div>[[topic:composer.drag_and_drop_images]]</div></div>
+			<div class="imagedrop"><div>[[topic:composer.drag-and-drop-images]]</div></div>
 
 			<div class="resizer position-absolute w-100 bottom-100 pe-3 border-bottom">
 				<div class="trigger text-center">

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

@@ -54,8 +54,8 @@
 		<div class="draft-icon m-2 hidden-xs hidden-sm"></div>
 		<button class="btn btn-sm btn-link py-2 text-body fw-semibold text-nowrap" data-action="preview">
 			<i class="fa fa-eye"></i>
-			<span class="d-none d-md-inline show-text">[[modules:composer.show_preview]]</span>
-			<span class="d-none d-md-inline hide-text">[[modules:composer.hide_preview]]</span>
+			<span class="d-none d-md-inline show-text">[[modules:composer.show-preview]]</span>
+			<span class="d-none d-md-inline hide-text">[[modules:composer.hide-preview]]</span>
 		</button>
 		{{{ if composer:showHelpTab }}}
 		<button class="btn btn-sm btn-link py-2 text-body fw-semibold text-nowrap" data-action="help">

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

@@ -3,7 +3,7 @@
 		<div class="btn-group dropup me-2 {{{ if !tagWhitelist.length }}}hidden{{{ end }}}" component="composer/tag/dropdown">
 			<button class="btn btn-sm btn-link text-body dropdown-toggle" data-bs-toggle="dropdown" type="button">
 				<span class="visible-sm-inline visible-md-inline visible-lg-inline"><i class="fa fa-tags"></i></span>
-				[[tags:select_tags]]
+				[[tags:select-tags]]
 			</button>
 
 			<ul class="dropdown-menu">
@@ -12,6 +12,6 @@
 				<!-- END tagWhitelist -->
 			</ul>
 		</div>
-		<input class="tags" type="text" class="" placeholder="[[tags:enter_tags_here, {minimumTagLength}, {maximumTagLength}]]" tabindex="5" />
+		<input class="tags" type="text" class="" placeholder="[[tags:enter-tags-here, {minimumTagLength}, {maximumTagLength}]]" tabindex="5" />
 	</div>
 </div>

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

@@ -7,14 +7,14 @@
 
 	{{{ if showHandleInput }}}
 	<div data-component="composer/handle">
-		<input class="handle form-control h-100 border-0 shadow-none" type="text" tabindex="1" placeholder="[[topic:composer.handle_placeholder]]" value="{handle}" />
+		<input class="handle form-control h-100 border-0 shadow-none" type="text" tabindex="1" placeholder="[[topic:composer.handle-placeholder]]" value="{handle}" />
 	</div>
 	{{{ end }}}
 	<div data-component="composer/title" class="position-relative flex-1" style="min-width: 0;">
 		{{{ if isTopicOrMain }}}
-		<input class="title form-control h-100 rounded-1 shadow-none" type="text" tabindex="1" placeholder="[[topic:composer.title_placeholder]]" value="{topicTitle}"/>
+		<input class="title form-control h-100 rounded-1 shadow-none" type="text" tabindex="1" placeholder="[[topic:composer.title-placeholder]]" value="{topicTitle}"/>
 		{{{ else }}}
-		<span class="d-none d-md-block title h-100 text-truncate">{{{ if isEditing }}}[[topic:composer.editing-in, "{topicTitle}"]]{{{ else }}}[[topic:composer.replying_to, "{topicTitle}"]]{{{ end }}}</span>
+		<span class="d-none d-md-block title h-100 text-truncate">{{{ if isEditing }}}[[topic:composer.editing-in, "{topicTitle}"]]{{{ else }}}[[topic:composer.replying-to, "{topicTitle}"]]{{{ end }}}</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>