🌐 AI搜索 & 代理 主页
Skip to content

Commit ac9e301

Browse files
karan-96mgol
karan-96
authored and
mgol
committed
Core: Deprecate jQuery.nodeName
Fixes gh-3475 Closes gh-3505
1 parent bd984f0 commit ac9e301

File tree

12 files changed

+56
-36
lines changed

12 files changed

+56
-36
lines changed

‎src/attributes/attr.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
define( [
22
"../core",
33
"../core/access",
4+
"../core/nodeName",
45
"./support",
56
"../var/rnothtmlwhite",
67
"../selector"
7-
], function( jQuery, access, support, rnothtmlwhite ) {
8+
], function( jQuery, access, nodeName, support, rnothtmlwhite ) {
89

910
"use strict";
1011

@@ -74,7 +75,7 @@ jQuery.extend( {
7475
type: {
7576
set: function( elem, value ) {
7677
if ( !support.radioValue && value === "radio" &&
77-
jQuery.nodeName( elem, "input" ) ) {
78+
nodeName( elem, "input" ) ) {
7879
var val = elem.value;
7980
elem.setAttribute( "type", value );
8081
if ( val ) {

‎src/attributes/val.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ define( [
22
"../core",
33
"../core/stripAndCollapse",
44
"./support",
5-
"../core/init"
6-
], function( jQuery, stripAndCollapse, support ) {
5+
"../core/init",
6+
"../core/nodeName"
7+
], function( jQuery, stripAndCollapse, support, nodeName ) {
78

89
"use strict";
910

@@ -121,7 +122,7 @@ jQuery.extend( {
121122
// Don't return options that are disabled or in a disabled optgroup
122123
!option.disabled &&
123124
( !option.parentNode.disabled ||
124-
!jQuery.nodeName( option.parentNode, "optgroup" ) ) ) {
125+
!nodeName( option.parentNode, "optgroup" ) ) ) {
125126

126127
// Get the specific value for the option
127128
value = jQuery( option ).val();

‎src/core.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -289,10 +289,6 @@ jQuery.extend( {
289289
return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
290290
},
291291

292-
nodeName: function( elem, name ) {
293-
return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
294-
},
295-
296292
each: function( obj, callback ) {
297293
var length, i = 0;
298294

‎src/core/nodeName.js‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
define( function() {
2+
3+
"use strict";
4+
5+
function nodeName( elem, name ) {
6+
7+
return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
8+
9+
};
10+
11+
return nodeName;
12+
13+
} );

‎src/deprecated.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
define( [
2-
"./core"
3-
], function( jQuery ) {
2+
"./core",
3+
"./core/nodeName"
4+
], function( jQuery, nodeName ) {
45

56
"use strict";
67

@@ -29,7 +30,8 @@ jQuery.fn.extend( {
2930
} else {
3031
jQuery.ready( true );
3132
}
32-
}
33+
},
34+
nodeName: nodeName
3335
} );
3436

3537
jQuery.isArray = Array.isArray;

‎src/event.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ define( [
77
"./var/slice",
88
"./data/var/dataPriv",
99
"./core/init",
10+
"./core/nodeName",
1011
"./selector"
11-
], function( jQuery, document, documentElement, rnothtmlwhite, rcheckableType, slice, dataPriv ) {
12+
], function( jQuery, document, documentElement, rnothtmlwhite, rcheckableType, slice, dataPriv,
13+
nodeName ) {
1214

1315
"use strict";
1416

@@ -477,7 +479,7 @@ jQuery.event = {
477479
// For checkable types, fire native event so checked state will be right
478480
trigger: function() {
479481
if ( rcheckableType.test( this.type ) &&
480-
this.click && jQuery.nodeName( this, "input" ) ) {
482+
this.click && nodeName( this, "input" ) ) {
481483

482484
this.click();
483485
return false;
@@ -486,7 +488,7 @@ jQuery.event = {
486488

487489
// For cross-browser consistency, don't fire native .click() on links
488490
_default: function( event ) {
489-
return jQuery.nodeName( event.target, "a" );
491+
return nodeName( event.target, "a" );
490492
}
491493
},
492494

‎src/manipulation.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,14 @@ define( [
1818
"./core/DOMEval",
1919

2020
"./core/init",
21+
"./core/nodeName",
2122
"./traversing",
2223
"./selector",
2324
"./event"
2425
], function( jQuery, concat, push, rcheckableType,
2526
access, rtagName, rscriptType,
2627
wrapMap, getAll, setGlobalEval, buildFragment, support,
27-
dataPriv, dataUser, acceptData, DOMEval ) {
28+
dataPriv, dataUser, acceptData, DOMEval, nodeName ) {
2829

2930
"use strict";
3031

@@ -49,8 +50,8 @@ var
4950

5051
// Prefer a tbody over its parent table for containing new rows
5152
function manipulationTarget( elem, content ) {
52-
if ( jQuery.nodeName( elem, "table" ) &&
53-
jQuery.nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ) {
53+
if ( nodeName( elem, "table" ) &&
54+
nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ) {
5455

5556
return jQuery( ">tbody", elem )[ 0 ] || elem;
5657
}

‎src/manipulation/getAll.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
define( [
2-
"../core"
3-
], function( jQuery ) {
2+
"../core",
3+
"../core/nodeName"
4+
], function( jQuery, nodeName ) {
45

56
"use strict";
67

@@ -20,7 +21,7 @@ function getAll( context, tag ) {
2021
ret = [];
2122
}
2223

23-
if ( tag === undefined || tag && jQuery.nodeName( context, tag ) ) {
24+
if ( tag === undefined || tag && nodeName( context, tag ) ) {
2425
return jQuery.merge( [ context ], ret );
2526
}
2627

‎src/offset.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ define( [
99
"./css/support",
1010

1111
"./core/init",
12+
"./core/nodeName",
1213
"./css",
1314
"./selector" // contains
14-
], function( jQuery, access, document, documentElement, rnumnonpx, curCSS, addGetHookIf, support ) {
15+
], function( jQuery, access, document, documentElement, rnumnonpx, curCSS, addGetHookIf, support,
16+
nodeName ) {
1517

1618
"use strict";
1719

@@ -129,7 +131,7 @@ jQuery.fn.extend( {
129131

130132
// Get correct offsets
131133
offset = this.offset();
132-
if ( !jQuery.nodeName( offsetParent[ 0 ], "html" ) ) {
134+
if ( !nodeName( offsetParent[ 0 ], "html" ) ) {
133135
parentOffset = offsetParent.offset();
134136
}
135137

‎src/traversing.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ define( [
55
"./traversing/var/siblings",
66
"./traversing/var/rneedsContext",
77
"./core/init",
8+
"./core/nodeName",
89
"./traversing/findFilter",
910
"./selector"
10-
], function( jQuery, indexOf, dir, siblings, rneedsContext ) {
11+
], function( jQuery, indexOf, dir, siblings, rneedsContext, nodeName ) {
1112

1213
"use strict";
1314

@@ -143,14 +144,14 @@ jQuery.each( {
143144
return siblings( elem.firstChild );
144145
},
145146
contents: function( elem ) {
146-
if ( jQuery.nodeName( elem, "iframe" ) ) {
147+
if ( nodeName( elem, "iframe" ) ) {
147148
return elem.contentDocument;
148149
}
149150

150151
// Support: IE 9 - 11 only, iOS 7 only, Android Browser <=4.3 only
151152
// Treat the template element as a regular one in browsers that
152153
// don't support it.
153-
if ( jQuery.nodeName( elem, "template" ) ) {
154+
if ( nodeName( elem, "template" ) ) {
154155
elem = elem.content || elem;
155156
}
156157

0 commit comments

Comments
 (0)