Merge branch 'master' of https://github.com/nextcloud/contacts into disabled-ab-should-not-be-suggested

5 files changed, 14 insertions, 27 deletions

diff --git a/src/components/Properties/PropertyDateTime.vue b/src/components/Properties/PropertyDateTime.vue
index e912c192..4a68f594 100644
--- a/src/components/Properties/PropertyDateTime.vue
+++ b/src/components/Properties/PropertyDateTime.vue
@@ -30,7 +30,7 @@
 			<!-- type selector -->
 			<multiselect v-if="propModel.options" v-model="localType"
 				:options="options" :searchable="false" :placeholder="t('contacts', 'Select type')"
-				class="multiselect-vue property__label" track-by="id" label="name"
+				class="property__label" track-by="id" label="name"
 				@input="updateType" />
 
 			<!-- if we do not support any type on our model but one is set anyway -->
@@ -51,13 +51,12 @@
 </template>
 
 <script>
-import Multiselect from 'vue-multiselect'
-import { DatetimePicker } from 'nextcloud-vue'
 import debounce from 'debounce'
 import moment from 'moment'
+import { DatetimePicker } from 'nextcloud-vue'
 import { VCardTime } from 'ical.js'
 
-import propertyTitle from './PropertyTitle'
+import PropertyTitle from './PropertyTitle'
 
 /**
  * Format time with locale to display only
@@ -134,9 +133,8 @@ export default {
 	name: 'PropertyDateTime',
 
 	components: {
-		Multiselect,
-		propertyTitle,
-		DatetimePicker
+		DatetimePicker,
+		PropertyTitle
 	},
 
 	props: {
diff --git a/src/components/Properties/PropertyGroups.vue b/src/components/Properties/PropertyGroups.vue
index 7675bbf1..b4de6185 100644
--- a/src/components/Properties/PropertyGroups.vue
+++ b/src/components/Properties/PropertyGroups.vue
@@ -29,7 +29,7 @@
 			<!-- multiselect taggable groups with a limit to 3 groups shown -->
 			<multiselect v-model="localValue" :options="groups" :placeholder="t('contacts', 'Add contact in group')"
 				:limit="3" :multiple="true" :taggable="true"
-				:close-on-select="false" tag-placeholder="create" class="multiselect-vue property__value"
+				:close-on-select="false" tag-placeholder="create" class="property__value"
 				@input="updateValue" @tag="validateGroup" @select="addContactToGroup"
 				@remove="removeContactToGroup">
 
@@ -42,17 +42,12 @@
 </template>
 
 <script>
-import Multiselect from 'vue-multiselect'
 import debounce from 'debounce'
 import Contact from '../../models/contact'
 
 export default {
 	name: 'PropertyGroups',
 
-	components: {
-		Multiselect
-	},
-
 	props: {
 		propModel: {
 			type: Object,
diff --git a/src/components/Properties/PropertyMultipleText.vue b/src/components/Properties/PropertyMultipleText.vue
index 50e2b71e..79386ba2 100644
--- a/src/components/Properties/PropertyMultipleText.vue
+++ b/src/components/Properties/PropertyMultipleText.vue
@@ -30,7 +30,7 @@
 			<!-- type selector -->
 			<multiselect v-if="propModel.options" v-model="localType"
 				:options="options" :searchable="false" :placeholder="t('contacts', 'Select type')"
-				class="multiselect-vue property__label" track-by="id" label="name"
+				class="property__label" track-by="id" label="name"
 				@input="updateType" />
 
 			<!-- if we do not support any type on our model but one is set anyway -->
@@ -69,16 +69,14 @@
 </template>
 
 <script>
-import Multiselect from 'vue-multiselect'
-import propertyTitle from './PropertyTitle'
+import PropertyTitle from './PropertyTitle'
 import debounce from 'debounce'
 
 export default {
 	name: 'PropertyText',
 
 	components: {
-		Multiselect,
-		propertyTitle
+		PropertyTitle
 	},
 
 	props: {
diff --git a/src/components/Properties/PropertySelect.vue b/src/components/Properties/PropertySelect.vue
index c365445f..92508124 100644
--- a/src/components/Properties/PropertySelect.vue
+++ b/src/components/Properties/PropertySelect.vue
@@ -45,16 +45,14 @@
 </template>
 
 <script>
-import Multiselect from 'vue-multiselect'
-import propertyTitle from './PropertyTitle'
+import PropertyTitle from './PropertyTitle'
 import debounce from 'debounce'
 
 export default {
 	name: 'PropertySelect',
 
 	components: {
-		Multiselect,
-		propertyTitle
+		PropertyTitle
 	},
 
 	props: {
diff --git a/src/components/Properties/PropertyText.vue b/src/components/Properties/PropertyText.vue
index d2681784..b67514f0 100644
--- a/src/components/Properties/PropertyText.vue
+++ b/src/components/Properties/PropertyText.vue
@@ -30,7 +30,7 @@
 			<!-- type selector -->
 			<multiselect v-if="propModel.options" v-model="localType"
 				:options="options" :searchable="false" :placeholder="t('contacts', 'Select type')"
-				class="multiselect-vue property__label" track-by="id" label="name"
+				class="property__label" track-by="id" label="name"
 				@input="updateType" />
 
 			<!-- if we do not support any type on our model but one is set anyway -->
@@ -55,16 +55,14 @@
 </template>
 
 <script>
-import Multiselect from 'vue-multiselect'
-import propertyTitle from './PropertyTitle'
+import PropertyTitle from './PropertyTitle'
 import debounce from 'debounce'
 
 export default {
 	name: 'PropertyText',
 
 	components: {
-		Multiselect,
-		propertyTitle
+		PropertyTitle
 	},
 
 	props: {