浏览代码

Fixing js assignation when render a template.

Julio Montoya 11 年之前
父节点
当前提交
3691b12313
共有 2 个文件被更改,包括 10 次插入6 次删除
  1. 5 1
      main/inc/lib/template.lib.php
  2. 5 5
      src/ChamiloLMS/Controller/IndexController.php

+ 5 - 1
main/inc/lib/template.lib.php

@@ -434,7 +434,7 @@ class Template
         }
     }
 
-    public function addJsFiles($htmlHeadXtra)
+    public function addJsFiles($htmlHeadXtra = array())
     {
         $extra_headers = null;
         if (isset($htmlHeadXtra) && $htmlHeadXtra) {
@@ -883,6 +883,8 @@ class Template
         return $this->menu_navigation;
     }
 
+    // Render Chamilo layouts:
+
     /**
      * @param string $layout
      * @return mixed
@@ -892,6 +894,7 @@ class Template
         if (empty($layout)) {
             $layout = $this->app['default_layout'];
         }
+        $this->addJsFiles();
         return $this->app['twig']->render($this->app['template_style'].'/layout/'.$layout);
     }
 
@@ -902,6 +905,7 @@ class Template
      */
     public function render_template($template, $elements = array())
     {
+        $this->addJsFiles();
         return $this->app['twig']->render($this->app['template_style'].'/'.$template, $elements);
     }
 

+ 5 - 5
src/ChamiloLMS/Controller/IndexController.php

@@ -27,7 +27,6 @@ class IndexController extends CommonController
     {
         /** @var \Template $template */
         $template = $app['template'];
-        $extraJS = array();
 
         /*
         $token = $app['security']->getToken();
@@ -76,8 +75,9 @@ class IndexController extends CommonController
         echo $formatter->format(time());*/
 
         //@todo improve this JS includes should be added using twig
-        $extraJS[] = api_get_jquery_libraries_js(array('bxslider'));
-        $extraJS[] = '<script>
+        $app['extraJS'] = array(
+            api_get_jquery_libraries_js(array('bxslider')),
+            '<script>
             $(document).ready(function(){
                 $("#slider").bxSlider({
                     infiniteLoop	: true,
@@ -87,10 +87,10 @@ class IndexController extends CommonController
                 pause			: 10000
                 });
             });
-        </script>';
+            </script>'
+        );
 
         $app['this_section'] = SECTION_CAMPUS;
-        $app['extraJS'] = $extraJS;
         $request = $app['request'];
 
         /*