Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
J
jquery
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
夏彬
jquery
Commits
d50c18e6
Commit
d50c18e6
authored
Dec 31, 2012
by
Rick Waldron
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolved conflict
parent
d96fa376
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
45 deletions
+1
-45
attributes.js
src/attributes.js
+0
-40
support.js
src/support.js
+1
-5
No files found.
src/attributes.js
View file @
d50c18e6
...
@@ -573,46 +573,6 @@ if ( !getSetAttribute ) {
...
@@ -573,46 +573,6 @@ if ( !getSetAttribute ) {
});
});
}
}
// Some attributes require a special call on IE
// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
if
(
!
jQuery
.
support
.
hrefNormalized
)
{
jQuery
.
each
([
"href"
,
"src"
,
"width"
,
"height"
],
function
(
i
,
name
)
{
jQuery
.
attrHooks
[
name
]
=
jQuery
.
extend
(
jQuery
.
attrHooks
[
name
],
{
get
:
function
(
elem
)
{
var
ret
=
elem
.
getAttribute
(
name
,
2
);
return
ret
==
null
?
undefined
:
ret
;
}
});
});
// href/src property should get the full normalized URL (#10299/#12915)
jQuery
.
each
([
"href"
,
"src"
],
function
(
i
,
name
)
{
jQuery
.
propHooks
[
name
]
=
{
get
:
function
(
elem
)
{
return
elem
.
getAttribute
(
name
,
4
);
}
};
});
}
<<<<<<<
HEAD
if
(
!
jQuery
.
support
.
style
)
{
jQuery
.
attrHooks
.
style
=
{
get
:
function
(
elem
)
{
// Return undefined in the case of empty string
// Note: IE uppercases css property names, but if we were to .toLowerCase()
// .cssText, that would destroy case senstitivity in URL's, like in "background"
return
elem
.
style
.
cssText
||
undefined
;
},
set
:
function
(
elem
,
value
)
{
return
(
elem
.
style
.
cssText
=
value
+
""
);
}
};
}
=======
>>>>>>>
2.0
:
Remove
style
->
cssText
attroproties
fallback
// Radios and checkboxes getter/setter
// Radios and checkboxes getter/setter
if
(
!
jQuery
.
support
.
checkOn
)
{
if
(
!
jQuery
.
support
.
checkOn
)
{
jQuery
.
each
([
"radio"
,
"checkbox"
],
function
()
{
jQuery
.
each
([
"radio"
,
"checkbox"
],
function
()
{
...
...
src/support.js
View file @
d50c18e6
...
@@ -5,7 +5,7 @@ jQuery.support = (function() {
...
@@ -5,7 +5,7 @@ jQuery.support = (function() {
// Setup
// Setup
div
.
setAttribute
(
"className"
,
"t"
);
div
.
setAttribute
(
"className"
,
"t"
);
div
.
innerHTML
=
" <link/><table></table><a
href='/a'
>a</a><input type='checkbox'/>"
;
div
.
innerHTML
=
" <link/><table></table><a>a</a><input type='checkbox'/>"
;
// Support tests won't run in some limited or non-browser environments
// Support tests won't run in some limited or non-browser environments
all
=
div
.
getElementsByTagName
(
"*"
);
all
=
div
.
getElementsByTagName
(
"*"
);
...
@@ -35,10 +35,6 @@ jQuery.support = (function() {
...
@@ -35,10 +35,6 @@ jQuery.support = (function() {
// This requires a wrapper element in IE
// This requires a wrapper element in IE
htmlSerialize
:
!!
div
.
getElementsByTagName
(
"link"
).
length
,
htmlSerialize
:
!!
div
.
getElementsByTagName
(
"link"
).
length
,
// Make sure that URLs aren't manipulated
// (IE normalizes it by default)
hrefNormalized
:
a
.
getAttribute
(
"href"
)
===
"/a"
,
// Make sure that element opacity exists
// Make sure that element opacity exists
// (IE uses filter instead)
// (IE uses filter instead)
// Use a regex to work around a WebKit issue. See #5145
// Use a regex to work around a WebKit issue. See #5145
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment