You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2014/12/23 08:40:49 UTC
[3/7] git commit: [flex-falcon] [refs/heads/develop] - fix css output
fix css output
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/7580fd52
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/7580fd52
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/7580fd52
Branch: refs/heads/develop
Commit: 7580fd52f00b01bacdf57b6dbfcae0cfcfd10243
Parents: 64ca5f6
Author: Alex Harui <ah...@apache.org>
Authored: Sun Dec 21 07:29:43 2014 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Sun Dec 21 07:29:43 2014 -0800
----------------------------------------------------------------------
.../org/apache/flex/compiler/internal/targets/FlexJSTarget.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/7580fd52/compiler.jx/src/org/apache/flex/compiler/internal/targets/FlexJSTarget.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/targets/FlexJSTarget.java b/compiler.jx/src/org/apache/flex/compiler/internal/targets/FlexJSTarget.java
index 83c118b..dd3fe6f 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/targets/FlexJSTarget.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/targets/FlexJSTarget.java
@@ -220,7 +220,8 @@ public class FlexJSTarget extends JSTarget implements IJSTarget
done = !allCompilationUnitsInTarget.addAll(cssDependencies);
}
- cssCompilationSession.cssDocuments.addAll(activatedStyleSheets.sort());
+ // add to front so user specified css overrides defaults
+ cssCompilationSession.cssDocuments.addAll(0, activatedStyleSheets.sort());
return super.findAllCompilationUnitsToLink(compilationUnits, problems);
}