git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
jquery core: saving some bytes in $.fn.val by using $.makeArray.
[jquery.git]
/
src
/
core.js
diff --git
a/src/core.js
b/src/core.js
index
e988d48
..
56a2b1f
100644
(file)
--- a/
src/core.js
+++ b/
src/core.js
@@
-410,9
+410,7
@@
jQuery.fn = jQuery.prototype = {
jQuery.inArray(this.name, value) >= 0);
else if ( jQuery.nodeName( this, "select" ) ) {
jQuery.inArray(this.name, value) >= 0);
else if ( jQuery.nodeName( this, "select" ) ) {
- var values = value.constructor == Array ?
- value :
- [ value ];
+ var values = jQuery.makeArray(value);
jQuery( "option", this ).each(function(){
this.selected = (jQuery.inArray( this.value, values ) >= 0 ||
jQuery( "option", this ).each(function(){
this.selected = (jQuery.inArray( this.value, values ) >= 0 ||
@@
-596,11
+594,10
@@
jQuery.extend = jQuery.fn.extend = function() {
};
var expando = "jQuery" + now(), uuid = 0, windowData = {},
};
var expando = "jQuery" + now(), uuid = 0, windowData = {},
-
-// exclude the following css properties to add px
+ // exclude the following css properties to add px
exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
-// cache getComputedStyle
- getComputedStyle = document.defaultView && document.defaultView.getComputedStyle;
+ // cache defaultView
+ defaultView = document.defaultView || {};
jQuery.extend({
noConflict: function( deep ) {
jQuery.extend({
noConflict: function( deep ) {
@@
-775,7
+772,7
@@
jQuery.extend({
"";
},
"";
},
- // internal only, use is(".class")
+ // internal only, use hasClass("class")
has: function( elem, className ) {
return jQuery.inArray( className, (elem.className || elem).toString().split(/\s+/) ) > -1;
}
has: function( elem, className ) {
return jQuery.inArray( className, (elem.className || elem).toString().split(/\s+/) ) > -1;
}
@@
-830,8
+827,8
@@
jQuery.extend({
if ( !jQuery.browser.safari )
return false;
if ( !jQuery.browser.safari )
return false;
- // getComputedStyle is cached
- var ret = getComputedStyle( elem, null );
+ // defaultView is cached
+ var ret = defaultView.getComputedStyle( elem, null );
return !ret || ret.getPropertyValue("color") == "";
}
return !ret || ret.getPropertyValue("color") == "";
}
@@
-857,7
+854,7
@@
jQuery.extend({
if ( !force && style && style[ name ] )
ret = style[ name ];
if ( !force && style && style[ name ] )
ret = style[ name ];
- else if ( getComputedStyle ) {
+ else if ( defaultView.getComputedStyle ) {
// Only "float" is needed here
if ( name.match( /float/i ) )
// Only "float" is needed here
if ( name.match( /float/i ) )
@@
-865,7
+862,7
@@
jQuery.extend({
name = name.replace( /([A-Z])/g, "-$1" ).toLowerCase();
name = name.replace( /([A-Z])/g, "-$1" ).toLowerCase();
- var computedStyle = getComputedStyle( elem, null );
+ var computedStyle = defaultView.getComputedStyle( elem, null );
if ( computedStyle && !color( elem ) )
ret = computedStyle.getPropertyValue( name );
if ( computedStyle && !color( elem ) )
ret = computedStyle.getPropertyValue( name );
@@
-1359,3
+1356,8
@@
jQuery.each([ "Height", "Width" ], function(i, name){
this.css( type, size.constructor == String ? size : size + "px" );
};
});
this.css( type, size.constructor == String ? size : size + "px" );
};
});
+
+// Helper function used by the dimensions and offset modules
+function num(elem, prop) {
+ return elem[0] && parseInt( jQuery.curCSS(elem[0], prop, true), 10 ) || 0;
+}
\ No newline at end of file