Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitff28199

Browse files
authored
Attributes: Refactor val(): don't strip carriage return, isolate IE workarounds
Before this change, `val()` was stripping out carriage return characters fromthe returned value. No test has relied on that. The logic was different foroption elements as its custom defined hook was omitting this stripping logic.This commit gets rid of the carriage return removal and isolates the IE-onlyselect val getter to be skipped in other browsers.Closesgh-4585
1 parenteb35be5 commitff28199

File tree

2 files changed

+70
-22
lines changed

2 files changed

+70
-22
lines changed

‎src/attributes/val.js

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
importjQueryfrom"../core.js";
2+
importisIEfrom"../var/isIE.js";
23
importstripAndCollapsefrom"../core/stripAndCollapse.js";
34
importnodeNamefrom"../core/nodeName.js";
45

56
import"../core/init.js";
67

7-
varrreturn=/\r/g;
8-
98
jQuery.fn.extend({
109
val:function(value){
1110
varhooks,ret,valueIsFunction,
@@ -25,11 +24,6 @@ jQuery.fn.extend( {
2524

2625
ret=elem.value;
2726

28-
// Handle most common string cases
29-
if(typeofret==="string"){
30-
returnret.replace(rreturn,"");
31-
}
32-
3327
// Handle cases where value is null/undef or number
3428
returnret==null ?"" :ret;
3529
}
@@ -77,20 +71,6 @@ jQuery.fn.extend( {
7771

7872
jQuery.extend({
7973
valHooks:{
80-
option:{
81-
get:function(elem){
82-
83-
varval=elem.getAttribute("value");
84-
returnval!=null ?
85-
val :
86-
87-
// Support: IE <=10 - 11+
88-
// option.text throws exceptions (#14686, #14858)
89-
// Strip and collapse whitespace
90-
// https://html.spec.whatwg.org/#strip-and-collapse-whitespace
91-
stripAndCollapse(jQuery.text(elem));
92-
}
93-
},
9474
select:{
9575
get:function(elem){
9676
varvalue,option,i,
@@ -144,7 +124,7 @@ jQuery.extend( {
144124
option=options[i];
145125

146126
if((option.selected=
147-
jQuery.inArray(jQuery.valHooks.option.get(option),values)>-1
127+
jQuery.inArray(jQuery(option).val(),values)>-1
148128
)){
149129
optionSet=true;
150130
}
@@ -160,6 +140,23 @@ jQuery.extend( {
160140
}
161141
});
162142

143+
if(isIE){
144+
jQuery.valHooks.option={
145+
get:function(elem){
146+
147+
varval=elem.getAttribute("value");
148+
returnval!=null ?
149+
val :
150+
151+
// Support: IE <=10 - 11+
152+
// option.text throws exceptions (#14686, #14858)
153+
// Strip and collapse whitespace
154+
// https://html.spec.whatwg.org/#strip-and-collapse-whitespace
155+
stripAndCollapse(jQuery.text(elem));
156+
}
157+
};
158+
}
159+
163160
// Radios and checkboxes getter/setter
164161
jQuery.each(["radio","checkbox"],function(){
165162
jQuery.valHooks[this]={

‎test/unit/attributes.js

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1196,6 +1196,57 @@ QUnit.test( "select.val(space characters) (gh-2978)", function( assert ) {
11961196
});
11971197
});
11981198

1199+
QUnit.test("radio.val(space characters)",function(assert){
1200+
assert.expect(42);
1201+
1202+
varradio=jQuery("<input type='radio'/>").appendTo("#qunit-fixture"),
1203+
spaces={
1204+
"\\t":{
1205+
html:"&#09;",
1206+
val:"\t"
1207+
},
1208+
"\\n":{
1209+
html:"&#10;",
1210+
val:"\n"
1211+
},
1212+
"\\r":{
1213+
html:"&#13;",
1214+
val:"\r"
1215+
},
1216+
"\\f":"\f",
1217+
"space":" ",
1218+
"\\u00a0":"\u00a0",
1219+
"\\u1680":"\u1680"
1220+
};
1221+
1222+
jQuery.each(spaces,function(key,obj){
1223+
varval=obj.val||obj;
1224+
1225+
radio.val("attr"+val);
1226+
assert.equal(radio.val(),"attr"+val,"Value ending with space character ("+key+") returned (set via val())");
1227+
1228+
radio.val("at"+val+"tr");
1229+
assert.equal(radio.val(),"at"+val+"tr","Value with space character ("+key+") in the middle returned (set via val())");
1230+
1231+
radio.val(val+"attr");
1232+
assert.equal(radio.val(),val+"attr","Value starting with space character ("+key+") returned (set via val())");
1233+
});
1234+
1235+
jQuery.each(spaces,function(key,obj){
1236+
varval=obj.val||obj,
1237+
htmlVal=obj.html||obj;
1238+
1239+
radio=jQuery("<input type='radio' value='attr"+htmlVal+"'/>").appendTo("#qunit-fixture");
1240+
assert.equal(radio.val(),"attr"+val,"Value ending with space character ("+key+") returned (set via HTML)");
1241+
1242+
radio=jQuery("<input type='radio' value='at"+htmlVal+"tr'/>").appendTo("#qunit-fixture");
1243+
assert.equal(radio.val(),"at"+val+"tr","Value with space character ("+key+") in the middle returned (set via HTML)");
1244+
1245+
radio=jQuery("<input type='radio' value='"+htmlVal+"attr'/>").appendTo("#qunit-fixture");
1246+
assert.equal(radio.val(),val+"attr","Value starting with space character ("+key+") returned (set via HTML)");
1247+
});
1248+
});
1249+
11991250
vartestAddClass=function(valueObj,assert){
12001251
assert.expect(9);
12011252

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp