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

Default image resize pref is now used correctly by TinyMce media-manager. Image captions may now be added to inline images. TinyMce media-manager 'cancel' button is working again.

Browse Source
This commit is contained in:
Cameron
2016-01-11 20:53:05 -08:00
parent 39cee385f7
commit b1c2e030d5
9 changed files with 151 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_plugins/tinymce4/e_footer.php
View File

@@ -113,7 +113,7 @@ if((e107::wysiwyg() === true && check_class($pref['post_html'])) || strpos(e_SEL
var s = $('#bbcode_holder').val();
// alert(s);
alert(s);
var p = $.ajax({
type: 'POST',
@@ -130,7 +130,7 @@ if((e107::wysiwyg() === true && check_class($pref['post_html'])) || strpos(e_SEL
}).responseText;
html = p;
// alert(s);
// alert(p);
if(html === undefined)
{
@@ -145,7 +145,7 @@ if((e107::wysiwyg() === true && check_class($pref['post_html'])) || strpos(e_SEL
$('.e-dialog-close').click(function(){
// top.tinymce.activeEditor.windowManager.close();
top.tinymce.activeEditor.windowManager.close();
});

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

@@ -220,6 +220,7 @@ TEMPL;
$style = vartrue($img['style']) ? ' style="'.$img['style'].'"' : '';
$class = vartrue($img['class']) ? ' class="'.$img['class'].'"' : '';
$alt = vartrue($img['alt']) ? ' alt="'.$img['alt'].'"' : '';
$title = vartrue($img['title']) ? ' title="'.$img['title'].'"' : '';
list($url,$qry) = explode("?",$img['src']);
@@ -233,7 +234,7 @@ TEMPL;
$src = $url."?".urldecode(http_build_query($qr));
$replacement = '<img'.$class.$style.' src="'.$src.'"'.$width.$height.$alt.' />';
$replacement = '<img'.$class.$style.' src="'.$src.'"'.$width.$height.$alt.$title.' />';
$text = preg_replace($regexp, $replacement, $text);