diff options
Diffstat (limited to 'src/data.js')
| -rw-r--r-- | src/data.js | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/src/data.js b/src/data.js index f7af18d0d..6dcfb4c22 100644 --- a/src/data.js +++ b/src/data.js @@ -46,13 +46,30 @@ jQuery.extend({ // Avoid generating a new cache unless none exists and we // want to manipulate it. if ( typeof name === "object" ) { - cache[ id ] = jQuery.extend(true, {}, name); + if ( isNode ) { + cache[ id ] = jQuery.extend(true, {}, name); + } else { + cache[ id ] = function() { + return jQuery.extend(true, {}, name); + } + } } else if ( !cache[ id ] ) { - cache[ id ] = {}; + if ( isNode ) { + cache[ id ] = {}; + } else { + var store = {}; + cache[ id ] = function() { + return store; + } + } + } thisCache = cache[ id ]; + if ( !isNode ) { + thisCache = thisCache(); + } // Prevent overriding the named cache with undefined values if ( data !== undefined ) { @@ -71,8 +88,12 @@ jQuery.extend({ windowData : elem; - var id = elem[ jQuery.expando ], cache = jQuery.cache, - isNode = elem.nodeType, thisCache = isNode ? cache[ id ] : id; + var isNode = elem.nodeType, + id = elem[ jQuery.expando ], cache = jQuery.cache; + if ( id && !isNode ) { + id = id(); + } + var thisCache = cache[ id ]; // If we want to remove a specific section of the element's data if ( name ) { |