X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcore.js;h=511180a08a58bcedfc58087978f1ae3b1ecb7b00;hb=c5f4d70e2ba039759ab6d889893d4feb1cca3c52;hp=e988d48f982cb9015720c9221823891be5ff30cf;hpb=b13a961ff58553ad76f134a3504d0c567f1703da;p=jquery.git diff --git a/src/core.js b/src/core.js index e988d48..511180a 100644 --- a/src/core.js +++ b/src/core.js @@ -596,11 +596,10 @@ jQuery.extend = jQuery.fn.extend = function() { }; 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, -// cache getComputedStyle - getComputedStyle = document.defaultView && document.defaultView.getComputedStyle; + // cache defaultView + defaultView = document.defaultView || {}; jQuery.extend({ noConflict: function( deep ) { @@ -830,8 +829,8 @@ jQuery.extend({ 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") == ""; } @@ -857,7 +856,7 @@ jQuery.extend({ 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 ) ) @@ -865,7 +864,7 @@ jQuery.extend({ 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 ); @@ -1359,3 +1358,8 @@ jQuery.each([ "Height", "Width" ], function(i, name){ 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