mirror/minify
1
0
Fork 0
mirror of https://github.com/mrclay/minify.git synced 2025-08-18 03:41:35 +02:00
Code Issues Releases Wiki Activity

Rewrite relative URIs in CSS by default (adjusted test accordingly)

Browse Source 
Minify.php: + 'rewriteCssUris' option
Controller/Base.php: + 'rewriteCssUris' default value
Controller/Version1.php: moved rewriting to serve()
Minify/CSS.php: renamed option 'currentPath' to 'currentDir'
Minify/Source.php: made $filepath public
This commit is contained in:
Steve Clay
2008-08-18 23:38:39 +00:00
parent 711fbeb365
commit 03e1989d35
7 changed files with 58 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Minify/CSS.php
View File

@@ -33,8 +33,8 @@ class Minify_CSS {
* 'prependRelativePath': (default null) if given, this string will be
* prepended to all relative URIs in import/url declarations
*
* 'currentPath': (default null) if given, this is assumed to be the
* file path of the current CSS file. Using this, minify will rewrite
* 'currentDir': (default null) if given, this is assumed to be the
* directory of the current CSS file. Using this, minify will rewrite
* all relative URIs in import/url declarations to correctly point to
* the desired files. For this to work, the files *must* exist and be
* visible by the PHP process.
@@ -185,8 +185,8 @@ class Minify_CSS {
if (isset($options['prependRelativePath'])) {
self::$_tempPrepend = $options['prependRelativePath'];
$rewrite = true;
} elseif (isset($options['currentPath'])) {
self::$_tempCurrentPath = $options['currentPath'];
} elseif (isset($options['currentDir'])) {
self::$_tempCurrentDir = $options['currentDir'];
$rewrite = true;
}
if ($rewrite) {
@@ -195,7 +195,7 @@ class Minify_CSS {
$css = preg_replace_callback('/url\\(([^\\)]+)\\)/'
,array('Minify_CSS', '_urlCB'), $css);
}
self::$_tempPrepend = self::$_tempCurrentPath = '';
self::$_tempPrepend = self::$_tempCurrentDir = '';
return trim($css);
}
@@ -225,9 +225,9 @@ class Minify_CSS {
protected static $_tempPrepend = '';
/**
* @var string path of this stylesheet for rewriting purposes
* @var string directory of this stylesheet for rewriting purposes
*/
protected static $_tempCurrentPath = '';
protected static $_tempCurrentDir = '';
/**
* Process a comment and return a replacement
@@ -302,7 +302,7 @@ class Minify_CSS {
} else {
// rewrite absolute url from scratch!
// prepend path with current dir separator (OS-independent)
$path = self::$_tempCurrentPath
$path = self::$_tempCurrentDir
. DIRECTORY_SEPARATOR . strtr($url, '/', DIRECTORY_SEPARATOR);
// strip doc root
$path = substr($path, strlen($_SERVER['DOCUMENT_ROOT']));