Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue81 fix hsl compression #338

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
deprecation="off"
debug="on"
includeantruntime="false"
target="1.5"
source="1.5">
target="9"
source="9">
<classpath>
<pathelement location="${lib.dir}/jargs-1.0.jar"/>
<pathelement location="${lib.dir}/rhino-1.7R2.jar"/>
Expand Down
6 changes: 3 additions & 3 deletions src/com/yahoo/platform/yui/compressor/CssCompressor.java
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,6 @@ public void compress(Writer out, int linebreakpos)
} while (!(css.equals(oldCss)));

// We do the same with % but don't replace the 0% in keyframes
String oldCss;
p = Pattern.compile("(?i)(: ?)((?:[0-9a-z-.]+ )*?)?(?:0?\\.)?0(?:%)");
do {
oldCss = css;
Expand All @@ -347,15 +346,16 @@ public void compress(Writer out, int linebreakpos)
} while (!(css.equals(oldCss)));

//Replace the keyframe 100% step with 'to' which is shorter
p = Pattern.compile("(?i)(^|,|{) ?(?:100% ?{)");
p = Pattern.compile("(?i)(^|,|\\{) ?(?:100% ?\\{)");
do {
oldCss = css;
m = p.matcher(css);
css = m.replaceAll("$1to{");
} while (!(css.equals(oldCss)));

// Replace 0(px,em,%) with 0 inside groups (e.g. -MOZ-RADIAL-GRADIENT(CENTER 45DEG, CIRCLE CLOSEST-SIDE, ORANGE 0%, RED 100%))
p = Pattern.compile("(?i)\\( ?((?:[0-9a-z-.]+[ ,])*)?(?:0?\\.)?0(?:px|em|%|in|cm|mm|pc|pt|ex|deg|g?rad|m?s|k?hz)");
// Avoid replacement within hsla(), where percents are required for `s` and `l` arguments.
p = Pattern.compile("(?i)(?<!hsla?|rgba?)\\( ?((?:[0-9a-z-.]+[ ,])*)?(?:0?\\.)?0(?:px|em|%|in|cm|mm|pc|pt|ex|deg|g?rad|m?s|k?hz)");
do {
oldCss = css;
m = p.matcher(css);
Expand Down
2 changes: 1 addition & 1 deletion tests/hsla-issue81.css.min
Original file line number Diff line number Diff line change
@@ -1 +1 @@
.color_chip{color:hsl(27,0%,50%);background:rgba(195,198,214,0.85)}
.color_chip{color:hsla(27,0%,50%,1);background:rgba(195,198,214,0.85)}
2 changes: 1 addition & 1 deletion tests/rgb-issue81.css.FAIL
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.color_chip {
color: color: rgb(0%, 50%, 50%);
color: rgb(0%, 50%, 50%);
background: rgba(195, 198, 214, 0.85);
}
2 changes: 1 addition & 1 deletion tests/rgb-issue81.css.min
Original file line number Diff line number Diff line change
@@ -1 +1 @@
.color_chip{color: rgb(0%, 50%, 50%);background:rgba(195,198,214,0.85)}
.color_chip{color:rgb(0%,50%,50%);background:rgba(195,198,214,0.85)}