First timer: Remove jQuery part 1 (#540)

* refactored two ajax request to simple xhr * added verify to request success * changed requests to fetch api * Rebase * check out package.json * Revert package.json state to main * change request url mistype and fixed response transform * Rebase * Rebase package-lock * Update response 200 to response.ok Co-authored-by: sashadev-sky <[email protected]>
publiclab · Apr 21, 2020 · d2e6b3f · d2e6b3f
1 parent 6b1efd5
commit d2e6b3f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/dist/leaflet.distortableimage.js b/dist/leaflet.distortableimage.js
diff --git a/src/edit/DistortableCollection.Edit.js b/src/edit/DistortableCollection.Edit.js
@@ -303,28 +303,28 @@ L.DistortableCollection.Edit = L.Handler.extend({
         statusUrl = opts.statusUrl + data;
         // repeatedly fetch the status.json
         self.updateInterval = setInterval(function intervalUpdater() {
-          $.ajax(statusUrl + '?' + Date.now(), {// bust cache with timestamp
-            type: 'GET',
-            crossDomain: true,
-          }).done(function(data) {
-            opts.updater(data);
-          });
+          var request = new Request(statusUrl+'?'+Date.now(), {method: 'GET'});
+          fetch(request).then(function(response) {
+            if (response.ok) {
+              return response.text();
+            }
+          }).then(opts.updater);
         }, opts.frequency);
       }
 
       // initiate the export
       function _defaultFetchStatusUrl(opts) {
-        $.ajax({
-          url: opts.exportStartUrl,
-          crossDomain: true,
-          type: 'POST',
-          data: {
-            collection: JSON.stringify(opts.collection),
-            scale: opts.scale,
-            upload: true,
-          },
-          success: function(data) { opts.handleStatusRes(data); }, // this handles the initial response
-        });
+        var form = new FormData();
+        form.append('collection', JSON.stringify(opts.collection));
+        form.append('scale', opts.scale);
+        form.append('upload', true);
+        var requestOptions = {method: 'POST', body: form};
+        var request = new Request(opts.exportStartUrl, requestOptions);
+        fetch(request).then(function(response) {
+          if (response.ok) {
+            return response.text();
+          }
+        }).then(opts.handleStatusRes);
       }
 
       // If the user has passed collection property