git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2526e29
)
Fixed some bugs relating to the setter arg change in val and html. Also optimized...
author
jeresig
<jeresig@gmail.com>
Thu, 7 Jan 2010 14:53:16 +0000
(09:53 -0500)
committer
jeresig
<jeresig@gmail.com>
Thu, 7 Jan 2010 14:53:16 +0000
(09:53 -0500)
src/attributes.js
patch
|
blob
|
history
src/manipulation.js
patch
|
blob
|
history
diff --git
a/src/attributes.js
b/src/attributes.js
index
a5a6662
..
1dd7084
100644
(file)
--- a/
src/attributes.js
+++ b/
src/attributes.js
@@
-195,28
+195,23
@@
jQuery.fn.extend({
return undefined;
}
return undefined;
}
- // Typecast once if the value is a number
- if ( typeof value === "number" ) {
- value += "";
- }
-
- var val = value;
+ var isFunction = jQuery.isFunction(value);
return this.each(function(i) {
return this.each(function(i) {
- var self = jQuery(this);
+ var self = jQuery(this), val = value;
- if ( jQuery.isFunction(value) ) {
- val = value.call(this, i, self.val());
+ if ( this.nodeType !== 1 ) {
+ return;
+ }
- // Typecast each time if the value is a Function and the appended
- // value is therefore different each time.
- if ( typeof val === "number" ) {
- val += "";
- }
+ if ( isFunction ) {
+ val = value.call(this, i, self.val());
}
}
- if ( this.nodeType !== 1 ) {
- return;
+ // Typecast each time if the value is a Function and the appended
+ // value is therefore different each time.
+ if ( typeof val === "number" ) {
+ val += "";
}
if ( jQuery.isArray(val) && rradiocheck.test( this.type ) ) {
}
if ( jQuery.isArray(val) && rradiocheck.test( this.type ) ) {
@@
-226,7
+221,7
@@
jQuery.fn.extend({
var values = jQuery.makeArray(val);
jQuery( "option", this ).each(function() {
var values = jQuery.makeArray(val);
jQuery( "option", this ).each(function() {
- this.selected = jQuery.inArray( self.val(), values ) >= 0;
+ this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
});
if ( !values.length ) {
});
if ( !values.length ) {
diff --git
a/src/manipulation.js
b/src/manipulation.js
index
730dfca
..
081bb54
100644
(file)
--- a/
src/manipulation.js
+++ b/
src/manipulation.js
@@
-173,7
+173,7
@@
jQuery.fn.extend({
html: function( value ) {
if ( value === undefined ) {
html: function( value ) {
if ( value === undefined ) {
- return this[0] ?
+ return this[0] && this[0].nodeType === 1 ?
this[0].innerHTML.replace(rinlinejQuery, "") :
null;
this[0].innerHTML.replace(rinlinejQuery, "") :
null;