From b3686b597e39881985be1811a3fd03147f3476b8 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Tue, 15 Apr 2008 15:01:16 +0000
Subject: [PATCH] Monotone-Parent: e0c7704c039513e9d35441827fe46a04a1a4f5f7
 Monotone-Revision: ee841fa65ddec5bf308a46939cb266bfd7f14732

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-04-15T15:01:16
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                               | 6 ++++++
 UI/MailerUI/UIxMailEditor.m             | 4 ++++
 UI/Templates/MailerUI/UIxMailEditor.wox | 3 +++
 UI/WebServerResources/UIxMailEditor.js  | 3 +++
 4 files changed, 16 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index feb01b6b5..962513b2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-15  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/MailerUI/UIxMailEditor.m ([UIxMailEditor -isMailReply]): new
+	method that returns the JS values "true" or "false" as strings is
+	the mail has a non-null count of recipients.
+
 2008-04-14  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/Appointments/SOGoAppointmentFolder.m ([SOGoAppointmentFolder -davCalendarQuery:queryContext])
diff --git a/UI/MailerUI/UIxMailEditor.m b/UI/MailerUI/UIxMailEditor.m
index 18e2bd8a0..39d7f9848 100644
--- a/UI/MailerUI/UIxMailEditor.m
+++ b/UI/MailerUI/UIxMailEditor.m
@@ -121,6 +121,10 @@ static NSArray *infoKeys = nil;
 }
 
 /* accessors */
+- (NSString *) isMailReply
+{
+  return ([to count] > 0 ? @"true" : @"false");
+}
 
 - (void) setFrom: (NSString *) newFrom
 {
diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox
index abda2830b..7753c0b3d 100644
--- a/UI/Templates/MailerUI/UIxMailEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailEditor.wox
@@ -11,6 +11,9 @@
   title="panelTitle"
   const:popup="YES"
   const:jsFiles="UIxMailToSelection.js">
+  <script type="text/javascript">
+    var mailIsReply = <var:string value="isMailReply"/>;
+  </script>
   <div class="menu" id="attachmentsMenu">
     <ul>
       <li><var:string label:value="Open"/></li>
diff --git a/UI/WebServerResources/UIxMailEditor.js b/UI/WebServerResources/UIxMailEditor.js
index 1aa2e1a54..c17e968ea 100644
--- a/UI/WebServerResources/UIxMailEditor.js
+++ b/UI/WebServerResources/UIxMailEditor.js
@@ -312,6 +312,9 @@ function initMailEditor() {
   onWindowResize(null);
   Event.observe(window, "resize", onWindowResize);
   Event.observe(window, "beforeunload", onMailEditorClose);
+
+  var focusField = (mailIsReply ? textarea : $("addr_0"));
+  focusField.focus();
 }
 
 function getMenus() {