aboutsummaryrefslogtreecommitdiffstats
path: root/src/css.js
diff options
context:
space:
mode:
authorjeresig <jeresig@gmail.com>2010-11-03 18:59:55 -0400
committerjeresig <jeresig@gmail.com>2010-11-03 18:59:55 -0400
commitd9478954b9de79a7f3538e935bfd98cdc61ee435 (patch)
treeec5f7f77493ed170661ca50b8726b6bf2c5132b2 /src/css.js
parent335e0a33e19b9c8703246dd033dcc68c2da5de36 (diff)
downloadjquery-d9478954b9de79a7f3538e935bfd98cdc61ee435.tar.gz
jquery-d9478954b9de79a7f3538e935bfd98cdc61ee435.zip
Limit the scope of the CSS 'auto' change to just height/width. Fixes #7393.
Diffstat (limited to 'src/css.js')
-rw-r--r--src/css.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/css.js b/src/css.js
index 0f1491466..1fbee3f47 100644
--- a/src/css.js
+++ b/src/css.js
@@ -177,7 +177,7 @@ jQuery.each(["height", "width"], function( i, name ) {
}
if ( val != null ) {
- return val;
+ return val === "" ? "auto" : val;
}
}
@@ -252,7 +252,7 @@ if ( document.defaultView && document.defaultView.getComputedStyle ) {
}
}
- return ret === "" ? "auto" : ret;
+ return ret;
};
}