Changeset 3334 in subversion

Timestamp:

Mar 6, 2010 1:59:25 PM (3 years ago)

Author:

alec

Message:

• Don't show a warning on html2text switch when textarea is empty
• Set properly select's value when html2text is aborted

Location:

trunk/roundcubemail/program

Files:

• js/editor.js (modified) (2 diffs)
• steps/mail/compose.inc (modified) (1 diff)
• steps/settings/edit_identity.inc (modified) (1 diff)

trunk/roundcubemail/program/js/editor.js

@@ -84 +84 @@
 
 // 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)
@@ -101 +106 @@
   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);

trunk/roundcubemail/program/steps/mail/compose.inc

@@ -977 +977 @@
     $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);

trunk/roundcubemail/program/steps/settings/edit_identity.inc

@@ -71 +71 @@
                        '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'));