Skip to content

Commit

Permalink
Merge pull request #72 from opti/assets_v9.9.2
Browse files Browse the repository at this point in the history
Update assets to v9.9.2
  • Loading branch information
opti committed Jan 23, 2015
2 parents 03d3b77 + cfef518 commit d3ab30c
Show file tree
Hide file tree
Showing 14 changed files with 84 additions and 28 deletions.
6 changes: 3 additions & 3 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 9.6.0
* jQuery File Upload Plugin 5.42.0
* jQuery UI Widget 1.11.1
* jQuery File Upload User Interface Plugin 9.6.1
* jQuery File Upload Plugin 5.42.2
* jQuery UI Widget 1.11.1+CommonJS

## Installing Gem

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* jQuery postMessage Transport Plugin 1.1.1
* jQuery postMessage Transport Plugin 1.1.2
* https://github.com/blueimp/jQuery-File-Upload
*
* Copyright 2011, Sebastian Tschan
Expand All @@ -9,13 +9,16 @@
* http://www.opensource.org/licenses/MIT
*/

/* global define, window, document */
/* global define, require, window, document */

(function (factory) {
'use strict';
if (typeof define === 'function' && define.amd) {
// Register as an anonymous AMD module:
define(['jquery'], factory);
} else if (typeof exports === 'object') {
// Node/CommonJS:
factory(require('jquery'));
} else {
// Browser globals:
factory(window.jQuery);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* jQuery XDomainRequest Transport Plugin 1.1.3
* jQuery XDomainRequest Transport Plugin 1.1.4
* https://github.com/blueimp/jQuery-File-Upload
*
* Copyright 2011, Sebastian Tschan
Expand All @@ -12,13 +12,16 @@
* https://github.com/jaubourg/ajaxHooks/
*/

/* global define, window, XDomainRequest */
/* global define, require, window, XDomainRequest */

(function (factory) {
'use strict';
if (typeof define === 'function' && define.amd) {
// Register as an anonymous AMD module:
define(['jquery'], factory);
} else if (typeof exports === 'object') {
// Node/CommonJS:
factory(require('jquery'));
} else {
// Browser globals:
factory(window.jQuery);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* jQuery File Upload Audio Preview Plugin 1.0.3
* jQuery File Upload Audio Preview Plugin 1.0.4
* https://github.com/blueimp/jQuery-File-Upload
*
* Copyright 2013, Sebastian Tschan
Expand All @@ -10,7 +10,7 @@
*/

/* jshint nomen:false */
/* global define, window, document */
/* global define, require, window, document */

(function (factory) {
'use strict';
Expand All @@ -21,6 +21,12 @@
'load-image',
'./jquery.fileupload-process'
], factory);
} else if (typeof exports === 'object') {
// Node/CommonJS:
factory(
require('jquery'),
require('load-image')
);
} else {
// Browser globals:
factory(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* jQuery File Upload Image Preview & Resize Plugin 1.7.2
* jQuery File Upload Image Preview & Resize Plugin 1.7.3
* https://github.com/blueimp/jQuery-File-Upload
*
* Copyright 2013, Sebastian Tschan
Expand All @@ -10,7 +10,7 @@
*/

/* jshint nomen:false */
/* global define, window, Blob */
/* global define, require, window, Blob */

(function (factory) {
'use strict';
Expand All @@ -25,6 +25,12 @@
'canvas-to-blob',
'./jquery.fileupload-process'
], factory);
} else if (typeof exports === 'object') {
// Node/CommonJS:
factory(
require('jquery'),
require('load-image')
);
} else {
// Browser globals:
factory(
Expand Down
7 changes: 5 additions & 2 deletions app/assets/javascripts/jquery-fileupload/jquery.fileupload-jquery-ui.js
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* jQuery File Upload jQuery UI Plugin 8.7.1
* jQuery File Upload jQuery UI Plugin 8.7.2
* https://github.com/blueimp/jQuery-File-Upload
*
* Copyright 2013, Sebastian Tschan
Expand All @@ -10,13 +10,16 @@
*/

/* jshint nomen:false */
/* global define, window */
/* global define, require, window */

(function (factory) {
'use strict';
if (typeof define === 'function' && define.amd) {
// Register as an anonymous AMD module:
define(['jquery', './jquery.fileupload-ui'], factory);
} else if (typeof exports === 'object') {
// Node/CommonJS:
factory(require('jquery'));
} else {
// Browser globals:
factory(window.jQuery);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* jQuery File Upload Processing Plugin 1.3.0
* jQuery File Upload Processing Plugin 1.3.1
* https://github.com/blueimp/jQuery-File-Upload
*
* Copyright 2012, Sebastian Tschan
Expand All @@ -10,7 +10,7 @@
*/

/* jshint nomen:false */
/* global define, window */
/* global define, require, window */

(function (factory) {
'use strict';
Expand All @@ -20,6 +20,9 @@
'jquery',
'./jquery.fileupload'
], factory);
} else if (typeof exports === 'object') {
// Node/CommonJS:
factory(require('jquery'));
} else {
// Browser globals:
factory(
Expand Down
10 changes: 8 additions & 2 deletions app/assets/javascripts/jquery-fileupload/jquery.fileupload-ui.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* jQuery File Upload User Interface Plugin 9.6.0
* jQuery File Upload User Interface Plugin 9.6.1
* https://github.com/blueimp/jQuery-File-Upload
*
* Copyright 2010, Sebastian Tschan
Expand All @@ -10,7 +10,7 @@
*/

/* jshint nomen:false */
/* global define, window */
/* global define, require, window */

(function (factory) {
'use strict';
Expand All @@ -24,6 +24,12 @@
'./jquery.fileupload-video',
'./jquery.fileupload-validate'
], factory);
} else if (typeof exports === 'object') {
// Node/CommonJS:
factory(
require('jquery'),
require('tmpl')
);
} else {
// Browser globals:
factory(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* jQuery File Upload Validation Plugin 1.1.2
* jQuery File Upload Validation Plugin 1.1.3
* https://github.com/blueimp/jQuery-File-Upload
*
* Copyright 2013, Sebastian Tschan
Expand All @@ -9,7 +9,7 @@
* http://www.opensource.org/licenses/MIT
*/

/* global define, window */
/* global define, require, window */

(function (factory) {
'use strict';
Expand All @@ -19,6 +19,9 @@
'jquery',
'./jquery.fileupload-process'
], factory);
} else if (typeof exports === 'object') {
// Node/CommonJS:
factory(require('jquery'));
} else {
// Browser globals:
factory(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* jQuery File Upload Video Preview Plugin 1.0.3
* jQuery File Upload Video Preview Plugin 1.0.4
* https://github.com/blueimp/jQuery-File-Upload
*
* Copyright 2013, Sebastian Tschan
Expand All @@ -10,7 +10,7 @@
*/

/* jshint nomen:false */
/* global define, window, document */
/* global define, require, window, document */

(function (factory) {
'use strict';
Expand All @@ -21,6 +21,12 @@
'load-image',
'./jquery.fileupload-process'
], factory);
} else if (typeof exports === 'object') {
// Node/CommonJS:
factory(
require('jquery'),
require('load-image')
);
} else {
// Browser globals:
factory(
Expand Down
17 changes: 13 additions & 4 deletions app/assets/javascripts/jquery-fileupload/jquery.fileupload.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* jQuery File Upload Plugin 5.42.0
* jQuery File Upload Plugin 5.42.2
* https://github.com/blueimp/jQuery-File-Upload
*
* Copyright 2010, Sebastian Tschan
Expand All @@ -10,7 +10,7 @@
*/

/* jshint nomen:false */
/* global define, window, document, location, Blob, FormData */
/* global define, require, window, document, location, Blob, FormData */

(function (factory) {
'use strict';
Expand All @@ -20,6 +20,12 @@
'jquery',
'jquery.ui.widget'
], factory);
} else if (typeof exports === 'object') {
// Node/CommonJS:
factory(
require('jquery'),
require('./vendor/jquery.ui.widget')
);
} else {
// Browser globals:
factory(window.jQuery);
Expand Down Expand Up @@ -1338,10 +1344,13 @@
_initDataAttributes: function () {
var that = this,
options = this.options,
clone = $(this.element[0].cloneNode(false));
clone = $(this.element[0].cloneNode(false)),
data = clone.data();
// Avoid memory leaks:
clone.remove();
// Initialize options set via HTML5 data-attributes:
$.each(
clone.data(),
data,
function (key, value) {
var dataAttributeName = 'data-' +
// Convert camelCase to hyphen-ated key:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* jQuery Iframe Transport Plugin 1.8.2
* jQuery Iframe Transport Plugin 1.8.3
* https://github.com/blueimp/jQuery-File-Upload
*
* Copyright 2011, Sebastian Tschan
Expand All @@ -9,13 +9,16 @@
* http://www.opensource.org/licenses/MIT
*/

/* global define, window, document */
/* global define, require, window, document */

(function (factory) {
'use strict';
if (typeof define === 'function' && define.amd) {
// Register as an anonymous AMD module:
define(['jquery'], factory);
} else if (typeof exports === 'object') {
// Node/CommonJS:
factory(require('jquery'));
} else {
// Browser globals:
factory(window.jQuery);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! jQuery UI - v1.11.1 - 2014-09-17
/*! jQuery UI - v1.11.1+CommonJS - 2014-09-17
* http://jqueryui.com
* Includes: widget.js
* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
Expand All @@ -8,6 +8,11 @@

// AMD. Register as an anonymous module.
define([ "jquery" ], factory );

} else if (typeof exports === "object") {
// Node/CommonJS:
factory(require("jquery"));

} else {

// Browser globals
Expand Down
Empty file.

0 comments on commit d3ab30c

Please sign in to comment.