mirror of
https://github.com/jquery/jquery.git
synced 2026-02-01 17:14:58 -05:00
Data: Don't expose jQuery.acceptData
jQuery.acceptData is an undocumented internal API that shouldn't be exposed. Fixes gh-2555
This commit is contained in:
committed by
Michał Gołębiowski
parent
02e10082b2
commit
224271982e
@@ -1,15 +1,14 @@
|
||||
define( [
|
||||
"../core",
|
||||
"../var/rnotwhite",
|
||||
"./accepts"
|
||||
], function( jQuery, rnotwhite ) {
|
||||
"./var/acceptData"
|
||||
], function( jQuery, rnotwhite, acceptData ) {
|
||||
|
||||
function Data() {
|
||||
this.expando = jQuery.expando + Data.uid++;
|
||||
}
|
||||
|
||||
Data.uid = 1;
|
||||
Data.accepts = jQuery.acceptData;
|
||||
|
||||
Data.prototype = {
|
||||
|
||||
@@ -38,7 +37,7 @@ Data.prototype = {
|
||||
// We can accept data for non-element nodes in modern browsers,
|
||||
// but we should not, see #8335.
|
||||
// Always return an empty object.
|
||||
if ( !Data.accepts( owner ) ) {
|
||||
if ( !acceptData( owner ) ) {
|
||||
return {};
|
||||
}
|
||||
|
||||
|
||||
@@ -1,12 +1,9 @@
|
||||
define( [
|
||||
"../core"
|
||||
], function( jQuery ) {
|
||||
define( function() {
|
||||
|
||||
/**
|
||||
* Determines whether an object can have data
|
||||
*/
|
||||
jQuery.acceptData = function( owner ) {
|
||||
|
||||
return function( owner ) {
|
||||
// Accepts only:
|
||||
// - Node
|
||||
// - Node.ELEMENT_NODE
|
||||
@@ -17,5 +14,4 @@ jQuery.acceptData = function( owner ) {
|
||||
return owner.nodeType === 1 || owner.nodeType === 9 || !( +owner.nodeType );
|
||||
};
|
||||
|
||||
return jQuery.acceptData;
|
||||
} );
|
||||
10
src/event.js
10
src/event.js
@@ -6,11 +6,11 @@ define( [
|
||||
"./var/slice",
|
||||
"./event/support",
|
||||
"./data/var/dataPriv",
|
||||
"./data/var/acceptData",
|
||||
|
||||
"./core/init",
|
||||
"./data/accepts",
|
||||
"./selector"
|
||||
], function( jQuery, document, rnotwhite, hasOwn, slice, support, dataPriv ) {
|
||||
], function( jQuery, document, rnotwhite, hasOwn, slice, support, dataPriv, acceptData ) {
|
||||
|
||||
var
|
||||
rkeyEvent = /^key/,
|
||||
@@ -376,7 +376,7 @@ jQuery.event = {
|
||||
|
||||
// Native handler
|
||||
handle = ontype && cur[ ontype ];
|
||||
if ( handle && handle.apply && jQuery.acceptData( cur ) ) {
|
||||
if ( handle && handle.apply && acceptData( cur ) ) {
|
||||
event.result = handle.apply( cur, data );
|
||||
if ( event.result === false ) {
|
||||
event.preventDefault();
|
||||
@@ -389,8 +389,8 @@ jQuery.event = {
|
||||
if ( !onlyHandlers && !event.isDefaultPrevented() ) {
|
||||
|
||||
if ( ( !special._default ||
|
||||
special._default.apply( eventPath.pop(), data ) === false ) &&
|
||||
jQuery.acceptData( elem ) ) {
|
||||
special._default.apply( eventPath.pop(), data ) === false ) &&
|
||||
acceptData( elem ) ) {
|
||||
|
||||
// Call a native DOM method on the target with the same name name as the event.
|
||||
// Don't do default actions on window, that's where global variables be (#6170)
|
||||
|
||||
@@ -14,16 +14,16 @@ define( [
|
||||
|
||||
"./data/var/dataPriv",
|
||||
"./data/var/dataUser",
|
||||
"./data/var/acceptData",
|
||||
|
||||
"./core/init",
|
||||
"./data/accepts",
|
||||
"./traversing",
|
||||
"./selector",
|
||||
"./event"
|
||||
], function( jQuery, concat, push, access,
|
||||
rcheckableType, rtagName, rscriptType,
|
||||
wrapMap, getAll, setGlobalEval, buildFragment, support,
|
||||
dataPriv, dataUser ) {
|
||||
dataPriv, dataUser, acceptData ) {
|
||||
|
||||
var
|
||||
rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,
|
||||
@@ -273,7 +273,7 @@ jQuery.extend( {
|
||||
i = 0;
|
||||
|
||||
for ( ; ( elem = elems[ i ] ) !== undefined; i++ ) {
|
||||
if ( jQuery.acceptData( elem ) ) {
|
||||
if ( acceptData( elem ) ) {
|
||||
if ( ( data = elem[ dataPriv.expando ] ) ) {
|
||||
if ( data.events ) {
|
||||
for ( type in data.events ) {
|
||||
|
||||
Reference in New Issue
Block a user