Resolving merge conflicts

2026-05-30 15:24:11 +03:00 · 2016-03-05 23:56:02 -07:00
parent 84755d1325 261e41644d
commit 5fc59a65aa
3 changed files with 23 additions and 3 deletions
@@ -26,7 +26,13 @@
          data.append('foo', 'bar');
          data.append('file', document.getElementById('file').files[0]);

-          axios.put('/upload/server', data)
+          var config = {
+            progress: function(progressEvent) {
+              var percentCompleted = progressEvent.loaded / progressEvent.total;
+            }
+          };
+
+          axios.put('/upload/server', data, config)
            .then(function (res) {
              output.className = 'container';
              output.innerHTML = res.data;
@@ -40,4 +46,3 @@
    </script>
  </body>
 </html>
-