diff --git a/README.md b/README.md index 7ef8f7a..4995170 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/app/assets/javascripts/jquery-fileupload/cors/jquery.postmessage-transport.js b/app/assets/javascripts/jquery-fileupload/cors/jquery.postmessage-transport.js index 2b4851e..65c19e6 100644 --- a/app/assets/javascripts/jquery-fileupload/cors/jquery.postmessage-transport.js +++ b/app/assets/javascripts/jquery-fileupload/cors/jquery.postmessage-transport.js @@ -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 @@ -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); diff --git a/app/assets/javascripts/jquery-fileupload/cors/jquery.xdr-transport.js b/app/assets/javascripts/jquery-fileupload/cors/jquery.xdr-transport.js index 0044cc2..2dfd0fa 100644 --- a/app/assets/javascripts/jquery-fileupload/cors/jquery.xdr-transport.js +++ b/app/assets/javascripts/jquery-fileupload/cors/jquery.xdr-transport.js @@ -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 @@ -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); diff --git a/app/assets/javascripts/jquery-fileupload/jquery.fileupload-audio.js b/app/assets/javascripts/jquery-fileupload/jquery.fileupload-audio.js index 575800e..1e3d05d 100644 --- a/app/assets/javascripts/jquery-fileupload/jquery.fileupload-audio.js +++ b/app/assets/javascripts/jquery-fileupload/jquery.fileupload-audio.js @@ -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 @@ -10,7 +10,7 @@ */ /* jshint nomen:false */ -/* global define, window, document */ +/* global define, require, window, document */ (function (factory) { 'use strict'; @@ -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( diff --git a/app/assets/javascripts/jquery-fileupload/jquery.fileupload-image.js b/app/assets/javascripts/jquery-fileupload/jquery.fileupload-image.js index 5bb7026..0ac9936 100644 --- a/app/assets/javascripts/jquery-fileupload/jquery.fileupload-image.js +++ b/app/assets/javascripts/jquery-fileupload/jquery.fileupload-image.js @@ -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 @@ -10,7 +10,7 @@ */ /* jshint nomen:false */ -/* global define, window, Blob */ +/* global define, require, window, Blob */ (function (factory) { 'use strict'; @@ -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( diff --git a/app/assets/javascripts/jquery-fileupload/jquery.fileupload-jquery-ui.js b/app/assets/javascripts/jquery-fileupload/jquery.fileupload-jquery-ui.js old mode 100644 new mode 100755 index af0a00b..e6cf5c7 --- a/app/assets/javascripts/jquery-fileupload/jquery.fileupload-jquery-ui.js +++ b/app/assets/javascripts/jquery-fileupload/jquery.fileupload-jquery-ui.js @@ -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 @@ -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); diff --git a/app/assets/javascripts/jquery-fileupload/jquery.fileupload-process.js b/app/assets/javascripts/jquery-fileupload/jquery.fileupload-process.js index 8a6b929..da78fa0 100644 --- a/app/assets/javascripts/jquery-fileupload/jquery.fileupload-process.js +++ b/app/assets/javascripts/jquery-fileupload/jquery.fileupload-process.js @@ -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 @@ -10,7 +10,7 @@ */ /* jshint nomen:false */ -/* global define, window */ +/* global define, require, window */ (function (factory) { 'use strict'; @@ -20,6 +20,9 @@ 'jquery', './jquery.fileupload' ], factory); + } else if (typeof exports === 'object') { + // Node/CommonJS: + factory(require('jquery')); } else { // Browser globals: factory( diff --git a/app/assets/javascripts/jquery-fileupload/jquery.fileupload-ui.js b/app/assets/javascripts/jquery-fileupload/jquery.fileupload-ui.js index 710e869..6164456 100644 --- a/app/assets/javascripts/jquery-fileupload/jquery.fileupload-ui.js +++ b/app/assets/javascripts/jquery-fileupload/jquery.fileupload-ui.js @@ -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 @@ -10,7 +10,7 @@ */ /* jshint nomen:false */ -/* global define, window */ +/* global define, require, window */ (function (factory) { 'use strict'; @@ -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( diff --git a/app/assets/javascripts/jquery-fileupload/jquery.fileupload-validate.js b/app/assets/javascripts/jquery-fileupload/jquery.fileupload-validate.js index f93a18f..cb0d9f8 100644 --- a/app/assets/javascripts/jquery-fileupload/jquery.fileupload-validate.js +++ b/app/assets/javascripts/jquery-fileupload/jquery.fileupload-validate.js @@ -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 @@ -9,7 +9,7 @@ * http://www.opensource.org/licenses/MIT */ -/* global define, window */ +/* global define, require, window */ (function (factory) { 'use strict'; @@ -19,6 +19,9 @@ 'jquery', './jquery.fileupload-process' ], factory); + } else if (typeof exports === 'object') { + // Node/CommonJS: + factory(require('jquery')); } else { // Browser globals: factory( diff --git a/app/assets/javascripts/jquery-fileupload/jquery.fileupload-video.js b/app/assets/javascripts/jquery-fileupload/jquery.fileupload-video.js index 3764b27..db5f248 100644 --- a/app/assets/javascripts/jquery-fileupload/jquery.fileupload-video.js +++ b/app/assets/javascripts/jquery-fileupload/jquery.fileupload-video.js @@ -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 @@ -10,7 +10,7 @@ */ /* jshint nomen:false */ -/* global define, window, document */ +/* global define, require, window, document */ (function (factory) { 'use strict'; @@ -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( diff --git a/app/assets/javascripts/jquery-fileupload/jquery.fileupload.js b/app/assets/javascripts/jquery-fileupload/jquery.fileupload.js index a4cfdc0..e99f309 100644 --- a/app/assets/javascripts/jquery-fileupload/jquery.fileupload.js +++ b/app/assets/javascripts/jquery-fileupload/jquery.fileupload.js @@ -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 @@ -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'; @@ -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); @@ -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: diff --git a/app/assets/javascripts/jquery-fileupload/jquery.iframe-transport.js b/app/assets/javascripts/jquery-fileupload/jquery.iframe-transport.js index 8d64b59..b7581f2 100644 --- a/app/assets/javascripts/jquery-fileupload/jquery.iframe-transport.js +++ b/app/assets/javascripts/jquery-fileupload/jquery.iframe-transport.js @@ -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 @@ -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); diff --git a/app/assets/javascripts/jquery-fileupload/vendor/jquery.ui.widget.js b/app/assets/javascripts/jquery-fileupload/vendor/jquery.ui.widget.js index 7899e6b..5ac2ed5 100644 --- a/app/assets/javascripts/jquery-fileupload/vendor/jquery.ui.widget.js +++ b/app/assets/javascripts/jquery-fileupload/vendor/jquery.ui.widget.js @@ -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 */ @@ -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 diff --git a/app/assets/javascripts/jquery-fileupload/vendor/load-image.all.min.js b/app/assets/javascripts/jquery-fileupload/vendor/load-image.all.min.js old mode 100755 new mode 100644