From c55c166d5d06217d5f3a62292b91c2e00bb1e919 Mon Sep 17 00:00:00 2001 From: Steve Clay Date: Wed, 24 Sep 2008 19:08:57 +0000 Subject: [PATCH] Minify/HTML.php : + 'xhtml' option builder : fixed Issue 52 --- min/builder/_index.js | 2 +- min/builder/index.php | 4 ++-- min/lib/Minify/HTML.php | 17 ++++++++++++++++- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/min/builder/_index.js b/min/builder/_index.js index db7ba35..8e5313a 100644 --- a/min/builder/_index.js +++ b/min/builder/_index.js @@ -11,7 +11,7 @@ var MUB = { ,success : function (data) { if (data === '1') { MUB._minRoot = '/min/'; - $('#minRoot').html('/min/'); + $('span.minRoot').html('/min/'); } else fail(); } diff --git a/min/builder/index.php b/min/builder/index.php index f67b4a7..d67515f 100644 --- a/min/builder/index.php +++ b/min/builder/index.php @@ -70,7 +70,7 @@ with cache headers.

How to serve these files as a group

For the best performance you can serve these files as a pre-defined group with a URI -like: /min/?g=keyName

+like: /min/?g=keyName

To do this, add a line like this to /min/groupsConfig.php:

return array(
@@ -96,7 +96,7 @@ remove them. Therefore, you will want to remove those that point to files alread
 in your list, and move any others to the top of the first file in your list 
 (imports below any styles will be ignored by browsers as invalid).

 
If you desire, you can use Minify URIs in imports and they will not be touched
-by Minify. E.g. @import "/min/?g=css2";

+by Minify. E.g. @import "/min/?g=css2";

 
 
 
diff --git a/min/lib/Minify/HTML.php b/min/lib/Minify/HTML.php
index 2581eb4..674764d 100644
--- a/min/lib/Minify/HTML.php
+++ b/min/lib/Minify/HTML.php
@@ -22,7 +22,18 @@ class Minify_HTML {
      * "Minify" an HTML page
      *
      * @param string $html
+     *
      * @param array $options
+     *
+     * 'cssMinifier' : (optional) callback function to process content of STYLE
+     * elements.
+     * 
+     * 'jsMinifier' : (optional) callback function to process content of SCRIPT
+     * elements. Note: the type attribute is ignored.
+     * 
+     * 'xhtml' : (optional boolean) should content be treated as XHTML1.0? If
+     * unset, minify will sniff for an XHTML doctype.
+     * 
      * @return string
      */
     public static function minify($html, $options = array()) {
@@ -36,7 +47,11 @@ class Minify_HTML {
         
         $html = str_replace("\r\n", "\n", trim($html));
         
-        self::$_isXhtml = (false !== strpos($html, '