nodebb-plugin-composer-default 10.0.44 → 10.0.46

package/package.json

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

package/static/lib/composer/scheduler.js

@@ -10,6 +10,9 @@ define('composer/scheduler', ['benchpress', 'bootbox', 'alerts'], function (Benc
 	};
 	let displayBtnCons = [];
 	let displayBtns;
+	let submitContainer;
+	let submitOptionsCon;
+
 	const submitBtn = {
 		el: null,
 		icon: null,
@@ -27,6 +30,8 @@ define('composer/scheduler', ['benchpress', 'bootbox', 'alerts'], function (Benc
 
 		displayBtnCons = $postContainer[0].querySelectorAll('.display-scheduler');
 		displayBtns = $postContainer[0].querySelectorAll('.display-scheduler i');
+		submitContainer = $postContainer.find('[component="composer/submit/container"]');
+		submitOptionsCon = $postContainer.find('[component="composer/submit/options/container"]');
 
 		submitBtn.el = $postContainer[0].querySelector('.composer-submit:not(.btn-sm)');
 		submitBtn.icon = submitBtn.el.querySelector('i');
@@ -58,6 +63,9 @@ define('composer/scheduler', ['benchpress', 'bootbox', 'alerts'], function (Benc
 	scheduler.onChangeCategory = function (categoryData) {
 		toggleDisplayButtons(categoryData.privileges['topics:schedule']);
 		toggleItems(false);
+		const optionsVisible = categoryData.privileges['topics:schedule'] || submitOptionsCon.attr('data-submit-options') > 0;
+		submitContainer.find('.composer-submit').toggleClass('rounded-1', !optionsVisible);
+		submitOptionsCon.toggleClass('hidden', !optionsVisible);
 		scheduler.reset();
 	};
 

package/static/lib/composer.js

@@ -332,9 +332,6 @@ define('composer', [
 			postContainer.attr('data-uuid', post_uuid);
 		}
 
-		var bodyEl = postContainer.find('textarea');
-		var submitBtn = postContainer.find('.composer-submit');
-
 		categoryList.init(postContainer, composer.posts[post_uuid]);
 		scheduler.init(postContainer, composer.posts);
 
@@ -350,7 +347,7 @@ define('composer', [
 			composer.posts[post_uuid].modified = true;
 		});
 
-		submitBtn.on('click', function (e) {
+		postContainer.on('click', '.composer-submit', function (e) {
 			e.preventDefault();
 			e.stopPropagation();	// Other click events bring composer back to active state which is undesired on submit
 
@@ -360,7 +357,7 @@ define('composer', [
 
 		require(['mousetrap'], function (mousetrap) {
 			mousetrap(postContainer.get(0)).bind('mod+enter', function () {
-				submitBtn.attr('disabled', true);
+				postContainer.find('.composer-submit').attr('disabled', true);
 				post(post_uuid);
 			});
 		});
@@ -393,11 +390,12 @@ define('composer', [
 			composer.minimize(post_uuid);
 		});
 
-		bodyEl.on('input propertychange', utils.debounce(function () {
+		const textareaEl = postContainer.find('textarea');
+		textareaEl.on('input propertychange', utils.debounce(function () {
 			preview.render(postContainer);
 		}, 250));
 
-		bodyEl.on('scroll', function () {
+		textareaEl.on('scroll', function () {
 			preview.matchScroll(postContainer);
 		});
 

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

@@ -25,19 +25,20 @@
 	<div class="d-none d-md-flex action-bar gap-1 align-items-center">
 		<button class="btn btn-sm btn-link text-body fw-semibold composer-minimize" data-action="hide" tabindex="-1"><i class="fa fa-angle-down"></i> [[topic:composer.hide]]</button>
 		<button class="btn btn-sm btn-link composer-discard text-body fw-semibold" data-action="discard" tabindex="-1"><i class="fa fa-trash"></i> [[topic:composer.discard]]</button>
-		<div class="btn-group btn-group-sm">
-			<button class="btn btn-primary composer-submit fw-bold" data-action="post" tabindex="6" data-text-variant=" [[topic:composer.schedule]]"><i class="fa fa-check"></i> [[topic:composer.submit]]</button>
-			{{{ if (submitOptions.length || canSchedule) }}}
-			<button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-				<i class="fa fa-caret-down"></i>
-				<span class="sr-only">[[topic:composer.additional-options]]</span>
-			</button>
-			<ul class="dropdown-menu dropdown-menu-end">
-				<li><a class="dropdown-item display-scheduler ">Post Later</a></li>
-				{{{ each submitOptions }}}
-				<li><a class="dropdown-item" href="#" data-action="{./action}">{./text}</a></li>
-				{{{ end }}}</ul>
-			{{{ end }}}
+		<div class="btn-group btn-group-sm" component="composer/submit/container">
+			<button class="btn btn-primary composer-submit fw-bold {{{ if !(submitOptions.length || canSchedule) }}}rounded-1{{{ end }}}" data-action="post" tabindex="6" data-text-variant=" [[topic:composer.schedule]]"><i class="fa fa-check"></i> [[topic:composer.submit]]</button>
+			<div component="composer/submit/options/container" data-submit-options="{submitOptions.length}" class="btn-group btn-group-sm {{{ if !(submitOptions.length || canSchedule) }}}hidden{{{ end }}}">
+				<button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+					<i class="fa fa-caret-down"></i>
+					<span class="sr-only">[[topic:composer.additional-options]]</span>
+				</button>
+				<ul class="dropdown-menu dropdown-menu-end p-1">
+					<li><a class="dropdown-item rounded-1 display-scheduler {{{ if !canSchedule }}}hidden{{{ end }}}">[[topic:composer.post-later]]</a></li>
+					{{{ each submitOptions }}}
+					<li><a class="dropdown-item rounded-1" href="#" data-action="{./action}">{./text}</a></li>
+					{{{ end }}}
+				</ul>
+			</div>
 		</div>
 	</div>
 </div>