Author: rande
Date: 2010-05-18 22:21:10 +0200 (Tue, 18 May 2010)
New Revision: 29510
Modified:
plugins/swCombinePlugin/trunk/lib/config/swCombineViewConfigHandler.class.php
plugins/swCombinePlugin/trunk/lib/task/swOptimizeCreateFilesTask.class.php
Log:
[swCombinePlugin] fix bugs ...
Modified:
plugins/swCombinePlugin/trunk/lib/config/swCombineViewConfigHandler.class.php
===================================================================
---
plugins/swCombinePlugin/trunk/lib/config/swCombineViewConfigHandler.class.php
2010-05-18 18:52:55 UTC (rev 29509)
+++
plugins/swCombinePlugin/trunk/lib/config/swCombineViewConfigHandler.class.php
2010-05-18 20:21:10 UTC (rev 29510)
@@ -41,11 +41,11 @@
$javascripts = $this->mergeConfigValue('javascripts', $viewName);
// clean stylesheet list (-*)
- $stylesheets = $this->addAssets('javascripts', $stylesheets, false);
+ $javascripts = $this->addAssets('javascripts', $javascripts, false);
// combine
$javascripts = $this->combineValues('javascript', $javascripts, $viewName);
-
+
$js = $this->addAssets('Javascript', $javascripts);
return implode("\n", array_merge($css, $js))."\n";
@@ -206,9 +206,10 @@
$assets = array_unique($assets);
sort($assets);
+
// compute the name
$name = md5(serialize($assets));
-
+
return sprintf($format, $name);
}
Modified:
plugins/swCombinePlugin/trunk/lib/task/swOptimizeCreateFilesTask.class.php
===================================================================
--- plugins/swCombinePlugin/trunk/lib/task/swOptimizeCreateFilesTask.class.php
2010-05-18 18:52:55 UTC (rev 29509)
+++ plugins/swCombinePlugin/trunk/lib/task/swOptimizeCreateFilesTask.class.php
2010-05-18 20:21:10 UTC (rev 29510)
@@ -71,7 +71,6 @@
->maxdepth(0)
->in($this->view_parameters->get('private_path'));
-
if(count($files) > 0 && ($confirmation ||
$this->askConfirmation(array_merge($files, array('--','Are you sure you want to
delete these files? (y/N)')), null, false)))
{
$this->logSection('combine', 'remove old files');
@@ -186,6 +185,7 @@
$combined = array();
foreach($assets as $asset)
{
+
if($use_ignore && $this->view_handler->excludeFile($type, $asset[1]))
{
// $this->logSection('combine', ' - exclude : '.$asset[1]);
@@ -193,7 +193,7 @@
continue;
}
- if(!$this->view_handler->isCombinable($type, $value))
+ if(!$this->view_handler->isCombinable($type, $asset[1]))
{
continue;
}
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
