diff options
| author | Richard Gibson <richard.gibson@gmail.com> | 2013-02-25 15:48:22 -0500 |
|---|---|---|
| committer | Richard Gibson <richard.gibson@gmail.com> | 2013-02-25 15:48:22 -0500 |
| commit | 6d188186d428668b91ddc60be4fb3c230dfec363 (patch) | |
| tree | 7ec03110bb9be83caa1ee91a379001dd7ce4a10c /src | |
| parent | 972de58990ed1c136de700654700ca1efa3de1b1 (diff) | |
| download | jquery-6d188186d428668b91ddc60be4fb3c230dfec363.tar.gz jquery-6d188186d428668b91ddc60be4fb3c230dfec363.zip | |
No ticket: move jQuery.expando to core
Diffstat (limited to 'src')
| -rw-r--r-- | src/core.js | 3 | ||||
| -rw-r--r-- | src/data.js | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/core.js b/src/core.js index 5fb6828ff..cae3a90e3 100644 --- a/src/core.js +++ b/src/core.js @@ -338,6 +338,9 @@ jQuery.extend = jQuery.fn.extend = function() { }; jQuery.extend({ + // Unique for each copy of jQuery on the page + expando: "jQuery" + ( core_version + Math.random() ).replace( /\D/g, "" ), + noConflict: function( deep ) { if ( window.$ === jQuery ) { window.$ = _$; diff --git a/src/data.js b/src/data.js index f0699d2a7..3685b7006 100644 --- a/src/data.js +++ b/src/data.js @@ -201,10 +201,6 @@ data_priv = new Data(); jQuery.extend({ - // Unique for each copy of jQuery on the page - // Non-digits removed to match rinlinejQuery - expando: "jQuery" + ( core_version + Math.random() ).replace( /\D/g, "" ), - // This is no longer relevant to jQuery core, but must remain // supported for the sake of jQuery 1.9.x API surface compatibility. acceptData: function() { |