nodebb-plugin-composer-default 7.0.10 → 7.0.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-composer-default",
-  "version": "7.0.10",
+  "version": "7.0.14",
   "description": "Default composer for NodeBB",
   "main": "library.js",
   "repository": {
@@ -26,11 +26,11 @@
   },
   "readmeFilename": "README.md",
   "nbbpm": {
-    "compatibility": "^1.17.2"
+    "compatibility": "^1.18.6"
   },
   "dependencies": {
     "screenfull": "^5.0.2",
-    "validator": "^13.1.17"
+    "validator": "^13.7.0"
   },
   "devDependencies": {
     "eslint": "^7.32.0",

package/static/less/composer.less

@@ -107,6 +107,14 @@
 		.composer-submit, .composer-discard {
 			min-width: 106px;
 		}
+
+		.action-bar {
+			.dropdown-menu:empty {
+				& ~ .dropdown-toggle {
+					display: none;
+				}
+			}
+		}
 	}
 
 	.display-scheduler {

package/static/lib/composer.js

@@ -19,8 +19,12 @@ define('composer', [
 	'api',
 	'bootbox',
 	'hooks',
+	'messages',
+	'search',
 ], function (taskbar, translator, uploads, formatting, drafts, tags,
-	categoryList, preview, resize, autocomplete, scheduler, scrollStop, topicThumbs, api, bootbox, hooks) {
+	categoryList, preview, resize, autocomplete, scheduler, scrollStop,
+	topicThumbs, api, bootbox, hooks, messagesModule, search
+) {
 	var composer = {
 		active: undefined,
 		posts: {},
@@ -482,6 +486,13 @@ define('composer', [
 			tagWhitelist: postData.category ? postData.category.tagWhitelist : ajaxify.data.tagWhitelist,
 			privileges: app.user.privileges,
 			selectedCategory: postData.category,
+			submitOptions: [
+				// Add items using `filter:composer.create`, or just add them to the <ul> in DOM
+				// {
+				// 	action: 'foobar',
+				// 	text: 'Text Label',
+				// }
+			],
 		};
 
 		if (data.mobile) {
@@ -602,7 +613,7 @@ define('composer', [
 			return;
 		}
 
-		app.enableTopicSearch({
+		search.enableQuickSearch({
 			searchElements: {
 				inputEl: postContainer.find('input.title'),
 				resultEl: postContainer.find('.quick-search-container'),
@@ -784,7 +795,7 @@ define('composer', [
 				composer.load(post_uuid);
 				textareaEl.prop('readonly', false);
 				if (err.message === '[[error:email-not-confirmed]]') {
-					return app.showEmailConfirmWarning(err);
+					return messagesModule.showEmailConfirmWarning(err.message);
 				}
 				composerAlert(post_uuid, err.message);
 			});

package/static/templates/composer.tpl

@@ -54,7 +54,12 @@
 			<div class="btn-group pull-right action-bar hidden-sm hidden-xs">
 				<button class="btn btn-default composer-discard" data-action="discard" tabindex="-1"><i class="fa fa-times"></i> [[topic:composer.discard]]</button>
 
+				<ul class="dropdown-menu">{{{ each submitOptions }}}<li><a href="#" data-action="{./action}">{./text}</a></li>{{{ end }}}</ul>
 				<button class="btn btn-primary composer-submit" data-action="post" tabindex="6" data-text-variant=" [[topic:composer.schedule]]"><i class="fa fa-check"></i> [[topic:composer.submit]]</button>
+				<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+					<span class="caret"></span>
+					<span class="sr-only">[[topic:composer.additional-options]]</span>
+				</button>
 			</div>
 		</div>