mirror/minify
1
0
Fork 0
mirror of https://github.com/mrclay/minify.git synced 2025-08-08 07:06:49 +02:00
Code Issues Releases Wiki Activity

Browse Source
This commit is contained in:
Ryan Grove
2007-06-02 19:24:27 +00:00
parent bef122d309
commit ee20c7a291
1 changed files with 0 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
minify.php
View File

@@ -139,24 +139,8 @@ class Minify {
* @return string minified string * @return string minified string
*/ */
public static function minify($string, $type = self::TYPE_JS) { public static function minify($string, $type = self::TYPE_JS) {
<<<<<<< .working
switch($type) {
case self::TYPE_CSS:
return self::minifyCSS($string);
case self::TYPE_HTML:
return self::minifyHTML($string);
case self::TYPE_JS:
return self::minifyJS($string);
default:
throw new MinifyInvalidArgumentException('Invalid content type.');
}
=======
return $type === self::TYPE_JS ? self::minifyJS($string) : return $type === self::TYPE_JS ? self::minifyJS($string) :
self::minifyCSS($string); self::minifyCSS($string);
>>>>>>> .merge-right.r41
} }
// -- Protected Static Methods ----------------------------------------------- // -- Protected Static Methods -----------------------------------------------
@@ -178,20 +162,6 @@ class Minify {
return trim($css); return trim($css);
} }
<<<<<<< .working
/**
* Minifies the specified HTML string and returns it.
*
* @param string $html HTML string
* @return string minified string
*/
protected static function minifyHTML($html) {
require_once dirname(__FILE__).'/lib/htmlmin.php';
return HTMLMin::minify($html);
}
=======
>>>>>>> .merge-right.r41
/** /**
* Minifies the specified JavaScript string and returns it. * Minifies the specified JavaScript string and returns it.