Browse Source

Minor - Format code - refs BT#15389

Angel Fernando Quiroz Campos 6 years ago
parent
commit
48639d333c
1 changed files with 19 additions and 18 deletions
  1. 19 18
      main/inc/lib/display.lib.php

+ 19 - 18
main/inc/lib/display.lib.php

@@ -2828,6 +2828,8 @@ HTML;
             }
         }
 
+        $webPublicPath = api_get_path(WEB_PUBLIC_PATH);
+
         $translateHtml = '';
         $translate = api_get_configuration_value('translate_html');
         if ($translate) {
@@ -2837,46 +2839,45 @@ HTML;
         $counter = 10;
         $extraMediaFiles = '';
         foreach ($bowerJsFiles as $file) {
-            $extraMediaFiles .= '{type: "script", id: "media_'.$counter.'", src: "'.api_get_path(WEB_PUBLIC_PATH).'assets/'.$file.'"},';
+            $extraMediaFiles .= '{type: "script", id: "media_'.$counter.'", src: "'.$webPublicPath.'assets/'.$file.'"},';
             $counter++;
         }
 
         foreach ($bowerCSSFiles as $file) {
-            $extraMediaFiles .= '{type: "stylesheet", id: "media_'.$counter.'", src: "'.api_get_path(WEB_PUBLIC_PATH).'assets/'.$file.'"},';
+            $extraMediaFiles .= '{type: "stylesheet", id: "media_'.$counter.'", src: "'.$webPublicPath.'assets/'.$file.'"},';
             $counter++;
         }
 
         $defaultFeatures = implode("','", $defaultFeatures);
-        $frameReady = '
-          $.frameReady(function() {
+        $frameReady = '$.frameReady(function() {
             $(function() {
                 $("video:not(.skip), audio:not(.skip)").mediaelementplayer({                    
-                    pluginPath: "'.api_get_path(WEB_PUBLIC_PATH).'assets/mediaelement/build/",            
+                    pluginPath: "'.$webPublicPath.'assets/mediaelement/build/",            
                     features: [\''.$defaultFeatures.'\'],
                     success: function(mediaElement, originalNode, instance) {
                     },
-                    vrPath: "'.api_get_path(WEB_PUBLIC_PATH).'assets/vrview/build/vrview.js"
+                    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:"'.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:"_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:"'.api_get_path(WEB_PUBLIC_PATH).'css/dialog.css"},
+                { 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: "'.api_get_path(WEB_PUBLIC_PATH).'assets/mediaelement/build/mediaelement-and-player.min.js"},
-                {type: "stylesheet", id: "_media2", src: "'.api_get_path(WEB_PUBLIC_PATH).'assets/mediaelement/build/mediaelementplayer.min.css"},                
-                {type: "stylesheet", id: "_media4", src: "'.api_get_path(WEB_PUBLIC_PATH).'assets/mediaelement/plugins/vrview/vrview.css"},
-                {type: "script", id: "_media4", src: "'.api_get_path(WEB_PUBLIC_PATH).'assets/mediaelement/plugins/vrview/vrview.js"},
+                {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"},
                 '.$extraMediaFiles.'
                 '.$translateHtml.'
             ]
-          });';
+        });';
 
         return $frameReady;
     }