Merge pull request #577 from archesproject/575_dependency_updates_lin…

…ting

pouchdb now uses fetch, add global lint property, re #575

.eslintrc.js

@@ -25,5 +25,8 @@ module.exports = {
     'generator-star-spacing': 'off',
     // allow debugger during development
     'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
+  },
+  globals: {
+    Camera: "readonly"
   }
 }

config.xml

@@ -1,9 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="org.archesproject.archescollector"
-    version="0.2.2"
-    xmlns="http://www.w3.org/ns/widgets"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="org.archesproject.archescollector" version="0.2.2" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>ArchesCollector</name>
     <description>
       A mobile app to manage Arches resources
@@ -47,7 +43,7 @@
     <edit-config file="*-Info.plist" mode="merge" target="NSPhotoLibraryAddUsageDescription">
         <string>need photo library access to save pictures there</string>
     </edit-config>
-    <engine name="browser" spec="~5.0.3" />
-    <engine name="android" spec="~7.1.4" />
-    <engine name="ios" spec="~4.5.5" />
+    <engine name="browser" spec="^5.0.3" />
+    <engine name="android" spec="^7.0.0" />
+    <engine name="ios" spec="4.5.5" />
 </widget>

package.json

@@ -151,4 +151,4 @@
             "ios"
         ]
     }
-}
+}

src/store.js

@@ -59,12 +59,9 @@ var pouchDBs = (function() {
                 iosDatabaseLocation: 'Library'
             });
             this._projectDBs[projectId].remote = new PouchDB(server.url + '/couchdb/project_' + projectId, {
-                ajax: {
-                    headers: {
-                        authorization: 'Bearer ' + server.token
-                        // 'X-Some-Special-Header': 'foo'
-                    },
-                    withCredentials: false
+                fetch: function (url, opts) {
+                    opts.headers.set('authorization', 'Bearer ' + server.token);
+                    return PouchDB.fetch(url, opts);
                 }
             });
         },
@@ -74,11 +71,9 @@ var pouchDBs = (function() {
                 .then(function(doc) {
                     Object.keys(doc.servers[server.url].projects).forEach(function(projectId) {
                         self._projectDBs[projectId].remote = new PouchDB(server.url + '/couchdb/project_' + projectId, {
-                            ajax: {
-                                headers: {
-                                    authorization: 'Bearer ' + server.token
-                                },
-                                withCredentials: false
+                            fetch: function (url, opts) {
+                                opts.headers.set('authorization', 'Bearer ' + server.token);
+                                return PouchDB.fetch(url, opts);
                             }
                         });
                     });
@@ -624,10 +619,10 @@ var store = new Vuex.Store({
             return store.dispatch('saveServerInfoToPouch');
         },
         syncRemote: function({ commit, state }, { projectId, syncAttempts }) {
+            var server = store.getters.activeServer;
             store.commit('clearNewlyCreatedResourcesAndTiles', projectId);
             return pouchDBs.syncProject(projectId)
                 .then(function() {
-                    var server = store.getters.activeServer;
                     return fetch(server.url + '/sync/' + projectId, {
                         method: 'GET',
                         headers: new Headers({