diff options
| author | Jessica <jessica@Absolventas-MacBook-Pro.local> | 2018-08-01 15:11:57 +0200 |
|---|---|---|
| committer | Jessica <jessica@Absolventas-MacBook-Pro.local> | 2018-08-01 15:11:57 +0200 |
| commit | 7034b82fc4b2a4f5fba1e9ae959cfc9bb3e96bac (patch) | |
| tree | 3c3ba983710232c96d60f3d7158a76a3321cd00a /src | |
| parent | 119028715dcaab7b77c0f78bf443074e3186e350 (diff) | |
worked on multiselect and translations for options
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/addressBook.vue | 2 | ||||
| -rw-r--r-- | src/components/settingsNavigation/shareAddressBook.vue | 5 | ||||
| -rw-r--r-- | src/components/settingsNavigation/sharee.vue | 5 | ||||
| -rw-r--r-- | src/components/settingsNavigation/sortContacts.vue | 51 |
4 files changed, 40 insertions, 23 deletions
diff --git a/src/components/addressBook.vue b/src/components/addressBook.vue index ecd38bb5..e61645bd 100644 --- a/src/components/addressBook.vue +++ b/src/components/addressBook.vue @@ -2,7 +2,7 @@ - @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com> - - @author John Molakvoæ <skjnldsv@protonmail.com> - - @author Team Popcorn <teampopcornberlin.gmail.com> + - @author Team Popcorn <teampopcornberlin@gmail.com> - - @license GNU AGPL version 3 or any later version - diff --git a/src/components/settingsNavigation/shareAddressBook.vue b/src/components/settingsNavigation/shareAddressBook.vue index df6a5015..d1351839 100644 --- a/src/components/settingsNavigation/shareAddressBook.vue +++ b/src/components/settingsNavigation/shareAddressBook.vue @@ -1,8 +1,7 @@ <!-- - - @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com> + - @copyright Copyright (c) 2018 Team Popcorn <teampopcornberlin@gmail.com> - - - @author John Molakvoæ <skjnldsv@protonmail.com> - - @author Team Popcorn <teampopcornberlin.gmail.com> + - @author Team Popcorn <teampopcornberlin@gmail.com> - - @license GNU AGPL version 3 or any later version - diff --git a/src/components/settingsNavigation/sharee.vue b/src/components/settingsNavigation/sharee.vue index 4df62f7e..e4398465 100644 --- a/src/components/settingsNavigation/sharee.vue +++ b/src/components/settingsNavigation/sharee.vue @@ -1,8 +1,7 @@ <!-- - - @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com> + - @copyright Copyright (c) 2018 Team Popcorn <teampopcornberlin@gmail.com> - - - @author John Molakvoæ <skjnldsv@protonmail.com> - - @author Team Popcorn <teampopcornberlin.gmail.com> + - @author Team Popcorn <teampopcornberlin@gmail.com> - - @license GNU AGPL version 3 or any later version - diff --git a/src/components/settingsNavigation/sortContacts.vue b/src/components/settingsNavigation/sortContacts.vue index 23851adf..b0814aab 100644 --- a/src/components/settingsNavigation/sortContacts.vue +++ b/src/components/settingsNavigation/sortContacts.vue @@ -1,8 +1,7 @@ <!-- - - @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com> + - @copyright Copyright (c) 2018 Team Popcorn <teampopcornberlin@gmail.com> - - - @author John Molakvoæ <skjnldsv@protonmail.com> - - @author Team Popcorn <teampopcornberlin.gmail.com> + - @author Team Popcorn <teampopcornberlin@gmail.com> - - @license GNU AGPL version 3 or any later version - @@ -29,12 +28,13 @@ v-model="value" :searchable="false" :allow-empty="false" - :placeholder="t('contacts', 'First name')" + :placeholder="placeholder" :options="options" - track-by="code" - label="display" + track-by="key" + label="label" + input="key" class="multiselect-vue" - @input="sortContacts(value.code)" /> + @input="sortContacts" /> </div> </template> @@ -59,18 +59,37 @@ export default { } }, data() { - return { - // options: [{'display':'First-name', 'code':'firstName'}, {'display':'Lastname', 'code': 'Lastname'}, {'display':'Display name', 'code':'displayName'}], - options: [ - { display: 'First name', code: 'firstName' }, - { display: 'Lastname', code: 'lastName' }, - { display: 'Display-name', code: 'displayName' } - ], - value: '' - } + return {} }, computed: { + /* Order Keys */ + options() { + return Array( + { + label: t('settings', 'First name'), + key: 'firstName' + }, + { + label: t('settings', 'Lastname'), + key: 'lastName' + }, + { + label: t('settings', 'Display-name'), + key: 'displayName' + } + ); + }, + + /* Current order Key */ + orderKey() { + return this.$store.getters.getOrderKey; + }, + + placeholder() { + return t('settings', this.orderKey) + } + }, methods: { sortContacts(orderKey = 'displayName') { |