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

Timestamp:

Nov 18, 2013, 6:01:11 AM (11 years ago)

Author:

rvelices

Message:

bug 2963: Ability to create css/js smarty templates - fixes rare cases + code simplifications

File:

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

trunk/include/template.class.php

@@ -1047 +1047 @@
   {
     uasort($this->registered_css, array('CssLoader', 'cmp_by_order'));
-    return self::do_combine($this->registered_css);
+    $combiner = new FileCombiner('css', $this->registered_css);
+    return $combiner->combine();
   }
   
@@ -1053 +1054 @@
   {
     return $a->order - $b->order;
-  }
-  
-  private static function do_combine($files)
-  {
-    $combiner = new FileCombiner('css');
-    foreach ($files as $css)
-    {
-      $combiner->add( $css);
-    }
-    return $combiner->combine();
   }
   
@@ -1253 +1244 @@
   private static function do_combine($scripts, $load_mode)
   {
-    $combiner = new FileCombiner('js');
-    foreach ($scripts as $script)
-    {
-      $combiner->add( $script);
-    }
+    $combiner = new FileCombiner('js', $scripts);
     return $combiner->combine();
   }
@@ -1378 +1365 @@
   private $type; // js or css
   private $is_css;
-  private $combinables = array();
-
-  function FileCombiner($type)
+  private $combinables;
+
+  function FileCombiner($type, $combinables)
   {
     $this->type = $type;
     $this->is_css = $type=='css';
+    $this->combinables = $combinables;
   }
 
@@ -1397 +1385 @@
   }
 
-  function add($combinable)
-  {
-    $this->combinables[] = $combinable;
+  function add($combinables)
+  {
+    foreach($combinables as $combinable)
+      $this->combinables[] = $combinable;
   }
 
@@ -1414 +1403 @@
     $result = array();
     $pending = array();
-    $key = $this->is_css ? array(get_absolute_root_url(false)): array(); //because for css we modify bg url
+    $ini_key = $this->is_css ? array(get_absolute_root_url(false)): array(); //because for css we modify bg url;
+    $key = $ini_key;
 
     foreach ($this->combinables as $combinable)
     {
-      if ($conf['template_combine_files'] && !$combinable->is_remote())
-      {
-        $key[] = $combinable->path;
-        $key[] = $combinable->version;
-        if ($conf['template_compile_check'])
-          $key[] = filemtime( PHPWG_ROOT_PATH . $combinable->path );
-        $pending[] = $combinable;
-      }
-      else
+      if ($combinable->is_remote())
       {
         $this->flush_pending($result, $pending, $key, $force);
-        $key = $this->is_css ? array(get_absolute_root_url(false)): array(); //because for css we modify bg url
-        if ($combinable->is_remote())
-          $result[] = $combinable;
-        else
-          $pending = array($combinable);
-      }
+        $key = $ini_key;
+        $result[] = $combinable;
+        continue;
+      }
+      elseif (!$conf['template_combine_files'])
+      {
+        $this->flush_pending($result, $pending, $key, $force);
+        $key = $ini_key;
+      }
+
+      $key[] = $combinable->path;
+      $key[] = $combinable->version;
+      if ($conf['template_compile_check'])
+        $key[] = filemtime( PHPWG_ROOT_PATH . $combinable->path );
+      $pending[] = $combinable;
     }
     $this->flush_pending($result, $pending, $key, $force);