Fix bug when accessing .data() on an empty set. Return null rather than throwing...

[jquery.git] / src / data.js

diff --git a/src/data.js b/src/data.js
index 562834a..b7a6ab9 100644 (file)
--- a/src/data.js
+++ b/src/data.js
@@ -129,8 +129,8 @@ jQuery.extend({
 
 jQuery.fn.extend({
        data: function( key, value ) {
-               if ( typeof key === "undefined" && this.length ) {
-                       return jQuery.data( this[0] );
+               if ( typeof key === "undefined" ) {
+                       return this.length ? jQuery.data( this[0] ) : null;
 
                } else if ( typeof key === "object" ) {
                        return this.each(function() {