git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tweaked the isXMLDoc iframe test case to test the document, not the body element...
[jquery.git]
/
src
/
attributes.js
diff --git
a/src/attributes.js
b/src/attributes.js
index
f7fb0a2
..
93e0433
100644
(file)
--- a/
src/attributes.js
+++ b/
src/attributes.js
@@
-82,30
+82,38
@@
jQuery.fn.extend({
return undefined;
}
return undefined;
}
+ // Typecast once if the value is a number
if ( typeof value === "number" )
value += '';
if ( typeof value === "number" )
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" ) val += '';
+ }
+
if ( this.nodeType != 1 )
return;
if ( this.nodeType != 1 )
return;
- if ( jQuery.isArray(value) && /radio|checkbox/.test( this.type ) )
- this.checked = (jQuery.inArray(this.value, value) >= 0 ||
- jQuery.inArray(this.name, value) >= 0);
+ if ( jQuery.isArray(val) && /radio|checkbox/.test( this.type ) )
+ this.checked = jQuery.inArray(this.value || this.name, val) >= 0;
else if ( jQuery.nodeName( this, "select" ) ) {
else if ( jQuery.nodeName( this, "select" ) ) {
- var values = jQuery.makeArray(value);
+ var values = jQuery.makeArray(val);
jQuery( "option", this ).each(function(){
jQuery( "option", this ).each(function(){
- this.selected = (jQuery.inArray( this.value, values ) >= 0 ||
- jQuery.inArray( this.text, values ) >= 0);
+ this.selected = jQuery.inArray( this.value || this.text, values ) >= 0;
});
if ( !values.length )
this.selectedIndex = -1;
} else
});
if ( !values.length )
this.selectedIndex = -1;
} else
- this.value = value;
+ this.value = val;
});
}
});
});
}
});
@@
-182,7
+190,7
@@
jQuery.extend({
if (!elem || elem.nodeType == 3 || elem.nodeType == 8)
return undefined;
if (!elem || elem.nodeType == 3 || elem.nodeType == 8)
return undefined;
- var notxml = !elem.tagName || !jQuery.isXMLDoc( elem ),
+ var notxml = elem.nodeType !== 1 || !jQuery.isXMLDoc( elem ),
// Whether we are setting (or getting)
set = value !== undefined;
// Whether we are setting (or getting)
set = value !== undefined;
@@
-190,7
+198,7
@@
jQuery.extend({
name = notxml && jQuery.props[ name ] || name;
// Only do all the following if this is a node (faster for style)
name = notxml && jQuery.props[ name ] || name;
// Only do all the following if this is a node (faster for style)
- if ( elem.tagName ) {
+ if ( elem.nodeType === 1 ) {
// These attributes require special treatment
var special = /href|src|style/.test( name );
// These attributes require special treatment
var special = /href|src|style/.test( name );
@@
-204,7
+212,7
@@
jQuery.extend({
if ( name in elem && notxml && !special ) {
if ( set ){
// We can't allow the type property to be changed (since it causes problems in IE)
if ( name in elem && notxml && !special ) {
if ( set ){
// We can't allow the type property to be changed (since it causes problems in IE)
- if ( name == "type" && elem.nodeName.match(/(button|input)/i) && elem.parentNode )
+ if ( name == "type" && /(button|input)/i.test(elem.nodeName) && elem.parentNode )
throw "type property can't be changed";
elem[ name ] = value;
throw "type property can't be changed";
elem[ name ] = value;
@@
-220,9
+228,9
@@
jQuery.extend({
var attributeNode = elem.getAttributeNode( "tabIndex" );
return attributeNode && attributeNode.specified
? attributeNode.value
var attributeNode = elem.getAttributeNode( "tabIndex" );
return attributeNode && attributeNode.specified
? attributeNode.value
- : elem.nodeName.match(/(button|input|object|select|textarea)/i)
+ : /(button|input|object|select|textarea)/i.test(elem.nodeName)
? 0
? 0
- : elem.nodeName.match(/^(a|area)$/i) && elem.href
+ : /^(a|area)$/i.test(elem.nodeName) && elem.href
? 0
: undefined;
}
? 0
: undefined;
}