Author: johnh
Date: Tue Aug 3 21:41:14 2010
New Revision: 982041
URL: http://svn.apache.org/viewvc?rev=982041&view=rev
Log:
Prevent dynamic-height.util from clobbering global x and y.
Modified:
shindig/trunk/features/src/main/javascript/features/dynamic-height.util/dynamic-height-util.js
Modified:
shindig/trunk/features/src/main/javascript/features/dynamic-height.util/dynamic-height-util.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/dynamic-height.util/dynamic-height-util.js?rev=982041&r1=982040&r2=982041&view=diff
==============================================================================
---
shindig/trunk/features/src/main/javascript/features/dynamic-height.util/dynamic-height-util.js
(original)
+++
shindig/trunk/features/src/main/javascript/features/dynamic-height.util/dynamic-height-util.js
Tue Aug 3 21:41:14 2010
@@ -34,6 +34,8 @@ gadgets.window = gadgets.window || {};
* @member gadgets.window
*/
gadgets.window.getViewportDimensions = function() {
+ var x = 0;
+ var y = 0;
if (self.innerHeight) {
// all except Explorer
x = self.innerWidth;
@@ -47,9 +49,6 @@ gadgets.window = gadgets.window || {};
// other Explorers
x = document.body.clientWidth;
y = document.body.clientHeight;
- } else {
- x = 0;
- y = 0;
}
return {width: x, height: y};
};