浏览代码

Prevents scss files leaking out into the web content folder when an

exception is thrown during linking (#10594)

Change-Id: I6c29b5c08722f5a90095d76c93be3ec949c15c9d
tags/7.0.0.rc1
michael 11 年前
父节点
当前提交
0b2e1caca9
共有 1 个文件被更改,包括 4 次插入5 次删除
  1. 4
    5
      client-compiler/src/com/vaadin/sass/linker/SassLinker.java

+ 4
- 5
client-compiler/src/com/vaadin/sass/linker/SassLinker.java 查看文件

@@ -65,6 +65,10 @@ public class SassLinker extends AbstractLinker {
// Create the temporary files.
String partialPath = resource.getPartialPath();
if (partialPath.endsWith(".scss")) {
// In my opinion, the SCSS file does not need to be
// output to the web content folder, as they can't
// be used there
toReturn.remove(resource);

String fileName = partialPath;
File path = tempFolder;
@@ -89,11 +93,6 @@ public class SassLinker extends AbstractLinker {

// Store the file info for the compilation
scssFiles.add(new FileInfo(tempfile, partialPath));

// In my opinion, the SCSS file does not need to be
// output to the web content folder, as they can't
// be used there
toReturn.remove(resource);
} else {
logger.log(TreeLogger.WARN, "Duplicate file "
+ tempfile.getPath());

正在加载...
取消
保存