git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for #883
[jquery.git]
/
src
/
jquery
/
jquery.js
diff --git
a/src/jquery/jquery.js
b/src/jquery/jquery.js
index
2c494d1
..
76f11d7
100644
(file)
--- a/
src/jquery/jquery.js
+++ b/
src/jquery/jquery.js
@@
-257,9
+257,9
@@
jQuery.fn = jQuery.prototype = {
* @cat Core
*/
pushStack: function( a ) {
* @cat Core
*/
pushStack: function( a ) {
- var ret = jQuery(this);
+ var ret = jQuery(a);
ret.prevObject = this;
ret.prevObject = this;
- return ret.setArray( a );
+ return ret;
},
/**
},
/**
@@
-803,7
+803,7
@@
jQuery.fn = jQuery.prototype = {
find: function(t) {
return this.pushStack( jQuery.map( this, function(a){
return jQuery.find(t,a);
find: function(t) {
return this.pushStack( jQuery.map( this, function(a){
return jQuery.find(t,a);
- }) );
+ }), t );
},
/**
},
/**
@@
-986,7
+986,7
@@
jQuery.fn = jQuery.prototype = {
this.get(),
t.constructor == String ?
jQuery(t).get() :
this.get(),
t.constructor == String ?
jQuery(t).get() :
- t.length != undefined && !t.nodeName ?
+ t.length != undefined && (!t.nodeName || t.nodeName == "FORM") ?
t : [t] )
);
},
t : [t] )
);
},
@@
-1281,7
+1281,7
@@
jQuery.extend({
var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i;
// Handle passing in a number to a CSS property
var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i;
// Handle passing in a number to a CSS property
- if ( value.constructor == Number && type == "curCSS" && !exclude.test(prop) )
+ if ( value && value.constructor == Number && type == "curCSS" && !exclude.test(prop) )
return value + "px";
return value;
return value + "px";
return value;