From 25437b96d2ec7575b634b749c0c4978fbafa5380 Mon Sep 17 00:00:00 2001
From: xh3n1 <myrtajxheni@gmail.com>
Date: Wed, 5 Jul 2017 16:49:05 +0200
Subject: [PATCH] Adjust dropdown options of instant messengers and social
 profile

---
 .gitignore                          |  1 +
 js/services/vCardProperties.js      | 17 +++++++++++------
 templates/detailItems/username.html | 11 +++++++++++
 3 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 templates/detailItems/username.html

diff --git a/.gitignore b/.gitignore
index daa0d5232..6cc22f1a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ js/public
 js/vendor
 coverage
 npm-debug.log
+package-lock.json
diff --git a/js/services/vCardProperties.js b/js/services/vCardProperties.js
index 4da3fc358..348b4415b 100644
--- a/js/services/vCardProperties.js
+++ b/js/services/vCardProperties.js
@@ -91,15 +91,15 @@ angular.module('contactsApp')
 		impp: {
 			multiple: true,
 			readableName: t('contacts', 'Instant messaging'),
-			template: 'text',
+			template: 'username',
 			defaultValue: {
 				value:[''],
-				meta:{type:['HOME']}
+				meta:{type:['SKYPE']}
 			},
 			options: [
-				{id: 'HOME', name: t('contacts', 'Home')},
-				{id: 'WORK', name: t('contacts', 'Work')},
-				{id: 'OTHER', name: t('contacts', 'Other')}
+				{id: 'IRC', name:  'IRC'},
+				{id: 'SKYPE', name:'Skype'},
+				{id: 'TELEGRAM', name:'Telegram'}
 			]
 		},
 		tel: {
@@ -124,14 +124,19 @@ angular.module('contactsApp')
 		'X-SOCIALPROFILE': {
 			multiple: true,
 			readableName: t('contacts', 'Social network'),
-			template: 'text',
+			template: 'username',
 			defaultValue: {
 				value:[''],
 				meta:{type:['facebook']}
 			},
 			options: [
 				{id: 'FACEBOOK', name: 'Facebook'},
+				{id: 'GOOGLEPLUS', name: 'Google+'},
+				{id: 'INSTAGRAM', name: 'Instagram'},
+				{id: 'LINKEDIN', name: 'LinkedIn'},
+				{id: 'PINTEREST', name: 'Pinterest'},
 				{id: 'TWITTER', name: 'Twitter'}
+
 			]
 
 		}
diff --git a/templates/detailItems/username.html b/templates/detailItems/username.html
new file mode 100644
index 000000000..2b4f88ad6
--- /dev/null
+++ b/templates/detailItems/username.html
@@ -0,0 +1,11 @@
+<select ng-if="ctrl.availableOptions.length > 0" ng-model="ctrl.type" ng-model-options="{ debounce: 500 }" ng-change="ctrl.changeType(ctrl.type)">
+	<option ng-repeat="option in ctrl.availableOptions" value="{{option.id}}">{{option.name}}</option>
+</select>
+<label ng-if="ctrl.availableOptions.length === 0" for="details-{{ctrl.name}}-{{ctrl.index}}">{{ctrl.meta.readableName}}</label>
+<input type="text" id="details-{{ctrl.name}}-{{ctrl.index}}" name="{{ctrl.name}}"
+	   ng-model="ctrl.data.value" ng-model-options="{ debounce: 500 }"
+	   ng-change="ctrl.model.updateContact()" value=""
+	   placeholder="Username"
+	   focus-expression="$parent.ctrl.focus === ctrl.name"
+/>
+<button ng-click="ctrl.deleteField()" class="icon-delete" title="{{ctrl.t.delete}}"></button>