[Svn] r3334 - in trunk/roundcubemail/program: js steps/mail steps/settings

trac at roundcube.net trac at roundcube.net
Sat Mar 6 19:59:25 CET 2010


Author: alec
Date: 2010-03-06 12:59:25 -0600 (Sat, 06 Mar 2010)
New Revision: 3334

Modified:
   trunk/roundcubemail/program/js/editor.js
   trunk/roundcubemail/program/steps/mail/compose.inc
   trunk/roundcubemail/program/steps/settings/edit_identity.inc
Log:
- Don't show a warning on html2text switch when textarea is empty
- Set properly select's value when html2text is aborted


Modified: trunk/roundcubemail/program/js/editor.js
===================================================================
--- trunk/roundcubemail/program/js/editor.js	2010-03-06 14:13:25 UTC (rev 3333)
+++ trunk/roundcubemail/program/js/editor.js	2010-03-06 18:59:25 UTC (rev 3334)
@@ -83,11 +83,16 @@
 }
 
 // switch html/plain mode
-function rcmail_toggle_editor(ishtml, textAreaId, flagElement)
+function rcmail_toggle_editor(select, textAreaId, flagElement)
 {
   var composeElement = document.getElementById(textAreaId);
-  var flag;
+  var flag, ishtml;
 
+  if (select.tagName != 'SELECT')
+    ishtml = select.checked;
+  else
+    ishtml = select.value == 'html';
+
   if (ishtml)
     {
     rcmail.display_spellcheck_controls(false);
@@ -100,12 +105,19 @@
     }
   else
     {
-    if (!confirm(rcmail.get_label('editorwarning')))
-      return false;
-
     var thisMCE = tinyMCE.get(textAreaId);
     var existingHtml = thisMCE.getContent();
-    rcmail.html2plain(existingHtml, textAreaId);
+
+    if (existingHtml) {
+      if (!confirm(rcmail.get_label('editorwarning'))) {
+        if (select.tagName == 'SELECT')
+	  select.value = 'html';
+        return false;
+	}
+
+      rcmail.html2plain(existingHtml, textAreaId);
+      }
+
     tinyMCE.execCommand('mceRemoveControl', true, textAreaId);
     rcmail.display_spellcheck_controls(true);
     if (flagElement && (flag = rcube_find_object(flagElement)))

Modified: trunk/roundcubemail/program/steps/mail/compose.inc
===================================================================
--- trunk/roundcubemail/program/steps/mail/compose.inc	2010-03-06 14:13:25 UTC (rev 3333)
+++ trunk/roundcubemail/program/steps/mail/compose.inc	2010-03-06 18:59:25 UTC (rev 3334)
@@ -976,7 +976,7 @@
   if (empty($attrib['name']))
     $attrib['name'] = 'editorSelect';
     
-  $attrib['onchange'] = "return rcmail_toggle_editor(this.value=='html', '".$attrib['editorid']."', '_is_html')";
+  $attrib['onchange'] = "return rcmail_toggle_editor(this, '".$attrib['editorid']."', '_is_html')";
 
   $select = new html_select($attrib);
 

Modified: trunk/roundcubemail/program/steps/settings/edit_identity.inc
===================================================================
--- trunk/roundcubemail/program/steps/settings/edit_identity.inc	2010-03-06 14:13:25 UTC (rev 3333)
+++ trunk/roundcubemail/program/steps/settings/edit_identity.inc	2010-03-06 18:59:25 UTC (rev 3334)
@@ -70,7 +70,7 @@
                        'reply-to'     => array('type' => 'text', 'label' => 'reply-to', 'size' => $i_size),
                        'bcc'          => array('type' => 'text', 'size' => $i_size),
                        'signature'	  => array('type' => 'textarea', 'size' => $t_cols, 'rows' => $t_rows),
-                       'html_signature'=>array('type' => 'checkbox', 'label' => 'htmlsignature', 'onclick' => 'return rcmail_toggle_editor(this.checked, \'rcmfd_signature\');'),
+                       'html_signature'=>array('type' => 'checkbox', 'label' => 'htmlsignature', 'onclick' => 'return rcmail_toggle_editor(this, \'rcmfd_signature\');'),
                        'standard'     => array('type' => 'checkbox', 'label' => 'setdefault'));
 
   // disable some field according to access level

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



More information about the Svn mailing list