Changeset 4556 for plugins

Timestamp:

02/07/12 17:12:53 (3 months ago)

Author:

wjohnald

Message:

Wrote an ajax queuing mechanism for the uploader using jQuery deferred objects. Wrote a file handler that was properly reviewed by Tom. Need to flesh out the controller action to add to the media library

Location:

plugins/apostropheMediaEnhancementsPlugin/trunk

Files:

• lib/action/BaseaEnhancedMediaActions.class.php (modified) (1 diff)
• lib/toolkit (added)
• lib/toolkit/BaseaEnhancedMediaTools.class.php (added)
• lib/toolkit/aEnhancedMediaTools.class.php (added)
• modules/aMedia/templates/html5UploadSuccess.php (modified) (2 diffs)
• web/js/apostrophe.html5.uploader.js (modified) (9 diffs)

plugins/apostropheMediaEnhancementsPlugin/trunk/lib/action/BaseaEnhancedMediaActions.class.php

@@ -12 +12 @@
         if ($request->getMethod() == "POST")
         {
-            if (isset($_GET['aFile'])) {
-                $this->file = new qqUploadedFileXhr();
-            } elseif (isset($_FILES['aFile'])) {
-                $this->file = new qqUploadedFileForm();
-            }
+            $files = aEnhancedMediaTools::getInstance()->handleHtml5Upload($request);
 
-            var_dump($this->file);
+            var_dump($files);
+            die;
         }
     }

plugins/apostropheMediaEnhancementsPlugin/trunk/modules/aMedia/templates/html5UploadSuccess.php

@@ -1 +1 @@
 <h1>Drag and Drop Upload!  -- REMIX</h1>
 
-<form>
-    <input id="fileupload" type="file" name="aFile[]" multiple>
+<form enctype="multipart/form-data" method="POST" action="/admin/media/html5Upload">
+    <?php /*<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo ini_get('upload_max_filesize') ?>" /> */ ?>
+    <input id="fileupload" type="file" name="aFile[]" multiple />
+    <input type="submit" />
 </form>
 
@@ -19 +21 @@
     $('#fileupload').aFileUploader({
         'dragenter': function () { console.log("dragenter"); },
-        'dragleave': function () { console.log("dragleave"); },
-        'invalidFile': function (file) { console.log(file.name + " is invalid."); },
-        'ajaxTransferSuccess': function(data) { console.log(data); }
+        'dragleave': function () { console.log("dragleave"); }
+        //'invalidFile': function (file) { console.log(file.name + " is invalid."); },
+        //'ajaxTransferSuccess': function(data) { console.log(data); }
     });
 });

plugins/apostropheMediaEnhancementsPlugin/trunk/web/js/apostrophe.html5.uploader.js

@@ -14 +14 @@
             "name": "aFile",
             "url": "/admin/media/html5Upload",
+            "maxAjaxUploads": 1,
 
             // Drag handlers
@@ -56 +57 @@
                 $input.bind("change", function () {
                     handleFiles(this.files);
+                    //$input.closest('form').submit();
                 });
             } else {
@@ -70 +72 @@
             function handleFiles(files)
             {
+                var requests = [];
+                
                 for (var i = 0; i < files.length; i++) {
 
@@ -75 +79 @@
 
                     if (file.size > 0) {
-                        upload(file);
+                        requests.push(upload(file));
                     }
                     else
@@ -86 +90 @@
 
                 }
+
+                function executeNextRequest() {
+                    var req = requests.shift();
+
+                    if (typeof(req) == 'function') {
+                        $.when(req()).then(function(){ executeNextRequest();});
+                    }
+                }
+
+                for (var i = 0; i < defaults.maxAjaxUploads; i++)
+                {
+                    executeNextRequest();
+                }
             }
 
@@ -119 +136 @@
             function upload(file)
             {
+                // deferred object will allow us to chain events based on resolution of ajax
+                var deferred = $.Deferred();
+                var aSendFunction;
+
                 // xmlHttpRequest is the easiest way to deal with posting data
                 var xmlHttpRequest = new XMLHttpRequest();
@@ -133 +154 @@
                             }
                         }
+                        deferred.resolve();
                     }
                 }
@@ -142 +164 @@
                 if (window.FileReader) { // Firefox and Chrome
                     var fileReader = new FileReader;
+
+                    var aSendFunction = null;
 
                     // attach events to the FileReader
@@ -181 +205 @@
 
                         xmlHttpRequest.setRequestHeader("Content-Type", "multipart/form-data;boundary=" + boundary);
-                        xmlHttpRequest.sendAsBinary(data);
+
+                        aSendFunction = function() {
+                            xmlHttpRequest.sendAsBinary(data);
+
+                            return deferred.promise();
+                        }
                     } else if (window.FormData) { // Chrome
                         var formData = new FormData();
                         formData.append(defaults.name, file);
-                        xmlHttpRequest.send(formData);
+
+                        aSendFunction = function() {
+                            xmlHttpRequest.send(formData);
+
+                            return deferred.promise();
+                        }
                     }
                 } else if (window.FormData) { // Safari
                     var formData = new FormData();
                     formData.append(defaults.name, file);
-                    xmlHttpRequest.send(formData);
-                }
+
+                    aSendFunction = function() {
+                        xmlHttpRequest.send(formData);
+
+                        return deferred.promise();
+                    }
+
+                }
+
+                return aSendFunction;
             }
         });