Skip to content

Commit

Permalink
TinyMce e107Bbcode fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
CaMer0n committed May 5, 2012
1 parent 1990c7c commit b14a31d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 14 deletions.
10 changes: 6 additions & 4 deletions e107_admin/image.php
Expand Up @@ -544,7 +544,7 @@ function updateBB()
{
var style = '';
var bb = '';
var src = document.getElementById('src').value;
var width = document.getElementById('width').value;
var height = document.getElementById('height').value;
Expand All @@ -555,12 +555,12 @@ function updateBB()
if(width !='')
{
style = style + 'width:' + width + 'px;';
// style = style + 'width:' + width + 'px;';
}
if(height !='')
{
style = style + 'height:' + height + 'px;';
// style = style + 'height:' + height + 'px;';
}
if(margin_right !='')
Expand Down Expand Up @@ -596,7 +596,9 @@ function updateBB()
document.getElementById('bbcode_holder').value = bb;
var html = '<img style=\"' + style + '\" src=\"'+ src +'\" />';
// var html = '<img style=\"' + style + '\" src=\"'+ src +'\" />';
var html = '<img style=\"' + style + '\" src=\"'+ src +'\" alt=\"\" width=\"' + width + '\" height=\"' + height + '\"/>';
document.getElementById('html_holder').value = html;
}
Expand Down
10 changes: 0 additions & 10 deletions e107_plugins/tinymce/plugins/ibrowser/ibrowser.php
Expand Up @@ -25,16 +25,6 @@
header("Location: ".e_ADMIN_ABS.'image.php?mode=main&action=dialog&for=news&tagid=news-thumbnail&iframe=1&bbcode=1');
exit;

$_GET['iframe'] = 1;
$_GET['mode'] = 'main';
$_GET['action'] = 'dialog';
$_GET['for'] = 'news';
$_GET['tagid'] = 'news-thumbnail';
$_GET['bbcode']= 1;

//
require_once(e_ADMIN.'image.php');
exit;

if (!defined('e107_INIT')) { exit; }

Expand Down

0 comments on commit b14a31d

Please sign in to comment.