fine_uploader 3.1.1 → 3.4.1

data/LICENSE.txt

@@ -1,5 +1,3 @@
-Copyright (c) 2012 Alif Rachmawadi
-
 MIT License
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -19,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Vendorfile

@@ -1,16 +1,27 @@
-from 'git://github.com/valums/file-uploader.git', ref: 'be738538a57633e355529ec13c63a7b2493b7ec8' do
+from 'git://github.com/Widen/fine-uploader.git', tag: '3.4.1' do
+  # images
   file 'vendor/assets/images/fine_uploader/loading.gif', 'client/loading.gif'
   file 'vendor/assets/images/fine_uploader/processing.gif', 'client/processing.gif'
-  file 'vendor/assets/javascripts/fine_uploader/header.js', 'client/js/header.js'
-  file 'vendor/assets/javascripts/fine_uploader/util.js', 'client/js/util.js'
+
+  # javascripts
+  file 'vendor/assets/javascripts/fine_uploader/ajax.requester.js', 'client/js/ajax.requester.js'
   file 'vendor/assets/javascripts/fine_uploader/button.js', 'client/js/button.js'
+  file 'vendor/assets/javascripts/fine_uploader/deletefile.ajax.requester.js', 'client/js/deletefile.ajax.requester.js'
+  file 'vendor/assets/javascripts/fine_uploader/dnd.js', 'client/js/dnd.js'
   file 'vendor/assets/javascripts/fine_uploader/handler.base.js', 'client/js/handler.base.js'
   file 'vendor/assets/javascripts/fine_uploader/handler.form.js', 'client/js/handler.form.js'
   file 'vendor/assets/javascripts/fine_uploader/handler.xhr.js', 'client/js/handler.xhr.js'
+  file 'vendor/assets/javascripts/fine_uploader/header.js', 'client/js/header.js'
+  file 'vendor/assets/javascripts/fine_uploader/iframe.xss.response.js', 'client/js/iframe.xss.response.js'
+  file 'vendor/assets/javascripts/fine_uploader/jquery-plugin.js', 'client/js/jquery-plugin.js'
+  file 'vendor/assets/javascripts/fine_uploader/paste.js', 'client/js/paste.js'
+  file 'vendor/assets/javascripts/fine_uploader/promise.js', 'client/js/promise.js'
   file 'vendor/assets/javascripts/fine_uploader/uploader.basic.js', 'client/js/uploader.basic.js'
-  file 'vendor/assets/javascripts/fine_uploader/dnd.js', 'client/js/dnd.js'
   file 'vendor/assets/javascripts/fine_uploader/uploader.js', 'client/js/uploader.js'
-  file 'vendor/assets/javascripts/fine_uploader/jquery-plugin.js', 'client/js/jquery-plugin.js'
+  file 'vendor/assets/javascripts/fine_uploader/util.js', 'client/js/util.js'
+  file 'vendor/assets/javascripts/fine_uploader/window.receive.message.js', 'client/js/window.receive.message.js'
+
+  # scss
   file 'vendor/assets/stylesheets/fine_uploader.css.scss', 'client/fineuploader.css' do |path|
     rewrite(path) do |content|
       content.gsub!('url', 'image-url')

data/lib/fine_uploader/version.rb

@@ -1,3 +1,3 @@
 module FineUploader
-  VERSION = "3.1.1"
+  VERSION = "3.4.1"
 end

data/vendor/assets/javascripts/fine_uploader/ajax.requester.js

