From 525c92670a40ed90c35d563549332d99cc11bce8 Mon Sep 17 00:00:00 2001 From: Sam Wilson Date: Thu, 30 May 2013 13:39:46 +0800 Subject: [PATCH 1/2] Permit correct merging of config files. --- config/asset-merger.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/asset-merger.php b/config/asset-merger.php index 87b1fee..0cf9558 100644 --- a/config/asset-merger.php +++ b/config/asset-merger.php @@ -4,11 +4,11 @@ 'merge' => array(Kohana::PRODUCTION, Kohana::STAGING), 'folder' => 'assets', 'load_paths' => array( - Assets::JAVASCRIPT => DOCROOT.'js'.DIRECTORY_SEPARATOR, - Assets::STYLESHEET => DOCROOT.'css'.DIRECTORY_SEPARATOR, + Assets::JAVASCRIPT => array( DOCROOT.'js'.DIRECTORY_SEPARATOR ), + Assets::STYLESHEET => array( DOCROOT.'css'.DIRECTORY_SEPARATOR ), ), 'processor' => array( Assets::STYLESHEET => 'cssmin', ), 'docroot' => DOCROOT -); \ No newline at end of file +); From 1cceeed65601c30b93afe70a0d0abd39590738d5 Mon Sep 17 00:00:00 2001 From: Sam Wilson Date: Thu, 30 May 2013 13:43:42 +0800 Subject: [PATCH 2/2] Update README to match modified config file. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b5ed91f..62ee957 100644 --- a/README.md +++ b/README.md @@ -112,8 +112,8 @@ config/asset-merger.php configuration file has a bunch of settings. Typical conf 'merge' => Kohana::PRODUCTION, 'folder' => "assets", "load_paths" => array( - Assets::JAVASCRIPT => DOCROOT.'js'.DIRECTORY_SEPARATOR, - Assets::STYLESHEET => DOCROOT.'css'.DIRECTORY_SEPARATOR, + Assets::JAVASCRIPT => array( DOCROOT.'js'.DIRECTORY_SEPARATOR ), + Assets::STYLESHEET => array( DOCROOT.'css'.DIRECTORY_SEPARATOR ), ), 'processor' => array( Assets::STYLESHEET => 'cssmin' @@ -127,7 +127,7 @@ __folder__: The URL to the folder that will contain the assets. Will be automatically generated if it's not present in the file system. Must be inside DOCROOT. __load_paths__: -Where to search for files. The CSS and JS files have different directories. Each can be an array of directories. +Where to search for files. The CSS and JS files have different directories. Each is an array of directories. __processor__: The default processor to be used on each type. This can be overridden for any individual file.