summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.txt1
-rw-r--r--editors/tinymce.inc12
2 files changed, 12 insertions, 1 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 490408c..4e1eac8 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -6,6 +6,7 @@ Wysiwyg x.x-x.x, xxxx-xx-xx
Wysiwyg 5.x-x.x, xxxx-xx-xx
---------------------------
+#328116 by sun: Added Safari plugin for TinyMCE 3.
#327710 by sun: Added nicEdit support.
#323855 by sun: Increased supported version of jWYSIWYG to 0.5.
#323671 by sun: Fixed TinyMCE editor not resized when browser is resized.
diff --git a/editors/tinymce.inc b/editors/tinymce.inc
index 69968d7..4b3bb30 100644
--- a/editors/tinymce.inc
+++ b/editors/tinymce.inc
@@ -314,7 +314,7 @@ function _wysiwyg_tinymce_plugin_name($op, $name) {
* Return internal plugins for TinyMCE; semi-implementation of hook_wysiwyg_plugin().
*/
function wysiwyg_tinymce_plugins($editor) {
- return array(
+ $plugins = array(
'default' => array(
'path' => $editor['library path'] .'/themes/advanced',
'buttons' => array(
@@ -482,5 +482,15 @@ function wysiwyg_tinymce_plugins($editor) {
'load' => TRUE,
),
);
+ if ($editor['installed version'] > 3) {
+ $plugins['safari'] = array(
+ 'path' => $editor['library path'] .'/plugins/safari',
+ 'extensions' => array('safari' => t('Safari compatibility')),
+ 'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/safari',
+ 'internal' => TRUE,
+ 'load' => TRUE,
+ );
+ }
+ return $plugins;
}