From 2bcbf95a3b6e0038f748cf3208de40d29d0038ea Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Thu, 18 Oct 2007 17:18:48 +0000
Subject: [PATCH] Monotone-Parent: c1039e97ecb95a8e1dd4a1ca25d457f206daeac3
 Monotone-Revision: f4831aba087ab84c9ea8408610dcf9769966b8b8

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-10-18T17:18:48
Monotone-Branch: ca.inverse.sogo
---
 UI/WebServerResources/HTMLElement.js           |  7 ++++---
 .../JavascriptAPIExtensions.js                 | 18 ++++++++++++++++++
 UI/WebServerResources/UIxContactEditor.js      |  4 ++--
 UI/WebServerResources/UIxMailEditor.js         |  5 ++---
 4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/UI/WebServerResources/HTMLElement.js b/UI/WebServerResources/HTMLElement.js
index c3c3bd35b..378670cab 100644
--- a/UI/WebServerResources/HTMLElement.js
+++ b/UI/WebServerResources/HTMLElement.js
@@ -127,12 +127,12 @@ Element.addMethods({
     
     var menuTop = Event.pointerY(event);
     var menuLeft = Event.pointerX(event);
-    var heightDiff = (window.innerHeight
+    var heightDiff = (window.height()
 		      - (menuTop + popup.offsetHeight));
     if (heightDiff < 0)
       menuTop += heightDiff;
     
-    var leftDiff = (window.innerWidth
+    var leftDiff = (window.width()
 		    - (menuLeft + popup.offsetWidth));
     if (leftDiff < 0)
       menuLeft -= popup.offsetWidth;
@@ -148,7 +148,8 @@ Element.addMethods({
   attachMenu: function(element, menuName) {
     element = $(element);
     element.sogoContextMenu = $(menuName);
-    Event.observe(element, "contextmenu", element.onContextMenu.bindAsEventListener(element));
+    Event.observe(element, "contextmenu",
+		  element.onContextMenu.bindAsEventListener(element));
   },
 
   select: function(element) {
diff --git a/UI/WebServerResources/JavascriptAPIExtensions.js b/UI/WebServerResources/JavascriptAPIExtensions.js
index 96943b882..18fe2bd6b 100644
--- a/UI/WebServerResources/JavascriptAPIExtensions.js
+++ b/UI/WebServerResources/JavascriptAPIExtensions.js
@@ -351,3 +351,21 @@ String.prototype.cssSafeString = function() {
 
   return newString;
 }
+
+window.width = function() {
+  if (window.innerWidth)
+    return window.innerWidth;
+  else if (document.body && document.body.offsetWidth)
+    return document.body.offsetWidth;
+  else
+    return 0;
+}
+
+window.height = function() {
+  if (window.innerHeight)
+    return window.innerHeight;
+  else if (document.body && document.body.offsetHeight)
+    return document.body.offsetHeight;
+  else
+    return 0;
+}
diff --git a/UI/WebServerResources/UIxContactEditor.js b/UI/WebServerResources/UIxContactEditor.js
index b17720dad..052b8bfa6 100644
--- a/UI/WebServerResources/UIxContactEditor.js
+++ b/UI/WebServerResources/UIxContactEditor.js
@@ -99,8 +99,8 @@ function showCoords(node) {
   node = $("givenName");
   window.alert("x: " + node.cascadeLeftOffset()
                + ";y: " + node.cascadeTopOffset()
-               + ";width: " + window.innerWidth
-               + ";height: " + window.innerHeight);
+               + ";width: " + window.width()
+               + ";height: " + window.height());
 }
 
 function onFnKeyDown() {
diff --git a/UI/WebServerResources/UIxMailEditor.js b/UI/WebServerResources/UIxMailEditor.js
index d4374c8e1..036b108cb 100644
--- a/UI/WebServerResources/UIxMailEditor.js
+++ b/UI/WebServerResources/UIxMailEditor.js
@@ -305,12 +305,11 @@ function onWindowResize(event) {
   var attachmentswidth = 0;
   if (attachmentsarea.style.display)
     attachmentswidth = attachmentsarea.getWidth();
-  var windowwidth = (typeof self.innerWidth == "number" ? self.innerWidth : document.body.clientWidth);
   var subjectfield = $(document).getElementsByClassName('headerField', $('subjectRow'))[0];
   var subjectinput = $(document).getElementsByClassName('textField', $('subjectRow'))[0];
 
   // Resize subject field
-  subjectinput.setStyle({ width: (windowwidth
+  subjectinput.setStyle({ width: (window.width()
 				  - $(subjectfield).getWidth()
 				  - attachmentswidth
 				  - 4 - 30
@@ -319,7 +318,7 @@ function onWindowResize(event) {
   // Resize address fields
   var addresslist = $('addressList');
   var firstselect = document.getElementsByClassName('headerField', addresslist)[0];
-  var inputwidth = windowwidth - $(firstselect).getWidth() - attachmentswidth - 24 - 30;
+  var inputwidth = $(this).width - $(firstselect).getWidth() - attachmentswidth - 24 - 30;
   var addresses = document.getElementsByClassName('textField', addresslist);
   for (var i = 0; i < addresses.length; i++) {
     addresses[i].setStyle({ width: inputwidth + 'px' });