mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-30 01:30:32 +02:00
Code Issues Releases Wiki Activity

TinyMce4 fixes. Video and Glyph plugins working again. Editor toggle button working. And embedded video thumbnail workaround added.

Browse Source
This commit is contained in:
Cameron
2015-04-02 02:49:19 -07:00
parent 21f3f2ed19
commit f253d00560
26 changed files with 2505 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_admin/image.php
View File

@@ -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 />" : "";
$br = (E107_DEBUG_LEVEL > 0) ? "<br />" : "";
$text .= "
".$br."<input title='bbcode' type='{$type}' readonly='readonly' class='span11' id='bbcode_holder' name='bbcode_holder' value='' />
".$br."<input title='html/wysiwyg' type='{$type}' class='span11' readonly='readonly' id='html_holder' name='html_holder' value='' />