From: helge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Tue, 5 Oct 2004 16:24:58 +0000 (+0000)
Subject: fixed windows open links
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d735ca29c6faf1a1e78ed1924e29d7651a48642;p=scalable-opengroupware.org

fixed windows open links


git-svn-id: http://svn.opengroupware.org/SOGo/trunk@362 d1b88da0-ebda-0310-925b-ed51d893ca5b
---

diff --git a/SOGo/UI/Mailer/ChangeLog b/SOGo/UI/Mailer/ChangeLog
index 3ee09841..e1539f59 100644
--- a/SOGo/UI/Mailer/ChangeLog
+++ b/SOGo/UI/Mailer/ChangeLog
@@ -1,7 +1,9 @@
 2004-10-05  Helge Hess  <helge.hess@opengroupware.org>
 
-	* v0.9.23
+	* UIxMailListView: removed href for JavaScript onclick links (v0.9.24)
 
+	* v0.9.23
+	
 	* product.plist: fixed addressbook label
 	
 	* UIxMailToolbar: added support for 'onclick' event handlers
diff --git a/SOGo/UI/Mailer/UIxMailListView.m b/SOGo/UI/Mailer/UIxMailListView.m
index 1a15d327..c9602911 100644
--- a/SOGo/UI/Mailer/UIxMailListView.m
+++ b/SOGo/UI/Mailer/UIxMailListView.m
@@ -242,7 +242,8 @@
 }
 
 - (NSString *)clickedMsgJS {
-  return [NSString stringWithFormat:@"clickedUid(this, '%@')", 
+  /* return 'false' aborts processing */
+  return [NSString stringWithFormat:@"clickedUid(this, '%@'); return false", 
 		     [self messageUidString]];
 }
 - (NSString *)dblClickedMsgJS {
diff --git a/SOGo/UI/Mailer/UIxMailListView.wox b/SOGo/UI/Mailer/UIxMailListView.wox
index 84a4dd4f..b597ada1 100644
--- a/SOGo/UI/Mailer/UIxMailListView.wox
+++ b/SOGo/UI/Mailer/UIxMailListView.wox
@@ -78,8 +78,9 @@
               <var:if condition="isMessageRead">
                 <div class="mailer_readmailsubject" var:id="msgDivID"
                 >
-                  <a var:href="messageViewURL" var:target="messageViewTarget"
-                     var:onclick="clickedMsgJS">
+                  <!-- Note: var:href="messageViewURL" (done by JS),
+                             var:target="messageViewTarget" -->
+                  <a href="#" var:onclick="clickedMsgJS">
                     <var:string value="message.envelope.subject"
                                 formatter="context.mailSubjectFormatter"/>
                   </a>
@@ -87,8 +88,8 @@
               </var:if>
               <var:if condition="isMessageRead" const:negate="YES">
                 <div class="mailer_unreadmailsubject">
-                  <a var:href="messageViewURL" var:target="messageViewTarget"
-                     var:onclick="messageViewJS">
+                  <!-- Note: var:href="messageViewURL" (done by JS) -->
+                  <a href="#" var:onclick="messageViewJS">
                     <var:string value="message.envelope.subject"
                                 formatter="context.mailSubjectFormatter"/>
                   </a>
diff --git a/SOGo/UI/Mailer/Version b/SOGo/UI/Mailer/Version
index 8a19b3e3..a281cca1 100644
--- a/SOGo/UI/Mailer/Version
+++ b/SOGo/UI/Mailer/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=23
+SUBMINOR_VERSION:=24