1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-05 06:07:32 +02:00

Merge pull request #2728 from lonalore/mediaManager

Fix for Issue #2720
This commit is contained in:
Cameron
2017-07-10 14:55:27 -07:00
committed by GitHub

View File

@@ -313,8 +313,12 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}};
var $preview = $('#preview');
var $path = $('#path');
$this.addClass("media-select-active");
$this.closest("img").addClass("active");
// Remove "selected" class from elements.
$('.e-media-select').removeClass('media-select-active');
// Add "selected" class to clicked element.
$this.addClass('media-select-active');
$this.closest('img').addClass('active');
if(bbcode == "file") // not needed for Tinymce
{
@@ -540,10 +544,9 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}};
$('#e-modal-loading', window.parent.document).show();
$('iframe', window.parent.document).attr('scrolling', 'no'); // hide the scrollbar.
// TODO use loading screen instead?
$(id).hide('slide', {direction: outDir}, 1500, function ()
{
});
$.get(src, function (data)
{
$(id).html(data);
@@ -554,6 +557,10 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}};
{
$('#e-modal-loading', window.parent.document).hide();
});
// We need to attach behaviors to the newly loaded contents.
e107.attachBehaviors();
});
});