Changeset 8170 for trunk/include/template.class.php

Timestamp:

Dec 17, 2010, 7:33:16 AM (13 years ago)

Author:

rvelices

Message:

combined css and js are minified

File:

• trunk/include/template.class.php (modified) (8 diffs)

trunk/include/template.class.php

@@ -399 +399 @@
               $content[]=
                   '<script type="text/javascript" src="'
-                  . Template::make_script_src($script)
+                  . self::make_script_src($script)
                   .'"></script>';
           }
@@ -996 +996 @@
   }
 
-        private static function do_combine($scripts, $load_mode)
-        {
-                global $conf;
-                if (count($scripts)<2 or !$conf['template_combine_files'])
-                        return $scripts;
-                $combiner = new FileCombiner('js');
-                foreach ($scripts as $script)
-                {
-                        if ($script->is_remote()) fatal_error("NOT IMPLEMENTED");// TODO - we cannot combine remote scripts
-                        $combiner->add( $script->path, $script->version );
-                }
-                if ( $combiner->combine( $out_file, $out_version) )
-                {
-                        return array( 'combi' => new Script($load_mode, 'combi', $out_file, $out_version, array() ) );
-                }
-                return null;
-        }
-        
-        // checks that if B depends on A, then B->load_mode >= A->load_mode in order to respect execution order
+  private static function do_combine($scripts, $load_mode)
+  {
+    global $conf;
+    if (count($scripts)<2 or !$conf['template_combine_files'])
+      return $scripts;
+    $combiner = new FileCombiner('js');
+    foreach ($scripts as $script)
+    {
+      if ($script->is_remote()) fatal_error("NOT IMPLEMENTED");// TODO - we cannot combine remote scripts
+      $combiner->add( $script->path, $script->version );
+    }
+    if ( $combiner->combine( $out_file, $out_version) )
+    {
+      return array( 'combi' => new Script($load_mode, 'combi', $out_file, $out_version, array() ) );
+    }
+    return null;
+  }
+  
+  // checks that if B depends on A, then B->load_mode >= A->load_mode in order to respect execution order
   private static function check_load_dep($scripts)
   {
-                global $conf;
+    global $conf;
     do
     {
@@ -1062 +1062 @@
   }
 
-  private function compute_script_topological_order($script_id)
+  private function compute_script_topological_order($script_id, $recursion_limiter=0)
   {
     if (!isset($this->registered_scripts[$script_id]))
@@ -1069 +1069 @@
       return 0;
     }
+    $recursion_limiter<5 or fatal_error("combined script circular dependency");
     $script = & $this->registered_scripts[$script_id];
     if (isset($script->extra['order']))
@@ -1076 +1077 @@
     $max = 0;
     foreach( $script->precedents as $precedent)
-      $max = max($max, $this->compute_script_topological_order($precedent) );
+      $max = max($max, $this->compute_script_topological_order($precedent, $recursion_limiter+1) );
     $max++;
     return ($script->extra['order'] = $max);
@@ -1209 +1210 @@
     if (strpos($file, '.min')===false and strpos($file, '.packed')===false )
     {
-      //TODO minify javascript with some php lib from www...
+      require_once(PHPWG_ROOT_PATH.'include/jsmin.class.php');
+      try { $js = JSMin::minify($js); } catch(Exception $e) {}
     }
     return $js;
@@ -1215 +1217 @@
   
   private static function process_css($file)
+  {
+    $css = self::process_css_rec($file);
+    require_once(PHPWG_ROOT_PATH.'include/cssmin.class.php');
+    $css = CssMin::minify($css, array('emulate-css3-variables'=>false));
+    return $css;
+  }
+  
+  private static function process_css_rec($file)
   {
     static $PATTERN = "#url\(\s*['|\"]{0,1}(.*?)['|\"]{0,1}\s*\)#";
@@ -1240 +1250 @@
       {
         $search[] = $match[0];
-        $replace[] = self::process_css(dirname($file) . "/$match[1]");
+        $replace[] = self::process_css_rec(dirname($file) . "/$match[1]");
       }
       $css = str_replace($search, $replace, $css);