Changeset 1765

Timestamp:

01/21/2008 06:18:56 AM (10 months ago)

Author:

Geert

Message:

Follow-up to r1763:

• Took a more solid approach on the whitespace stripping
  
• Now also stripping empty CSS declarations like h1 { /*nothing*/ }
  

Files:

• trunk/modules/media/controllers/media.php (modified) (3 diffs)

trunk/modules/media/controllers/media.php

@@ -170 +170 @@
                 echo $data;
         }
-        
+
         public function _default()
         {
@@ -179 +179 @@
         }
 
-        // Based on http://www.ibloomstudios.com/articles/php_css_compressor/   
+        // Based on http://www.ibloomstudios.com/articles/php_css_compressor/
         public function _css_compress($data)
         {
@@ -186 +186 @@
                 
                 // Remove tabs, spaces, newlines, etc.
+                $data = preg_replace('/\s+/s', ' ', $data);
                 $data = str_replace
                 (
-                        array("\r\n", "\r", "\n", "\t", '  ', ' {', '{ ', ' }', '} ', ' +', '+ ', ' >', '> ', ' :', ': ', ' ;', '; ', ' ,', ', ', ';}'),
-                        array(' ',    ' ',  ' ',  ' ',  ' ',  '{',  '{',  '}',  '}',  '+',  '+',  '>',  '>',  ':',  ':',  ';',  ';',  ',',  ',',  '}' ),
+                        array(' {', '{ ', ' }', '} ', ' +', '+ ', ' >', '> ', ' :', ': ', ' ;', '; ', ' ,', ', ', ';}'),
+                        array('{',  '{',  '}',  '}',  '+',  '+',  '>',  '>',  ':',  ':',  ';',  ';',  ',',  ',',  '}' ),
                         $data
                 );
-                
+
+                // Remove empty CSS declarations
+                $data = preg_replace('/[^{}]++\{\}/', '', $data);
+
                 return $data;
         }