Skip to content

J
jquery
Commit d584a884 authored by Gilles van den Hoven's avatar Gilles van den Hoven
Browse files
Options

$.getCSS (see bug #11)

parent 8ad487f2
Show whitespace changes
Inline Side-by-side
Showing with 45 additions and 45 deletions
jquery/jquery.js
View file @ d584a884
...@@ -357,17 +357,17 @@ $.getCSS = function(e,p) { ...@@ -357,17 +357,17 @@ $.getCSS = function(e,p) {
// Handle extra width/height provided by the W3C box model // Handle extra width/height provided by the W3C box model
var ph = !$.boxModel ? 0 : var ph = !$.boxModel ? 0 :
parseInt($.css(e,"paddingTop")) + parseInt($.css(e,"paddingBottom")) + parseInt($.css(e,"paddingTop")) + parseInt($.css(e,"paddingBottom")) +
parseInt($.css(e,"borderTop")) + parseInt($.css(e,"borderBottom")); parseInt($.css(e,"borderTop")) + parseInt($.css(e,"borderBottom")) || 0;
var pw = !$.boxModel ? 0 : var pw = !$.boxModel ? 0 :
parseInt($.css(e,"paddingLeft")) + parseInt($.css(e,"paddingRight")) + parseInt($.css(e,"paddingLeft")) + parseInt($.css(e,"paddingRight")) +
parseInt($.css(e,"borderLeft")) + parseInt($.css(e,"borderRight")); parseInt($.css(e,"borderLeft")) + parseInt($.css(e,"borderRight")) || 0;
var oHeight, oWidth; var oHeight, oWidth;
if ($.css(e,"display") != 'none') { if ($.css(e,"display") != 'none') {
oHeight = e.offsetHeight || parseInt(e.style.height,10); oHeight = e.offsetHeight || parseInt(e.style.height,10) || 0;
oWidth = e.offsetWidth || parseInt(e.style.width,10); oWidth = e.offsetWidth || parseInt(e.style.width,10) || 0;
} else { } else {
var els = e.style; var els = e.style;
var ov = els.visibility; var ov = els.visibility;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment