From f253d0056036a02af758475d299026e0b88c1f32 Mon Sep 17 00:00:00 2001 From: Cameron Date: Thu, 2 Apr 2015 02:49:19 -0700 Subject: [PATCH] TinyMce4 fixes. Video and Glyph plugins working again. Editor toggle button working. And embedded video thumbnail workaround added. --- e107_admin/image.php | 6 +- e107_handlers/media_class.php | 18 +- e107_plugins/tinymce4/admin_config.php | 733 ++++++++++++++++++ e107_plugins/tinymce4/e_footer.php | 144 ++-- e107_plugins/tinymce4/images/icon_16.png | Bin 0 -> 859 bytes e107_plugins/tinymce4/images/icon_32.png | Bin 0 -> 2441 bytes e107_plugins/tinymce4/plugin.xml | 3 + .../tinymce4/plugins/compat3x/css/dialog.css | 118 +++ .../tinymce4/plugins/compat3x/img/buttons.png | Bin 0 -> 3133 bytes .../tinymce4/plugins/compat3x/img/icons.gif | Bin 0 -> 11982 bytes .../tinymce4/plugins/compat3x/img/items.gif | Bin 0 -> 64 bytes .../plugins/compat3x/img/menu_arrow.gif | Bin 0 -> 68 bytes .../plugins/compat3x/img/menu_check.gif | Bin 0 -> 70 bytes .../plugins/compat3x/img/progress.gif | Bin 0 -> 1787 bytes .../tinymce4/plugins/compat3x/img/tabs.gif | Bin 0 -> 1322 bytes .../tinymce4/plugins/compat3x/plugin.js | 297 +++++++ .../tinymce4/plugins/compat3x/plugin.min.js | 1 + .../plugins/compat3x/tiny_mce_popup.js | 542 +++++++++++++ .../compat3x/utils/editable_selects.js | 70 ++ .../plugins/compat3x/utils/form_utils.js | 210 +++++ .../tinymce4/plugins/compat3x/utils/mctabs.js | 164 ++++ .../plugins/compat3x/utils/validate.js | 252 ++++++ e107_plugins/tinymce4/plugins/e107/dialog.php | 4 +- e107_plugins/tinymce4/plugins/e107/parser.php | 16 +- e107_plugins/tinymce4/templates/mainadmin.xml | 2 +- e107_plugins/tinymce4/wysiwyg.php | 7 + 26 files changed, 2505 insertions(+), 82 deletions(-) create mode 100644 e107_plugins/tinymce4/admin_config.php create mode 100644 e107_plugins/tinymce4/images/icon_16.png create mode 100644 e107_plugins/tinymce4/images/icon_32.png create mode 100644 e107_plugins/tinymce4/plugins/compat3x/css/dialog.css create mode 100644 e107_plugins/tinymce4/plugins/compat3x/img/buttons.png create mode 100644 e107_plugins/tinymce4/plugins/compat3x/img/icons.gif create mode 100644 e107_plugins/tinymce4/plugins/compat3x/img/items.gif create mode 100644 e107_plugins/tinymce4/plugins/compat3x/img/menu_arrow.gif create mode 100644 e107_plugins/tinymce4/plugins/compat3x/img/menu_check.gif create mode 100644 e107_plugins/tinymce4/plugins/compat3x/img/progress.gif create mode 100644 e107_plugins/tinymce4/plugins/compat3x/img/tabs.gif create mode 100644 e107_plugins/tinymce4/plugins/compat3x/plugin.js create mode 100644 e107_plugins/tinymce4/plugins/compat3x/plugin.min.js create mode 100644 e107_plugins/tinymce4/plugins/compat3x/tiny_mce_popup.js create mode 100644 e107_plugins/tinymce4/plugins/compat3x/utils/editable_selects.js create mode 100644 e107_plugins/tinymce4/plugins/compat3x/utils/form_utils.js create mode 100644 e107_plugins/tinymce4/plugins/compat3x/utils/mctabs.js create mode 100644 e107_plugins/tinymce4/plugins/compat3x/utils/validate.js diff --git a/e107_admin/image.php b/e107_admin/image.php index 2fff8fc3a..0cdabf58d 100644 --- a/e107_admin/image.php +++ b/e107_admin/image.php @@ -946,7 +946,7 @@ class media_admin_ui extends e_admin_ui if($this->getQuery('iframe')) { - e107::js('tinymce','tiny_mce_popup.js'); + e107::js('tinymce4','plugins/compat3x/tiny_mce_popup.js'); $this->getResponse()->setIframeMod(); // disable header/footer menus etc. if(!$this->getQuery('for')) @@ -1262,8 +1262,8 @@ class media_admin_ui extends e_admin_ui } $type = (E107_DEBUG_LEVEL > 0) ? "text" : "hidden"; - $br = (E107_DEBUG_LEVEL > 0) ? "
" : ""; - + $br = (E107_DEBUG_LEVEL > 0) ? "
" : ""; + $text .= " ".$br." ".$br." diff --git a/e107_handlers/media_class.php b/e107_handlers/media_class.php index 592d8f086..133c567b4 100644 --- a/e107_handlers/media_class.php +++ b/e107_handlers/media_class.php @@ -1102,13 +1102,15 @@ class e_media $close = (E107_DEBUG_LEVEL > 0) ? "" : " data-close='true' "; // - - // - $text .= "\n\n\n