git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fcf6237
)
Revert fb4445070cd9e06929c7b6f27c10dbf42d4a3367 which is no longer necessary with...
author
Colin Snover
<github.com@zetafleet.com>
Sun, 9 Jan 2011 23:34:58 +0000
(17:34 -0600)
committer
Colin Snover
<github.com@zetafleet.com>
Sun, 9 Jan 2011 23:34:58 +0000
(17:34 -0600)
src/css.js
patch
|
blob
|
history
diff --git
a/src/css.js
b/src/css.js
index
8a83c60
..
a6e2bb6
100644
(file)
--- a/
src/css.js
+++ b/
src/css.js
@@
-12,9
+12,6
@@
var ralpha = /alpha\([^)]*\)/i,
cssHeight = [ "Top", "Bottom" ],
curCSS,
cssHeight = [ "Top", "Bottom" ],
curCSS,
- getComputedStyle,
- currentStyle,
-
fcamelCase = function( all, letter ) {
return letter.toUpperCase();
};
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 <= 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
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 ) {
}
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();
var ret, defaultView, computedStyle;
name = name.replace( rupper, "-$1" ).toLowerCase();
@@
-259,10
+252,8
@@
if ( document.defaultView && document.defaultView.getComputedStyle ) {
return ret;
};
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;
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;
function getWH( elem, name, extra ) {
var which = name === "width" ? cssWidth : cssHeight,
val = name === "width" ? elem.offsetWidth : elem.offsetHeight;