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 #1701 by passing through the arguments as suggested.
[jquery.git]
/
src
/
core.js
diff --git
a/src/core.js
b/src/core.js
index
a42e8f6
..
0ebc61d
100644
(file)
--- a/
src/core.js
+++ b/
src/core.js
@@
-36,8
+36,14
@@
jQuery.fn = jQuery.prototype = {
// Make sure that a selection was provided
selector = selector || document;
// Make sure that a selection was provided
selector = selector || document;
+ // Handle $(DOMElement)
+ if ( selector.nodeType ) {
+ this[0] = selector;
+ this.length = 1;
+ return this;
+
// Handle HTML strings
// Handle HTML strings
- if ( typeof selector == "string" ) {
+ } else if ( typeof selector == "string" ) {
// Are we dealing with HTML string or an ID?
var match = quickExpr.exec( selector );
// Are we dealing with HTML string or an ID?
var match = quickExpr.exec( selector );
@@
-188,6
+194,9
@@
jQuery.fn = jQuery.prototype = {
},
css: function( key, value ) {
},
css: function( key, value ) {
+ // ignore negative width and height values
+ if ( (key == 'width' || key == 'height') && parseFloat(value) < 0 )
+ value = undefined;
return this.attr( key, value, "curCSS" );
},
return this.attr( key, value, "curCSS" );
},
@@
-354,7
+363,7
@@
jQuery.fn = jQuery.prototype = {
if ( this.length ) {
var elem = this[0];
if ( this.length ) {
var elem = this[0];
-
+
// We need to handle select boxes special
if ( jQuery.nodeName( elem, "select" ) ) {
var index = elem.selectedIndex,
// We need to handle select boxes special
if ( jQuery.nodeName( elem, "select" ) ) {
var index = elem.selectedIndex,
@@
-387,7
+396,7
@@
jQuery.fn = jQuery.prototype = {
// Everything else, we just grab the value
} else
// Everything else, we just grab the value
} else
- return this[0].value.replace(/\r/g, "");
+ return (this[0].value || "").replace(/\r/g, "");
}
}
@@
-749,7
+758,7
@@
jQuery.extend({
elem.style[ name ] = elem.style[ "old" + name ];
},
elem.style[ name ] = elem.style[ "old" + name ];
},
- css: function( elem, name ) {
+ css: function( elem, name, force ) {
if ( name == "height" || name == "width" ) {
var old = {}, height, width;
if ( name == "height" || name == "width" ) {
var old = {}, height, width;
@@
-799,7
+808,7
@@
jQuery.extend({
width;
}
width;
}
- return jQuery.curCSS( elem, name );
+ return jQuery.curCSS( elem, name, force );
},
curCSS: function( elem, name, force ) {
},
curCSS: function( elem, name, force ) {
@@
-1315,7
+1324,7
@@
jQuery.each([ "Height", "Width" ], function(i, name){
this[0] == document ?
// Either scroll[Width/Height] or offset[Width/Height], whichever is greater (Mozilla reports scrollWidth the same as offsetWidth)
Math.max( document.body[ "scroll" + name ], document.body[ "offset" + name ] ) :
this[0] == document ?
// Either scroll[Width/Height] or offset[Width/Height], whichever is greater (Mozilla reports scrollWidth the same as offsetWidth)
Math.max( document.body[ "scroll" + name ], document.body[ "offset" + name ] ) :
-
+
// Get or set width or height on the element
size == undefined ?
// Get width or height on the element
// Get or set width or height on the element
size == undefined ?
// Get width or height on the element