Browse Source

Resolve selected files (WIP)

Kevin van Zonneveld 9 years ago
parent
commit
177e3105f5

+ 17 - 23
src/plugins/Formtag.js

@@ -16,37 +16,31 @@ export default class Formtag extends Plugin {
     this.setProgress(0);
 
     const button = document.querySelector(this.opts.doneButtonSelector);
-    var self   = this;
+    var self     = this;
 
     return new Promise((resolve, reject) => {
       button.addEventListener('click', (e) => {
-        alert('hey');
-        var fields   = document.querySelectorAll(this.opts.selector);
+        var fields   = document.querySelectorAll(self.opts.selector);
         var files    = [];
         var selected = [];
-        for (let i in fields) {
-          for (let j in fields[i].files) {
-            selected.push(fields[i].files[j]);
+        for (var i in fields) {
+          for (var j in fields[i].files) {
+            var file = fields[i].files.item(j);
+            if (file) {
+              selected.push({
+                from: 'Formtag',
+                file: fields[i].files.item(j)
+              });
+            }
           }
         }
-        this.setProgress(100);
-        // resolve(this.handleDrop.bind(null, e));
-        resolve('yo');
+        self.setProgress(100);
+        console.log({
+          selected:selected,
+          fields  :fields
+        })
+        resolve(selected);
       });
     });
-
-    // button.addEventListener('click', (e) => {
-    //   alert('hey');
-    //   var fields   = document.querySelectorAll(self.opts.selector);
-    //   var files    = [];
-    //   var selected = [];
-    //   for (let i in fields) {
-    //     for (let j in fields[i].files) {
-    //       selected.push(fields[i].files[j]);
-    //     }
-    //   }
-    //   this.setProgress(100);
-    //   return Promise.resolve(selected);
-    // });
   }
 }

+ 3 - 3
website/_config.yml

@@ -5,9 +5,9 @@
 # Uppy versions, auto updated by update.js
 uppy_version: 0.0.1
 
-uppy_dev_size: "79.24"
-uppy_min_size: "79.24"
-uppy_gz_size: "79.24"
+uppy_dev_size: "78.96"
+uppy_min_size: "78.96"
+uppy_gz_size: "78.96"
 
 # Theme
 google_analytics: UA-63083-12

+ 7 - 6
website/src/examples/multipart/app.css

@@ -1,8 +1,9 @@
-/* Drag & Drop CSS to style the demo itself */
-
-#myform1 {
-  border: 1px dashed blue;
+#myform1, #myform2 {
+  float  : left;
+  width  : 200px;
+  margin : 20px;
 }
-#myform2 {
-  border: 1px dashed blue;
+
+.clearfix {
+  clear: both;
 }

+ 6 - 8
website/src/examples/multipart/app.html

@@ -1,20 +1,18 @@
 <!-- Basic Uppy styles -->
 <link rel="stylesheet" href="/css/uppy.css">
 
+<div class="clearfix"></div>
+
 <form id="myform1">
-  <div>
-    <input id="myfile1" type="file" name="myfile" data-multiple-caption="{count} files selected" multiple />
-    <label for="myfile1"><strong>Choose a file</strong></label>
-  </div>
+  <input id="myfile1" type="file" name="myfile" multiple />
 </form>
 
 <form id="myform2">
-  <div>
-    <input id="myfile2" type="file" name="myfile" data-multiple-caption="{count} files selected" multiple />
-    <label for="myfile2"><strong>Choose a file</strong></label>
-  </div>
+  <input id="myfile2" type="file" name="myfile" multiple />
 </form>
 
+<div class="clearfix"></div>
+
 <button id="myupload">
   Upload
 </button>