Merge branch 'master' of yuisource.corp.yahoo.com:yuicompressor

yui · Oct 20, 2010 · 5847c27 · 5847c27
2 parents 53128bd + a4674b5
commit 5847c27
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 4 deletions.
diff --git a/ports/js/cssmin.js b/ports/js/cssmin.js
@@ -144,8 +144,12 @@ YAHOO.compressor.cssmin = function (css, linebreakpos) {
     css = css.replace(/:0 0 0 0(;|\})/g, ":0$1");
     css = css.replace(/:0 0 0(;|\})/g, ":0$1");
     css = css.replace(/:0 0(;|\})/g, ":0$1");
+
     // Replace background-position:0; with background-position:0 0;
-    css = css.replace(/background-position:0(;|\})/gi, "background-position:0 0$1");
+    // same for transform-origin
+    css = css.replace(/(background-position|transform-origin|webkit-transform-origin|moz-transform-origin|o-transform-origin|ms-transform-origin):0(;|\})/gi, function(all, prop, tail) {
+        return prop.toLowerCase() + ":0 0" + tail;
+    });
 
     // Replace 0.6 to .6, but only when preceded by : or a white-space
     css = css.replace(/(:|\s)0+\.(\d+)/g, "$1.$2");
@@ -183,6 +187,11 @@ YAHOO.compressor.cssmin = function (css, linebreakpos) {
         }
     });
 
+    // border: none -> border:0
+    css = css.replace(/(border|border-top|border-right|border-bottom|border-right|outline|background):none(;|\})/gi, function(all, prop, tail) {
+        return prop.toLowerCase() + ":0" + tail;
+    });
+
     // shorter opacity IE filter
     css = css.replace(/progid:DXImageTransform\.Microsoft\.Alpha\(Opacity=/gi, "alpha(opacity=");
 
@@ -202,7 +211,7 @@ YAHOO.compressor.cssmin = function (css, linebreakpos) {
                 startIndex = i;
             }
         }
-    }
+    }   
 
     // Replace multiple semi-colons in a row by a single one
     // See SF bug #1980989

diff --git a/src/com/yahoo/platform/yui/compressor/CssCompressor.java b/src/com/yahoo/platform/yui/compressor/CssCompressor.java
@@ -181,9 +181,19 @@ public void compress(Writer out, int linebreakpos)
         css = css.replaceAll(":0 0 0 0(;|})", ":0$1");
         css = css.replaceAll(":0 0 0(;|})", ":0$1");
         css = css.replaceAll(":0 0(;|})", ":0$1");
+
+
         // Replace background-position:0; with background-position:0 0;
-        css = css.replaceAll("(?i)background-position:0(;|})", "background-position:0 0$1");
-
+        // same for transform-origin
+        sb = new StringBuffer();
+        p = Pattern.compile("(?i)(background-position|transform-origin|webkit-transform-origin|moz-transform-origin|o-transform-origin|ms-transform-origin):0(;|})");
+        m = p.matcher(css);
+        while (m.find()) {
+            m.appendReplacement(sb, m.group(1).toLowerCase() + ":0 0" + m.group(2));
+        }
+        m.appendTail(sb);
+        css = sb.toString();
+
         // Replace 0.6 to .6, but only when preceded by : or a white-space
         css = css.replaceAll("(:|\\s)0+\\.(\\d+)", "$1.$2");
 
@@ -229,6 +239,16 @@ public void compress(Writer out, int linebreakpos)
         m.appendTail(sb);
         css = sb.toString();
 
+        // border: none -> border:0
+        sb = new StringBuffer();
+        p = Pattern.compile("(?i)(border|border-top|border-right|border-bottom|border-right|outline|background):none(;|})");
+        m = p.matcher(css);
+        while (m.find()) {
+            m.appendReplacement(sb, m.group(1).toLowerCase() + ":0" + m.group(2));
+        }
+        m.appendTail(sb);
+        css = sb.toString();
+
         // shorter opacity IE filter
         css = css.replaceAll("(?i)progid:DXImageTransform.Microsoft.Alpha\\(Opacity=", "alpha(opacity=");
 

diff --git a/tests/border-none.css b/tests/border-none.css
@@ -0,0 +1,5 @@
+a {
+    border: none;
+}
+b {BACKGROUND:none}
+s {border-top: none;}
diff --git a/tests/border-none.css.min b/tests/border-none.css.min
@@ -0,0 +1 @@
+a{border:0}b{background:0}s{border-top:0}
diff --git a/tests/webkit-transform.css b/tests/webkit-transform.css
@@ -0,0 +1,2 @@
+c {-webkit-transform-origin: 0 0;}
+d {-MOZ-TRANSFORM-ORIGIN: 0 0 }
diff --git a/tests/webkit-transform.css.min b/tests/webkit-transform.css.min
@@ -0,0 +1 @@
+c{-webkit-transform-origin:0 0}d{-moz-transform-origin:0 0}