@@ -0,0 +1,184 @@
+/** Generic class for sending non-upload ajax requests and handling the associated responses **/
+//TODO Use XDomainRequest if expectCors = true.  Not necessary now since only DELETE requests are sent and XDR doesn't support pre-flighting.
+/*globals qq, XMLHttpRequest*/
+qq.AjaxRequestor = function(o) {
+    "use strict";
+
+    var log, shouldParamsBeInQueryString,
+        queue = [],
+        requestState = [],
+        options = {
+            method: 'POST',
+            maxConnections: 3,
+            customHeaders: {},
+            endpointStore: {},
+            paramsStore: {},
+            successfulResponseCodes: [200],
+            demoMode: false,
+            cors: {
+                expected: false,
+                sendCredentials: false
+            },
+            log: function(str, level) {},
+            onSend: function(id) {},
+            onComplete: function(id, xhr, isError) {},
+            onCancel: function(id) {}
+        };
+
+    qq.extend(options, o);
+    log = options.log;
+    shouldParamsBeInQueryString = getMethod() === 'GET' || getMethod() === 'DELETE';
+
+
+    /**
+     * Removes element from queue, sends next request
+     */
+    function dequeue(id) {
+        var i = qq.indexOf(queue, id),
+            max = options.maxConnections,
+            nextId;
+
+        delete requestState[id];
+        queue.splice(i, 1);
+
+        if (queue.length >= max && i < max){
+            nextId = queue[max-1];
+            sendRequest(nextId);
+        }
+    }
+
+    function onComplete(id) {
+        var xhr = requestState[id].xhr,
+            method = getMethod(),
+            isError = false;
+
+        dequeue(id);
+
+        if (!isResponseSuccessful(xhr.status)) {
+            isError = true;
+            log(method + " request for " + id + " has failed - response code " + xhr.status, "error");
+        }
+
+        options.onComplete(id, xhr, isError);
+    }
+
+    function sendRequest(id) {
+        var xhr = new XMLHttpRequest(),
+            method = getMethod(),
+            params = {},
+            url;
+
+        options.onSend(id);
+
+        if (options.paramsStore.getParams) {
+            params = options.paramsStore.getParams(id);
+        }
+
+        url = createUrl(id, params);
+
+        requestState[id].xhr = xhr;
+        xhr.onreadystatechange = getReadyStateChangeHandler(id);
+        xhr.open(method, url, true);
+
+        if (options.cors.expected && options.cors.sendCredentials) {
+            xhr.withCredentials = true;
+        }
+
+        setHeaders(id);
+
+        log('Sending ' + method + " request for " + id);
+        if (!shouldParamsBeInQueryString && params) {
+            xhr.send(qq.obj2url(params, ""));
+        }
+        else {
+            xhr.send();
+        }
+    }
+
+    function createUrl(id, params) {
+        var endpoint = options.endpointStore.getEndpoint(id),
+            addToPath = requestState[id].addToPath;
+
+        if (addToPath !== undefined) {
+            endpoint += "/" + addToPath;
+        }
+
+        if (shouldParamsBeInQueryString && params) {
+            return qq.obj2url(params, endpoint);
+        }
+        else {
+            return endpoint;
+        }
+    }
+
+    function getReadyStateChangeHandler(id) {
+        var xhr = requestState[id].xhr;
+
+        return function() {
+            if (xhr.readyState === 4) {
+                onComplete(id, xhr);
+            }
+        };
+    }
+
+    function setHeaders(id) {
+        var xhr = requestState[id].xhr,
+            customHeaders = options.customHeaders;
+
+        xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+        xhr.setRequestHeader("Cache-Control", "no-cache");
+
+        qq.each(customHeaders, function(name, val) {
+            xhr.setRequestHeader(name, val);
+        });
+    }
+
+    function cancelRequest(id) {
+        var xhr = requestState[id].xhr,
+            method = getMethod();
+
+        if (xhr) {
+            xhr.onreadystatechange = null;
+            xhr.abort();
+            dequeue(id);
+
+            log('Cancelled ' + method + " for " + id);
+            options.onCancel(id);
+
+            return true;
+        }
+
+        return false;
+    }
+
+    function isResponseSuccessful(responseCode) {
+        return qq.indexOf(options.successfulResponseCodes, responseCode) >= 0;
+    }
+
+    function getMethod() {
+        if (options.demoMode) {
+            return "GET";
+        }
+
+        return options.method;
+    }
+
+
+    return {
+        send: function(id, addToPath) {
+            requestState[id] = {
+                addToPath: addToPath
+            };
+
+            var len = queue.push(id);
+
+            // if too many active connections, wait...
+            if (len <= options.maxConnections){
+                sendRequest(id);
+            }
+        },
+        cancel: function(id) {
+            return cancelRequest(id);
+        }
+    };
+};

data/vendor/assets/javascripts/fine_uploader/button.js

