LP: Don't load frameReady resources for external content - refs BT#19446

main/inc/lib/display.lib.php

@@ -2866,13 +2866,11 @@ HTML;
         return $content;
     }
 
-    /**
+    public static function getFrameReadyBlock(
-     * @param string $frameName
+        string $frameName,
-     *
+        string $itemType = '',
-     * @return string
+        string $jsConditionalFunction = 'function () { return false; }'
-     */
+    ): string {
-    public static function getFrameReadyBlock($frameName, $itemType = '')
-    {
         $webPublicPath = api_get_path(WEB_PUBLIC_PATH);
         $webJsPath = api_get_path(WEB_LIBRARY_JS_PATH);
 
@@ -2980,7 +2978,7 @@ HTML;
             {type:"stylesheet", src:"'.$webPublicPath.'css/dialog.css"},
             {type:"stylesheet", src: "'.$webPublicPath.'assets/mediaelement/build/mediaelementplayer.min.css"},
             {type:"stylesheet", src: "'.$webJsPath.'mediaelement/plugins/vrview/vrview.css"},
-        ]);';
+        ], '.$jsConditionalFunction.');';
 
         return $frameReady;
     }

main/inc/lib/javascript/jquery.frameready.js

@@ -2,9 +2,10 @@
  * @param {function} callback
  * @param {string} target
  * @param {Array} resources
+ * @param {function} conditional
  * @constructor
  */
-$.frameReady = function (callback, targetSelector, resources) {
+$.frameReady = function (callback, targetSelector, resources, conditional) {
     /**
      * @type {window}
      */
@@ -46,6 +47,10 @@ $.frameReady = function (callback, targetSelector, resources) {
     targetWindow.onload = function () {
         scripsLoadedCount = 0;
 
+        if (typeof conditional === 'function' && conditional()) {
+            return;
+        }
+
         targetDocument = targetWindow.contentDocument;
 
         scripts.forEach(function (script) {

main/lp/lp_view.php

@@ -620,7 +620,15 @@ $template->assign(
     )
 );
 
-$frameReady = Display::getFrameReadyBlock('#content_id, #content_id_blank', $itemType);
+$frameReady = Display::getFrameReadyBlock(
+    '#content_id, #content_id_blank',
+    $itemType,
+    'function () {
+        var arr = ["link", "sco", "xapi"];
+
+        return $.inArray(olms.lms_item_type, arr) !== -1;
+    }'
+);
 $template->assign('frame_ready', $frameReady);
 
 $view = $template->get_template('learnpath/view.tpl');

main/template/default/learnpath/view.tpl

@@ -377,10 +377,7 @@
         {% endif %}
         {% if disable_js_in_lp_view == 0 %}
             $(function() {
-                var arr = ['link', 'sco', 'xapi'];
+                {{ frame_ready }}
-                if ($.inArray(olms.lms_item_type, arr) == -1) {
-                    {{ frame_ready }}
-                }
             });
         {% endif %}