diff --git a/e107_web/js/core/admin.jquery.js b/e107_web/js/core/admin.jquery.js index 7f9b04c72..3d74b4f11 100644 --- a/e107_web/js/core/admin.jquery.js +++ b/e107_web/js/core/admin.jquery.js @@ -185,11 +185,7 @@ $(document).ready(function() - - - - - + @@ -197,14 +193,19 @@ $(document).ready(function() /* Bootstrap Modal window within an iFrame */ $('.e-modal').on('click', function(e) { - e.preventDefault(); - var url = $(this).attr('href'); - var caption = $(this).attr('data-modal-caption'); + e.preventDefault(); + var url = $(this).attr('href'); + var caption = $(this).attr('data-modal-caption'); var height = ($(window).height() * 0.7) - 50; - $('.modal-body').html('
'); - $('.modal-caption').text(caption); + + $('.modal-body').html(''); + $('.modal-caption').html(caption + ' '); $('.modal').modal('show'); + + $("#e-modal-iframe").on("load", function () { + $('#e-modal-loading').hide(); + }); });