Updated jQuery UI Widget Factory and fixed AngularJS widget options handling. Closes blueimp#2904

blueimp · blueimp · commit d1b1361ebb22 · 2014-01-27T09:42:29.000-06:00
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.3",
+  "version": "9.5.4",
   "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.3",
+  "version": "9.5.4",
   "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-angular.js b/js/jquery.fileupload-angular.js
@@ -1,5 +1,5 @@
 /*
- * jQuery File Upload AngularJS Plugin 2.1.3
+ * jQuery File Upload AngularJS Plugin 2.2.0
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2013, Sebastian Tschan
@@ -38,7 +38,7 @@
         .provider('fileUpload', function () {
             var scopeEvalAsync = function (expression) {
                     var scope = angular.element(this)
-                            .fileupload('option', 'scope')();
+                            .fileupload('option', 'scope');
                     // Schedule a new $digest cycle if not already inside of one
                     // and evaluate the given expression:
                     scope.$evalAsync(expression);
@@ -75,7 +75,7 @@
                 handleResponse: function (e, data) {
                     var files = data.result && data.result.files;
                     if (files) {
-                        data.scope().replace(data.files, files);
+                        data.scope.replace(data.files, files);
                     } else if (data.errorThrown ||
                             data.textStatus === 'error') {
                         data.files[0].error = data.errorThrown ||
@@ -86,7 +86,7 @@
                     if (e.isDefaultPrevented()) {
                         return false;
                     }
-                    var scope = data.scope(),
+                    var scope = data.scope,
                         filesCopy = [];
                     angular.forEach(data.files, function (file) {
                         filesCopy.push(file);
@@ -116,14 +116,14 @@
                     if (e.isDefaultPrevented()) {
                         return false;
                     }
-                    data.scope().$apply();
+                    data.scope.$apply();
                 },
                 done: function (e, data) {
                     if (e.isDefaultPrevented()) {
                         return false;
                     }
                     var that = this;
-                    data.scope().$apply(function () {
+                    data.scope.$apply(function () {
                         data.handleResponse.call(that, e, data);
                     });
                 },
@@ -132,7 +132,7 @@
                         return false;
                     }
                     var that = this,
-                        scope = data.scope();
+                        scope = data.scope;
                     if (data.errorThrown === 'abort') {
                         scope.clear(data.files);
                         return;
@@ -145,7 +145,7 @@
                 processstart: scopeEvalAsync,
                 processstop: scopeEvalAsync,
                 getNumberOfFiles: function () {
-                    var scope = this.scope();
+                    var scope = this.scope;
                     return scope.queue.length - scope.processing();
                 },
                 dataType: 'json',
@@ -207,7 +207,10 @@
                         return $element.fileupload('active');
                     },
                     option: function (option, data) {
-                        return $element.fileupload('option', option, data);
+                        if (arguments.length === 1) {
+                            return $element.fileupload('option', option);
+                        }
+                        $element.fileupload('option', option, data);
                     },
                     add: function (data) {
                         return $element.fileupload('add', data);
@@ -277,12 +280,10 @@
                 // the options provided via "data-"-parameters,
                 // as well as those given via options object:
                 $element.fileupload(angular.extend(
-                    {scope: function () {
-                        return $scope;
-                    }},
+                    {scope: $scope},
                     fileUpload.defaults
                 )).on('fileuploadadd', function (e, data) {
-                    data.scope = $scope.option('scope');
+                    data.scope = $scope;
                 }).on('fileuploadfail', function (e, data) {
                     if (data.errorThrown === 'abort') {
                         return;
diff --git a/js/vendor/jquery.ui.widget.js b/js/vendor/jquery.ui.widget.js
@@ -1,8 +1,8 @@
-/*
- * jQuery UI Widget 1.10.3+amd
+/*!
+ * jQuery UI Widget 1.10.4+amd
  * https://github.com/blueimp/jQuery-File-Upload
  *
- * Copyright 2013 jQuery Foundation and other contributors
+ * Copyright 2014 jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -115,7 +115,7 @@ $.widget = function( name, base, prototype ) {
 		// TODO: remove support for widgetEventPrefix
 		// always use the name + a colon as the prefix, e.g., draggable:start
 		// don't prefix for widgets that aren't DOM-based
-		widgetEventPrefix: existingConstructor ? basePrototype.widgetEventPrefix : name
+		widgetEventPrefix: existingConstructor ? (basePrototype.widgetEventPrefix || name) : name
 	}, proxiedPrototype, {
 		constructor: constructor,
 		namespace: namespace,
@@ -324,12 +324,12 @@ $.Widget.prototype = {
 					curOption = curOption[ parts[ i ] ];
 				}
 				key = parts.pop();
-				if ( value === undefined ) {
+				if ( arguments.length === 1 ) {
 					return curOption[ key ] === undefined ? null : curOption[ key ];
 				}
 				curOption[ key ] = value;
 			} else {
-				if ( value === undefined ) {
+				if ( arguments.length === 1 ) {
 					return this.options[ key ] === undefined ? null : this.options[ key ];
 				}
 				options[ key ] = value;
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "blueimp-file-upload",
-  "version": "9.5.3",
+  "version": "9.5.4",
   "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": [

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "blueimp-file-upload",`
`3`		`- "version": "9.5.3",`
	`3`	`+ "version": "9.5.4",`
`4`	`4`	`"title": "jQuery File Upload",`
`5`	`5`	`"author": {`
`6`	`6`	`"name": "Sebastian Tschan",`