nodebb-plugin-composer-default 10.0.18 → 10.0.20

package/package.json

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

package/static/lib/client.js

@@ -30,7 +30,7 @@ $(document).ready(function () {
 	$(window).on('action:composer.post.edit', function (ev, data) {
 		if (config['composer-default'].composeRouteEnabled !== 'on') {
 			require(['composer'], function (composer) {
-				composer.editPost(data.pid);
+				composer.editPost({ pid: data.pid });
 			});
 		} else {
 			ajaxify.go('compose?pid=' + data.pid);
@@ -40,7 +40,12 @@ $(document).ready(function () {
 	$(window).on('action:composer.post.new', function (ev, data) {
 		if (config['composer-default'].composeRouteEnabled !== 'on') {
 			require(['composer'], function (composer) {
-				composer.newReply(data.tid, data.pid, data.topicName, data.text);
+				composer.newReply({
+					tid: data.tid,
+					toPid: data.pid,
+					title: data.topicName,
+					body: data.text,
+				});
 			});
 		} else {
 			ajaxify.go(
@@ -56,7 +61,15 @@ $(document).ready(function () {
 		if (config['composer-default'].composeRouteEnabled !== 'on') {
 			require(['composer'], function (composer) {
 				var topicUUID = composer.findByTid(data.tid);
-				composer.addQuote(data.tid, data.pid, data.selectedPid, data.topicName, data.username, data.text, topicUUID);
+				composer.addQuote({
+					tid: data.tid,
+					toPid: data.pid,
+					selectedPid: data.selectedPid,
+					title: data.topicName,
+					username: data.username,
+					body: data.text,
+					uuid: topicUUID,
+				});
 			});
 		} else {
 			ajaxify.go('compose?tid=' + data.tid + '&toPid=' + data.pid + '&quoted=1&username=' + data.username);

package/static/lib/composer/drafts.js

@@ -2,7 +2,7 @@
 
 define('composer/drafts', ['api', 'alerts'], function (api, alerts) {
 	const drafts = {};
-
+	const draftSaveDelay = 2000;
 	drafts.init = function (postContainer, postData) {
 		const draftIconEl = postContainer.find('.draft-icon');
 		function doSaveDraft() {
@@ -15,9 +15,10 @@ define('composer/drafts', ['api', 'alerts'], function (api, alerts) {
 			saveDraft(postContainer, draftIconEl, postData);
 		}
 
-		postContainer.on('keyup', 'textarea, input.handle, input.title', utils.debounce(doSaveDraft, 1000));
-		postContainer.on('click', 'input[type="checkbox"]', utils.debounce(doSaveDraft, 1000));
-		postContainer.on('click', '[component="category/list"] [data-cid]', utils.debounce(doSaveDraft, 1000));
+		postContainer.on('keyup', 'textarea, input.handle, input.title', utils.debounce(doSaveDraft, draftSaveDelay));
+		postContainer.on('click', 'input[type="checkbox"]', utils.debounce(doSaveDraft, draftSaveDelay));
+		postContainer.on('click', '[component="category/list"] [data-cid]', utils.debounce(doSaveDraft, draftSaveDelay));
+		postContainer.on('itemAdded', '.tags', utils.debounce(doSaveDraft, draftSaveDelay));
 		postContainer.on('thumb.uploaded', doSaveDraft);
 
 		draftIconEl.on('animationend', function () {
@@ -79,6 +80,7 @@ define('composer/drafts', ['api', 'alerts'], function (api, alerts) {
 
 			if (raw.length || (title && title.length)) {
 				const draftData = {
+					save_id: postData.save_id,
 					action: postData.action,
 					text: raw,
 					uuid: postContainer.attr('data-uuid'),
@@ -95,6 +97,7 @@ define('composer/drafts', ['api', 'alerts'], function (api, alerts) {
 					// new reply only
 					draftData.title = postData.title;
 					draftData.tid = postData.tid;
+					draftData.toPid = postData.toPid;
 				} else if (postData.action === 'posts.edit') {
 					draftData.pid = postData.pid;
 				}
@@ -235,7 +238,7 @@ define('composer/drafts', ['api', 'alerts'], function (api, alerts) {
 	};
 
 	drafts.loadOpen = function () {
-		if (ajaxify.data.template.login || ajaxify.data.template.register || !config.hasOwnProperty('openDraftsOnPageLoad') || !config.openDraftsOnPageLoad) {
+		if (ajaxify.data.template.login || ajaxify.data.template.register || (config.hasOwnProperty('openDraftsOnPageLoad') && !config.openDraftsOnPageLoad)) {
 			return;
 		}
 		// Load drafts if they were open
@@ -269,6 +272,7 @@ define('composer/drafts', ['api', 'alerts'], function (api, alerts) {
 		require(['composer'], function (composer) {
 			if (draft.action === 'topics.post') {
 				composer.newTopic({
+					save_id: draft.save_id,
 					cid: draft.cid,
 					handle: app.user && app.user.uid ? undefined : utils.escapeHTML(draft.handle),
 					title: utils.escapeHTML(draft.title),
@@ -280,10 +284,21 @@ define('composer/drafts', ['api', 'alerts'], function (api, alerts) {
 					if (err) {
 						return alerts.error(err);
 					}
-					composer.newReply(draft.tid, undefined, topicObj.title, utils.escapeHTML(draft.text));
+
+					composer.newReply({
+						save_id: draft.save_id,
+						tid: draft.tid,
+						toPid: draft.toPid,
+						title: topicObj.title,
+						body: utils.escapeHTML(draft.text),
+					});
 				});
 			} else if (draft.action === 'posts.edit') {
-				composer.editPost(draft.pid, draft.text);
+				composer.editPost({
+					save_id: draft.save_id,
+					pid: draft.pid,
+					body: utils.escapeHTML(draft.text),
+				});
 			}
 		});
 	}

package/static/lib/composer/resize.js

@@ -11,6 +11,7 @@ define('composer/resize', ['taskbar'], function (taskbar) {
 	var $body = $('body');
 	var $window = $(window);
 	var $headerMenu = $('[component="navbar"]');
+	const content = document.getElementById('content');
 
 	var body = document.body;
 	var header = $headerMenu[0];
@@ -69,10 +70,10 @@ define('composer/resize', ['taskbar'], function (taskbar) {
 			// Add some extra space at the bottom of the body so that
 			// the user can still scroll to the last post w/ composer open
 			var rect = elem.getBoundingClientRect();
-			body.style.paddingBottom = (rect.bottom - rect.top).toString() + 'px';
+			content.style.paddingBottom = (rect.bottom - rect.top).toString() + 'px';
 		} else {
 			postContainer.removeAttr('style');
-			body.style.paddingBottom = 0;
+			content.style.paddingBottom = 0;
 		}
 
 		postContainer.ratio = ratio;

package/static/lib/composer.js

@@ -188,7 +188,8 @@ define('composer', [
 	};
 
 	composer.newTopic = async (data) => {
-		var pushData = {
+		let pushData = {
+			save_id: data.save_id,
 			action: 'topics.post',
 			cid: data.cid,
 			handle: data.handle,
@@ -207,76 +208,90 @@ define('composer', [
 		push(pushData);
 	};
 
-	composer.addQuote = function (tid, toPid, selectedPid, title, username, text, uuid) {
-		uuid = uuid || composer.active;
+	composer.addQuote = function (data) {
+		// tid, toPid, selectedPid, title, username, text, uuid
+		data.uuid = data.uuid || composer.active;
 
-		var escapedTitle = (title || '')
+		var escapedTitle = (data.title || '')
 			.replace(/([\\`*_{}[\]()#+\-.!])/g, '\\$1')
 			.replace(/\[/g, '[')
 			.replace(/\]/g, ']')
 			.replace(/%/g, '%')
 			.replace(/,/g, ',');
 
-		if (text) {
-			text = '> ' + text.replace(/\n/g, '\n> ') + '\n\n';
+		if (data.body) {
+			data.body = '> ' + data.body.replace(/\n/g, '\n> ') + '\n\n';
 		}
-		var link = '[' + escapedTitle + '](' + config.relative_path + '/post/' + (selectedPid || toPid) + ')';
-		if (uuid === undefined) {
-			if (title && (selectedPid || toPid)) {
-				composer.newReply(tid, toPid, title, '[[modules:composer.user_said_in, ' + username + ', ' + link + ']]\n' + text);
+		var link = '[' + escapedTitle + '](' + config.relative_path + '/post/' + (data.selectedPid || data.toPid) + ')';
+		if (data.uuid === undefined) {
+			if (data.title && (data.selectedPid || data.toPid)) {
+				composer.newReply({
+					tid: data.tid,
+					toPid: data.toPid,
+					title: data.title,
+					body: '[[modules:composer.user_said_in, ' + data.username + ', ' + link + ']]\n' + data.body,
+				});
 			} else {
-				composer.newReply(tid, toPid, title, '[[modules:composer.user_said, ' + username + ']]\n' + text);
+				composer.newReply({
+					tid: data.tid,
+					toPid: data.toPid,
+					title: data.title,
+					body: '[[modules:composer.user_said, ' + data.username + ']]\n' + data.body,
+				});
 			}
 			return;
-		} else if (uuid !== composer.active) {
+		} else if (data.uuid !== composer.active) {
 			// If the composer is not currently active, activate it
-			composer.load(uuid);
+			composer.load(data.uuid);
 		}
 
-		var postContainer = $('.composer[data-uuid="' + uuid + '"]');
+		var postContainer = $('.composer[data-uuid="' + data.uuid + '"]');
 		var bodyEl = postContainer.find('textarea');
 		var prevText = bodyEl.val();
-		if (title && (selectedPid || toPid)) {
-			translator.translate('[[modules:composer.user_said_in, ' + username + ', ' + link + ']]\n', config.defaultLang, onTranslated);
+		if (data.title && (data.selectedPid || data.toPid)) {
+			translator.translate('[[modules:composer.user_said_in, ' + data.username + ', ' + link + ']]\n', config.defaultLang, onTranslated);
 		} else {
-			translator.translate('[[modules:composer.user_said, ' + username + ']]\n', config.defaultLang, onTranslated);
+			translator.translate('[[modules:composer.user_said, ' + data.username + ']]\n', config.defaultLang, onTranslated);
 		}
 
 		function onTranslated(translated) {
-			composer.posts[uuid].body = (prevText.length ? prevText + '\n\n' : '') + translated + text;
-			bodyEl.val(composer.posts[uuid].body);
+			composer.posts[data.uuid].body = (prevText.length ? prevText + '\n\n' : '') + translated + data.body;
+			bodyEl.val(composer.posts[data.uuid].body);
 			focusElements(postContainer);
 			preview.render(postContainer);
 		}
 	};
 
-	composer.newReply = function (tid, toPid, title, text) {
-		translator.translate(text, config.defaultLang, function (translated) {
+	composer.newReply = function (data) {
+		translator.translate(data.body, config.defaultLang, function (translated) {
 			push({
+				save_id: data.save_id,
 				action: 'posts.reply',
-				tid: tid,
-				toPid: toPid,
-				title: title,
+				tid: data.tid,
+				toPid: data.toPid,
+				title: data.title,
 				body: translated,
-				modified: !!((title && title.length) || (translated && translated.length)),
+				modified: !!((data.title && data.title.length) || (translated && translated.length)),
 				isMain: false,
 			});
 		});
 	};
 
-	composer.editPost = function (pid, text) {
-		socket.emit('plugins.composer.push', pid, function (err, threadData) {
+	composer.editPost = function (data) {
+		// pid, text
+		socket.emit('plugins.composer.push', data.pid, function (err, postData) {
 			if (err) {
 				return alerts.error(err);
 			}
-			threadData.action = 'posts.edit';
-			threadData.pid = pid;
-			threadData.modified = false;
-			if (text) {
-				threadData.body = text;
-				threadData.modified = true;
+			postData.save_id = data.save_id;
+			postData.action = 'posts.edit';
+			postData.pid = data.pid;
+			postData.modified = false;
+			if (data.body) {
+				postData.body = data.body;
+				postData.modified = true;
 			}
-			push(threadData);
+			push(postData);
 		});
 	};