From 943b044622e60174d8bbcfb769e2c6a48612d892 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Tue, 19 Jan 2010 12:16:45 +0000
Subject: [PATCH] Monotone-Parent: 90dcf7eaa4fa5c45bd56305ac6f63144ef5d7536
 Monotone-Revision: 538aedd7d01174f61f329561b71c913f2c048a26

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-01-19T12:16:45
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                           | 7 +++++++
 UI/WebServerResources/ContactsUI.js | 8 ++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 123b30fba..d6fca10cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-19  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/WebServerResources/ContactsUI.js (initContacts): fixed a bug
+	causing a null exception error on IE7 when the window is not the
+	main window, and is therefore missing the "uploadCancel" and
+	"uploadOK" elements.
+
 2010-01-18  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* Tests/utilities.py: new module implementing utility classes and
diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index bedf35647..9518d774c 100644
--- a/UI/WebServerResources/ContactsUI.js
+++ b/UI/WebServerResources/ContactsUI.js
@@ -1161,12 +1161,12 @@ function onDocumentKeydown(event) {
 function initContacts(event) {
     if ($(document.body).hasClassName("popup")) {
         configureSelectionButtons();
+    } else {
+        // Addressbook import form
+        $("uploadCancel").observe("click", hideContactsImport);
+        $("uploadOK").observe("click", hideImportResults);
     }
     
-    // Addressbook import form
-    $("uploadCancel").observe("click", hideContactsImport);
-    $("uploadOK").observe("click", hideImportResults);
-    
     if (Prototype.Browser.Gecko)
         Event.observe(document, "keypress", onDocumentKeydown); // for FF2
     else