[Jifty-commit] r4429 - in jifty/trunk: lib/Jifty/Plugin

[jifty-commit at lists.jifty.org]

Author: sunnavy
Date: Tue Nov 13 14:28:29 2007
New Revision: 4429

Modified:
   jifty/trunk/Makefile.PL
   jifty/trunk/lib/Jifty/Plugin/CompressedCSSandJS.pm

Log:
require CSS::Squish 0.07, no need to call _resolve_file any more

Modified: jifty/trunk/Makefile.PL
==============================================================================
--- jifty/trunk/Makefile.PL	(original)
+++ jifty/trunk/Makefile.PL	Tue Nov 13 14:28:29 2007
@@ -15,7 +15,7 @@
 requires('Crypt::CBC');
 requires('Crypt::Rijndael');
 requires('Compress::Zlib');
-requires('CSS::Squish' => 0.05 );
+requires('CSS::Squish' => 0.07 );
 requires('DBD::SQLite' => 1.11 );
 requires('Data::Page');
 requires('Data::UUID');

Modified: jifty/trunk/lib/Jifty/Plugin/CompressedCSSandJS.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/CompressedCSSandJS.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/CompressedCSSandJS.pm	Tue Nov 13 14:28:29 2007
@@ -157,10 +157,7 @@
     
         CSS::Squish->roots( @roots );
         
-        my $css = CSS::Squish->concatenate(
-            map { CSS::Squish->_resolve_file( $_, @roots ) }
-                @{ Jifty->web->css_files }
-        );
+        my $css = CSS::Squish->concatenate( @{ Jifty->web->css_files } );
 
         $self->cached_css( $css );
         $self->cached_css_digest( md5_hex( $css ) );