nodebb-plugin-composer-default 11.0.0 → 11.0.2

package/package.json

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

package/static/lib/composer/scheduler.js

@@ -21,8 +21,6 @@ define('composer/scheduler', ['benchpress', 'modals', 'alerts', 'translator'], f
 
 	const dropdownDisplayBtn = {
 		el: null,
-		defaultText: '',
-		activeText: '',
 	};
 
 	const submitBtn = {
@@ -40,11 +38,6 @@ define('composer/scheduler', ['benchpress', 'modals', 'alerts', 'translator'], f
 		state.timestamp = 0;
 		state.posts = posts;
 
-		translator.translateKeys(['[[topic:composer.post-later]]', '[[modules:composer.change-schedule-date]]']).then((translated) => {
-			dropdownDisplayBtn.defaultText = translated[0];
-			dropdownDisplayBtn.activeText = translated[1];
-		});
-
 		displayBtnCons = $postContainer[0].querySelectorAll('.display-scheduler');
 		displayBtns = $postContainer[0].querySelectorAll('.display-scheduler i');
 		dropdownDisplayBtn.el = $postContainer[0].querySelector('.dropdown-item.display-scheduler');
@@ -179,14 +172,16 @@ define('composer/scheduler', ['benchpress', 'modals', 'alerts', 'translator'], f
 		state.timestamp = 0;
 	}
 
-	function toggleItems(active = true) {
+	async function toggleItems(active = true) {
 		displayBtns.forEach(btn => btn.classList.toggle('active', active));
 		if (submitBtn.icon) {
 			submitBtn.icon.classList.toggle('fa-check', !active);
 			submitBtn.icon.classList.toggle('fa-clock-o', active);
 		}
 		if (dropdownDisplayBtn.el) {
-			dropdownDisplayBtn.el.textContent = active ? dropdownDisplayBtn.activeText : dropdownDisplayBtn.defaultText;
+			dropdownDisplayBtn.el.textContent = active ?
+				await translator.translateKey('[[modules:composer.change-schedule-date]]') :
+				await translator.translateKey('[[topic:composer.post-later]]');
 			cancelBtn.classList.toggle('hidden', !active);
 		}
 		// Toggle submit button text

package/static/lib/composer.js

@@ -686,15 +686,15 @@ define('composer', [
 
 		if (uploads.inProgress[post_uuid] && uploads.inProgress[post_uuid].length) {
 			return composerAlert(post_uuid, '[[error:still-uploading]]');
-		} else if (checkTitle && payload.titleLen < parseInt(config.minimumTitleLength, 10)) {
+		} else if (!app.user.isAdmin && checkTitle && payload.titleLen < parseInt(config.minimumTitleLength, 10)) {
 			return composerAlert(post_uuid, '[[error:title-too-short, ' + config.minimumTitleLength + ']]');
-		} else if (checkTitle && payload.titleLen > parseInt(config.maximumTitleLength, 10)) {
+		} else if (!app.user.isAdmin && checkTitle && payload.titleLen > parseInt(config.maximumTitleLength, 10)) {
 			return composerAlert(post_uuid, '[[error:title-too-long, ' + config.maximumTitleLength + ']]');
 		} else if (action === 'topics.post' && !isCategorySelected) {
 			return composerAlert(post_uuid, '[[error:category-not-selected]]');
-		} else if (payload.bodyLen < parseInt(config.minimumPostLength, 10)) {
+		} else if (!app.user.isAdmin && payload.bodyLen < parseInt(config.minimumPostLength, 10)) {
 			return composerAlert(post_uuid, '[[error:content-too-short, ' + config.minimumPostLength + ']]');
-		} else if (payload.bodyLen > parseInt(config.maximumPostLength, 10)) {
+		} else if (!app.user.isAdmin && payload.bodyLen > parseInt(config.maximumPostLength, 10)) {
 			return composerAlert(post_uuid, '[[error:content-too-long, ' + config.maximumPostLength + ']]');
 		} else if (checkTitle && !tags.isEnoughTags(post_uuid)) {
 			return composerAlert(post_uuid, '[[error:not-enough-tags, ' + tags.minTagCount() + ']]');

package/static/scss/composer.scss

@@ -369,12 +369,9 @@
 	}
 }
 
-@include media-breakpoint-up(md) {
-	// without this formatting elements that are dropdowns are not visible on desktop.
-	// on mobile dropdowns use bottom-sheet and overflow is auto
-	.formatting-group {
-		overflow: visible!important;
-	}
+// without this formatting elements that are dropdowns are not visible
+.formatting-group:has([aria-expanded="true"]) {
+	overflow:visible!important;
 }
 
 @import './zen-mode';

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

@@ -1,5 +1,5 @@
 <div class="d-flex justify-content-between gap-2 align-items-center formatting-bar m-0">
-	<ul class="list-unstyled mb-0 d-flex formatting-group gap-2 overflow-auto">
+	<ul class="list-unstyled mb-0 d-flex formatting-group gap-2 overflow-auto ghost-scrollbar" style="min-width: 0;">
 		{{{ each formatting }}}
 			{{{ if ./spacer }}}
 			<li class="small spacer"></li>

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

@@ -42,10 +42,16 @@
 					<span class="visually-hidden">[[topic:composer.additional-options]]</span>
 				</button>
 				<ul class="dropdown-menu dropdown-menu-end p-1" role="menu">
-					<li><a class="dropdown-item rounded-1 display-scheduler {{{ if !canSchedule }}}hidden{{{ end }}}" role="menuitem">[[topic:composer.post-later]]</a></li>
-					<li><a class="dropdown-item rounded-1 cancel-scheduling hidden" role="menuitem">[[modules:composer.cancel-scheduling]]</a></li>
+					<li>
+						<a class="dropdown-item rounded-1 display-scheduler {{{ if !canSchedule }}}hidden{{{ end }}}" role="menuitem">[[topic:composer.post-later]]</a>
+					</li>
+					<li>
+						<a class="dropdown-item rounded-1 cancel-scheduling hidden" role="menuitem">[[modules:composer.cancel-scheduling]]</a>
+					</li>
 					{{{ each submitOptions }}}
-					<li><a class="dropdown-item rounded-1" href="#" data-action="{./action}" role="menuitem">{{./text}}</a></li>
+					<li>
+						<a class="dropdown-item rounded-1" href="#" data-action="{./action}" role="menuitem">{{./text}}</a>
+					</li>
 					{{{ end }}}
 				</ul>
 			</div>