From 012f0c3b4bd3d04c2f3e1ea80fc1230901d607d9 Mon Sep 17 00:00:00 2001 From: Colin Snover Date: Sun, 9 Jan 2011 17:34:58 -0600 Subject: [PATCH] Revert fb4445070cd9e06929c7b6f27c10dbf42d4a3367 which is no longer necessary with the release of Opera 11. Fixes #7608. --- src/css.js | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/src/css.js b/src/css.js index 8a83c607..a6e2bb61 100644 --- a/src/css.js +++ b/src/css.js @@ -12,9 +12,6 @@ var ralpha = /alpha\([^)]*\)/i, cssHeight = [ "Top", "Bottom" ], curCSS, - getComputedStyle, - currentStyle, - fcamelCase = function( all, letter ) { return letter.toUpperCase(); }; @@ -172,10 +169,6 @@ jQuery.each(["height", "width"], function( i, name ) { if ( val <= 0 ) { val = curCSS( elem, name, name ); - if ( val === "0px" && currentStyle ) { - val = currentStyle( elem, name, name ); - } - if ( val != null ) { // Should return "auto" instead of 0, use 0 for // temporary backwards-compat @@ -241,7 +234,7 @@ if ( !jQuery.support.opacity ) { } if ( document.defaultView && document.defaultView.getComputedStyle ) { - getComputedStyle = function( elem, newName, name ) { + curCSS = function( elem, newName, name ) { var ret, defaultView, computedStyle; name = name.replace( rupper, "-$1" ).toLowerCase(); @@ -259,10 +252,8 @@ if ( document.defaultView && document.defaultView.getComputedStyle ) { return ret; }; -} - -if ( document.documentElement.currentStyle ) { - currentStyle = function( elem, name ) { +} else if ( document.documentElement.currentStyle ) { + curCSS = function( elem, name ) { var left, rsLeft, ret = elem.currentStyle && elem.currentStyle[ name ], style = elem.style; @@ -291,8 +282,6 @@ if ( document.documentElement.currentStyle ) { }; } -curCSS = getComputedStyle || currentStyle; - function getWH( elem, name, extra ) { var which = name === "width" ? cssWidth : cssHeight, val = name === "width" ? elem.offsetWidth : elem.offsetHeight;