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 (from parent 1:
d584a88
)
Changed border stuff to borderTopWidth (Ticket #9)
author
John Resig
<jeresig@gmail.com>
Sun, 18 Jun 2006 01:23:08 +0000
(
01:23
+0000)
committer
John Resig
<jeresig@gmail.com>
Sun, 18 Jun 2006 01:23:08 +0000
(
01:23
+0000)
jquery/jquery.js
patch
|
blob
|
history
diff --git
a/jquery/jquery.js
b/jquery/jquery.js
index
6ff825b
..
b938b5b
100644
(file)
--- a/
jquery/jquery.js
+++ b/
jquery/jquery.js
@@
-355,13
+355,13
@@
$.getCSS = function(e,p) {
if ( p == 'height' || p == 'width' ) {
// Handle extra width/height provided by the W3C box model
if ( p == 'height' || p == 'width' ) {
// 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")) || 0;
+ parseInt($.css(e,"borderTopWidth")) + parseInt($.css(e,"borderBottomWidth"))) || 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")) || 0;
+ parseInt($.css(e,"borderLeftWidth")) + parseInt($.css(e,"borderRightWidth"))) || 0;
var oHeight, oWidth;
var oHeight, oWidth;