nodebb-plugin-composer-default 7.0.13 → 7.0.17

package/package.json

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

package/static/lib/admin.js

@@ -1,6 +1,6 @@
 'use strict';
 
-define('admin/plugins/composer-default', ['settings'], function (Settings) {
+define('admin/plugins/composer-default', ['settings', 'alerts'], function (Settings, alerts) {
 	var ACP = {};
 
 	ACP.init = function () {
@@ -8,7 +8,7 @@ define('admin/plugins/composer-default', ['settings'], function (Settings) {
 
 		$('#save').on('click', function () {
 			Settings.save('composer-default', $('.composer-default-settings'), function () {
-				app.alert({
+				alerts.alert({
 					type: 'success',
 					alert_id: 'composer-default-saved',
 					title: 'Settings Saved',

package/static/lib/composer/drafts.js

@@ -1,8 +1,8 @@
 'use strict';
 
-define('composer/drafts', ['api'], function (api) {
+define('composer/drafts', ['api', 'alerts'], function (api, alerts) {
 	var drafts = {};
-	var	saveThrottleId;
+	var saveThrottleId;
 
 	drafts.init = function (postContainer, postData) {
 		var draftIconEl = postContainer.find('.draft-icon');
@@ -263,7 +263,7 @@ define('composer/drafts', ['api'], function (api) {
 					} else if (type === 'tid') {
 						socket.emit('topics.getTopic', id, function (err, topicObj) {
 							if (err) {
-								return app.alertError(err.message);
+								return alerts.error(err);
 							}
 							composer.newReply(id, undefined, topicObj.title, draft.text);
 						});

package/static/lib/composer/resize.js

@@ -100,7 +100,7 @@ define('composer/resize', ['taskbar'], function (taskbar) {
 	}
 
 	resize.reposition = function (postContainer) {
-		var	ratio = getSavedRatio();
+		var ratio = getSavedRatio();
 
 		if (ratio >= 1 - snapMargin) {
 			ratio = 1;

package/static/lib/composer/scheduler.js

@@ -1,6 +1,6 @@
 'use strict';
 
-define('composer/scheduler', ['benchpress', 'bootbox'], function (Benchpress, bootbox) {
+define('composer/scheduler', ['benchpress', 'bootbox', 'alerts'], function (Benchpress, bootbox, alerts) {
 	const scheduler = {};
 	const state = {
 		timestamp: 0,
@@ -128,7 +128,7 @@ define('composer/scheduler', ['benchpress', 'bootbox'], function (Benchpress, bo
 		if (!bothFilled || isNaN(timestamp) || timestamp < Date.now()) {
 			state.timestamp = 0;
 			const message = timestamp < Date.now() ? '[[error:scheduling-to-past]]' : '[[error:invalid-schedule-date]]';
-			app.alert({
+			alerts.alert({
 				type: 'danger',
 				timeout: 3000,
 				title: '',

package/static/lib/composer/tags.js

@@ -1,7 +1,7 @@
 
 'use strict';
 
-define('composer/tags', function () {
+define('composer/tags', ['alerts'], function (alerts) {
 	var tags = {};
 
 	var minTags;
@@ -38,7 +38,7 @@ define('composer/tags', function () {
 						cid: postData.cid,
 					}, function (err, tags) {
 						if (err) {
-							return app.alertError(err.message);
+							return alerts.error(err);
 						}
 						if (tags) {
 							response(tags);
@@ -64,11 +64,11 @@ define('composer/tags', function () {
 					reachedMaxTags;
 
 				if (event.item.length < config.minimumTagLength) {
-					return app.alertError('[[error:tag-too-short, ' + config.minimumTagLength + ']]');
+					return alerts.error('[[error:tag-too-short, ' + config.minimumTagLength + ']]');
 				} else if (event.item.length > config.maximumTagLength) {
-					return app.alertError('[[error:tag-too-long, ' + config.maximumTagLength + ']]');
+					return alerts.error('[[error:tag-too-long, ' + config.maximumTagLength + ']]');
 				} else if (reachedMaxTags) {
-					return app.alertError('[[error:too-many-tags, ' + maxTags + ']]');
+					return alerts.error('[[error:too-many-tags, ' + maxTags + ']]');
 				}
 				if (different) {
 					tagEl.tagsinput('add', cleanTag);
@@ -88,10 +88,10 @@ define('composer/tags', function () {
 				}
 				socket.emit('topics.canRemoveTag', { tag: event.item }, function (err, allowed) {
 					if (err) {
-						return app.alertError(err.message);
+						return alerts.error(err);
 					}
 					if (!allowed) {
-						app.alertError('[[error:cant-remove-system-tag]]');
+						alerts.error('[[error:cant-remove-system-tag]]');
 						skipAddCheck = true;
 						tagEl.tagsinput('add', event.item);
 					}
@@ -106,7 +106,7 @@ define('composer/tags', function () {
 				var cid = postData.hasOwnProperty('cid') ? postData.cid : ajaxify.data.cid;
 				socket.emit('topics.isTagAllowed', { tag: event.item, cid: cid || 0 }, function (err, allowed) {
 					if (err) {
-						return app.alertError(err.message);
+						return alerts.error(err);
 					}
 					if (!allowed) {
 						skipRemoveCheck = true;

package/static/lib/composer/uploads.js

@@ -4,8 +4,9 @@ define('composer/uploads', [
 	'composer/preview',
 	'composer/categoryList',
 	'translator',
+	'alerts',
 	'jquery-form',
-], function (preview, categoryList, translator) {
+], function (preview, categoryList, translator, alerts) {
 	var uploads = {
 		inProgress: {},
 	};
@@ -193,7 +194,7 @@ define('composer/uploads', [
 		for (i = 0; i < files.length; ++i) {
 			isImage = files[i].type.match(/image./);
 			if ((isImage && !app.user.privileges['upload:post:image']) || (!isImage && !app.user.privileges['upload:post:file'])) {
-				return app.alertError('[[error:no-privileges]]');
+				return alerts.error('[[error:no-privileges]]');
 			}
 		}
 
@@ -207,7 +208,7 @@ define('composer/uploads', [
 
 			if (files[i].size > parseInt(config.maximumFileSize, 10) * 1024) {
 				uploadForm[0].reset();
-				return app.alertError('[[error:file-too-big, ' + config.maximumFileSize + ']]');
+				return alerts.error('[[error:file-too-big, ' + config.maximumFileSize + ']]');
 			}
 
 			text = insertText(text, textarea.getCursorPosition(), (isImage ? '!' : '') + '[' + filenameMapping[i] + '](' + uploadingText + ') ');
@@ -321,7 +322,7 @@ define('composer/uploads', [
 		if (xhr && xhr.status === 413) {
 			msg = xhr.statusText || 'Request Entity Too Large';
 		}
-		app.alertError(msg);
+		alerts.error(msg);
 		$(window).trigger('action:composer.uploadError', {
 			post_uuid: post_uuid,
 			message: msg,

package/static/lib/composer.js

@@ -18,10 +18,14 @@ define('composer', [
 	'topicThumbs',
 	'api',
 	'bootbox',
+	'alerts',
 	'hooks',
 	'messages',
+	'search',
 ], function (taskbar, translator, uploads, formatting, drafts, tags,
-	categoryList, preview, resize, autocomplete, scheduler, scrollStop, topicThumbs, api, bootbox, hooks, messagesModule) {
+	categoryList, preview, resize, autocomplete, scheduler, scrollStop,
+	topicThumbs, api, bootbox, alerts, hooks, messagesModule, search
+) {
 	var composer = {
 		active: undefined,
 		posts: {},
@@ -104,7 +108,7 @@ define('composer', [
 
 	function alreadyOpen(post) {
 		// If a composer for the same cid/tid/pid is already open, return the uuid, else return bool false
-		var	type;
+		var type;
 		var id;
 
 		if (post.hasOwnProperty('cid')) {
@@ -169,7 +173,7 @@ define('composer', [
 		const { showAlert } = await hooks.fire('filter:composer.error', { post_uuid, message, showAlert: true });
 
 		if (showAlert) {
-			app.alert({
+			alerts.alert({
 				type: 'danger',
 				timeout: 3000,
 				title: '',
@@ -273,7 +277,7 @@ define('composer', [
 	composer.editPost = function (pid) {
 		socket.emit('plugins.composer.push', pid, function (err, threadData) {
 			if (err) {
-				return app.alertError(err.message);
+				return alerts.error(err);
 			}
 			threadData.action = 'posts.edit';
 			threadData.pid = pid;
@@ -294,7 +298,7 @@ define('composer', [
 		} else {
 			socket.emit('plugins.composer.getFormattingOptions', function (err, options) {
 				if (err) {
-					return app.alertError(err);
+					return alerts.error(err);
 				}
 				composer.formatting = options;
 				createNewComposer(post_uuid);
@@ -610,7 +614,7 @@ define('composer', [
 			return;
 		}
 
-		app.enableTopicSearch({
+		search.enableQuickSearch({
 			searchElements: {
 				inputEl: postContainer.find('input.title'),
 				resultEl: postContainer.find('.quick-search-container'),
@@ -767,7 +771,15 @@ define('composer', [
 				drafts.removeDraft(postData.save_id);
 
 				if (data.queued) {
-					bootbox.alert(data.message);
+					alerts.alert({
+						type: 'success',
+						title: '[[global:alert.success]]',
+						message: data.message,
+						timeout: 10000,
+						clickfn: function () {
+							ajaxify.go(`/post-queue/${data.id}`);
+						},
+					});
 				} else if (action === 'topics.post') {
 					if (submitHookData.redirect) {
 						ajaxify.go('topic/' + data.slug, undefined, (onComposeRoute || composer.bsEnvironment === 'xs' || composer.bsEnvironment === 'sm'));