nodebb-plugin-composer-default 7.0.16 → 7.0.20

package/package.json

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

package/static/less/composer.less

@@ -436,16 +436,6 @@
 		box-shadow: none;
 	}
 
-	.imagedrop {
-		position: absolute;
-		top: 250px;
-		text-align: center;
-		font-size: 24px;
-		color: #999;
-		width: 100%;
-		display: none;
-	}
-
 	.draft-icon {
 		font-family: 'FontAwesome';
 		color: @state-success-text;

package/static/lib/composer/drafts.js

@@ -261,7 +261,7 @@ define('composer/drafts', ['api', 'alerts'], function (api, alerts) {
 							tags: [],
 						});
 					} else if (type === 'tid') {
-						socket.emit('topics.getTopic', id, function (err, topicObj) {
+						api.get('/topics/' + id, {}, function (err, topicObj) {
 							if (err) {
 								return alerts.error(err);
 							}

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/uploads.js

@@ -5,8 +5,9 @@ define('composer/uploads', [
 	'composer/categoryList',
 	'translator',
 	'alerts',
+	'uploadHelpers',
 	'jquery-form',
-], function (preview, categoryList, translator, alerts) {
+], function (preview, categoryList, translator, alerts, uploadHelpers) {
 	var uploads = {
 		inProgress: {},
 	};
@@ -67,103 +68,33 @@ define('composer/uploads', [
 	}
 
 	function initializeDragAndDrop(post_uuid) {
-		var draggingDocument = false;
 		var postContainer = $('.composer[data-uuid="' + post_uuid + '"]');
-		var drop = postContainer.find('.imagedrop');
-
-		function onDragEnter() {
-			if (draggingDocument) {
-				return;
-			}
-
-			drop.css('top', '0px');
-			drop.css('height', postContainer.height() + 'px');
-			drop.css('line-height', postContainer.height() + 'px');
-			drop.show();
-
-			drop.on('dragleave', function () {
-				drop.hide();
-				drop.off('dragleave');
-			});
-		}
-
-		function onDragDrop(e) {
-			e.preventDefault();
-			var files = e.originalEvent.dataTransfer.files;
-			var fd;
-
-			if (files.length) {
-				if (window.FormData) {
-					fd = new FormData();
-					for (var i = 0; i < files.length; ++i) {
-						fd.append('files[]', files[i], files[i].name);
-					}
-				}
-
+		uploadHelpers.handleDragDrop({
+			container: postContainer,
+			callback: function (upload) {
 				uploadContentFiles({
-					files: files,
+					files: upload.files,
 					post_uuid: post_uuid,
 					route: '/api/post/upload',
-					formData: fd,
+					formData: upload.formData,
 				});
 			}
-
-			drop.hide();
-			return false;
-		}
-
-		function cancel(e) {
-			e.preventDefault();
-			return false;
-		}
-
-		$(document)
-			.off('dragstart')
-			.on('dragstart', function () {
-				draggingDocument = true;
-			})
-			.off('dragend')
-			.on('dragend', function () {
-				draggingDocument = false;
-			});
-
-		postContainer.on('dragenter', onDragEnter);
-
-		drop.on('dragover', cancel);
-		drop.on('dragenter', cancel);
-		drop.on('drop', onDragDrop);
+		});
 	}
 
 	function initializePaste(post_uuid) {
 		var postContainer = $('.composer[data-uuid="' + post_uuid + '"]');
-		postContainer.on('paste', function (event) {
-			var items = (event.clipboardData || event.originalEvent.clipboardData || {}).items;
-
-			[].some.call(items, function (item) {
-				var blob = item.getAsFile();
-
-				if (!blob) {
-					return false;
-				}
-
-				var blobName = utils.generateUUID() + '-' + blob.name;
-
-				var fd = null;
-				if (window.FormData) {
-					fd = new FormData();
-					fd.append('files[]', blob, blobName);
-				}
-
+		uploadHelpers.handlePaste({
+			container: postContainer,
+			callback: function (upload) {
 				uploadContentFiles({
-					files: [blob],
-					fileNames: [blobName],
+					files: upload.files,
+					fileNames: upload.fileNames,
 					post_uuid: post_uuid,
 					route: '/api/post/upload',
-					formData: fd,
+					formData: upload.formData,
 				});
-
-				return true;
-			});
+			},
 		});
 	}
 

package/static/lib/composer.js

@@ -367,10 +367,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) {
@@ -777,7 +774,7 @@ define('composer', [
 						message: data.message,
 						timeout: 10000,
 						clickfn: function () {
-							ajaxify.go(`/post-queue#${data.id}`);
+							ajaxify.go(`/post-queue/${data.id}`);
 						},
 					});
 				} else if (action === 'topics.post') {