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

MediaManager Fixes.

Browse Source
This commit is contained in:
Cameron
2018-08-16 19:02:02 -07:00
parent 0c900efdf2
commit 1754887672
6 changed files with 134 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_web/js/core/admin.jquery.js
View File

@@ -48,7 +48,11 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}};
if($this.attr('data-modal-submit'))
{
var buttonCaption = $('#e-modal-iframe').contents().find('#etrigger-submit').text(); // copy submit button caption from iframe form.
$('#e-modal-submit').text(buttonCaption).fadeIn(); // display the button in the modal footer.
if(buttonCaption)
{
$('#e-modal-submit').text(buttonCaption).fadeIn(); // display the button in the modal footer.
}
$('#e-modal-iframe').contents().find('.buttons-bar').hide(); // hide buttons in the iframe's form.
}

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

@@ -519,6 +519,7 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}};
$this.closest('img').addClass('active');
console.log('Bbcode: '+bbcode);
@@ -572,20 +573,7 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}};
$('img#' + target + "_prev", window.top.document).attr('src', preview); // set new value
if(previewHTML) // mediapicker() method. New in v2.1.9
{
console.log("Mode: MediaPicker");
console.log("Preview Raw: "+previewHTML);
if($htmlHolder.length > 0)
{
$htmlHolder.val(previewHTML);
}
preview = atob(previewHTML).trim();
e107.mediaManager.eMediaAttribute($this, bbcode);
}
else if(type === 'glyph')
if(type === 'glyph')
{
preview = "<span class='" + src + "'>&nbsp;</span>";
@@ -676,11 +664,18 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}};
var bbcode = $this.attr('data-bbcode'); // TinyMce/Textarea insert mode
var close = $this.attr('data-close');
if(!target || !bbcode)
{
console.log('eDialogSave: no target or bbcode');
console.log('eDialogSave (bbcode): ' + bbcode);
console.log('eDialogSave (target): ' + target);
return true;
}
var $target = $('#' + target, window.top.document);
if ($target.length > 0)