nodebb-plugin-composer-default 10.1.4 → 10.1.6

package/package.json

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

package/static/lib/admin.js

@@ -1,23 +1,13 @@
 'use strict';
 
-define('admin/plugins/composer-default', ['settings', 'alerts'], function (Settings, alerts) {
-	var ACP = {};
+define('admin/plugins/composer-default', ['settings'], function (Settings) {
+	const ACP = {};
 
 	ACP.init = function () {
 		Settings.load('composer-default', $('.composer-default-settings'));
 
 		$('#save').on('click', function () {
-			Settings.save('composer-default', $('.composer-default-settings'), function () {
-				alerts.alert({
-					type: 'success',
-					alert_id: 'composer-default-saved',
-					title: 'Settings Saved',
-					message: 'Please reload your NodeBB to apply these settings',
-					clickfn: function () {
-						socket.emit('admin.reload');
-					},
-				});
-			});
+			Settings.save('composer-default', $('.composer-default-settings'));
 		});
 	};
 

package/static/lib/composer/preview.js

@@ -50,7 +50,11 @@ define('composer/preview', ['hooks'], function (hooks) {
 		const toggler = postContainer.querySelector('.formatting-bar [data-action="preview"]');
 		const showText = toggler.querySelector('.show-text');
 		const hideText = toggler.querySelector('.hide-text');
-		let show = localStorage.getItem('composer:previewToggled') && !isMobile;
+		const previewToggled = localStorage.getItem('composer:previewToggled');
+		const hidePreviewOnOpen = config['composer-default'].hidePreviewOnOpen === 'on';
+		let show = !isMobile && (
+			((previewToggled === null && !hidePreviewOnOpen) || previewToggled)
+		);
 		const previewContainer = postContainer.querySelector('.preview-container');
 		const writeContainer = postContainer.querySelector('.write-container');
 
@@ -74,11 +78,7 @@ define('composer/preview', ['hooks'], function (hooks) {
 				previewContainer.classList.toggle('hide', !show);
 				writeContainer.classList.toggle('w-50', show);
 				writeContainer.classList.toggle('w-100', !show);
-				if (show) {
-					localStorage.setItem('composer:previewToggled', true);
-				} else {
-					localStorage.removeItem('composer:previewToggled');
-				}
+				localStorage.setItem('composer:previewToggled', show);
 			}
 			showText.classList.toggle('hide', show);
 			hideText.classList.toggle('hide', !show);

package/static/lib/composer.js

@@ -426,7 +426,7 @@ define('composer', [
 	};
 
 	async function getSelectedCategory(postData) {
-		if (ajaxify.data.template.category) {
+		if (ajaxify.data.template.category && parseInt(postData.cid, 10) === parseInt(ajaxify.data.cid, 10)) {
 			// no need to load data if we are already on the category page
 			return ajaxify.data;
 		} else if (parseInt(postData.cid, 10)) {

package/static/templates/admin/plugins/composer-default.tpl

@@ -2,11 +2,14 @@
 	<div class="row">
 		<div class="col-sm-2 col-12 settings-header">General</div>
 		<div class="col-sm-10 col-12">
-			<div class="checkbox">
-				<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
-					<input class="mdl-switch__input" type="checkbox" name="composeRouteEnabled" />
-					<span class="mdl-switch__label"><strong>Use a separate route for the composer</strong></span>
-				</label>
+			<div class="form-check form-switch">
+				<input id="composeRouteEnabled" class="form-check-input" type="checkbox" name="composeRouteEnabled" />
+				<label for="composeRouteEnabled" class="form-check-label">Use a separate route for the composer</label>
+			</div>
+
+			<div class="form-check form-switch">
+				<input type="checkbox" class="form-check-input" id="hidePreviewOnOpen" name="hidePreviewOnOpen" />
+				<label for="hidePreviewOnOpen" class="form-check-label">Hide preview on open</label>
 			</div>
 		</div>
 	</div>