jquery.fileupload-rails 0.1.2 → 1.0.0.alpha

data/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "jQuery-File-Upload"]
+	path = jQuery-File-Upload
+	url = git://github.com/blueimp/jQuery-File-Upload.git

data/Rakefile

@@ -1 +1,40 @@
-require "bundler/gem_tasks"
+require 'json'
+require 'bundler/gem_tasks'
+
+DEPENDENCY_HASH = JSON.load(File.read('dependencies.json'))
+PROJECT_NAME = "jQuery-File-Upload"
+
+task :submodule do
+  sh 'git submodule update --init' unless File.exist?("#{PROJECT_NAME}/README.md")
+end
+
+desc "Remove the vendor directory"
+task :clean do
+  rm_rf 'vendor'
+end
+
+desc "Generate the JavaScript assets"
+task :javascripts => :submodule do
+  target_dir = "vendor/assets/javascripts"
+  mkdir_p target_dir
+  Rake.rake_output_message 'Generating javascripts'
+  DEPENDENCY_HASH.each do |name, dep_modules|
+    path = "#{PROJECT_NAME}/js/#{name}.js"
+    File.open("#{target_dir}/#{name}.js", "w") do |out|
+      dep_modules.each do |mod|
+        out.write("//= require #{mod}\n")
+      end
+      out.write("\n") unless dep_modules.empty?
+      source_code = File.read(path)
+      out.write(source_code)
+    end
+  end
+end
+
+desc "Clean and then generate everything (default)"
+task :assets => [:clean, :javascripts]
+
+task :build => :assets
+
+task :default => :assets
+

data/Readme.md

@@ -9,6 +9,12 @@ This is a simple gem package for this plugin.
 
 ## Changelog
 
+1.0.0.alpha. Core 5.17.2, added jquery-ui-rails dependency.
+
+Now rake task generates assets from official repo and adds dependencies automatically.
+That means you can just require jquery.fileupload, no extra requires needed.
+UI stuff is removed temporarily.
+
 0.1.2. Fixed CSS that makes SASS 3.2 raise an error on rake assets:precompile
 
 0.1.1. Core 5.11.2, UI 6.9.1, minor gemspec change.
@@ -19,8 +25,8 @@ This is a simple gem package for this plugin.
 
 ## Todo
 
-* Add convinient file-package with jquery.fileupload and all it's dependencies.
+* Import UI js/css/images in rake task too. Need to fix relative paths to images. See [jquery-ui-rails][2].
 * Add example usage in Rails here.
-* Add script to automate updating the library from [the official repo][1].
 
 [1]: https://github.com/blueimp/jQuery-File-Upload
+[2]: https://github.com/joliss/jquery-ui-rails

data/dependencies.json

@@ -0,0 +1,4 @@
+{
+  "jquery.fileupload": ["jquery.ui.widget", "jquery.iframe-transport"],
+  "jquery.iframe-transport": []
+}

data/jquery.fileupload-rails.gemspec

@@ -19,4 +19,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'sprockets', '~> 2.0'
+  s.add_dependency 'jquery-ui-rails'
 end

data/lib/jquery.fileupload-rails/version.rb

@@ -1,5 +1,5 @@
 module JqueryFileUpload
   module Rails
-    VERSION = "0.1.2"
+    VERSION = "1.0.0.alpha"
   end
 end

data/vendor/assets/javascripts/jquery.fileupload.js

