Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

Author: ywarnier

main/document/showinframes.php

@@ -174,20 +174,8 @@
 }
 
 $js_glossary_in_documents = '
-  $.frameReady(function(){
-   //  $("<div>I am a div courses</div>").prependTo("body");
-  }, "top.mainFrame",
-  {
-    load: [
-        { type:"script", id:"_fr1", src:"'.api_get_jquery_web_path().'"},
-        { type:"script", id:"_fr7", src:"'.api_get_path(WEB_PUBLIC_PATH).'assets/MathJax/MathJax.js?config=AM_HTMLorMML"},
-        { type:"script", id:"_fr4", src:"'.api_get_path(WEB_PUBLIC_PATH).'assets/jquery-ui/jquery-ui.min.js"},
-        { type:"stylesheet", id:"_fr5", src:"'.api_get_path(WEB_PUBLIC_PATH).'assets/jquery-ui/themes/smoothness/jquery-ui.min.css"},
-        { type:"stylesheet", id:"_fr6", src:"'.api_get_path(WEB_PUBLIC_PATH).'assets/jquery-ui/themes/smoothness/theme.css"},
-        { 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().'"}
-    ]
-  });';
+    setFrameReady("mainFrame");
+';
 
 $web_odf_supported_files = DocumentManager::get_web_odf_extension_list();
 // PDF should be displayed with viewerJS

main/template/default/layout/main.js.tpl

@@ -601,4 +601,34 @@ function copyTextToClipBoard(elementId)
 
     /* Alert the copied text */
     //alert('Copied');
+}
+
+function setFrameReady(iframeName) {
+    $.frameReady(function () {
+        $(document).ready(function () {
+            $('video:not(.skip), audio:not(.skip)').mediaelementplayer({
+                pluginPath: '{{ _p.web }}web/assets/mediaelement/build/',
+                //renderers: ['html5', 'flash_video', 'native_flv'],
+                features: ['{{ video_features }}'],
+                success: function(mediaElement, originalNode, instance) {
+                },
+                vrPath: '{{ _p.web }}web/assets/vrview/build/vrview.js'
+            });
+        });
+    }, 'top.' + iframeName, {
+        load: [
+            {type: 'script', id: '_fr1', src: '{{ _p.web }}web/assets/jquery/dist/jquery.min.js'},
+            {type: 'script', id: '_fr7', src: '{{ _p.web }}web/assets/MathJax/MathJax.js?config=AM_HTMLorMML'},
+            {type: 'script', id: '_fr4', src: '{{ _p.web }}web/assets/jquery-ui/jquery-ui.min.js'},
+            {type: 'stylesheet', id: '_fr5', src: '{{ _p.web }}web/assets/jquery-ui/themes/smoothness/jquery-ui.min.css'},
+            {type: 'stylesheet', id: '_fr6', src: '{{ _p.web }}web/assets/jquery-ui/themes/smoothness/theme.css'},
+            {type: 'script', id: '_fr2', src: '{{ _p.web_lib }}javascript/jquery.highlight.js'},
+            {type: 'script', id: '_fr3', src: '{{ _p.web_main }}glossary/glossary.js.php?{{ _p.web_cid_query }}'},
+            {type: 'script', id: '_media1', src: '{{ _p.web }}web/assets/mediaelement/build/mediaelement-and-player.min.js'},
+            {type: 'stylesheet', id: '_media2', src: '{{ _p.web }}web/assets/mediaelement/build/mediaelementplayer.min.css'},
+            {#{type: 'script', id: '_media3', src: '{{ _p.web_lib }}javascript/iframe-js-loader.js'},#}
+            {type: 'stylesheet', id: '_media4', src: '{{ _p.web }}web/assets/mediaelement/plugins/vrview/vrview.css'},
+            {type: 'script', id: '_media4', src: '{{ _p.web }}web/assets/mediaelement/plugins/vrview/vrview.js'},
+        ]
+    });
 }

main/template/default/learnpath/view.tpl

@@ -297,25 +297,11 @@
         {% endif %}
 
         {% if disable_js_in_lp_view == 0 %}
-        $('iframe#content_id').on('load', function () {
-            if ('link' !== olms.lms_item_type) {
-                $.frameReady(function () {
-                }, 'top.content_name', {
-                    load: [
-                        {type: 'script', id: '_fr1', src: '{{ _p.web }}web/assets/jquery/dist/jquery.min.js'},
-                        {type: 'script', id: '_fr7', src: '{{ _p.web }}web/assets/MathJax/MathJax.js?config=AM_HTMLorMML'},
-                        {type: 'script', id: '_fr4', src: '{{ _p.web }}web/assets/jquery-ui/jquery-ui.min.js'},
-                        {type: 'stylesheet', id: '_fr5', src: '{{ _p.web }}web/assets/jquery-ui/themes/smoothness/jquery-ui.min.css'},
-                        {type: 'stylesheet', id: '_fr6', src: '{{ _p.web }}web/assets/jquery-ui/themes/smoothness/theme.css'},
-                        {type: 'script', id: '_fr2', src: '{{ _p.web_lib }}javascript/jquery.highlight.js'},
-                        {type: 'script', id: '_fr3', src: '{{ _p.web_main }}glossary/glossary.js.php?{{ _p.web_cid_query }}'},
-                        {type: 'script', id: '_media1', src: '{{ _p.web }}web/assets/mediaelement/build/mediaelement-and-player.min.js'},
-                        {type: 'stylesheet', id: '_media2', src: '{{ _p.web }}web/assets/mediaelement/build/mediaelementplayer.min.css'},
-                        {type: 'script', id: '_media3', src: '{{ _p.web_lib }}javascript/iframe-js-loader.js'}
-                    ]
-                });
-            }
-        });
+            $('iframe#content_id').on('load', function () {
+                if ('link' !== olms.lms_item_type) {
+                    setFrameReady('content_name');
+                }
+            });
         {% endif %}
     });