Improved Jua uploader

dev/Settings/User/Themes.js

@@ -57,10 +57,7 @@ export class ThemesUserSettings {
 		if (this.background.uploaderButton() && this.capaUserBackground()) {
 			const oJua = new Jua({
 				action: serverRequest('UploadBackground'),
-				name: 'uploader',
+				limit: 1,
-				queueSize: 1,
-				multipleSizeLimit: 1,
-				disableMultiple: true,
 				clickElement: this.background.uploaderButton()
 			});
 

dev/View/Popup/Compose.js

@@ -1096,9 +1096,6 @@ class ComposePopupView extends AbstractViewPopup {
 				attachmentSizeLimit = pInt(SettingsGet('AttachmentLimit')),
 				oJua = new Jua({
 					action: serverRequest('Upload'),
-					name: 'uploader',
-					queueSize: 2,
-					multipleSizeLimit: 50,
 					clickElement: this.composeUploaderButton(),
 					dragAndDropElement: this.composeUploaderDropPlace()
 				});
@@ -1176,23 +1173,24 @@ class ComposePopupView extends AbstractViewPopup {
 				})
 				.on('onComplete', (id, result, data) => {
 					const attachment = this.getAttachmentById(id),
-						errorCode = data && data.Result && data.Result.ErrorCode ? data.Result.ErrorCode : null,
+						response = (data && data.Result) || {},
-						attachmentJson = result && data && data.Result && data.Result.Attachment ? data.Result.Attachment : null;
+						errorCode = response.ErrorCode,
+						attachmentJson = result && response.Attachment;
 
 					let error = '';
-					if (null !== errorCode) {
+					if (null != errorCode) {
 						error = getUploadErrorDescByCode(errorCode);
 					} else if (!attachmentJson) {
 						error = i18n('UPLOAD/ERROR_UNKNOWN');
 					}
 
 					if (attachment) {
-						if (error && error.length) {
+						if (error) {
 							attachment
 								.waiting(false)
 								.uploading(false)
 								.complete(true)
-								.error(error);
+								.error(error + '\n' + response.ErrorMessage);
 						} else if (attachmentJson) {
 							attachment
 								.waiting(false)

dev/View/Popup/Contacts.js

@@ -472,10 +472,7 @@ class ContactsPopupView extends AbstractViewPopup {
 		if (this.importUploaderButton()) {
 			const j = new Jua({
 				action: serverRequest('UploadContacts'),
-				name: 'uploader',
+				limit: 1,
-				queueSize: 1,
-				multipleSizeLimit: 1,
-				disableMultiple: true,
 				disableDocumentDropPrevent: true,
 				clickElement: this.importUploaderButton()
 			});

dev/View/User/MailBox/MessageList.js

@@ -720,8 +720,7 @@ export class MessageListMailBoxUserView extends AbstractViewRight {
 			const oJua = new Jua({
 				action: serverRequest('Append'),
 				name: 'AppendFile',
-				queueSize: 1,
+				limit: 1,
-				multipleSizeLimit: 1,
 				hidden: {
 					Folder: () => FolderUserStore.currentFolderFullNameRaw()
 				},

vendors/jua/jua.js

@@ -1,7 +1,6 @@
 /* RainLoop Webmail (c) RainLoop Team | MIT */
 (doc => {
 	const
-		iDefLimit = 20,
 		defined = v => undefined !== v,
 		/**
 		 * @param {*} aItems
@@ -13,7 +12,6 @@
 		{
 			if (aItems && aItems.length)
 			{
-				iLimit = defined(iLimit) ? parseInt(iLimit || 0, 10) : iDefLimit;
 				let
 					iInputLimit = iLimit,
 					oFile = null,
@@ -53,15 +51,15 @@
 				sType = oFile.type || ''
 			;
 
-			return (!sType && 0 == iSize)
+			return (sType && iSize)
-			? null // Folder
+			? {
-			: {
+				FileName: (oFile.name || '').replace(/^.*\/([^/]*)$/, '$1'),
-				'FileName': (oFile.name || '').replace(/^.*\/([^/]*)$/, '$1'),
+				Size: iSize,
-				'Size': iSize,
+				Type: sType,
-				'Type': sType,
+				Folder: '',
-				'Folder': '',
+				File : oFile
-				'File' : oFile
+			}
-			};
+			: null; // Folder
 		},
 
 		eventContainsFiles = oEvent =>
@@ -97,11 +95,11 @@
 
 	/**
 	 * @constructor
-	 * @param {Object=} oOptions
+	 * @param {Object=} options
 	 */
 	class Jua
 	{
-		constructor(oOptions)
+		constructor(options)
 		{
 			const self = this;
 
@@ -117,25 +115,17 @@
 				onLimitReached: null
 			};
 
-			oOptions = Object.assign({
-				action: '',
-				name: 'juaFile',
-				hidden: {},
-				disableMultiple: false,
-				queueSize: 10,
-				clickElement: null,
-				dragAndDropElement: null,
-				dragAndDropBodyElement: null,
-				disableDocumentDropPrevent: false,
-				multipleSizeLimit: iDefLimit
-			}, oOptions || {});
-
 			self.oXhrs = {};
 			self.oUids = {};
-			self.oOptions = oOptions;
+			self.options = Object.assign({
-			self.oQueue = new Queue(oOptions.queueSize);
+					action: '',
+					name: 'uploader',
+					hidden: {},
+					limit: 0
+				}, options || {});
+			self.oQueue = new Queue(1 == options.limit ? 1 : 2);
 
-			let el = oOptions.clickElement;
+			let el = options.clickElement;
 			if (el) {
 				el.style.position = 'relative';
 				el.style.overflow = 'hidden';
@@ -146,12 +136,12 @@
 				self.generateNewInput(el);
 			}
 
-			el = oOptions.dragAndDropElement;
+			el = options.dragAndDropElement;
 			if (el)
 			{
-				let oBigDropZone = oOptions.dragAndDropBodyElement || doc;
+				let oBigDropZone = options.dragAndDropBodyElement || doc;
 
-				if (!oOptions.disableDocumentDropPrevent)
+				if (!options.disableDocumentDropPrevent)
 				{
 					doc.addEventListener('dragover', oEvent => {
 						if (eventContainsFiles(oEvent))
@@ -246,7 +236,7 @@
 										self.docTimer.clear();
 									}
 								},
-								oOptions.multipleSizeLimit,
+								self.options.limit,
 								self.getEvent('onLimitReached')
 							);
 						}
@@ -273,10 +263,7 @@
 		 */
 		runEvent(sName, aArgs)
 		{
-			if (this.oEvents[sName])
+			this.oEvents[sName] && this.oEvents[sName].apply(null, aArgs || []);
-			{
-				this.oEvents[sName].apply(null, aArgs || []);
-			}
 		}
 
 		/**
@@ -330,8 +317,8 @@
 					self = this,
 					oXhr = new XMLHttpRequest(),
 					oFormData = new FormData(),
-					sAction = this.oOptions.action,
+					sAction = this.options.action,
-					aHidden = this.oOptions.hidden,
+					aHidden = this.options.hidden,
 					fStartFunction = this.getEvent('onStart'),
 					fProgressFunction = this.getEvent('onProgress')
 				;
@@ -366,13 +353,13 @@
 								console.error(e);
 							}
 						}
-						this.getEvent('onComplete')(sUid, bResult, bResult ? oResult : null);
+						this.getEvent('onComplete')(sUid, bResult, oResult);
 					}
 				};
 
 				fStartFunction && fStartFunction(sUid);
 
-				oFormData.append(this.oOptions.name, oFileInfo['File']);
+				oFormData.append(this.options.name, oFileInfo['File']);
 				Object.entries(aHidden).forEach(([key, value]) =>
 					oFormData.append(key, (typeof value === "function" ? value(oFileInfo) : value).toString())
 				);
@@ -395,13 +382,14 @@
 			if (oClickElement)
 			{
 				const self = this,
+					limit = self.options.limit,
 					oInput = doc.createElement('input'),
 					onClick = ()=>oInput.click();
 
 				oInput.type = 'file';
 				oInput.tabIndex = -1;
 				oInput.style.display = 'none';
-				oInput.multiple = !self.oOptions.disableMultiple;
+				oInput.multiple = 1 < limit;
 
 				oClickElement.addEventListener('click', onClick);
 
@@ -416,16 +404,16 @@
 					};
 					if (oInput.files && oInput.files.length) {
 						getDataFromFiles(oInput.files, fFileCallback,
-							self.oOptions.multipleSizeLimit,
+							limit,
 							self.getEvent('onLimitReached')
 						);
 					} else {
 						fFileCallback({
-							'FileName': oInput.value.split('\\').pop().split('/').pop(),
+							FileName: oInput.value.split(/\\\//).pop(),
-							'Size': null,
+							Size: null,
-							'Type': null,
+							Type: null,
-							'Folder': '',
+							Folder: '',
-							'File' : null
+							File : null
 						});
 					}
 				});