Skip to content

Commit

Permalink
Merge pull request #68 from opti/assets_v9.8.0
Browse files Browse the repository at this point in the history
Update assets to jQuery-File-Upload 9.8.0
  • Loading branch information
tors committed Jan 8, 2015
2 parents 0ff3c5b + 4ec122b commit 21e3de5
Show file tree
Hide file tree
Showing 36 changed files with 1,815 additions and 1,292 deletions.
32 changes: 27 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ jquery-fileupload-rails is a library that integrates jQuery File Upload for Rail

## Plugin versions

* jQuery File Upload User Interface Plugin 6.11
* jQuery File Upload Plugin 5.19.3
* jQuery UI Widget 1.9.1+amd
* jQuery File Upload User Interface Plugin 9.6.0
* jQuery File Upload Plugin 5.42.0
* jQuery UI Widget 1.11.1

## Installing Gem

Expand All @@ -23,14 +23,22 @@ Require jquery-fileupload in your app/assets/application.js file.
The snippet above will add the following js files to the mainfest file.

//= require jquery-fileupload/vendor/jquery.ui.widget
//= require jquery-fileupload/vendor/tmpl
//= require jquery-fileupload/vendor/load-image
//= require jquery-fileupload/vendor/canvas-to-blob
//= require jquery-fileupload/vendor/tmpl
//= require jquery-fileupload/jquery.iframe-transport
//= require jquery-fileupload/jquery.fileupload
//= require jquery-fileupload/jquery.fileupload-fp
//= require jquery-fileupload/jquery.fileupload-process
//= require jquery-fileupload/jquery.fileupload-image
//= require jquery-fileupload/jquery.fileupload-audio
//= require jquery-fileupload/jquery.fileupload-video
//= require jquery-fileupload/jquery.fileupload-validate
//= require jquery-fileupload/jquery.fileupload-ui
//= require jquery-fileupload/locale
//= require jquery-fileupload/jquery.fileupload-angular
//= require jquery-fileupload/jquery.fileupload-jquery-ui
//= require jquery-fileupload/cors/jquery.postmessage-transport
//= require jquery-fileupload/cors/jquery.xdr-transport

