From 6dde7e1183f0f5210b9d6de1e36ea7e15e58348b Mon Sep 17 00:00:00 2001
From: Julius Härtl <jus@bitgrid.net>
Date: Wed, 10 Oct 2018 14:58:58 +0200
Subject: Improve share select list
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 core/js/sharedialogview.js | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'core/js')

diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 9c648357e61..c8d9822d256 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -442,19 +442,26 @@
 
 		autocompleteRenderItem: function(ul, item) {
 
+			var icon = 'icon-user';
 			var text = item.label;
 			if (item.value.shareType === OC.Share.SHARE_TYPE_GROUP) {
 				text = t('core', '{sharee} (group)', { sharee: text }, undefined, { escape: false });
+				icon = 'icon-contacts-dark';
 			} else if (item.value.shareType === OC.Share.SHARE_TYPE_REMOTE) {
 				text = t('core', '{sharee} (remote)', {sharee: text}, undefined, {escape: false});
+				icon = 'icon-shared';
 			} else if (item.value.shareType === OC.Share.SHARE_TYPE_REMOTE_GROUP) {
 				text = t('core', '{sharee} (remote group)', { sharee: text }, undefined, { escape: false });
+				icon = 'icon-shared';
 			} else if (item.value.shareType === OC.Share.SHARE_TYPE_EMAIL) {
 				text = t('core', '{sharee} (email)', { sharee: text }, undefined, { escape: false });
+				icon = 'icon-mail';
 			} else if (item.value.shareType === OC.Share.SHARE_TYPE_CIRCLE) {
 				text = t('core', '{sharee} ({type}, {owner})', {sharee: text, type: item.value.circleInfo, owner: item.value.circleOwner}, undefined, {escape: false});
+				icon = 'icon-circle';
 			} else if (item.value.shareType === OC.Share.SHARE_TYPE_ROOM) {
 				text = t('core', '{sharee} (conversation)', { sharee: text }, undefined, { escape: false });
+				icon = 'icon-talk';
 			}
 			var insert = $("<div class='share-autocomplete-item'/>");
 			var avatar = $("<div class='avatardiv'></div>").appendTo(insert);
@@ -468,6 +475,7 @@
 				.text(text)
 				.appendTo(insert);
 			insert.attr('title', item.value.shareWith);
+			insert.append('<span class="icon '+icon+'"></span>');
 			insert = $("<a>")
 				.append(insert);
 			return $("<li>")
-- 
cgit v1.2.3


From e5cae301ebeb472d8c635b479fb5971530122f81 Mon Sep 17 00:00:00 2001
From: Julius Härtl <jus@bitgrid.net>
Date: Wed, 17 Oct 2018 21:56:41 +0200
Subject: Highlight search term in sharing results
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 core/css/jquery-ui-fixes.scss | 1 +
 core/js/sharedialogview.js    | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'core/js')

diff --git a/core/css/jquery-ui-fixes.scss b/core/css/jquery-ui-fixes.scss
index 729a6197376..d80d0c61e46 100644
--- a/core/css/jquery-ui-fixes.scss
+++ b/core/css/jquery-ui-fixes.scss
@@ -71,6 +71,7 @@
 	border: 1px solid var(--color-main-background);
 	background: var(--color-main-background) none;
 	color: var(--color-text-lighter);
+	font-weight: 600;
 }
 .ui-state-highlight a,
 .ui-widget-content .ui-state-highlight a,
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index c8d9822d256..7b8759527b3 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -472,7 +472,11 @@
 			}
 
 			$("<div class='autocomplete-item-text'></div>")
-				.text(text)
+				.html(
+					text.replace(
+					new RegExp(this.term, "gi"),
+					"<span class='ui-state-highlight'>$&</span>")
+				)
 				.appendTo(insert);
 			insert.attr('title', item.value.shareWith);
 			insert.append('<span class="icon '+icon+'"></span>');
-- 
cgit v1.2.3


From a1c6e44700d255654838836f4bf5dd00272605bd Mon Sep 17 00:00:00 2001
From: Julius Härtl <jus@bitgrid.net>
Date: Wed, 17 Oct 2018 21:57:22 +0200
Subject: Add collaborators uuid to properly render the avatar and for later
 grouping
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 core/js/sharedialogview.js                               | 5 ++++-
 lib/private/Collaboration/Collaborators/MailPlugin.php   | 5 +++++
 lib/private/Collaboration/Collaborators/RemotePlugin.php | 2 ++
 3 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'core/js')

diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 7b8759527b3..baf70fa63ad 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -468,7 +468,10 @@
 			if (item.value.shareType === OC.Share.SHARE_TYPE_USER || item.value.shareType === OC.Share.SHARE_TYPE_CIRCLE) {
 				avatar.avatar(item.value.shareWith, 32, undefined, undefined, undefined, item.label);
 			} else {
-				avatar.imageplaceholder(text, undefined, 32);
+				if (typeof item.uuid === 'undefined') {
+					item.uuid = text;
+				}
+				avatar.imageplaceholder(item.uuid, text, 32);
 			}
 
 			$("<div class='autocomplete-item-text'></div>")
diff --git a/lib/private/Collaboration/Collaborators/MailPlugin.php b/lib/private/Collaboration/Collaborators/MailPlugin.php
index 101d6845ec3..9abbc0f3afd 100644
--- a/lib/private/Collaboration/Collaborators/MailPlugin.php
+++ b/lib/private/Collaboration/Collaborators/MailPlugin.php
@@ -121,6 +121,7 @@ class MailPlugin implements ISearchPlugin {
 							if (!$this->isCurrentUser($cloud) && !$searchResult->hasResult($userType, $cloud->getUser())) {
 								$singleResult = [[
 									'label' => $displayName,
+									'uuid' => $contact['UID'],
 									'value' => [
 										'shareType' => Share::SHARE_TYPE_USER,
 										'shareWith' => $cloud->getUser(),
@@ -142,6 +143,7 @@ class MailPlugin implements ISearchPlugin {
 							if (!$this->isCurrentUser($cloud) && !$searchResult->hasResult($userType, $cloud->getUser())) {
 								$userResults['wide'][] = [
 									'label' => $displayName,
+									'uuid' => $contact['UID'],
 									'value' => [
 										'shareType' => Share::SHARE_TYPE_USER,
 										'shareWith' => $cloud->getUser(),
@@ -160,6 +162,7 @@ class MailPlugin implements ISearchPlugin {
 						}
 						$result['exact'][] = [
 							'label' => $displayName,
+							'uuid' => $contact['UID'],
 							'value' => [
 								'shareType' => Share::SHARE_TYPE_EMAIL,
 								'shareWith' => $emailAddress,
@@ -168,6 +171,7 @@ class MailPlugin implements ISearchPlugin {
 					} else {
 						$result['wide'][] = [
 							'label' => $displayName,
+							'uuid' => $contact['UID'],
 							'value' => [
 								'shareType' => Share::SHARE_TYPE_EMAIL,
 								'shareWith' => $emailAddress,
@@ -194,6 +198,7 @@ class MailPlugin implements ISearchPlugin {
 		if (!$searchResult->hasExactIdMatch($emailType) && filter_var($search, FILTER_VALIDATE_EMAIL)) {
 			$result['exact'][] = [
 				'label' => $search,
+				'uuid' => $search,
 				'value' => [
 					'shareType' => Share::SHARE_TYPE_EMAIL,
 					'shareWith' => $search,
diff --git a/lib/private/Collaboration/Collaborators/RemotePlugin.php b/lib/private/Collaboration/Collaborators/RemotePlugin.php
index 405db986d2b..af28c97c108 100644
--- a/lib/private/Collaboration/Collaborators/RemotePlugin.php
+++ b/lib/private/Collaboration/Collaborators/RemotePlugin.php
@@ -89,6 +89,7 @@ class RemotePlugin implements ISearchPlugin {
 						}
 						$result['exact'][] = [
 							'label' => $contact['FN'] . " ($cloudId)",
+							'uuid' => $contact['UID'],
 							'value' => [
 								'shareType' => Share::SHARE_TYPE_REMOTE,
 								'shareWith' => $cloudId,
@@ -98,6 +99,7 @@ class RemotePlugin implements ISearchPlugin {
 					} else {
 						$result['wide'][] = [
 							'label' => $contact['FN'] . " ($cloudId)",
+							'uuid' => $contact['UID'],
 							'value' => [
 								'shareType' => Share::SHARE_TYPE_REMOTE,
 								'shareWith' => $cloudId,
-- 
cgit v1.2.3


From 06d8438fdab04371532d5bbf7f482bf3fca7c526 Mon Sep 17 00:00:00 2001
From: Julius Härtl <jus@bitgrid.net>
Date: Wed, 17 Oct 2018 21:57:47 +0200
Subject: Group share suggestions by userid
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 core/js/sharedialogview.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'core/js')

diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index baf70fa63ad..2c31a96324f 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -312,6 +312,12 @@
 
 						var suggestions = exactMatches.concat(users).concat(groups).concat(remotes).concat(remoteGroups).concat(emails).concat(circles).concat(rooms).concat(lookup);
 
+						function dynamicSort(property) {
+							return function (a,b) {
+								return (a[property] < b[property]) ? -1 : (a[property] > b[property]) ? 1 : 0;
+							}
+						}
+						var grouped = suggestions.sort(dynamicSort('uuid'));
 						var moreResultsAvailable =
 							(
 								oc_config['sharing.maxAutocompleteResults'] > 0
@@ -328,7 +334,7 @@
 									)
 							);
 
-						deferred.resolve(suggestions, exactMatches, moreResultsAvailable);
+						deferred.resolve(grouped, exactMatches, moreResultsAvailable);
 					} else {
 						deferred.reject(result.ocs.meta.message);
 					}
-- 
cgit v1.2.3


From 3e11515b9c4ab9f8cb9c3f48082d6d086801c0e7 Mon Sep 17 00:00:00 2001
From: Julius Härtl <jus@bitgrid.net>
Date: Thu, 18 Oct 2018 12:36:37 +0200
Subject: Merge contacts and add type of result to the UI
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 apps/files_sharing/css/sharetabview.scss | 19 ++++++++++
 core/js/sharedialogview.js               | 60 +++++++++++++++++++++++++++-----
 2 files changed, 71 insertions(+), 8 deletions(-)

(limited to 'core/js')

diff --git a/apps/files_sharing/css/sharetabview.scss b/apps/files_sharing/css/sharetabview.scss
index 11747e5c062..c3c55c10ba2 100644
--- a/apps/files_sharing/css/sharetabview.scss
+++ b/apps/files_sharing/css/sharetabview.scss
@@ -4,6 +4,10 @@
 
 .share-autocomplete-item {
 	display: flex;
+
+	&.merged {
+		margin-left: 32px;
+	}
 	.autocomplete-item-text {
 		margin-left: 10px;
 		margin-right: 10px;
@@ -13,6 +17,21 @@
 		line-height: 32px;
 		vertical-align: middle;
 		flex-grow: 1;
+		.ui-state-highlight {
+			border: none;
+			margin: 0;
+		}
+	}
+	&.with-description {
+		.autocomplete-item-text {
+			line-height: 100%;
+		}
+	}
+	.autocomplete-item-details {
+		display: block;
+		line-height: 130%;
+		font-size: 90%;
+		opacity: 0.7;
 	}
 }
 
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 2c31a96324f..8c9e812adfa 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -314,10 +314,29 @@
 
 						function dynamicSort(property) {
 							return function (a,b) {
-								return (a[property] < b[property]) ? -1 : (a[property] > b[property]) ? 1 : 0;
+								var aProperty = '';
+								var bProperty = '';
+								if (typeof a[property] !== 'undefined') {
+									aProperty = a[property];
+								}
+								if (typeof b[property] !== 'undefined') {
+									bProperty = b[property];
+								}
+								return (aProperty < bProperty) ? -1 : (aProperty > bProperty) ? 1 : 0;
 							}
 						}
 						var grouped = suggestions.sort(dynamicSort('uuid'));
+						console.log(grouped);
+						var previousUuid = null;
+						groupedLength = grouped.length;
+						for (i = 0; i < groupedLength; i++) {
+							if (typeof grouped[i].uuid !== 'undefined' && grouped[i].uuid === previousUuid) {
+								grouped[i].merged = true;
+							} else {
+								grouped[i].merged = false;
+							}
+							previousUuid = grouped[i].uuid;
+						}
 						var moreResultsAvailable =
 							(
 								oc_config['sharing.maxAutocompleteResults'] > 0
@@ -469,15 +488,39 @@
 				text = t('core', '{sharee} (conversation)', { sharee: text }, undefined, { escape: false });
 				icon = 'icon-talk';
 			}
+			var description = '';
+			var getTranslatedType = function(type) {
+				switch (type) {
+					case 'HOME':
+						return t('core', 'Home');
+					case 'WORK':
+						return t('core', 'Home');
+					case 'OTHER':
+						return t('core', 'Other');
+					default:
+						return type;
+				}
+			};
+			if (typeof item.type !== 'undefined') {
+				description = getTranslatedType(item.type);
+			}
 			var insert = $("<div class='share-autocomplete-item'/>");
-			var avatar = $("<div class='avatardiv'></div>").appendTo(insert);
-			if (item.value.shareType === OC.Share.SHARE_TYPE_USER || item.value.shareType === OC.Share.SHARE_TYPE_CIRCLE) {
-				avatar.avatar(item.value.shareWith, 32, undefined, undefined, undefined, item.label);
+			if (description !== '') {
+				insert.addClass('with-description');
+			}
+			if (item.merged) {
+				insert.addClass('merged');
+				text = item.value.shareWith;
 			} else {
-				if (typeof item.uuid === 'undefined') {
-					item.uuid = text;
+				var avatar = $("<div class='avatardiv'></div>").appendTo(insert);
+				if (item.value.shareType === OC.Share.SHARE_TYPE_USER || item.value.shareType === OC.Share.SHARE_TYPE_CIRCLE) {
+					avatar.avatar(item.value.shareWith, 32, undefined, undefined, undefined, item.label);
+				} else {
+					if (typeof item.uuid === 'undefined') {
+						item.uuid = text;
+					}
+					avatar.imageplaceholder(item.uuid, text, 32);
 				}
-				avatar.imageplaceholder(item.uuid, text, 32);
 			}
 
 			$("<div class='autocomplete-item-text'></div>")
@@ -485,10 +528,11 @@
 					text.replace(
 					new RegExp(this.term, "gi"),
 					"<span class='ui-state-highlight'>$&</span>")
+					+ '<span class="autocomplete-item-details">' + description + '</span>'
 				)
 				.appendTo(insert);
 			insert.attr('title', item.value.shareWith);
-			insert.append('<span class="icon '+icon+'"></span>');
+			insert.append('<span class="icon '+icon+'" title="' + text + '"></span>');
 			insert = $("<a>")
 				.append(insert);
 			return $("<li>")
-- 
cgit v1.2.3


From 3313c0142df1399a038371c5265fa4b3d126b201 Mon Sep 17 00:00:00 2001
From: Julius Härtl <jus@bitgrid.net>
Date: Thu, 18 Oct 2018 12:38:22 +0200
Subject: Simplify share list text
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 core/js/sharedialogview.js | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'core/js')

diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 8c9e812adfa..9709c734f60 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -466,26 +466,21 @@
 		},
 
 		autocompleteRenderItem: function(ul, item) {
-
 			var icon = 'icon-user';
 			var text = item.label;
 			if (item.value.shareType === OC.Share.SHARE_TYPE_GROUP) {
-				text = t('core', '{sharee} (group)', { sharee: text }, undefined, { escape: false });
 				icon = 'icon-contacts-dark';
 			} else if (item.value.shareType === OC.Share.SHARE_TYPE_REMOTE) {
-				text = t('core', '{sharee} (remote)', {sharee: text}, undefined, {escape: false});
 				icon = 'icon-shared';
 			} else if (item.value.shareType === OC.Share.SHARE_TYPE_REMOTE_GROUP) {
 				text = t('core', '{sharee} (remote group)', { sharee: text }, undefined, { escape: false });
 				icon = 'icon-shared';
 			} else if (item.value.shareType === OC.Share.SHARE_TYPE_EMAIL) {
-				text = t('core', '{sharee} (email)', { sharee: text }, undefined, { escape: false });
 				icon = 'icon-mail';
 			} else if (item.value.shareType === OC.Share.SHARE_TYPE_CIRCLE) {
 				text = t('core', '{sharee} ({type}, {owner})', {sharee: text, type: item.value.circleInfo, owner: item.value.circleOwner}, undefined, {escape: false});
 				icon = 'icon-circle';
 			} else if (item.value.shareType === OC.Share.SHARE_TYPE_ROOM) {
-				text = t('core', '{sharee} (conversation)', { sharee: text }, undefined, { escape: false });
 				icon = 'icon-talk';
 			}
 			var description = '';
-- 
cgit v1.2.3


From e8e898ede8b7655f9c4e61834d2a038b009bc6cb Mon Sep 17 00:00:00 2001
From: Julius Härtl <jus@bitgrid.net>
Date: Thu, 25 Oct 2018 21:36:44 +0200
Subject: Use tab to complete selected entry to the share entry
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 core/js/sharedialogview.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'core/js')

diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 9709c734f60..cd7f07011c3 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -539,6 +539,16 @@
 		_onSelectRecipient: function(e, s) {
 			var self = this;
 
+			if (e.keyCode == 9) {
+				e.preventDefault();
+				e.target.value = s.item.label;
+				setTimeout(function() {
+					$(e.target).attr('disabled', false)
+						.autocomplete('search', $(e.target).val());
+				}, 0);
+				return false;
+			}
+
 			e.preventDefault();
 			// Ensure that the keydown handler for the input field is not
 			// called; otherwise it would try to add the recipient again, which
-- 
cgit v1.2.3


From f116461d4b435b28cd62c3c121a33108e8812e56 Mon Sep 17 00:00:00 2001
From: Julius Härtl <jus@bitgrid.net>
Date: Fri, 26 Oct 2018 13:46:24 +0200
Subject: Show one share method per contact for inaccurate results
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 core/js/sharedialogview.js | 38 ++++++++++++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 8 deletions(-)

(limited to 'core/js')

diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index cd7f07011c3..c255152e666 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -325,16 +325,30 @@
 								return (aProperty < bProperty) ? -1 : (aProperty > bProperty) ? 1 : 0;
 							}
 						}
+
+						/**
+						 * Sort share entries by uuid to properly group them
+						 */
 						var grouped = suggestions.sort(dynamicSort('uuid'));
-						console.log(grouped);
+
 						var previousUuid = null;
-						groupedLength = grouped.length;
+						var groupedLength = grouped.length;
+						var result = [];
+						/**
+						 * build the result array that only contains all contact entries from
+						 * merged contacts, if the search term matches its contact name
+						 */
 						for (i = 0; i < groupedLength; i++) {
+							console.log(grouped[i]);
 							if (typeof grouped[i].uuid !== 'undefined' && grouped[i].uuid === previousUuid) {
 								grouped[i].merged = true;
 							} else {
 								grouped[i].merged = false;
 							}
+							if (searchTerm === grouped[i].name || grouped[i].merged === false) {
+								result.push(grouped[i]);
+							} else {
+							}
 							previousUuid = grouped[i].uuid;
 						}
 						var moreResultsAvailable =
@@ -353,7 +367,7 @@
 									)
 							);
 
-						deferred.resolve(grouped, exactMatches, moreResultsAvailable);
+						deferred.resolve(result, exactMatches, moreResultsAvailable);
 					} else {
 						deferred.reject(result.ocs.meta.message);
 					}
@@ -468,6 +482,9 @@
 		autocompleteRenderItem: function(ul, item) {
 			var icon = 'icon-user';
 			var text = item.label;
+			if (typeof item.name !== 'undefined') {
+				text = item.name;
+			}
 			if (item.value.shareType === OC.Share.SHARE_TYPE_GROUP) {
 				icon = 'icon-contacts-dark';
 			} else if (item.value.shareType === OC.Share.SHARE_TYPE_REMOTE) {
@@ -496,13 +513,10 @@
 						return type;
 				}
 			};
-			if (typeof item.type !== 'undefined') {
+			if (typeof item.type !== 'undefined' && item.type !== null) {
 				description = getTranslatedType(item.type);
 			}
 			var insert = $("<div class='share-autocomplete-item'/>");
-			if (description !== '') {
-				insert.addClass('with-description');
-			}
 			if (item.merged) {
 				insert.addClass('merged');
 				text = item.value.shareWith;
@@ -516,6 +530,10 @@
 					}
 					avatar.imageplaceholder(item.uuid, text, 32);
 				}
+				description = item.value.shareWith;
+			}
+			if (description !== '') {
+				insert.addClass('with-description');
 			}
 
 			$("<div class='autocomplete-item-text'></div>")
@@ -541,7 +559,11 @@
 
 			if (e.keyCode == 9) {
 				e.preventDefault();
-				e.target.value = s.item.label;
+				if (typeof s.item.name !== 'undefined') {
+					e.target.value = s.item.name;
+				} else {
+					e.target.value = s.item.label;
+				}
 				setTimeout(function() {
 					$(e.target).attr('disabled', false)
 						.autocomplete('search', $(e.target).val());
-- 
cgit v1.2.3


From e6952edaf450c6a74e38eac27d1de37b1934d6e3 Mon Sep 17 00:00:00 2001
From: Julius Härtl <jus@bitgrid.net>
Date: Tue, 30 Oct 2018 11:37:11 +0100
Subject: Don't enforce merged property
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 core/js/sharedialogview.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'core/js')

diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index c255152e666..082bf9571d7 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -339,15 +339,11 @@
 						 * merged contacts, if the search term matches its contact name
 						 */
 						for (i = 0; i < groupedLength; i++) {
-							console.log(grouped[i]);
 							if (typeof grouped[i].uuid !== 'undefined' && grouped[i].uuid === previousUuid) {
 								grouped[i].merged = true;
-							} else {
-								grouped[i].merged = false;
 							}
-							if (searchTerm === grouped[i].name || grouped[i].merged === false) {
+							if (searchTerm === grouped[i].name || typeof grouped[i].merged === 'undefined') {
 								result.push(grouped[i]);
-							} else {
 							}
 							previousUuid = grouped[i].uuid;
 						}
-- 
cgit v1.2.3