mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-22 14:13:03 +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

4
e107_plugins/tinymce4/plugins/e107/dialog.php
View File

@@ -26,7 +26,7 @@ e107::css('inline',"
");
e107::js('tinymce','tiny_mce_popup.js');
e107::js('tinymce4','plugins/compat3x/tiny_mce_popup.js');
e107::js('inline',"
@@ -89,7 +89,7 @@ $(document).ready(function()
}).responseText;
html = '<bbcode alt=\"'+encodeURIComponent(s)+'\">' + html + '</bbcode> ' ;
alert(html);
tinyMCEPopup.editor.execCommand('mceInsertContent', false, html);
tinyMCEPopup.close();
});

16
e107_plugins/tinymce4/plugins/e107/parser.php
View File

@@ -24,8 +24,8 @@ require_once("../../../../class2.php");
if($_POST['mode'] == 'tohtml')
{
// XXX @Cam possible fix - convert to BB first, see news admin AJAX request/response values for reference why
$content = stripslashes($_POST['content']);
@@ -59,12 +59,16 @@ if($_POST['mode'] == 'tohtml')
if(!empty($content) && E107_DEBUG_LEVEL > 0)
{
$content = "-- DEBUG MODE ACTIVE -- \n".$content;
echo htmlentities($content)."\n";
exit;
$content = "-- DEBUG MODE ACTIVE -- \n".$content;
// echo htmlentities($content)."\n";
// echo "<pre>".$content."</pre>";
echo $content;
exit;
}
echo $content;
}
else // bbcode Mode.
{