If you only need the basic files, just add the code below to your application.js file. [Basic setup guide](https://github.com/blueimp/jQuery-File-Upload/wiki/Basic-plugin)

Expand All @@ -42,12 +50,26 @@ The basic setup only includes the following files:
//= require jquery-fileupload/jquery.iframe-transport
//= require jquery-fileupload/jquery.fileupload

You can also require the following to get the js from the Basic-Plus, AngularJS and jQuery UI Examples:

//= require jquery-fileupload/basic-plus

//= require jquery-fileupload/angularjs

//= require jquery-fileupload/jquery-ui

## Using the stylesheet

Require the stylesheet file to app/assets/stylesheets/application.css

*= require jquery.fileupload
*= require jquery.fileupload-ui

There are also noscript styles for Browsers with Javascript disabled, to use them create a noscript.css and add it to your precompile-list and layout inside a noscript tag:

*= require jquery.fileupload-noscript
*= require jquery.fileupload-ui-noscript

## Using the middleware

The `jquery.iframe-transport` fallback transport has some special caveats regarding the response data type, http status, and character encodings. `jquery-fileupload-rails` includes a middleware that handles these inconsistencies seamlessly. If you decide to use it, create an initializer that adds the middleware to your application's middleware stack.
Expand Down
File renamed without changes
File renamed without changes
12 changes: 12 additions & 0 deletions app/assets/javascripts/jquery-fileupload/angularjs.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
//= require jquery-fileupload/vendor/jquery.ui.widget
//= require jquery-fileupload/vendor/load-image.all.min
//= require jquery-fileupload/vendor/canvas-to-blob
//= require jquery-fileupload/jquery.iframe-transport
//= require jquery-fileupload/jquery.fileupload
//= require jquery-fileupload/jquery.fileupload-process
//= require jquery-fileupload/jquery.fileupload-image
//= require jquery-fileupload/jquery.fileupload-audio
//= require jquery-fileupload/jquery.fileupload-video
//= require jquery-fileupload/jquery.fileupload-validate
//= require jquery-fileupload/jquery.fileupload-angular
//= require jquery-fileupload/locale
11 changes: 11 additions & 0 deletions app/assets/javascripts/jquery-fileupload/basic-plus.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
//= require jquery-fileupload/vendor/jquery.ui.widget
//= require jquery-fileupload/vendor/load-image.all.min
//= require jquery-fileupload/vendor/canvas-to-blob
//= require jquery-fileupload/jquery.iframe-transport
//= require jquery-fileupload/jquery.fileupload
//= require jquery-fileupload/jquery.fileupload-process
//= require jquery-fileupload/jquery.fileupload-image
//= require jquery-fileupload/jquery.fileupload-audio
//= require jquery-fileupload/jquery.fileupload-video
//= require jquery-fileupload/jquery.fileupload-validate
//= require jquery-fileupload/locale
3 changes: 3 additions & 0 deletions app/assets/javascripts/jquery-fileupload/basic.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
//= require jquery-fileupload/vendor/jquery.ui.widget
//= require jquery-fileupload/jquery.iframe-transport
//= require jquery-fileupload/jquery.fileupload
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* jQuery postMessage Transport Plugin 1.1
* jQuery postMessage Transport Plugin 1.1.1
* https://github.com/blueimp/jQuery-File-Upload
*
* Copyright 2011, Sebastian Tschan
Expand All @@ -9,8 +9,7 @@
* http://www.opensource.org/licenses/MIT
*/

/*jslint unparam: true, nomen: true */
/*global define, window, document */
/* global define, window, document */

(function (factory) {
'use strict';
Expand Down Expand Up @@ -64,8 +63,9 @@
xhrUpload = options.xhr().upload;
return {
send: function (_, completeCallback) {
counter += 1;
var message = {
id: 'postmessage-transport-' + (counter += 1)
id: 'postmessage-transport-' + counter
},
eventName = 'message.' + message.id;
iframe = $(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
* https://github.com/jaubourg/ajaxHooks/
*/

/*jslint unparam: true */
/*global define, window, XDomainRequest */
/* global define, window, XDomainRequest */

(function (factory) {
'use strict';
Expand Down
13 changes: 13 additions & 0 deletions app/assets/javascripts/jquery-fileupload/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
//= require jquery-fileupload/vendor/jquery.ui.widget
//= require jquery-fileupload/vendor/tmpl
//= require jquery-fileupload/vendor/load-image.all.min
//= require jquery-fileupload/vendor/canvas-to-blob
//= require jquery-fileupload/jquery.iframe-transport
//= require jquery-fileupload/jquery.fileupload
//= require jquery-fileupload/jquery.fileupload-process
//= require jquery-fileupload/jquery.fileupload-image
//= require jquery-fileupload/jquery.fileupload-audio
//= require jquery-fileupload/jquery.fileupload-video
//= require jquery-fileupload/jquery.fileupload-validate
//= require jquery-fileupload/jquery.fileupload-ui
//= require jquery-fileupload/locale
13 changes: 13 additions & 0 deletions app/assets/javascripts/jquery-fileupload/jquery-ui.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
//= require jquery-fileupload/vendor/tmpl
//= require jquery-fileupload/vendor/load-image.all.min
//= require jquery-fileupload/vendor/canvas-to-blob
//= require jquery-fileupload/jquery.iframe-transport
//= require jquery-fileupload/jquery.fileupload
//= require jquery-fileupload/jquery.fileupload-process
//= require jquery-fileupload/jquery.fileupload-image
//= require jquery-fileupload/jquery.fileupload-audio
//= require jquery-fileupload/jquery.fileupload-video
//= require jquery-fileupload/jquery.fileupload-validate
//= require jquery-fileupload/jquery.fileupload-ui
//= require jquery-fileupload/jquery.fileupload-jquery-ui
//= require jquery-fileupload/locale
Loading

0 comments on commit 21e3de5

Please sign in to comment.