- Allow and use spellcheck attribute for input/textarea fields (#1485060)

5 files changed, 9 insertions, 4 deletions

diff --git a/CHANGELOG b/CHANGELOG
index dbf62244e..efe8760ce 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@ CHANGELOG RoundCube Webmail
 ----------
 - Reduced memory footprint when forwarding attachments (#1485345)
 - Fix inline images handling when replying/forwarding html messages
+- Allow and use spellcheck attribute for input/textarea fields (#1485060)
 
 2008/09/15 (thomasb)
 ----------
diff --git a/program/include/html.php b/program/include/html.php
index 87c9c1715..8d3144d93 100644
--- a/program/include/html.php
+++ b/program/include/html.php
@@ -248,7 +248,7 @@ class html_inputfield extends html
 {
     protected $tagname = 'input';
     protected $type = 'text';
-    protected $allowed = array('type','name','value','size','tabindex','autocomplete','checked','onchange','onclick','disabled','readonly');
+    protected $allowed = array('type','name','value','size','tabindex','autocomplete','checked','onchange','onclick','disabled','readonly','spellcheck');
 
     public function __construct($attrib = array())
     {
@@ -416,7 +416,7 @@ class html_checkbox extends html_inputfield
 class html_textarea extends html
 {
     protected $tagname = 'textarea';
-    protected $allowed = array('name','rows','cols','wrap','tabindex','onchange','disabled','readonly');
+    protected $allowed = array('name','rows','cols','wrap','tabindex','onchange','disabled','readonly','spellcheck');
 
     /**
      * Get HTML code for this object
diff --git a/program/js/editor.js b/program/js/editor.js
index c4f449c78..ceab021ef 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -34,6 +34,7 @@ function rcmail_editor_init(skin_path, editor_lang, spellcheck)
     content_css : skin_path + "/editor_content.css",
     external_image_list_url : "program/js/editor_images.js",
     spellchecker_languages : (rcmail.env.spellcheck_langs ? rcmail.env.spellcheck_langs : "Dansk=da,Deutsch=de,+English=en,Espanol=es,Francais=fr,Italiano=it,Nederlands=nl,Polski=pl,Portugues=pt,Suomi=fi,Svenska=sv"),
+    gecko_spellcheck : true,
     rc_client: rcube_webmail_client
   });
 }
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 02d062c1f..151b46146 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -241,7 +241,7 @@ function rcmail_compose_headers($attrib)
   if ($fname && $field_type)
   {
     // pass the following attributes to the form class
-    $field_attrib = array('name' => $fname);
+    $field_attrib = array('name' => $fname, 'spellcheck' => 'false');
     foreach ($attrib as $attr => $value)
       if (in_array($attr, $allow_attrib))
         $field_attrib[$attr] = $value;
@@ -650,6 +650,7 @@ function rcmail_compose_subject($attrib)
   unset($attrib['form']);
   
   $attrib['name'] = '_subject';
+  $attrib['spellcheck'] = 'true';
   $textfield = new html_inputfield($attrib);
 
   $subject = '';
diff --git a/program/steps/settings/edit_identity.inc b/program/steps/settings/edit_identity.inc
index 1e3fa3494..dbb3ece66 100644
--- a/program/steps/settings/edit_identity.inc
+++ b/program/steps/settings/edit_identity.inc
@@ -58,7 +58,8 @@ function rcube_identity_form($attrib)
                                     "theme_advanced_toolbar_align : 'left'," .
                                     "theme_advanced_buttons1 : 'bold,italic,underline,strikethrough,justifyleft,justifycenter,justifyright,justifyfull,separator,outdent,indent,charmap,hr'," .
                                     "theme_advanced_buttons2 : 'link,unlink,code,forecolor,fontselect,fontsizeselect'," .
-                                    "theme_advanced_buttons3 : '' });");
+                                    "theme_advanced_buttons3 : '',".
+				    "gecko_spellcheck : true });");
 
   if (!$IDENTITY_RECORD && $RCMAIL->action != 'add-identity')
     return rcube_label('notfound');
@@ -113,6 +114,7 @@ function rcube_identity_form($attrib)
       {
       $attrib['size'] = $colprop['size'];
       $attrib['rows'] = $colprop['rows'];
+      $attrib['spellcheck'] = true;
       if ($IDENTITY_RECORD['html_signature'])
         {
         $attrib['class'] = "mce_editor";