git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed toggle() test to exclude konquerer
[jquery.git]
/
src
/
jquery
/
jquery.js
diff --git
a/src/jquery/jquery.js
b/src/jquery/jquery.js
index
d9f5b8a
..
004d634
100644
(file)
--- a/
src/jquery/jquery.js
+++ b/
src/jquery/jquery.js
@@
-38,7
+38,7
@@
var jQuery = function(a,c) {
// Handle HTML strings
if ( typeof a == "string" ) {
// HANDLE: $(html) -> $(array)
// Handle HTML strings
if ( typeof a == "string" ) {
// HANDLE: $(html) -> $(array)
- var m = /^[^<]*(<(.|\n)+>)[^>]*$/.exec(a);
+ var m = /^[^<]*(<(.|\s)+>)[^>]*$/.exec(a);
if ( m )
a = jQuery.clean( [ m[1] ] );
if ( m )
a = jQuery.clean( [ m[1] ] );
@@
-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 );
},
/**
},
/**
@@
-1281,10
+1281,9
@@
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) )
- return value + "px";
-
- return value;
+ return value && value.constructor == Number && type == "curCSS" && !exclude.test(prop) ?
+ value + "px" :
+ value;
},
className: {
},
className: {