@@ -1,58 +1,34 @@
-qq.UploadButton = function(o){
-    this._options = {
-        element: null,
-        // if set to true adds multiple attribute to file input
-        multiple: false,
-        acceptFiles: null,
-        // name attribute of file input
-        name: 'file',
-        onChange: function(input){},
-        hoverClass: 'qq-upload-button-hover',
-        focusClass: 'qq-upload-button-focus'
-    };
-
-    qq.extend(this._options, o);
-    this._disposeSupport = new qq.DisposeSupport();
-
-    this._element = this._options.element;
-
-    // make button suitable container for input
-    qq(this._element).css({
-        position: 'relative',
-        overflow: 'hidden',
-        // Make sure browse button is in the right side
-        // in Internet Explorer
-        direction: 'ltr'
-    });
-
-    this._input = this._createInput();
-};
+/*globals qq*/
+qq.UploadButton = function(o) {
+    "use strict";
 
-qq.UploadButton.prototype = {
-    /* returns file input element */
-    getInput: function(){
-        return this._input;
-    },
-    /* cleans/recreates the file input */
-    reset: function(){
-        if (this._input.parentNode){
-            qq(this._input).remove();
-        }
+    var input,
+        disposeSupport = new qq.DisposeSupport(),
+        options = {
+            element: null,
+            // if set to true adds multiple attribute to file input
+            multiple: false,
+            acceptFiles: null,
+            // name attribute of file input
+            name: 'file',
+            onChange: function(input) {},
+            hoverClass: 'qq-upload-button-hover',
+            focusClass: 'qq-upload-button-focus'
+        };
 
-        qq(this._element).removeClass(this._options.focusClass);
-        this._input = this._createInput();
-    },
-    _createInput: function(){
+    function createInput() {
         var input = document.createElement("input");
 
-        if (this._options.multiple){
+        if (options.multiple){
             input.setAttribute("multiple", "multiple");
         }
 
-        if (this._options.acceptFiles) input.setAttribute("accept", this._options.acceptFiles);
+        if (options.acceptFiles) {
+            input.setAttribute("accept", options.acceptFiles);
+        }
 
         input.setAttribute("type", "file");
-        input.setAttribute("name", this._options.name);
+        input.setAttribute("name", options.name);
 
         qq(input).css({
             position: 'absolute',
@@ -70,24 +46,23 @@ qq.UploadButton.prototype = {
             opacity: 0
         });
 
-        this._element.appendChild(input);
+        options.element.appendChild(input);
 
-        var self = this;
-        this._disposeSupport.attach(input, 'change', function(){
-            self._options.onChange(input);
+        disposeSupport.attach(input, 'change', function(){
+            options.onChange(input);
         });
 
-        this._disposeSupport.attach(input, 'mouseover', function(){
-            qq(self._element).addClass(self._options.hoverClass);
+        disposeSupport.attach(input, 'mouseover', function(){
+            qq(options.element).addClass(options.hoverClass);
         });
-        this._disposeSupport.attach(input, 'mouseout', function(){
-            qq(self._element).removeClass(self._options.hoverClass);
+        disposeSupport.attach(input, 'mouseout', function(){
+            qq(options.element).removeClass(options.hoverClass);
         });
-        this._disposeSupport.attach(input, 'focus', function(){
-            qq(self._element).addClass(self._options.focusClass);
+        disposeSupport.attach(input, 'focus', function(){
+            qq(options.element).addClass(options.focusClass);
         });
-        this._disposeSupport.attach(input, 'blur', function(){
-            qq(self._element).removeClass(self._options.focusClass);
+        disposeSupport.attach(input, 'blur', function(){
+            qq(options.element).removeClass(options.focusClass);
         });
 
         // IE and Opera, unfortunately have 2 tab stops on file input
@@ -99,4 +74,33 @@ qq.UploadButton.prototype = {
 
         return input;
     }
+
+
+    qq.extend(options, o);
+
+    // make button suitable container for input
+    qq(options.element).css({
+        position: 'relative',
+        overflow: 'hidden',
+        // Make sure browse button is in the right side
+        // in Internet Explorer
+        direction: 'ltr'
+    });
+
+    input = createInput();
+
+    return {
+        getInput: function(){
+            return input;
+        },
+
+        reset: function(){
+            if (input.parentNode){
+                qq(input).remove();
+            }
+
+            qq(options.element).removeClass(options.focusClass);
+            input = createInput();
+        }
+    };
 };

data/vendor/assets/javascripts/fine_uploader/deletefile.ajax.requester.js

@@ -0,0 +1,44 @@
+/** Generic class for sending non-upload ajax requests and handling the associated responses **/
+/*globals qq, XMLHttpRequest*/
+qq.DeleteFileAjaxRequestor = function(o) {
+    "use strict";
+
+    var requestor,
+        options = {
+            endpointStore: {},
+            maxConnections: 3,
+            customHeaders: {},
+            paramsStore: {},
+            demoMode: false,
+            cors: {
+                expected: false,
+                sendCredentials: false
+            },
+            log: function(str, level) {},
+            onDelete: function(id) {},
+            onDeleteComplete: function(id, xhr, isError) {}
+        };
+
+    qq.extend(options, o);
+
+    requestor = new qq.AjaxRequestor({
+        method: 'DELETE',
+        endpointStore: options.endpointStore,
+        paramsStore: options.paramsStore,
+        maxConnections: options.maxConnections,
+        customHeaders: options.customHeaders,
+        successfulResponseCodes: [200, 202, 204],
+        demoMode: options.demoMode,
+        log: options.log,
+        onSend: options.onDelete,
+        onComplete: options.onDeleteComplete
+    });
+
+
+    return {
+        sendDelete: function(id, uuid) {
+            requestor.send(id, uuid);
+            options.log("Submitted delete file request for " + id);
+        }
+    };
+};

data/vendor/assets/javascripts/fine_uploader/dnd.js

@@ -73,7 +73,9 @@ qq.DragAndDrop = function(o) {
         dz.dropDisabled(true);
 
         if (dataTransfer.files.length > 1 && !options.multiple) {
+            options.callbacks.dropProcessing(false);
             options.callbacks.error('tooManyFilesError', "");
+            dz.dropDisabled(false);
         }
         else {
             droppedFiles = [];