Changeset 5181 in subversion for trunk/roundcubemail/program/include/main.inc

Timestamp:

Sep 6, 2011 9:39:45 AM (21 months ago)

Author:

alec

Message:

• Merge devel-spellcheck branch:
  • Added spellchecker exceptions dictionary (shared or per-user)
  • Added possibility to ignore words containing caps, numbers, symbols (spellcheck_ignore_* options)

Location:

trunk/roundcubemail

Files:

• . (modified) (1 prop)
• program/include/main.inc (modified) (2 diffs)

trunk/roundcubemail/program/include/main.inc

@@ -1596 +1596 @@
 
   if ($hook['abort'])
-    return;  
+    return;
 
   $lang = strtolower($_SESSION['language']);
@@ -1608 +1608 @@
   $RCMAIL->output->include_script('tiny_mce/tiny_mce.js');
   $RCMAIL->output->include_script('editor.js');
-  $RCMAIL->output->add_script(sprintf("rcmail_editor_init('\$__skin_path', '%s', %d, '%s');",
-    JQ($lang), intval($CONFIG['enable_spellcheck']), $mode),
-    'foot');
+  $RCMAIL->output->add_script(sprintf("rcmail_editor_init(%s)",
+    json_encode(array(
+        'mode'       => $mode,
+        'skin_path'  => '$__skin_path',
+        'lang'       => $lang,
+        'spellcheck' => intval($CONFIG['enable_spellcheck']),
+        'spelldict'  => intval($CONFIG['spellcheck_dictionary']),
+    ))), 'foot');
 }