Refactored last merge to fix HTML5 data-attributes handling.

mgkirs · Feb 12, 2014 · 0f386a9 · 0f386a9
1 parent 592c73f
commit 0f386a9
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/blueimp-file-upload.jquery.json b/blueimp-file-upload.jquery.json
@@ -1,6 +1,6 @@
 {
   "name": "blueimp-file-upload",
-  "version": "9.5.5",
+  "version": "9.5.6",
   "title": "jQuery File Upload",
   "author": {
     "name": "Sebastian Tschan",

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "blueimp-file-upload",
-  "version": "9.5.5",
+  "version": "9.5.6",
   "title": "jQuery File Upload",
   "description": "File Upload widget with multiple file selection, drag&amp;drop support, progress bar, validation and preview images, audio and video for jQuery. Supports cross-domain, chunked and resumable file uploads. Works with any server-side platform (Google App Engine, PHP, Python, Ruby on Rails, Java, etc.) that supports standard HTML form file uploads.",
   "keywords": [

diff --git a/js/jquery.fileupload.js b/js/jquery.fileupload.js
@@ -1,5 +1,5 @@
 /*
- * jQuery File Upload Plugin 5.40.0
+ * jQuery File Upload Plugin 5.40.1
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
@@ -1307,13 +1307,16 @@
 
         _initDataAttributes: function () {
             var that = this,
-                options = this.options;
+                options = this.options,
+                clone = $(this.element[0].cloneNode(false));
             // Initialize options set via HTML5 data-attributes:
-            var clone = $(this.element[0].cloneNode(false));
             $.each(
                 clone.data(),
                 function (key, value) {
-                    if (clone[0].getAttribute('data-'+key)) {
+                    var dataAttributeName = 'data-' +
+                        // Convert camelCase to hyphen-ated key:
+                        key.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
+                    if (clone.attr(dataAttributeName)) {
                         if (that._isRegExpOption(key, value)) {
                             value = that._getRegExp(value);
                         }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "blueimp-file-upload",
-  "version": "9.5.5",
+  "version": "9.5.6",
   "title": "jQuery File Upload",
   "description": "File Upload widget with multiple file selection, drag&amp;drop support, progress bar, validation and preview images, audio and video for jQuery. Supports cross-domain, chunked and resumable file uploads. Works with any server-side platform (Google App Engine, PHP, Python, Ruby on Rails, Java, etc.) that supports standard HTML form file uploads.",
   "keywords": [