git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added tests for global and local ajax handlers, added global option to $.ajax to...
[jquery.git]
/
src
/
dimensions
/
dimensions.js
diff --git
a/src/dimensions/dimensions.js
b/src/dimensions/dimensions.js
index
a821696
..
6e6e6d6
100644
(file)
--- a/
src/dimensions/dimensions.js
+++ b/
src/dimensions/dimensions.js
@@
-78,7
+78,7
@@
$.fn.width = function() {
$.fn.innerHeight = function() {
\r
return this.get(0) == window || this.get(0) == document ?
this.height() :
$.fn.innerHeight = function() {
\r
return this.get(0) == window || this.get(0) == document ?
this.height() :
- this.get(0).offsetHeight - parseInt(this.css("borderTop")) - parseInt(this.css("borderBottom"));
\r
+ this.get(0).offsetHeight - parseInt(this.css("borderTop") || 0) - parseInt(this.css("borderBottom") || 0);
\r
};
\r
/**
\r
};
\r
/**
\r
@@
-96,7
+96,7
@@
$.fn.innerHeight = function() {
$.fn.innerWidth = function() {
\r
return this.get(0) == window || this.get(0) == document ?
this.width() :
$.fn.innerWidth = function() {
\r
return this.get(0) == window || this.get(0) == document ?
this.width() :
- this.get(0).offsetWidth - parseInt(this.css("borderLeft")) - parseInt(this.css("borderRight"));
\r
+ this.get(0).offsetWidth - parseInt(this.css("borderLeft") || 0) - parseInt(this.css("borderRight") || 0);
\r
};
\r
/**
\r
};
\r
/**
\r