Fixing #225 , this time for real

SomMeri · Aug 3, 2014 · 1685bbb · 1685bbb
1 parent dd3a74e
commit 1685bbb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/main/java/com/github/sommeri/less4j/core/compiler/expressions/MiscFunctions.java b/src/main/java/com/github/sommeri/less4j/core/compiler/expressions/MiscFunctions.java
@@ -272,8 +272,6 @@ protected Expression evaluate(List<Expression> splitParameters, ProblemsHandler
  if (splitParameters.size() == 1) {
  CssString filenameArg = (CssString) splitParameters.get(0);
  filename = filenameArg.getValue();
-
- mimetype = guessMimetype(filename);
  } else {
  CssString mimetypeArg = (CssString) splitParameters.get(0);
  mimetype = mimetypeArg.getValue();
@@ -284,7 +282,10 @@ protected Expression evaluate(List<Expression> splitParameters, ProblemsHandler
 
  String[] filenameParts = filename.split("#", 2);
  filename = filenameParts[0];
- String fragments = filenameParts.length > 1 ? filenameParts[1] : "";
+ String fragments = filenameParts.length > 1 ? "#" + filenameParts[1] : "";
+
+ if (mimetype==null)
+ mimetype = guessMimetype(filename);
 
  LessSource source = token.getSource();
  try {

diff --git a/src/test/resources/compile-basic-features/functions/functions-data-uri.css b/src/test/resources/compile-basic-features/functions/functions-data-uri.css
@@ -4,11 +4,11 @@
 }
 #data-uri {
  uri: url("data:image/jpeg;base64,bm90IGFjdHVhbGx5IGEganBlZyBmaWxl");
- uri: url("data:image/jpeg;base64,bm90IGFjdHVhbGx5IGEganBlZyBmaWxl#fragment");
+ uri-fragment: url("data:image/jpeg;base64,bm90IGFjdHVhbGx5IGEganBlZyBmaWxl#fragment");
 }
 #data-uri-guess {
  uri: url("data:image/jpeg;base64,bm90IGFjdHVhbGx5IGEganBlZyBmaWxl");
- uri: url("data:image/jpeg;base64,bm90IGFjdHVhbGx5IGEganBlZyBmaWxl#fragment");
+ uri-fragment: url("data:image/jpeg;base64,bm90IGFjdHVhbGx5IGEganBlZyBmaWxl#fragment");
 }
 #data-uri-ascii {
  uri-1: url("data:text/html,%3Ch1%3EThis%20page%20is%20100%25%20Awesome.%3C%2Fh1%3E");

diff --git a/src/test/resources/compile-basic-features/functions/functions-data-uri.err b/src/test/resources/compile-basic-features/functions/functions-data-uri.err
@@ -1,2 +1,2 @@
 Warnings produced by compilation of testCase
-WARNING 20:8 Skipped data-uri embedding of ../data/data-uri-fail.png because its size (51dKB) exceeds IE8-safe 32dKB!
+WARNING 22:8 Skipped data-uri embedding of ../data/data-uri-fail.png because its size (51dKB) exceeds IE8-safe 32dKB!