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
1e64d581
Commit
1e64d581
authored
Dec 22, 2009
by
jeresig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make sure that the correct value is being pulled from checkboxes in Webkit. Fixes #5699.
parent
1b67aaee
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
6 deletions
+24
-6
attributes.js
src/attributes.js
+10
-3
support.js
src/support.js
+6
-1
manipulation.js
test/unit/manipulation.js
+8
-2
No files found.
src/attributes.js
View file @
1e64d581
...
@@ -4,7 +4,8 @@ var rclass = /[\n\t]/g,
...
@@ -4,7 +4,8 @@ var rclass = /[\n\t]/g,
rspecialurl
=
/href|src|style/
,
rspecialurl
=
/href|src|style/
,
rtype
=
/
(
button|input
)
/i
,
rtype
=
/
(
button|input
)
/i
,
rfocusable
=
/
(
button|input|object|select|textarea
)
/i
,
rfocusable
=
/
(
button|input|object|select|textarea
)
/i
,
rclickable
=
/^
(
a|area
)
$/i
;
rclickable
=
/^
(
a|area
)
$/i
,
rradiocheck
=
/radio|checkbox/
;
jQuery
.
fn
.
extend
({
jQuery
.
fn
.
extend
({
attr
:
function
(
name
,
value
)
{
attr
:
function
(
name
,
value
)
{
...
@@ -127,6 +128,12 @@ jQuery.fn.extend({
...
@@ -127,6 +128,12 @@ jQuery.fn.extend({
return
values
;
return
values
;
}
}
// Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
if
(
rradiocheck
.
test
(
elem
.
type
)
&&
!
jQuery
.
support
.
checkOn
)
{
return
elem
.
getAttribute
(
"value"
)
===
null
?
"on"
:
elem
.
value
;
}
// Everything else, we just grab the value
// Everything else, we just grab the value
return
(
elem
.
value
||
""
).
replace
(
rreturn
,
""
);
return
(
elem
.
value
||
""
).
replace
(
rreturn
,
""
);
...
@@ -157,8 +164,8 @@ jQuery.fn.extend({
...
@@ -157,8 +164,8 @@ jQuery.fn.extend({
return
;
return
;
}
}
if
(
jQuery
.
isArray
(
val
)
&&
/radio|checkbox/
.
test
(
this
.
type
)
)
{
if
(
jQuery
.
isArray
(
val
)
&&
rradiocheck
.
test
(
this
.
type
)
)
{
this
.
checked
=
jQuery
.
inArray
(
this
.
value
,
val
)
>=
0
;
this
.
checked
=
jQuery
.
inArray
(
jQuery
(
this
).
val
()
,
val
)
>=
0
;
}
else
if
(
jQuery
.
nodeName
(
this
,
"select"
)
)
{
}
else
if
(
jQuery
.
nodeName
(
this
,
"select"
)
)
{
var
values
=
jQuery
.
makeArray
(
val
);
var
values
=
jQuery
.
makeArray
(
val
);
...
...
src/support.js
View file @
1e64d581
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
id
=
"script"
+
now
();
id
=
"script"
+
now
();
div
.
style
.
display
=
"none"
;
div
.
style
.
display
=
"none"
;
div
.
innerHTML
=
" <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><select><option>text</option></select>"
;
div
.
innerHTML
=
" <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><select><option>text</option></select>
<input type='checkbox'/>
"
;
var
all
=
div
.
getElementsByTagName
(
"*"
),
var
all
=
div
.
getElementsByTagName
(
"*"
),
a
=
div
.
getElementsByTagName
(
"a"
)[
0
];
a
=
div
.
getElementsByTagName
(
"a"
)[
0
];
...
@@ -47,6 +47,11 @@
...
@@ -47,6 +47,11 @@
// (IE uses styleFloat instead of cssFloat)
// (IE uses styleFloat instead of cssFloat)
cssFloat
:
!!
a
.
style
.
cssFloat
,
cssFloat
:
!!
a
.
style
.
cssFloat
,
// Make sure that if no value is specified for a checkbox
// that it defaults to "on".
// (WebKit defaults to "" instead)
checkOn
:
div
.
getElementsByTagName
(
"input"
)[
0
].
value
===
"on"
,
// Will be defined later
// Will be defined later
scriptEval
:
false
,
scriptEval
:
false
,
noCloneEvent
:
true
,
noCloneEvent
:
true
,
...
...
test/unit/manipulation.js
View file @
1e64d581
...
@@ -619,7 +619,7 @@ test("clone() on XML nodes", function() {
...
@@ -619,7 +619,7 @@ test("clone() on XML nodes", function() {
}
}
test
(
"val()"
,
function
()
{
test
(
"val()"
,
function
()
{
expect
(
1
5
);
expect
(
1
7
);
document
.
getElementById
(
'text1'
).
value
=
"bla"
;
document
.
getElementById
(
'text1'
).
value
=
"bla"
;
equals
(
jQuery
(
"#text1"
).
val
(),
"bla"
,
"Check for modified value of input element"
);
equals
(
jQuery
(
"#text1"
).
val
(),
"bla"
,
"Check for modified value of input element"
);
...
@@ -648,10 +648,13 @@ test("val()", function() {
...
@@ -648,10 +648,13 @@ test("val()", function() {
var
checks
=
jQuery
(
"<input type='checkbox' name='test' value='1'/>"
).
appendTo
(
"#form"
)
var
checks
=
jQuery
(
"<input type='checkbox' name='test' value='1'/>"
).
appendTo
(
"#form"
)
.
add
(
jQuery
(
"<input type='checkbox' name='test' value='2'/>"
).
appendTo
(
"#form"
)
)
.
add
(
jQuery
(
"<input type='checkbox' name='test' value='2'/>"
).
appendTo
(
"#form"
)
)
.
add
(
jQuery
(
"<input type='checkbox' name='test' value=''/>"
).
appendTo
(
"#form"
)
);
.
add
(
jQuery
(
"<input type='checkbox' name='test' value=''/>"
).
appendTo
(
"#form"
)
)
.
add
(
jQuery
(
"<input type='checkbox' name='test'/>"
).
appendTo
(
"#form"
)
);
same
(
checks
.
serialize
(),
""
,
"Get unchecked values."
);
same
(
checks
.
serialize
(),
""
,
"Get unchecked values."
);
equals
(
checks
.
eq
(
3
).
val
(),
"on"
,
"Make sure a value of 'on' is provided if none is specified."
);
checks
.
val
([
"2"
]);
checks
.
val
([
"2"
]);
same
(
checks
.
serialize
(),
"test=2"
,
"Get a single checked value."
);
same
(
checks
.
serialize
(),
"test=2"
,
"Get a single checked value."
);
...
@@ -661,6 +664,9 @@ test("val()", function() {
...
@@ -661,6 +664,9 @@ test("val()", function() {
checks
.
val
([
""
,
"2"
]);
checks
.
val
([
""
,
"2"
]);
same
(
checks
.
serialize
(),
"test=2&test="
,
"Get multiple checked values."
);
same
(
checks
.
serialize
(),
"test=2&test="
,
"Get multiple checked values."
);
checks
.
val
([
"1"
,
"on"
]);
same
(
checks
.
serialize
(),
"test=1&test=on"
,
"Get multiple checked values."
);
checks
.
remove
();
checks
.
remove
();
});
});
...
...
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