git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The logic for specified option values was already handled by .val(), removed the...
[jquery.git]
/
src
/
attributes.js
diff --git
a/src/attributes.js
b/src/attributes.js
index
90f3062
..
d3afa89
100644
(file)
--- a/
src/attributes.js
+++ b/
src/attributes.js
@@
-4,7
+4,8
@@
var rclass = /[\n\t]/g,
rspecialurl = /href|src|style/,
rtype = /(button|input)/i,
rfocusable = /(button|input|object|select|textarea)/i,
rspecialurl = /href|src|style/,
rtype = /(button|input)/i,
rfocusable = /(button|input|object|select|textarea)/i,
- rclickable = /^(a|area)$/i;
+ rclickable = /^(a|area)$/i,
+ rradiocheck = /radio|checkbox/;
jQuery.fn.extend({
attr: function( name, value ) {
jQuery.fn.extend({
attr: function( name, value ) {
@@
-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
return (elem.value || "").replace(rreturn, "");
// Everything else, we just grab the value
return (elem.value || "").replace(rreturn, "");
@@
-137,19
+144,19
@@
jQuery.fn.extend({
// Typecast once if the value is a number
if ( typeof value === "number" ) {
// Typecast once if the value is a number
if ( typeof value === "number" ) {
- value += '';
+ value += "";
}
var val = value;
}
var val = value;
- return this.each(function(){
+ return this.each(function() {
if ( jQuery.isFunction(value) ) {
val = value.call(this);
// Typecast each time if the value is a Function and the appended
// value is therefore different each time.
if ( typeof val === "number" ) {
if ( jQuery.isFunction(value) ) {
val = value.call(this);
// Typecast each time if the value is a Function and the appended
// value is therefore different each time.
if ( typeof val === "number" ) {
- val += '';
+ val += "";
}
}
}
}
@@
-157,14
+164,14
@@
jQuery.fn.extend({
return;
}
return;
}
- if ( jQuery.isArray(val) && /radio|checkbox/.test( this.type ) ) {
- this.checked = jQuery.inArray(this.value || this.name, val) >= 0;
+ if ( jQuery.isArray(val) && rradiocheck.test( this.type ) ) {
+ this.checked = jQuery.inArray( jQuery(this).val(), val ) >= 0;
} else if ( jQuery.nodeName( this, "select" ) ) {
var values = jQuery.makeArray(val);
} else if ( jQuery.nodeName( this, "select" ) ) {
var values = jQuery.makeArray(val);
- jQuery( "option", this ).each(function(){
- this.selected = jQuery.inArray( this.value || this.text, values ) >= 0;
+ jQuery( "option", this ).each(function() {
+ this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
});
if ( !values.length ) {
});
if ( !values.length ) {
@@
-210,10
+217,12
@@
jQuery.each({
this.className = this.className || classNames === false ? "" : jQuery.data( this, "__className__" ) || "";
}
}
this.className = this.className || classNames === false ? "" : jQuery.data( this, "__className__" ) || "";
}
}
-}, function(name, fn){
- jQuery.fn[ name ] = function(val, state){
+}, function( name, fn ) {
+ jQuery.fn[ name ] = function( val, state ) {
if ( jQuery.isFunction( val ) ) {
if ( jQuery.isFunction( val ) ) {
- return this.each(function() { jQuery(this)[ name ]( val.call(this), state ); });
+ return this.each(function() {
+ jQuery(this)[ name ]( val.call(this), state );
+ });
}
return this.each( fn, arguments );
}
return this.each( fn, arguments );
@@
-232,13
+241,13
@@
jQuery.extend({
offset: true
},
offset: true
},
- attr: function( elem, name, value ) {
+ attr: function( elem, name, value, pass ) {
// don't set attributes on text and comment nodes
if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
return undefined;
}
// don't set attributes on text and comment nodes
if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
return undefined;
}
- if ( name in jQuery.attrFn && value !== undefined ) {
+ if ( pass && name in jQuery.attrFn ) {
return jQuery(elem)[name](value);
}
return jQuery(elem)[name](value);
}