[Svn] r2197 - in trunk/roundcubemail: program/steps/mail skins/default

trac at roundcube.net trac at roundcube.net
Tue Dec 30 14:30:20 CET 2008


Author: thomasb
Date: 2008-12-30 07:30:20 -0600 (Tue, 30 Dec 2008)
New Revision: 2197

Modified:
   trunk/roundcubemail/program/steps/mail/func.inc
   trunk/roundcubemail/skins/default/mail.css
Log:
Use <pre> instead of <div class=pre>: Fix line-break issue when copy & paste in Firefox (#1485425)

Modified: trunk/roundcubemail/program/steps/mail/func.inc
===================================================================
--- trunk/roundcubemail/program/steps/mail/func.inc	2008-12-30 12:40:07 UTC (rev 2196)
+++ trunk/roundcubemail/program/steps/mail/func.inc	2008-12-30 13:30:20 UTC (rev 2197)
@@ -755,8 +755,8 @@
 
   // insert the links for urls and mailtos
   $body = preg_replace("/##string_replacement\{([0-9]+)\}##/e", "\$replace_strings[\\1]", join("\n", $a_lines));
-  
-  return "<div class=\"pre\">".$body."\n</div>";
+
+  return html::tag('pre', array(), $body);
 }
 
 /**
@@ -924,7 +924,7 @@
       }
     }
   else
-    $out .= html::div('message-part', html::div('pre', Q($MESSAGE->body)));
+    $out .= html::div('message-part', html::tag('pre', array(), Q($MESSAGE->body)));
 
 
   $ctype_primary = strtolower($MESSAGE->structure->ctype_primary);

Modified: trunk/roundcubemail/skins/default/mail.css
===================================================================
--- trunk/roundcubemail/skins/default/mail.css	2008-12-30 12:40:07 UTC (rev 2196)
+++ trunk/roundcubemail/skins/default/mail.css	2008-12-30 13:30:20 UTC (rev 2197)
@@ -820,6 +820,7 @@
   color: #0000CC;
 }
 
+div.message-part pre,
 div.message-part div.pre
 {
   margin: 0px;

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn



More information about the Svn mailing list