nodebb-plugin-composer-default 7.0.19 → 7.0.22

package/package.json

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

package/static/less/composer.less

@@ -527,8 +527,8 @@
 @media (min-width: @screen-md-max) {
 	html.composing {
 		.composer {
-			left: 10%;
-			width: 80%;
+			left: 15%;
+			width: 70%;
 		}
 	}
 }

package/static/lib/composer/autocomplete.js

@@ -42,12 +42,14 @@ define('composer/autocomplete', ['composer/preview'], function (preview) {
 			clearTimeout(timer);
 			timer = setTimeout(function () {
 				var dropdown = document.querySelector('.' + dropdownClass);
-				var pos = dropdown.getBoundingClientRect();
+				if (dropdown) {
+					var pos = dropdown.getBoundingClientRect();
 
-				var margin = parseFloat(dropdown.style.marginTop, 10) || 0;
+					var margin = parseFloat(dropdown.style.marginTop, 10) || 0;
 
-				var offset = window.innerHeight + margin - 10 - pos.bottom;
-				dropdown.style.marginTop = Math.min(offset, 0) + 'px';
+					var offset = window.innerHeight + margin - 10 - pos.bottom;
+					dropdown.style.marginTop = Math.min(offset, 0) + 'px';
+				}
 			}, 0);
 		});
 

package/static/lib/composer/formatting.js

@@ -17,6 +17,7 @@ define('composer/formatting', ['composer/preview', 'composer/resize', 'topicThum
 		},
 
 		thumbs: function () {
+			formatting.exitFullscreen();
 			var postContainer = this;
 			require(['composer'], function (composer) {
 				const uuid = postContainer.get(0).getAttribute('data-uuid');
@@ -61,11 +62,18 @@ define('composer/formatting', ['composer/preview', 'composer/resize', 'topicThum
 			});
 
 			screenfull.toggle(postContainer.get(0));
+			$(window).trigger('action:composer.fullscreen', { postContainer: postContainer });
 		},
 	};
 
 	var buttons = [];
 
+	formatting.exitFullscreen = function () {
+		if (screenfull.isEnabled && screenfull.isFullscreen) {
+			screenfull.exit();
+		}
+	};
+
 	formatting.addComposerButtons = function () {
 		for (var x = 0, numButtons = buttons.length; x < numButtons; x++) {
 			$('.formatting-bar .formatting-group #fileForm').before('<li tabindex="-1" data-format="' + buttons[x].name + '" title="' + (buttons[x].title || '') + '"><i class="' + buttons[x].iconClass + '"></i></li>');

package/static/lib/composer.js

@@ -24,8 +24,7 @@ define('composer', [
 	'search',
 ], function (taskbar, translator, uploads, formatting, drafts, tags,
 	categoryList, preview, resize, autocomplete, scheduler, scrollStop,
-	topicThumbs, api, bootbox, alerts, hooks, messagesModule, search
-) {
+	topicThumbs, api, bootbox, alerts, hooks, messagesModule, search) {
 	var composer = {
 		active: undefined,
 		posts: {},
@@ -175,7 +174,7 @@ define('composer', [
 		if (showAlert) {
 			alerts.alert({
 				type: 'danger',
-				timeout: 3000,
+				timeout: 10000,
 				title: '',
 				message: message,
 				alert_id: 'post_error',
@@ -198,7 +197,7 @@ define('composer', [
 		formatting.addButton(iconClass, onClick, title);
 	};
 
-	composer.newTopic = function (data) {
+	composer.newTopic = async (data) => {
 		var pushData = {
 			action: 'topics.post',
 			cid: data.cid,
@@ -209,10 +208,10 @@ define('composer', [
 			isMain: true,
 		};
 
-		$(window).trigger('filter:composer.topic.push', {
+		({ pushData } = await hooks.fire('filter:composer.topic.push', {
 			data: data,
 			pushData: pushData,
-		});
+		}));
 
 		push(pushData);
 	};
@@ -367,10 +366,7 @@ define('composer', [
 				return removeComposerHistory();
 			}
 
-			// Exit fullscreen
-			if (screenfull.isEnabled && screenfull.isFullscreen) {
-				screenfull.exit();
-			}
+			formatting.exitFullscreen();
 
 			var btn = $(this).prop('disabled', true);
 			translator.translate('[[modules:composer.discard]]', function (translated) {
@@ -797,7 +793,7 @@ define('composer', [
 					removeComposerHistory();
 				}
 
-				$(window).trigger('action:composer.' + action, { composerData: composerData, data: data });
+				hooks.fire('action:composer.' + action, { composerData: composerData, data: data });
 			})
 			.catch((err) => {
 				// Restore composer on error