nodebb-plugin-composer-default 10.0.35 → 10.0.37

package/library.js

@@ -120,17 +120,12 @@ plugin.filterComposerBuild = async function (hookData) {
 	const { res } = hookData;
 
 	if (req.query.p) {
-		if (!res.locals.isAPI) {
-			let a;
-			try {
-				a = url.parse(req.query.p, true, true);
-			} catch (e) {
-				return helpers.redirect(res, '/');
-			}
+		try {
+			const a = url.parse(req.query.p, true, true);
 			return helpers.redirect(res, `/${(a.path || '').replace(/^\/*/, '')}`);
+		} catch (e) {
+			return helpers.redirect(res, '/');
 		}
-		res.render('', {});
-		return;
 	} else if (!req.query.pid && !req.query.tid && !req.query.cid) {
 		return helpers.redirect(res, '/');
 	}

package/package.json

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

package/static/templates/compose.tpl

@@ -1,17 +1,16 @@
-<div component="composer" class="composer<!-- IF resizable --> resizable<!-- ENDIF resizable --><!-- IF !isTopicOrMain --> reply<!-- ENDIF !isTopicOrMain -->"<!-- IF !disabled --> style="visibility: inherit;"<!-- ENDIF !disabled -->>
-
+<div component="composer" class="composer{{{ if resizable }}} resizable{{{ end }}}{{{ if !isTopicOrMain }}} reply{{{ end }}}"{{{ if !disabled }}} style="visibility: inherit;"{{{ end }}}>
 	<div class="composer-container">
 		<form id="compose-form" method="post">
-			<!-- IF pid -->
+			{{{ if pid }}}
 			<input type="hidden" name="pid" value="{pid}" />
 			<input type="hidden" name="thumb" value="{thumb}" />
-			<!-- ENDIF pid -->
-			<!-- IF tid -->
+			{{{ end }}}
+			{{{ if tid }}}
 			<input type="hidden" name="tid" value="{tid}" />
-			<!-- ENDIF tid -->
-			<!-- IF cid -->
+			{{{ end }}}
+			{{{ if cid }}}
 			<input type="hidden" name="cid" value="{cid}" />
-			<!-- ENDIF cid -->
+			{{{ end }}}
 			<input type="hidden" name="_csrf" value="{config.csrf_token}" />
 		</form>
 
@@ -21,8 +20,8 @@
 
 		<!-- IMPORT partials/composer-write-preview.tpl -->
 
-		<!-- IF isTopicOrMain -->
+		{{{ if isTopicOrMain }}}
 		<!-- IMPORT partials/composer-tags.tpl -->
-		<!-- ENDIF isTopicOrMain -->
+		{{{ end }}}
 	</div>
 </div>

package/static/templates/composer.tpl

@@ -1,5 +1,4 @@
-<div component="composer" class="composer <!-- IF resizable --> resizable<!-- ENDIF resizable --><!-- IF !isTopicOrMain --> reply<!-- ENDIF !isTopicOrMain -->">
-
+<div component="composer" class="composer {{{ if resizable }}} resizable{{{ end }}}{{{ if !isTopicOrMain }}} reply{{{ end }}}">
 	<div class="composer-container d-flex flex-column gap-1 h-100">
 		<!-- mobile header -->
 		<nav class="navbar fixed-top mobile-navbar hidden-md hidden-lg text-bg-primary flex-nowrap gap-1">
@@ -7,14 +6,14 @@
 				<button class="btn btn-sm btn-primary composer-discard" data-action="discard" tabindex="-1"><i class="fa fa-times"></i></button>
 				<button class="btn btn-sm btn-primary composer-minimize" data-action="minimize" tabindex="-1"><i class="fa fa-minus"></i></button>
 			</div>
-			<!-- IF isTopic -->
+			{{{ if isTopic }}}
 			<div class="category-name-container">
 				<span class="category-name"></span> <i class="fa fa-sort"></i>
 			</div>
-			<!-- ENDIF isTopic -->
-			<!-- IF !isTopicOrMain -->
+			{{{ end }}}
+			{{{ if !isTopicOrMain }}}
 			<h4 class="title text-bg-primary">[[topic:composer.replying_to, "{topicTitle}"]]</h4>
-			<!-- ENDIF !isTopicOrMain -->
+			{{{ end }}}
 			<div class="display-scheduler p-2 {{{ if !canSchedule }}} hidden{{{ end }}}">
 				<i class="fa fa-clock-o"></i>
 			</div>
@@ -29,9 +28,9 @@
 
 			<!-- IMPORT partials/composer-write-preview.tpl -->
 
-			<!-- IF isTopicOrMain -->
+			{{{ if isTopicOrMain }}}
 			<!-- IMPORT partials/composer-tags.tpl -->
-			<!-- ENDIF isTopicOrMain -->
+			{{{ end }}}
 
 			<div class="imagedrop"><div>[[topic:composer.drag_and_drop_images]]</div></div>
 

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

@@ -1,33 +1,33 @@
 <div class="d-flex justify-content-between gap-2 align-items-center formatting-bar">
 	<ul class="list-unstyled mb-0 d-flex formatting-group gap-2 overflow-auto">
-		<!-- BEGIN formatting -->
-			<!-- IF formatting.spacer -->
+		{{{ each formatting }}}
+			{{{ if ./spacer }}}
 			<li class="small spacer"></li>
-			<!-- ELSE -->
+			{{{ else }}}
 			{{{ if (./visibility.desktop && ((isTopicOrMain && ./visibility.main) || (!isTopicOrMain && ./visibility.reply))) }}}
 			<li class="small">
-				<a href="#" class="btn btn-sm btn-link text-reset" tabindex="-1" data-format="{formatting.name}" title="{formatting.title}">
-					<i class="{formatting.className}"></i>
+				<a href="#" class="btn btn-sm btn-link text-reset" tabindex="-1" data-format="{./name}" title="{./title}">
+					<i class="{./className}"></i>
 				</a>
 			</li>
 			{{{ end }}}
-			<!-- ENDIF formatting.spacer -->
-		<!-- END formatting -->
+			{{{ end }}}
+		{{{ end }}}
 
-		<!-- IF privileges.upload:post:image -->
+		{{{ 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>
-		<!-- ENDIF privileges.upload:post:image -->
-		<!-- IF privileges.upload:post:file -->
+		{{{ 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>
-		<!-- ENDIF privileges.upload:post:file -->
+		{{{ end }}}
 
 		<form id="fileForm" method="post" enctype="multipart/form-data">
 			<input type="file" id="files" name="files[]" multiple class="gte-ie9 hide"/>

package/static/templates/partials/composer-write-preview.tpl

@@ -1,9 +1,9 @@
-<div class="write-preview-container d-flex gap-2 flex-grow-1">
+<div class="write-preview-container d-flex gap-2 flex-grow-1 overflow-auto">
 	<div class="write-container d-flex d-md-flex w-50">
 		<div class="float-end draft-icon hidden-md hidden-lg"></div>
 		<textarea class="write shadow-none rounded-1 w-100 form-control" tabindex="4" placeholder="[[modules:composer.textarea.placeholder]]">{body}</textarea>
 	</div>
 	<div class="preview-container d-none d-md-flex w-50">
-		<div class="preview card card-body bg-light rounded-1"></div>
+		<div class="preview card card-body bg-light rounded-1 overflow-auto"></div>
 	</div>
 </div>