Merge pull request #37 from conclurer/AIOM-3.2.1

AIOM 3.2.1
flipzoom · Feb 11, 2015 · f3754c8 · f3754c8
2 parents e3a2e7d + cc77ebf
commit f3754c8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/AllInOneMinify.module b/AllInOneMinify.module
@@ -68,7 +68,7 @@ class AllInOneMinify extends WireData implements Module, ConfigurableModule {
             // ------------------------------------------------------------------------
             // Version: major, minor, revision, i.e. 100 = 1.1.0
             // ------------------------------------------------------------------------
-            'version' => 320,
+            'version' => 321,
 
             'author' => 'David Karich & Conclurer GbR',
 
@@ -419,7 +419,7 @@ class AllInOneMinify extends WireData implements Module, ConfigurableModule {
 
         // Support passing of $config->scripts as argument which is of type FilenameArray
         if(($javascripts instanceof FilenameArray))
-            $stylesheets = (array) $javascripts->getIterator(); // Convert to array
+            $javascripts = (array) $javascripts->getIterator(); // Convert to array
 
         // ------------------------------------------------------------------------
         // Check if files exist and generating the cache file name based 

diff --git a/README.md b/README.md
@@ -161,6 +161,11 @@ If you are currently in development of the site, caching can be a problem. For t
 
 ##Changelog##
 
+3.2.1
+
+* Bugfix: $config->scripts was not included properly
+* Support for @-webkit-keyframes added
+
 3.2
 
 * New CSS Compressor: AIOM now uses YUI Compressor (thanks to hwmaier)

diff --git a/lib/Less/Less.php b/lib/Less/Less.php
@@ -2040,6 +2040,7 @@ private function parseDirective(){
                 $hasBlock = false;
                 break;
             case "@keyframes":
+            case "@-webkit-keyframes":
                 $hasIdentifier = true;
                 break;
             case "@host":