diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-09-06 15:30:41 +0200 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-09-06 15:30:41 +0200 |
| commit | f23e45d923e3bf57c1d35a3681e435a5d88714a6 (patch) | |
| tree | c0add3b6a32e732239715b8336bbb3bb757f37c1 /src | |
| parent | 91f33bbafe3bed9cd2eb77566a560cead27c74dd (diff) | |
Allow href + action in popover but action prevent link redirection + adb.url fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/core/popoverMenu/popoverItem.vue | 6 | ||||
| -rw-r--r-- | src/store/addressbooks.js | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/components/core/popoverMenu/popoverItem.vue b/src/components/core/popoverMenu/popoverItem.vue index 6d11f3be..de3d3075 100644 --- a/src/components/core/popoverMenu/popoverItem.vue +++ b/src/components/core/popoverMenu/popoverItem.vue @@ -24,7 +24,7 @@ <li> <!-- If item.href is set, a link will be directly used --> <a v-if="item.href" :href="(item.href) ? item.href : '#' " :target="(item.target) ? item.target : '' " - rel="noreferrer noopener" @click="item.action"> + rel="noreferrer noopener" @click.stop.prevent="item.action"> <span :class="item.icon" /> <span v-if="item.text">{{ item.text }}</span> <p v-else-if="item.longtext">{{ item.longtext }}</p> @@ -33,10 +33,10 @@ <span v-else-if="item.input" class="menuitem"> <input :id="item.key" :type="item.input" :class="item.input" v-model="item.model" @change="item.action"> - <label :for="item.key" @click="item.action">{{ item.text }}</label> + <label :for="item.key" @click.stop.prevent="item.action">{{ item.text }}</label> </span> <!-- If item.action is set instead, a button will be used --> - <button v-else-if="item.action" @click="item.action"> + <button v-else-if="item.action" @click.stop.prevent="item.action"> <span :class="item.icon" /> <span v-if="item.text">{{ item.text }}</span> <p v-else-if="item.longtext">{{ item.longtext }}</p> diff --git a/src/store/addressbooks.js b/src/store/addressbooks.js index 740d8faf..20fcdbf8 100644 --- a/src/store/addressbooks.js +++ b/src/store/addressbooks.js @@ -206,13 +206,15 @@ const actions = { id: 'ab1', displayName: 'Addressbook 1', enabled: true, - owner: 'admin' + owner: 'admin', + url: '/remote.php/dav/ab1' // dav: addressbook }, { id: 'ab2', displayName: 'Addressbook 2', enabled: true, - owner: 'admin' + owner: 'admin', + url: '/remote.php/dav/ab2' // dav: addressbook }] // }) |