Fix crippled contact names (RainLoop#1447)

Author: RainLoop

dev/App/User.js

@@ -494,7 +494,7 @@ class AppUser extends AbstractApp
 							if (item.userId)
 							{
 								email.clear();
-								email.mailsoParse(item.userId.userid);
+								email.parse(item.userId.userid);
 								if (email.validate())
 								{
 									aEmails.push(email.email);

dev/Common/Utils.js

@@ -1517,14 +1517,14 @@ export function resizeAndCrop(url, value, fCallback)
 
 /**
  * @param {string} mailToUrl
- * @param {Function} PopupComposeVoreModel
+ * @param {Function} PopupComposeViewModel
  * @returns {boolean}
  */
-export function mailToHelper(mailToUrl, PopupComposeVoreModel)
+export function mailToHelper(mailToUrl, PopupComposeViewModel)
 {
 	if (mailToUrl && 'mailto:' === mailToUrl.toString().substr(0, 7).toLowerCase())
 	{
-		if (!PopupComposeVoreModel)
+		if (!PopupComposeViewModel)
 		{
 			return true;
 		}
@@ -1540,28 +1540,22 @@ export function mailToHelper(mailToUrl, PopupComposeVoreModel)
 		const
 			email = mailToUrl.replace(/\?.+$/, ''),
 			query = mailToUrl.replace(/^[^\?]*\?/, ''),
-			EmailModel = require('Model/Email').default,
-			emailObj = new EmailModel(),
-			fParseEmailLine = (line) => (line ? _.compact(_.map(decodeURIComponent(line).split(/[,]/), (item) => {
-				emailObj.clear();
-				emailObj.mailsoParse(item);
-				return '' !== emailObj.email ? emailObj : null;
-			})) : null);
-
-		to = fParseEmailLine(email);
+			EmailModel = require('Model/Email').default;
+
+		to = EmailModel.parseEmailLine(email);
 		params = simpleQueryParser(query);
 
 		if (!isUnd(params.cc))
 		{
-			cc = fParseEmailLine(decodeURIComponent(params.cc));
+			cc = EmailModel.parseEmailLine(decodeURIComponent(params.cc));
 		}
 
 		if (!isUnd(params.bcc))
 		{
-			bcc = fParseEmailLine(decodeURIComponent(params.bcc));
+			bcc = EmailModel.parseEmailLine(decodeURIComponent(params.bcc));
 		}
 
-		require('Knoin/Knoin').showScreenPopup(PopupComposeVoreModel, [
+		require('Knoin/Knoin').showScreenPopup(PopupComposeViewModel, [
 			ComposeType.Empty, null, to, cc, bcc,
 			isUnd(params.subject) ? null : pString(decodeURIComponent(params.subject)),
 			isUnd(params.body) ? null : plainToHtml(pString(decodeURIComponent(params.body)))

dev/External/ko.js

@@ -884,6 +884,7 @@ ko.bindingHandlers.emailsTags = {
 			fValue = fValueAccessor(),
 			fAllBindings = fAllBindingsAccessor(),
 			fAutoCompleteSource = fAllBindings.autoCompleteSource || null,
+			inputDelimiters = [',', ';', '\n'],
 			fFocusCallback = (value) => {
 				if (fValue && fValue.focused)
 				{
@@ -895,26 +896,26 @@ ko.bindingHandlers.emailsTags = {
 			parseOnBlur: true,
 			allowDragAndDrop: true,
 			focusCallback: fFocusCallback,
-			inputDelimiters: [',', ';', '\n'],
+			inputDelimiters: inputDelimiters,
 			autoCompleteSource: fAutoCompleteSource,
-			// elementHook: (el, item) => {
-			// 	if (el && item)
-			// 	{
-			// 		el.addClass('pgp');
-			// 	}
-			// },
-			parseHook: (input) => _.map(input, (inputValue) => {
-				const value = Utils.trim(inputValue);
-				if ('' !== value)
-				{
-					const email = new EmailModel();
-					email.mailsoParse(value);
-					return [email.toLine(false), email];
+			splitHook: (value) => {
+				const v = Utils.trim(value);
+				if (v && -1 < inputDelimiters.indexOf(v.substr(-1))) {
+					return EmailModel.splitEmailLine(value);
 				}
-				return [value, null];
-
-			}),
-			'change': (event) => {
+				return null;
+			},
+			parseHook: (input) => _.map(
+				_.flatten(_.map(
+					input,
+					(inputValue) => {
+						const values = EmailModel.parseEmailLine(inputValue);
+						return values.length ? values : inputValue;
+					}
+				)),
+				(item) => (_.isObject(item) ? [item.toLine(false), item] : [item, null])
+			),
+			change: (event) => {
 				$el.data('EmailsTagsValue', event.target.value);
 				fValue(event.target.value);
 			}