joshtronic/pickles
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity Actions

Turned off modified time checks for CSS files

Browse source 
There's a note in the code as to why
This commit is contained in:
Josh Sherman 2013-01-13 00:11:44 -05:00
parent 80e6e35191
commit 640727c554
2 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
classes/Dynamic.php
View file

@ -141,9 +141,18 @@ class Dynamic extends Object
{ {
$reference = $original_reference; $reference = $original_reference;
if (is_writable($path) /**
&& (!file_exists($minified_filename) || filemtime($original_filename) > filemtime($minified_filename)) * Disabled the sanity checks because I'm using LESS's @import for
&& $this->config->pickles['minify'] === true) * some hackery and it's not validating as true due to the imported
* file not being interrogated. Should be okay as minifying is now
* a subjective action that's turned on in the config due to the
* issues I had in production with it.
*
* if (is_writable($path)
* && (!file_exists($minified_filename) || filemtime($original_filename) > filemtime($minified_filename))
* && $this->config->pickles['minify'] === true)
*/
if ($this->config->pickles['minify'] === true)
{ {
// Compiles LESS to CSS before minifying // Compiles LESS to CSS before minifying
if ($less) if ($less)

19
jar.php
View file

@ -3149,9 +3149,18 @@ class Dynamic extends Object
{ {
$reference = $original_reference; $reference = $original_reference;
if (is_writable($path) /**
&& (!file_exists($minified_filename) || filemtime($original_filename) > filemtime($minified_filename)) * Disabled the sanity checks because I'm using LESS's @import for
&& $this->config->pickles['minify'] === true) * some hackery and it's not validating as true due to the imported
* file not being interrogated. Should be okay as minifying is now
* a subjective action that's turned on in the config due to the
* issues I had in production with it.
*
* if (is_writable($path)
* && (!file_exists($minified_filename) || filemtime($original_filename) > filemtime($minified_filename))
* && $this->config->pickles['minify'] === true)
*/
if ($this->config->pickles['minify'] === true)
{ {
// Compiles LESS to CSS before minifying // Compiles LESS to CSS before minifying
if ($less) if ($less)
@ -3240,10 +3249,6 @@ class Dynamic extends Object
&& extension_loaded('curl') && extension_loaded('curl')
&& $this->config->pickles['minify'] === true) && $this->config->pickles['minify'] === true)
{ {
echo '-------- ';
echo('java -jar ' . PICKLES_PATH . 'vendors/google/closure-compiler/compiler.jar --js=' . $original_filename . ' --compilation_level=' . ($level . '_' . ($level == 'WHITESPACE' ? 'ONLY' : 'OPTIMIZATIONS')) . ' --js_output_file=' . $minified_filename);
echo ' -------- ';
exec('java -jar ' . PICKLES_PATH . 'vendors/google/closure-compiler/compiler.jar --js=' . $original_filename . ' --compilation_level=' . ($level . '_' . ($level == 'WHITESPACE' ? 'ONLY' : 'OPTIMIZATIONS')) . ' --js_output_file=' . $minified_filename); exec('java -jar ' . PICKLES_PATH . 'vendors/google/closure-compiler/compiler.jar --js=' . $original_filename . ' --compilation_level=' . ($level . '_' . ($level == 'WHITESPACE' ? 'ONLY' : 'OPTIMIZATIONS')) . ' --js_output_file=' . $minified_filename);
$reference = $minified_reference; $reference = $minified_reference;