Skip to content

Commit ec3e9a3

Browse files
committed
Update jQuery UI Widget to 1.10.4+amd
1 parent 44b3b7a commit ec3e9a3

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

vendor/assets/javascripts/jquery-fileupload/vendor/jquery.ui.widget.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
/*
2-
* jQuery UI Widget 1.10.1+amd
1+
/*!
2+
* jQuery UI Widget 1.10.4+amd
33
* https://github.com/blueimp/jQuery-File-Upload
44
*
5-
* Copyright 2013 jQuery Foundation and other contributors
5+
* Copyright 2014 jQuery Foundation and other contributors
66
* Released under the MIT license.
77
* http://jquery.org/license
88
*
@@ -115,7 +115,7 @@ $.widget = function( name, base, prototype ) {
115115
// TODO: remove support for widgetEventPrefix
116116
// always use the name + a colon as the prefix, e.g., draggable:start
117117
// don't prefix for widgets that aren't DOM-based
118-
widgetEventPrefix: existingConstructor ? basePrototype.widgetEventPrefix : name
118+
widgetEventPrefix: existingConstructor ? (basePrototype.widgetEventPrefix || name) : name
119119
}, proxiedPrototype, {
120120
constructor: constructor,
121121
namespace: namespace,
@@ -324,12 +324,12 @@ $.Widget.prototype = {
324324
curOption = curOption[ parts[ i ] ];
325325
}
326326
key = parts.pop();
327-
if ( value === undefined ) {
327+
if ( arguments.length === 1 ) {
328328
return curOption[ key ] === undefined ? null : curOption[ key ];
329329
}
330330
curOption[ key ] = value;
331331
} else {
332-
if ( value === undefined ) {
332+
if ( arguments.length === 1 ) {
333333
return this.options[ key ] === undefined ? null : this.options[ key ];
334334
}
335335
options[ key ] = value;

0 commit comments

Comments
 (0)