nodebb-plugin-composer-default 10.1.1 → 10.1.3

package/package.json

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

package/static/lib/composer/formatting.js

@@ -75,9 +75,17 @@ define('composer/formatting', [
 	};
 
 	formatting.addComposerButtons = function () {
-		for (var x = 0, numButtons = buttons.length; x < numButtons; x++) {
-			$('.formatting-bar .formatting-group #fileForm').before('<li tabindex="-1" data-format="' + buttons[x].name + '" title="' + (buttons[x].title || '') + '"><i class="' + buttons[x].iconClass + '"></i></li>');
-		}
+		const fileForm = $('.formatting-bar .formatting-group #fileForm');
+		buttons.forEach((btn) => {
+			fileForm
+				.before(`
+					<li class="small">
+						<a data-format="${btn.name}" title="${btn.title || ''}" href="#" class="btn btn-sm btn-link text-reset position-relative" tabindex="-1">
+							<i class="${btn.iconClass}"></i>
+						</a>
+					</li>
+				`);
+		});
 	};
 
 	formatting.addButton = function (iconClass, onClick, title, name) {
@@ -99,7 +107,7 @@ define('composer/formatting', [
 	};
 
 	formatting.addHandler = function (postContainer) {
-		postContainer.on('click', '.formatting-bar li a', function (event) {
+		postContainer.on('click', '.formatting-bar li', function (event) {
 			var format = $(this).attr('data-format');
 			var textarea = $(this).parents('[component="composer"]').find('textarea')[0];
 

package/static/lib/composer.js

@@ -419,7 +419,7 @@ define('composer', [
 
 		// Hide "zen mode" if fullscreen API is not enabled/available (ahem, iOS...)
 		if (!screenfull.isEnabled) {
-			$('[data-format="zen"]').parent().addClass('hidden');
+			$('[data-format="zen"]').addClass('hidden');
 		}
 
 		hooks.fire('action:composer.enhanced', { postContainer, postData, draft });

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

@@ -5,30 +5,24 @@
 			<li class="small spacer"></li>
 			{{{ else }}}
 			{{{ if (./visibility.desktop && ((isTopicOrMain && ./visibility.main) || (!isTopicOrMain && ./visibility.reply))) }}}
-			<li class="small">
-				<a href="#" class="btn btn-sm btn-link text-reset position-relative" tabindex="-1" data-format="{./name}" title="{./title}">
-					<i class="{./className}"></i>
-					{{{ if ./badge }}}
-					<span class="px-1 position-absolute top-0 start-100 translate-middle-x badge rounded text-bg-info"></span>
-					{{{ end }}}
-				</a>
+			<li class="btn btn-sm btn-link text-reset position-relative" tabindex="-1" data-format="{./name}" title="{./title}">
+				<i class="{./className}"></i>
+				{{{ if ./badge }}}
+				<span class="px-1 position-absolute top-0 start-100 translate-middle-x badge rounded text-bg-info"></span>
+				{{{ end }}}
 			</li>
 			{{{ end }}}
 			{{{ end }}}
 		{{{ end }}}
 
 		{{{ if privileges.upload:post:image }}}
-		<li class="img-upload-btn small">
-			<a href="#" class="btn btn-sm btn-link text-reset" data-format="picture" tabindex="-1" title="[[modules:composer.upload-picture]]">
-				<i class="fa fa-file-image-o"></i>
-			</a>
+		<li class="img-upload-btn btn btn-sm btn-link text-reset" data-format="picture" tabindex="-1" title="[[modules:composer.upload-picture]]">
+			<i class="fa fa-file-image-o"></i>
 		</li>
 		{{{ end }}}
 		{{{ if privileges.upload:post:file }}}
-		<li class="file-upload-btn small">
-			<a href="#" class="btn btn-sm btn-link text-reset" data-format="upload" tabindex="-1" title="[[modules:composer.upload-file]]">
-				<i class="fa fa-file-o"></i>
-			</a>
+		<li href="#" class="file-upload-btn btn btn-sm btn-link text-reset" data-format="upload" tabindex="-1" title="[[modules:composer.upload-file]]">
+			<i class="fa fa-file-o"></i>
 		</li>
 		{{{ end }}}