Permalink
Browse files

Merge branch 'release/1.13'

* release/1.13:
  Update changelog
  Bump version to v1.13
  Document new feature in readme
  If the asset url starts with a leading /, ignore path settings.
  Move setting of the core namespace to after default_folders are loaded
  Add link to quickref from readme
  Add quickref
  Detail exactly how to contribute in readme
  Add 'Thanks' section to readme
  • Loading branch information...
2 parents b71cbe6 + cf1daf2 commit 14930874ea056de9aaa0541657082d78d537763b @canton7 canton7 committed Feb 9, 2012
Showing with 463 additions and 14 deletions.
  1. +1 −1 bootstrap.php
  2. +6 −0 changelog.md
  3. +9 −9 classes/casset.php
  4. +1 −1 classes/casset/csscompressor.php
  5. +1 −1 classes/casset/cssurirewriter.php
  6. +1 −1 classes/casset/jsmin.php
  7. +1 −1 config/casset.php
  8. +397 −0 quickref.md
  9. +46 −0 readme.md
View
@@ -4,7 +4,7 @@
* Casset: Convenient asset library for FuelPHP.
*
* @package Casset
- * @version v1.12
+ * @version v1.13
* @author Antony Male
* @license MIT License
* @copyright 2011 Antony Male
View
@@ -3,6 +3,12 @@ Changelog
This file lists the important changes between versions. For a list of minor changes, check the log.
+v1.13
+-----
+ - Add quickref.md -- ideal for quickly accessing the API, assuming you know roughly what you're looking for.
+ - Fix bug where the js_dir, etc, config settings made no difference to the core namespace.
+ - Script paths prefixed with a leading slash will ignore the path specified by js_dir, etc.
+
v1.12
-----
- `<link>` and `<script>` tags now respect whether document is HTML5
View
@@ -4,7 +4,7 @@
* Casset: Convenient asset library for FuelPHP.
*
* @package Casset
- * @version v1.12
+ * @version v1.13
* @author Antony Male
* @license MIT License
* @copyright 2011 Antony Male
@@ -134,13 +134,6 @@ public static function _init()
\Config::load('casset', true);
- $paths = \Config::get('casset.paths', static::$asset_paths);
-
- foreach($paths as $key => $path)
- {
- static::add_path($key, $path);
- }
-
static::$asset_url = \Config::get('casset.url', \Config::get('base_url'));
static::$default_folders = array(
@@ -149,6 +142,13 @@ public static function _init()
'img' => \Config::get('casset.img_dir', static::$default_folders['img']),
);
+ $paths = \Config::get('casset.paths', static::$asset_paths);
+
+ foreach($paths as $key => $path)
+ {
+ static::add_path($key, $path);
+ }
+
static::$cache_path = \Config::get('casset.cache_path', static::$cache_path);
static::$default_options['min'] = \Config::get('casset.min', static::$default_options['min']);
@@ -885,7 +885,7 @@ protected static function find_files($file, $asset_type)
$path = static::$asset_paths[$parts[0]]['path'];
$file = $parts[1];
- $folder = static::$asset_paths[$parts[0]]['dirs'][$asset_type];
+ $folder = $file[0] == '/' ? '' : static::$asset_paths[$parts[0]]['dirs'][$asset_type];
$file = ltrim($file, '/');
$remote = (strpos($path, '//') !== false);
@@ -17,7 +17,7 @@
* This library is used as part of Casset.
*
* @package Casset
- * @version v1.12
+ * @version v1.13
* @author Antony Male
* @license MIT License
* @link http://github.com/canton7/fuelphp-casset
@@ -10,7 +10,7 @@
* This library is used as part of Casset.
*
* @package Casset
- * @version v1.12
+ * @version v1.13
* @author Antony Male
* @license MIT License
* @link http://github.com/canton7/fuelphp-casset
View
@@ -52,7 +52,7 @@
/**
* This library is used as part of Casset.
* @package Casset
- * @version v1.12
+ * @version v1.13
* @author Antony Male
* @license MIT License
* @link http://github.com/canton7/fuelphp-casset
View
@@ -3,7 +3,7 @@
* Casset: Convenient asset library for FuelPHP.
*
* @package Casset
- * @version v1.12
+ * @version v1.13
* @author Antony Male
* @license MIT License
* @copyright 2011 Antony Male
Oops, something went wrong.

0 comments on commit 1493087

Please sign in to comment.