summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-08-28 20:49:19 +0200
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-08-28 20:49:19 +0200
commit8850e9a3aeb637210cd4461e12b0dadc55d48857 (patch)
treed0dff137e80b7473421bf3691cf26454b3f53e92 /src
parentd0517b8a42662f7323fa54f09b1eb85377be90d2 (diff)
Disable client while waiting for fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/services/cdav.js44
-rw-r--r--src/store/addressbooks.js20
-rw-r--r--src/views/Contacts.vue30
3 files changed, 47 insertions, 47 deletions
diff --git a/src/services/cdav.js b/src/services/cdav.js
index baecc096..043444fd 100644
--- a/src/services/cdav.js
+++ b/src/services/cdav.js
@@ -20,28 +20,28 @@
*
*/
-import cdav from 'cdav-library'
+// import cdav from 'cdav-library'
-function xhrProvider() {
- var headers = {
- 'X-Requested-With': 'XMLHttpRequest',
- 'requesttoken': OC.requestToken
- }
- var xhr = new XMLHttpRequest()
- var oldOpen = xhr.open
+// function xhrProvider() {
+// var headers = {
+// 'X-Requested-With': 'XMLHttpRequest',
+// 'requesttoken': OC.requestToken
+// }
+// var xhr = new XMLHttpRequest()
+// var oldOpen = xhr.open
- // override open() method to add headers
- xhr.open = function() {
- var result = oldOpen.apply(this, arguments)
- for (let name in headers) {
- xhr.setRequestHeader(name, headers[name])
- }
- return result
- }
- OC.registerXHRForErrorProcessing(xhr)
- return xhr
-}
+// // override open() method to add headers
+// xhr.open = function() {
+// var result = oldOpen.apply(this, arguments)
+// for (let name in headers) {
+// xhr.setRequestHeader(name, headers[name])
+// }
+// return result
+// }
+// OC.registerXHRForErrorProcessing(xhr)
+// return xhr
+// }
-export default new cdav.DavClient({
- rootUrl: OC.linkToRemote('dav')
-}, xhrProvider)
+// export default new cdav.DavClient({
+// rootUrl: OC.linkToRemote('dav')
+// }, xhrProvider)
diff --git a/src/store/addressbooks.js b/src/store/addressbooks.js
index bb1858f2..be152edf 100644
--- a/src/store/addressbooks.js
+++ b/src/store/addressbooks.js
@@ -25,7 +25,7 @@ import vcfFile from '!raw-loader!./FakeName.vcf'
import parseVcf from '../services/parseVcf'
import Vue from 'vue'
-import client from '../services/cdav'
+// import client from '../services/cdav'
const addressbookModel = {
id: '',
@@ -169,15 +169,15 @@ const actions = {
* @returns {Promise} fetch and commit
*/
async getAddressbooks(context) {
- let addressbooks = client.addressbookHomes.map(addressbook => {
- return {
- id: 'ab1',
- displayName: 'Addressbook 1',
- enabled: true,
- owner: 'admin',
- dav: addressbook
- }
- })
+ // let addressbooks = client.addressbookHomes.map(addressbook => {
+ let addressbooks = [{
+ id: 'ab1',
+ displayName: 'Addressbook 1',
+ enabled: true,
+ owner: 'admin'
+ // dav: addressbook
+ }]
+ // })
addressbooks.forEach(addressbook => {
context.commit('addAddressbooks', addressbook)
diff --git a/src/views/Contacts.vue b/src/views/Contacts.vue
index 5eaef100..a999a505 100644
--- a/src/views/Contacts.vue
+++ b/src/views/Contacts.vue
@@ -51,7 +51,7 @@ import contactDetails from '../components/ContactDetails'
import Contact from '../models/contact'
import rfcProps from '../models/rfcProps.js'
-import client from '../services/cdav.js'
+// import client from '../services/cdav.js'
export default {
components: {
@@ -183,22 +183,22 @@ export default {
beforeMount() {
// get addressbooks then get contacts
- client.connect({ enableCardDAV: true }).then(() => {
- this.$store.dispatch('getAddressbooks')
- .then(() => {
- Promise.all(this.addressbooks.map(async addressbook => {
- await this.$store.dispatch('getContactsFromAddressBook', addressbook)
- })).then(() => {
- this.loading = false
- this.selectFirstContactIfNone()
- })
+ // client.connect({ enableCardDAV: true }).then(() => {
+ this.$store.dispatch('getAddressbooks')
+ .then(() => {
+ Promise.all(this.addressbooks.map(async addressbook => {
+ await this.$store.dispatch('getContactsFromAddressBook', addressbook)
+ })).then(() => {
+ this.loading = false
+ this.selectFirstContactIfNone()
})
+ })
// check local storage for orderKey
- if (localStorage.getItem('orderKey')) {
- // run setOrder mutation with local storage key
- this.$store.commit('setOrder', localStorage.getItem('orderKey'))
- }
- })
+ if (localStorage.getItem('orderKey')) {
+ // run setOrder mutation with local storage key
+ this.$store.commit('setOrder', localStorage.getItem('orderKey'))
+ }
+ // })
},
methods: {