@@ -1,5 +1,8 @@
+//= require jquery.ui.widget
+//= require jquery.iframe-transport
+
 /*
- * jQuery File Upload Plugin 5.11.2
+ * jQuery File Upload Plugin 5.17.2
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
@@ -44,17 +47,20 @@
     $.widget('blueimp.fileupload', {
 
         options: {
-            // The namespace used for event handler binding on the dropZone and
-            // fileInput collections.
+            // The namespace used for event handler binding on the fileInput,
+            // dropZone and pasteZone document nodes.
             // If not set, the name of the widget ("fileupload") is used.
             namespace: undefined,
-            // The drop target collection, by the default the complete document.
-            // Set to null or an empty collection to disable drag & drop support:
+            // The drop target element(s), by the default the complete document.
+            // Set to null to disable drag & drop support:
             dropZone: $(document),
-            // The file input field collection, that is listened for change events.
+            // The paste target element(s), by the default the complete document.
+            // Set to null to disable paste support:
+            pasteZone: $(document),
+            // The file input field(s), that are listened to for change events.
             // If undefined, it is set to the file input fields inside
             // of the widget element on plugin initialization.
-            // Set to null or an empty collection to disable the change listener.
+            // Set to null to disable the change listener.
             fileInput: undefined,
             // By default, the file input field is replaced with a clone after
             // each input field change event. This is required for iframe transport
@@ -159,13 +165,13 @@
             // start: function (e) {}, // .bind('fileuploadstart', func);
             // Callback for uploads stop, equivalent to the global ajaxStop event:
             // stop: function (e) {}, // .bind('fileuploadstop', func);
-            // Callback for change events of the fileInput collection:
+            // Callback for change events of the fileInput(s):
             // change: function (e, data) {}, // .bind('fileuploadchange', func);
-            // Callback for paste events to the dropZone collection:
+            // Callback for paste events to the pasteZone(s):
             // paste: function (e, data) {}, // .bind('fileuploadpaste', func);
-            // Callback for drop events of the dropZone collection:
+            // Callback for drop events of the dropZone(s):
             // drop: function (e, data) {}, // .bind('fileuploaddrop', func);
-            // Callback for dragover events of the dropZone collection:
+            // Callback for dragover events of the dropZone(s):
             // dragover: function (e) {}, // .bind('fileuploaddragover', func);
 
             // The plugin options are used as settings object for the ajax calls.
@@ -178,8 +184,9 @@
         // A list of options that require a refresh after assigning a new value:
         _refreshOptionsList: [
             'namespace',
-            'dropZone',
             'fileInput',
+            'dropZone',
+            'pasteZone',
             'multipart',
             'forceIframeTransport'
         ],
@@ -436,6 +443,11 @@
             // associated form, if available:
             if (!options.form || !options.form.length) {
                 options.form = $(options.fileInput.prop('form'));
+                // If the given file input doesn't have an associated form,
+                // use the default widget file input's form:
+                if (!options.form.length) {
+                    options.form = $(this.options.fileInput.prop('form'));
+                }
             }
             options.paramName = this._getParamName(options);
             if (!options.url) {
@@ -447,6 +459,9 @@
             if (options.type !== 'POST' && options.type !== 'PUT') {
                 options.type = 'POST';
             }
+            if (!options.formAcceptCharset) {
+                options.formAcceptCharset = options.form.attr('accept-charset');
+            }
         },
 
         _getAJAXSettings: function (data) {
@@ -530,6 +545,10 @@
                         ub + i * mcs,
                         ub + (i + 1) * mcs
                     );
+                    // Expose the chunk index:
+                    o.chunkIndex = i;
+                    // Expose the number of chunks:
+                    o.chunksNumber = n;
                     // Store the current chunk size, as the blob itself
                     // will be dereferenced after data processing:
                     o.chunkSize = o.blob.size;
@@ -659,9 +678,15 @@
                                 options.limitConcurrentUploads > that._sending) {
                             // Start the next queued upload,
                             // that has not been aborted:
-                            var nextSlot = that._slots.shift();
+                            var nextSlot = that._slots.shift(),
+                                isPending;
                             while (nextSlot) {
-                                if (!nextSlot.isRejected()) {
+                                // jQuery 1.6 doesn't provide .state(),
+                                // while jQuery 1.8+ removed .isRejected():
+                                isPending = nextSlot.state ?
+                                        nextSlot.state() === 'pending' :
+                                        !nextSlot.isRejected();
+                                if (isPending) {
                                     nextSlot.resolve();
                                     break;
                                 }
@@ -689,7 +714,7 @@
                     var args = [undefined, 'abort', 'abort'];
                     if (!jqXHR) {
                         if (slot) {
-                            slot.rejectWith(args);
+                            slot.rejectWith(pipe, args);
                         }
                         return send(false, args);
                     }
@@ -744,14 +769,6 @@
             return result;
         },
 
-        // File Normalization for Gecko 1.9.1 (Firefox 3.5) support:
-        _normalizeFile: function (index, file) {
-            if (file.name === undefined && file.size === undefined) {
-                file.name = file.fileName;
-                file.size = file.fileSize;
-            }
-        },
-
         _replaceFileInput: function (input) {
             var inputClone = input.clone(true);
             $('<form></form>').append(inputClone)[0].reset();
@@ -761,7 +778,7 @@
             // Avoid memory leaks with the detached file input:
             $.cleanData(input.unbind('remove'));
             // Replace the original file input element in the fileInput
-            // collection with the clone, which has been copied including
+            // elements set with the clone, which has been copied including
             // event handlers:
             this.options.fileInput = this.options.fileInput.map(function (i, el) {
                 if (el === input[0]) {
@@ -776,26 +793,131 @@
             }
         },
 
+        _handleFileTreeEntry: function (entry, path) {
+            var that = this,
+                dfd = $.Deferred(),
+                errorHandler = function (e) {
+                    if (e && !e.entry) {
+                        e.entry = entry;
+                    }
+                    // Since $.when returns immediately if one
+                    // Deferred is rejected, we use resolve instead.
+                    // This allows valid files and invalid items
+                    // to be returned together in one set:
+                    dfd.resolve([e]);
+                },
+                dirReader;
+            path = path || '';
+            if (entry.isFile) {
+                entry.file(function (file) {
+                    file.relativePath = path;
+                    dfd.resolve(file);
+                }, errorHandler);
+            } else if (entry.isDirectory) {
+                dirReader = entry.createReader();
+                dirReader.readEntries(function (entries) {
+                    that._handleFileTreeEntries(
+                        entries,
+                        path + entry.name + '/'
+                    ).done(function (files) {
+                        dfd.resolve(files);
+                    }).fail(errorHandler);
+                }, errorHandler);
+            } else {
+                // Return an empy list for file system items
+                // other than files or directories:
+                dfd.resolve([]);
+            }
+            return dfd.promise();
+        },
+
+        _handleFileTreeEntries: function (entries, path) {
+            var that = this;
+            return $.when.apply(
+                $,
+                $.map(entries, function (entry) {
+                    return that._handleFileTreeEntry(entry, path);
+                })
+            ).pipe(function () {
+                return Array.prototype.concat.apply(
+                    [],
+                    arguments
+                );
+            });
+        },
+
+        _getDroppedFiles: function (dataTransfer) {
+            dataTransfer = dataTransfer || {};
+            var items = dataTransfer.items;
+            if (items && items.length && (items[0].webkitGetAsEntry ||
+                    items[0].getAsEntry)) {
+                return this._handleFileTreeEntries(
+                    $.map(items, function (item) {
+                        if (item.webkitGetAsEntry) {
+                            return item.webkitGetAsEntry();
+                        }
+                        return item.getAsEntry();
+                    })
+                );
+            }
+            return $.Deferred().resolve(
+                $.makeArray(dataTransfer.files)
+            ).promise();
+        },
+
+        _getSingleFileInputFiles: function (fileInput) {
+            fileInput = $(fileInput);
+            var entries = fileInput.prop('webkitEntries') ||
+                    fileInput.prop('entries'),
+                files,
+                value;
+            if (entries && entries.length) {
+                return this._handleFileTreeEntries(entries);
+            }
+            files = $.makeArray(fileInput.prop('files'));
+            if (!files.length) {
+                value = fileInput.prop('value');
+                if (!value) {
+                    return $.Deferred().resolve([]).promise();
+                }
+                // If the files property is not available, the browser does not
+                // support the File API and we add a pseudo File object with
+                // the input value as name with path information removed:
+                files = [{name: value.replace(/^.*\\/, '')}];
+            }
+            return $.Deferred().resolve(files).promise();
+        },
+
+        _getFileInputFiles: function (fileInput) {
+            if (!(fileInput instanceof $) || fileInput.length === 1) {
+                return this._getSingleFileInputFiles(fileInput);
+            }
+            return $.when.apply(
+                $,
+                $.map(fileInput, this._getSingleFileInputFiles)
+            ).pipe(function () {
+                return Array.prototype.concat.apply(
+                    [],
+                    arguments
+                );
+            });
+        },
+
         _onChange: function (e) {
             var that = e.data.fileupload,
                 data = {
-                    files: $.each($.makeArray(e.target.files), that._normalizeFile),
                     fileInput: $(e.target),
                     form: $(e.target.form)
                 };
-            if (!data.files.length) {
-                // If the files property is not available, the browser does not
-                // support the File API and we add a pseudo File object with
-                // the input value as name with path information removed:
-                data.files = [{name: e.target.value.replace(/^.*\\/, '')}];
-            }
-            if (that.options.replaceFileInput) {
-                that._replaceFileInput(data.fileInput);
-            }
-            if (that._trigger('change', e, data) === false ||
-                    that._onAdd(e, data) === false) {
-                return false;
-            }
+            that._getFileInputFiles(data.fileInput).always(function (files) {
+                data.files = files;
+                if (that.options.replaceFileInput) {
+                    that._replaceFileInput(data.fileInput);
+                }
+                if (that._trigger('change', e, data) !== false) {
+                    that._onAdd(e, data);
+                }
+            });
         },
 
         _onPaste: function (e) {
@@ -816,19 +938,16 @@
         },
 
         _onDrop: function (e) {
+            e.preventDefault();
             var that = e.data.fileupload,
                 dataTransfer = e.dataTransfer = e.originalEvent.dataTransfer,
-                data = {
-                    files: $.each(
-                        $.makeArray(dataTransfer && dataTransfer.files),
-                        that._normalizeFile
-                    )
-                };
-            if (that._trigger('drop', e, data) === false ||
-                    that._onAdd(e, data) === false) {
-                return false;
-            }
-            e.preventDefault();
+                data = {};
+            that._getDroppedFiles(dataTransfer).always(function (files) {
+                data.files = files;
+                if (that._trigger('drop', e, data) !== false) {
+                    that._onAdd(e, data);
+                }
+            });
         },
 
         _onDragOver: function (e) {
@@ -838,7 +957,7 @@
                 return false;
             }
             if (dataTransfer) {
-                dataTransfer.dropEffect = dataTransfer.effectAllowed = 'copy';
+                dataTransfer.dropEffect = 'copy';
             }
             e.preventDefault();
         },
@@ -848,7 +967,8 @@
             if (this._isXHRUpload(this.options)) {
                 this.options.dropZone
                     .bind('dragover.' + ns, {fileupload: this}, this._onDragOver)
-                    .bind('drop.' + ns, {fileupload: this}, this._onDrop)
+                    .bind('drop.' + ns, {fileupload: this}, this._onDrop);
+                this.options.pasteZone
                     .bind('paste.' + ns, {fileupload: this}, this._onPaste);
             }
             this.options.fileInput
@@ -859,7 +979,8 @@
             var ns = this.options.namespace;
             this.options.dropZone
                 .unbind('dragover.' + ns, this._onDragOver)
-                .unbind('drop.' + ns, this._onDrop)
+                .unbind('drop.' + ns, this._onDrop);
+            this.options.pasteZone
                 .unbind('paste.' + ns, this._onPaste);
             this.options.fileInput
                 .unbind('change.' + ns, this._onChange);
@@ -880,14 +1001,17 @@
         _initSpecialOptions: function () {
             var options = this.options;
             if (options.fileInput === undefined) {
-                options.fileInput = this.element.is('input:file') ?
-                        this.element : this.element.find('input:file');
+                options.fileInput = this.element.is('input[type="file"]') ?
+                        this.element : this.element.find('input[type="file"]');
             } else if (!(options.fileInput instanceof $)) {
                 options.fileInput = $(options.fileInput);
             }
             if (!(options.dropZone instanceof $)) {
                 options.dropZone = $(options.dropZone);
             }
+            if (!(options.pasteZone instanceof $)) {
+                options.pasteZone = $(options.pasteZone);
+            }
         },
 
         _create: function () {
@@ -908,12 +1032,20 @@
         },
 
         enable: function () {
+            var wasDisabled = false;
+            if (this.options.disabled) {
+                wasDisabled = true;
+            }
             $.Widget.prototype.enable.call(this);
-            this._initEventHandlers();
+            if (wasDisabled) {
+                this._initEventHandlers();
+            }
         },
 
         disable: function () {
-            this._destroyEventHandlers();
+            if (!this.options.disabled) {
+                this._destroyEventHandlers();
+            }
             $.Widget.prototype.disable.call(this);
         },
 
@@ -922,21 +1054,61 @@
         // must have a files property and can contain additional options:
         // .fileupload('add', {files: filesList});
         add: function (data) {
+            var that = this;
             if (!data || this.options.disabled) {
                 return;
             }
-            data.files = $.each($.makeArray(data.files), this._normalizeFile);
-            this._onAdd(null, data);
+            if (data.fileInput && !data.files) {
+                this._getFileInputFiles(data.fileInput).always(function (files) {
+                    data.files = files;
+                    that._onAdd(null, data);
+                });
+            } else {
+                data.files = $.makeArray(data.files);
+                this._onAdd(null, data);
+            }
         },
 
         // This method is exposed to the widget API and allows sending files
         // using the fileupload API. The data parameter accepts an object which
-        // must have a files property and can contain additional options:
+        // must have a files or fileInput property and can contain additional options:
         // .fileupload('send', {files: filesList});
         // The method returns a Promise object for the file upload call.
         send: function (data) {
             if (data && !this.options.disabled) {
-                data.files = $.each($.makeArray(data.files), this._normalizeFile);
+                if (data.fileInput && !data.files) {
+                    var that = this,
+                        dfd = $.Deferred(),
+                        promise = dfd.promise(),
+                        jqXHR,
+                        aborted;
+                    promise.abort = function () {
+                        aborted = true;
+                        if (jqXHR) {
+                            return jqXHR.abort();
+                        }
+                        dfd.reject(null, 'abort', 'abort');
+                        return promise;
+                    };
+                    this._getFileInputFiles(data.fileInput).always(
+                        function (files) {
+                            if (aborted) {
+                                return;
+                            }
+                            data.files = files;
+                            jqXHR = that._onSend(null, data).then(
+                                function (result, textStatus, jqXHR) {
+                                    dfd.resolve(result, textStatus, jqXHR);
+                                },
+                                function (jqXHR, textStatus, errorThrown) {
+                                    dfd.reject(jqXHR, textStatus, errorThrown);
+                                }
+                            );
+                        }
+                    );
+                    return this._enhancePromise(promise);
+                }
+                data.files = $.makeArray(data.files);
                 if (data.files.length) {
                     return this._onSend(null, data);
                 }