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

30
e107_web/js/core/mediaManager.js
View File

@@ -33,10 +33,11 @@ $(document).ready(function()
var margin_bottom = $('#margin-bottom').val();
var margin_right = $('#margin-right').val();
var margin_left = $('#margin-left').val();
var _float = $('#float').val();
var _float = $('#float').val();
var alt = $('#alt').val();
if(margin_right !='' && margin_right !== undefined)
if(margin_right !='' && margin_right !== undefined)
{
style = style + 'margin-right:' + margin_right + 'px;';
}
@@ -95,7 +96,12 @@ $(document).ready(function()
{
bb = bb + ' style='+style;
}
if(alt != '')
{
bb = bb + '&alt=' + alt;
}
bb = bb + ']';
bb = bb + path;
bb = bb + '[/img]';
@@ -129,7 +135,7 @@ $(document).ready(function()
var width = $(this).attr('data-width');
var height = ''; // disable for now - will be updated by bb parser. // $(this).attr('data-height');
var type = $(this).attr('data-type');
var alt = $(this).attr('data-alt');
// return;
// alert(width);
@@ -169,13 +175,13 @@ $(document).ready(function()
$('#src').attr('src',src); // working old
$('#width').val(width);
$('#height').val(height);
$('img#' + target + "_prev", window.top.document).attr('src',preview); // set new value
$('#height').val(height);
$('#alt').val(alt);
$('img#' + target + "_prev", window.top.document).attr('src',preview); // set new value
if(type == 'glyph')