nodebb-plugin-composer-default 10.3.10 → 10.3.12

package/library.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const url = require('url');
 
 const nconf = require.main.require('nconf');
 const validator = require('validator');
@@ -103,8 +102,9 @@ plugin.filterComposerBuild = async function (hookData) {
 
 	if (req.query.p) {
 		try {
-			const a = url.parse(req.query.p, true, true);
-			return helpers.redirect(res, `/${(a.path || '').replace(/^\/*/, '')}`);
+			const a = new URL(req.query.p, 'http://localhost.com');
+			const path = (a.pathname + a.search).replace(/^\/+/, '');
+			return helpers.redirect(res, `/${path}`);
 		} catch (e) {
 			return helpers.redirect(res, '/');
 		}

package/package.json

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

package/static/lib/composer/preview.js

@@ -63,6 +63,7 @@ define('composer/preview', ['hooks'], function (hooks) {
 		}
 
 		function togglePreview(show) {
+			const isMobile = ['xs', 'sm'].includes(preview.env);
 			if (isMobile) {
 				previewContainer.classList.toggle('hide', false);
 				writeContainer.classList.toggle('maximized', false);

package/static/lib/composer.js

@@ -40,7 +40,7 @@ define('composer', [
 		localStorage.removeItem('category:' + data.data.cid + ':bookmark:clicked');
 	});
 
-	$(window).on('popstate', function () {
+	window.addEventListener('popstate', function () {
 		var env = utils.findBootstrapEnvironment();
 		if (composer.active && (env === 'xs' || env === 'sm')) {
 			if (!composer.posts[composer.active].modified) {
@@ -74,29 +74,17 @@ define('composer', [
 		var env = utils.findBootstrapEnvironment();
 		var isMobile = env === 'xs' || env === 'sm';
 
-		if (preview.toggle) {
-			if (preview.env !== env && isMobile) {
-				preview.env = env;
-				preview.toggle(false);
-			}
+		if (preview.toggle && preview.env !== env) {
 			preview.env = env;
+			preview.toggle(!isMobile);
 		}
 
 		if (composer.active !== undefined) {
 			resize.reposition($('.composer[data-uuid="' + composer.active + '"]'));
 
-			if (!isMobile && window.location.pathname.startsWith(config.relative_path + '/compose')) {
-				/*
-				 * If this conditional is met, we're no longer in mobile/tablet
-				 * resolution but we've somehow managed to have a mobile
-				 * composer load, so let's go back to the topic
-				 */
+			if (!isMobile && window.history.state && window.history.state.composerBackState) {
 				history.back();
-			} else if (isMobile && !window.location.pathname.startsWith(config.relative_path + '/compose')) {
-				/*
-				 * In this case, we're in mobile/tablet resolution but the composer
-				 * that loaded was a regular composer, so let's fix the address bar
-				 */
+			} else if (isMobile) {
 				mobileHistoryAppend();
 			}
 		}
@@ -562,24 +550,22 @@ define('composer', [
 	}
 
 	function mobileHistoryAppend() {
-		var path = 'compose?p=' + window.location.pathname;
-		var returnPath = window.location.pathname.slice(1) + window.location.search;
-
-		// Remove relative path from returnPath
-		if (returnPath.startsWith(config.relative_path.slice(1))) {
-			returnPath = returnPath.slice(config.relative_path.length);
+		// add a fake entry to the browser history so that the user can
+		// press back to return to where they were before opening the composer
+		// popstate listener in this file closes the composer on mobile,
+		// browser automatically removes the fake entry when user presses back
+		if (window.history.state && !window.history.state.composerBackState) {
+			// modify current state so that ajaxify.go doesn't
+			// trigger when user presses back from composer
+			window.history.replaceState({
+				url: null,
+				returnPath: history.state.url,
+			}, ''); // 3rd param optional url, we dont change it
+
+			window.history.pushState({
+				composerBackState: true,
+			}, ''); // 3rd param optional url, we dont change it
 		}
-
-		// Add in return path to be caught by ajaxify when post is completed, or if back is pressed
-		window.history.replaceState({
-			url: null,
-			returnPath: returnPath,
-		}, returnPath, config.relative_path + '/' + returnPath);
-
-		// Update address bar in case f5 is pressed
-		window.history.pushState({
-			url: path,
-		}, path, `${config.relative_path}/${returnPath}`);
 	}
 
 	function handleRemotePid(postContainer) {