Added functionality to define options via data attributes on the widget element.

blueimp · blueimp · commit 4576df9cc08e · 2012-02-16T17:30:18.000+09:00
Allow using query strings and document elements for the dropZone and
fileInput options.
diff --git a/js/jquery.fileupload.js b/js/jquery.fileupload.js
@@ -1,5 +1,5 @@
 /*
- * jQuery File Upload Plugin 5.7
+ * jQuery File Upload Plugin 5.8
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
@@ -767,44 +767,38 @@
                 .unbind('change.' + ns, this._onChange);
         },
 
-        _beforeSetOption: function (key, value) {
-            this._destroyEventHandlers();
-        },
-
-        _afterSetOption: function (key, value) {
-            var options = this.options;
-            if (!options.fileInput) {
-                options.fileInput = $();
-            }
-            if (!options.dropZone) {
-                options.dropZone = $();
-            }
-            this._initEventHandlers();
-        },
-
         _setOption: function (key, value) {
             var refresh = $.inArray(key, this._refreshOptionsList) !== -1;
             if (refresh) {
-                this._beforeSetOption(key, value);
+                this._destroyEventHandlers();
             }
             $.Widget.prototype._setOption.call(this, key, value);
             if (refresh) {
-                this._afterSetOption(key, value);
+                this._initSpecialOptions();
+                this._initEventHandlers();
             }
         },
 
-        _create: function () {
+        _initSpecialOptions: function () {
             var options = this.options;
-            options.namespace = options.namespace || this.widgetName;
             if (options.fileInput === undefined) {
                 options.fileInput = this.element.is('input:file') ?
                         this.element : this.element.find('input:file');
-            } else if (!options.fileInput) {
-                options.fileInput = $();
+            } else if (!(options.fileInput instanceof $)) {
+                options.fileInput = $(options.fileInput);
             }
-            if (!options.dropZone) {
-                options.dropZone = $();
+            if (!(options.dropZone instanceof $)) {
+                options.dropZone = $(options.dropZone);
             }
+        },
+
+        _create: function () {
+            var options = this.options,
+                dataOpts = $.extend({}, this.element.data());
+            dataOpts[this.widgetName] = undefined;
+            $.extend(options, dataOpts);
+            options.namespace = options.namespace || this.widgetName;
+            this._initSpecialOptions();
             this._slots = [];
             this._sequence = this._getXHRPromise(true);
             this._sending = this._active = this._loaded = this._total = 0;
diff --git a/package.json b/package.json
@@ -49,7 +49,7 @@
     "dependencies": {
         "jquery": ">=1.6",
         "jquery.ui.widget": ">=1.8",
-        "blueimp-tmpl": ">=1.0.2",
+        "blueimp-tmpl": ">=2.1.0",
         "blueimp-load-image": ">=1.1.4",
         "blueimp-canvas-to-blob": ">=1.0.1"
     }
diff --git a/test/test.js b/test/test.js
@@ -1,5 +1,5 @@
 /*
- * jQuery File Upload Plugin Test 6.3
+ * jQuery File Upload Plugin Test 6.4
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
@@ -61,6 +61,15 @@ $(function () {
         ok($('#fileupload').fileupload().data('fileupload'));
     });
 
+    test('Data attribute options', function () {
+        $('#fileupload').attr('data-url', 'http://example.org');
+        $('#fileupload').fileupload();
+        strictEqual(
+            $('#fileupload').fileupload('option', 'url'),
+            'http://example.org'
+        );
+    });
+
     test('File input initialization', function () {
         var fu = $('#fileupload').fileupload();
         ok(
@@ -217,6 +226,30 @@ $(function () {
             dropZone.data('events').dragover.length,
             'Adds dragover event listener after setting dropZone option'
         );
+        fu.fileupload('option', 'dropZone', 'body');
+        strictEqual(
+            fu.fileupload('option', 'dropZone')[0],
+            document.body,
+            'Allow a query string as parameter for the dropZone option'
+        );
+        fu.fileupload('option', 'dropZone', document);
+        strictEqual(
+            fu.fileupload('option', 'dropZone')[0],
+            document,
+            'Allow a document element as parameter for the dropZone option'
+        );
+        fu.fileupload('option', 'fileInput', ':file');
+        strictEqual(
+            fu.fileupload('option', 'fileInput')[0],
+            $(':file')[0],
+            'Allow a query string as parameter for the fileInput option'
+        );
+        fu.fileupload('option', 'fileInput', $(':file')[0]);
+        strictEqual(
+            fu.fileupload('option', 'fileInput')[0],
+            $(':file')[0],
+            'Allow a document element as parameter for the fileInput option'
+        );
     });
 
     asyncTest('add', function () {

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@`
`49`	`49`	`"dependencies": {`
`50`	`50`	`"jquery": ">=1.6",`
`51`	`51`	`"jquery.ui.widget": ">=1.8",`
`52`		`- "blueimp-tmpl": ">=1.0.2",`
	`52`	`+ "blueimp-tmpl": ">=2.1.0",`
`53`	`53`	`"blueimp-load-image": ">=1.1.4",`
`54`	`54`	`"blueimp-canvas-to-blob": ">=1.0.1"`
`55`	`55`	`}`