summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak (Kolab Systems) <machniak@kolabsys.com>2012-10-12 12:54:57 (GMT)
committerAleksander Machniak (Kolab Systems) <machniak@kolabsys.com>2012-10-12 12:54:57 (GMT)
commit3c3d973df1f8a3afda04afe81d25ba4a7d3eb10e (patch)
tree4e64befbf18d9b90ff4f496ebd282375b90efa07
parentcb1387cf0e62578275d7b31cef22721e00c6f36b (diff)
downloadroundcubemail-plugins-kolab-3c3d973df1f8a3afda04afe81d25ba4a7d3eb10e.tar.gz
Add workaround for jQuery.extend() bug
-rw-r--r--plugins/tinymce_config/tinymce_config.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/plugins/tinymce_config/tinymce_config.php b/plugins/tinymce_config/tinymce_config.php
index bc8e10a..e30f72e 100644
--- a/plugins/tinymce_config/tinymce_config.php
+++ b/plugins/tinymce_config/tinymce_config.php
@@ -39,7 +39,13 @@ class tinymce_config extends rcube_plugin
'force_br_newlines' => true,
);
- $script = sprintf('$.extend(window.rcmail_editor_settings, %s);', json_encode($config));
+ $script = sprintf('
+ if (!window.rcmail_editor_settings)
+ window.rcmail_editor_settings = {};
+ var tinymce_config = %s;
+ for (var i in tinymce_config)
+ window.rcmail_editor_settings[i] = tinymce_config[i];
+ ', json_encode($config));
$rcmail->output->add_script($script, 'docready');
}