royale-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [royale-compiler] branch develop updated: remove code that copied in all CSS from files other than defaults.css. It was originally intended to handle folks specifying fx:Styles in other files, but I'm pretty sure we've since fixed that in other ways, and that code was wrongly copying in CSS from theme files. So we'll see if custom css files break after this change
Date Tue, 22 May 2018 18:16:56 GMT
This is an automated email from the ASF dual-hosted git repository.

aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git


The following commit(s) were added to refs/heads/develop by this push:
     new c73d89e  remove code that copied in all CSS from files other than defaults.css. 
It was originally intended to handle folks specifying fx:Styles in other files, but I'm pretty
sure we've since fixed that in other ways, and that code was wrongly copying in CSS from theme
files.  So we'll see if custom css files break after this change
c73d89e is described below

commit c73d89ec20c2ffbbb1d3eeca47204e9cdcc50510
Author: Alex Harui <aharui@apache.org>
AuthorDate: Tue May 22 11:16:39 2018 -0700

    remove code that copied in all CSS from files other than defaults.css.  It was originally
intended to handle folks specifying fx:Styles in other files, but I'm pretty sure we've since
fixed that in other ways, and that code was wrongly copying in CSS from theme files.  So we'll
see if custom css files break after this change
---
 .../internal/driver/js/royale/JSCSSCompilationSession.java       | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/royale/JSCSSCompilationSession.java
b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/royale/JSCSSCompilationSession.java
index fad1da8..f0031aa 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/royale/JSCSSCompilationSession.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/driver/js/royale/JSCSSCompilationSession.java
@@ -549,14 +549,7 @@ public class JSCSSCompilationSession extends CSSCompilationSession
     {
     	if (super.keepRule(newRule))
     		return true;
-    	
-    	// include all rules not found in defaults.css
-    	// theoretically, defaults.css rules were
-    	// properly added in the super call.
-    	String sp = newRule.getSourcePath();
-    	if (!sp.contains("defaults.css"))
-    		return true;
-    	
+    	    	
     	// might need to loop over all selectors in selector group
     	if (newRule.getSelectorGroup().size() > 0)
     	{

-- 
To stop receiving notification emails like this one, please contact
aharui@apache.org.

Mime
View raw message