Browse Source

Fix lp js errors

Julio Montoya 5 years ago
parent
commit
366dfb4a67
2 changed files with 27 additions and 22 deletions
  1. 5 5
      app/Resources/public/css/scorm.css
  2. 22 17
      main/inc/lib/display.lib.php

+ 5 - 5
app/Resources/public/css/scorm.css

@@ -586,7 +586,7 @@ See https://support.chamilo.org/issues/6976
 }
 
 .scorm-collapse .panel-default .panel-heading {
-    background: url(../../../../main/img/icons/svg/arrow-down.svg) #FFF right center no-repeat;
+    background: url(../../main/img/icons/svg/arrow-down.svg) #FFF right center no-repeat;
     padding-top: 0;
     padding-bottom: 0;
 }
@@ -632,19 +632,19 @@ See https://support.chamilo.org/issues/6976
 }
 
 .scorm_item_normal.scorm_completed {
-    background: url(../../../../main/img/icons/svg/check-completed.svg) #F5F5F5 right center no-repeat;
+    background: url(../../main/img/icons/svg/check-completed.svg) #F5F5F5 right center no-repeat;
 }
 
 .scorm_item_normal.scorm_not_attempted {
-    background: url(../../../../main/img/icons/svg/check-not-attempted.svg) #FFFFFF right center no-repeat;
+    background: url(../../main/img/icons/svg/check-not-attempted.svg) #FFFFFF right center no-repeat;
 }
 
 .scorm_item_normal.scorm_highlight.scorm_not_attempted {
-    background: url(../../../../main/img/icons/svg/check-not-attempted.svg) #00829C right center no-repeat;
+    background: url(../../main/img/icons/svg/check-not-attempted.svg) #00829C right center no-repeat;
 }
 
 .scorm_item_normal.scorm_highlight.scorm_completed {
-    background: url(../../../../main/img/icons/svg/check-highlight.svg) #00829C right center no-repeat;
+    background: url(../../main/img/icons/svg/check-highlight.svg) #00829C right center no-repeat;
 }
 
 .sidebar-scorm {

+ 22 - 17
main/inc/lib/display.lib.php

@@ -2849,9 +2849,11 @@ HTML;
         }
 
         $defaultFeatures = implode("','", $defaultFeatures);
-        $frameReady = '$.frameReady(function() {
-            $(function() {
-                $("video:not(.skip), audio:not(.skip)").mediaelementplayer({                    
+        $frameReady = '
+        $.frameReady(function() {
+             // Use $(document).ready() instead of shortcut method in order to work with frameReady
+             $(document).ready(function () {
+                $("video:not(.skip), audio:not(.skip)").mediaelementplayer({
                     pluginPath: "'.$webPublicPath.'assets/mediaelement/build/",            
                     features: [\''.$defaultFeatures.'\'],
                     success: function(mediaElement, originalNode, instance) {
@@ -2860,22 +2862,25 @@ HTML;
                     vrPath: "'.$webPublicPath.'assets/vrview/build/vrview.js"
                 });
             });
-        }, "'.$frameName.'",
+        }, 
+        "'.$frameName.'",
         {
             load: [
-                { type:"script", id:"_fr1", src:"'.api_get_jquery_web_path().'"},
-                { type:"script", id:"_fr7", src:"'.$webPublicPath.'assets/MathJax/MathJax.js?config=AM_HTMLorMML"},
-                { type:"script", id:"_fr4", src:"'.$webPublicPath.'assets/jquery-ui/jquery-ui.min.js"},
-                { type:"stylesheet", id:"_fr5", src:"'.$webPublicPath.'assets/jquery-ui/themes/smoothness/jquery-ui.min.css"},
-                { type:"stylesheet", id:"_fr6", src:"'.$webPublicPath.'assets/jquery-ui/themes/smoothness/theme.css"},
-                { type:"script", id:"_fr2", src:"'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.highlight.js"},
-                { type:"stylesheet", id:"_fr7", src:"'.$webPublicPath.'css/dialog.css"},
-                { type:"script", id:"_fr3", src:"'.api_get_path(WEB_CODE_PATH).'glossary/glossary.js.php?'.api_get_cidreq().'"},
-                {type: "script", id: "_media1", src: "'.$webPublicPath.'assets/mediaelement/build/mediaelement-and-player.min.js"},
-                {type: "stylesheet", id: "_media2", src: "'.$webPublicPath.'assets/mediaelement/build/mediaelementplayer.min.css"},                
-                {type: "stylesheet", id: "_media4", src: "'.$webPublicPath.'assets/mediaelement/plugins/vrview/vrview.css"},
-                {type: "script", id: "_media4", src: "'.$webPublicPath.'assets/mediaelement/plugins/vrview/vrview.js"},
-                {type: "script", id: "_media5", src: "'.$webPublicPath.'assets/mediaelement/plugins/markersrolls/markersrolls.js"},
+                {type:"script", id:"_fr1", src:"'.api_get_jquery_web_path().'"},
+                {type:"script", id:"_fr2", src:"'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.highlight.js"},
+                {type:"script", id:"_fr3", src:"'.api_get_path(WEB_CODE_PATH).'glossary/glossary.js.php?'.api_get_cidreq().'"},
+                {type:"script", id:"_fr4", src:"'.$webPublicPath.'assets/jquery-ui/jquery-ui.min.js"},
+                {type:"script", id:"_fr5", src:"'.$webPublicPath.'assets/MathJax/MathJax.js?config=AM_HTMLorMML"},
+                {type:"script", id:"_fr6", src: "'.$webPublicPath.'assets/mediaelement/build/mediaelement-and-player.min.js"},
+                {type:"script", id:"_fr7", src: "'.$webPublicPath.'assets/mediaelement/plugins/vrview/vrview.js"},
+                {type:"script", id:"_fr8", src: "'.$webPublicPath.'assets/mediaelement/plugins/markersrolls/markersrolls.js"},
+                                
+                {type:"stylesheet", id:"_fr9", src:"'.$webPublicPath.'assets/jquery-ui/themes/smoothness/jquery-ui.min.css"},
+                {type:"stylesheet", id:"_fr10", src:"'.$webPublicPath.'assets/jquery-ui/themes/smoothness/theme.css"},                
+                {type:"stylesheet", id:"_fr11", src:"'.$webPublicPath.'css/dialog.css"},
+                {type:"stylesheet", id: "_fr12", src: "'.$webPublicPath.'assets/mediaelement/build/mediaelementplayer.min.css"},                
+                {type:"stylesheet", id: "_fr13", src: "'.$webPublicPath.'assets/mediaelement/plugins/vrview/vrview.css"},
+                
                 '.$extraMediaFiles.'
                 '.$translateHtml.'
             ]