diff --git a/main/document/showinframes.php b/main/document/showinframes.php index e422a48ef2..b7b11ecaf9 100755 --- a/main/document/showinframes.php +++ b/main/document/showinframes.php @@ -426,19 +426,12 @@ if ($execute_iframe) { echo $toolbar = Display::toolbarAction('actions-documents', [$actionsLeft]); - $translate = api_get_configuration_value('translate_html'); - $display = ''; - if ($translate) { - $display = ' display:none;'; - } - echo '
'; echo ''; echo '
'; diff --git a/main/inc/lib/display.lib.php b/main/inc/lib/display.lib.php index dab13d4dd4..b4babacb96 100755 --- a/main/inc/lib/display.lib.php +++ b/main/inc/lib/display.lib.php @@ -2946,6 +2946,12 @@ HTML; $videoFeatures = implode("','", $videoFeatures); $frameReady = ' + + var $iframe = $("'.$frameName.'"); + var $iframeSpinner = $(""); + + $iframe.hide().parent().append($iframeSpinner); + $.frameReady(function() { $(function () { $("video:not(.skip), audio:not(.skip)").mediaelementplayer({ @@ -2957,9 +2963,9 @@ HTML; vrPath: "'.$webPublicPath.'assets/vrview/build/vrview.js" }); - window.setTimeout(function () { - window.top.document.getElementById("mainFrame").style.display = ""; - }, 1500); + var iframe = window.top.document.querySelector("'.$frameName.'"); + iframe.parentNode.querySelector(".fa").remove() + iframe.style.display = "block"; }); }, "'.$frameName.'", diff --git a/main/lp/scorm_api.php b/main/lp/scorm_api.php index 421005e73f..09109b9058 100755 --- a/main/lp/scorm_api.php +++ b/main/lp/scorm_api.php @@ -1679,6 +1679,10 @@ function switch_item(current_item, next_item) } else { ?> log_in_log('loading '+mysrc+' in frame'); + + var $iframeSpinner = $(''); + cont_f.hide().parent().append($iframeSpinner); + cont_f.attr("src",mysrc);