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 2881125 merge -royale-swf into main selector set
2881125 is described below
commit 2881125c18de63ccbadd12b094941d5d974cfd4b
Author: Alex Harui <[email protected]>
AuthorDate: Fri Mar 23 10:52:05 2018 -0700
merge -royale-swf into main selector set
---
.../royale/compiler/internal/css/codegen/CSSCompilationSession.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/compiler/src/main/java/org/apache/royale/compiler/internal/css/codegen/CSSCompilationSession.java
b/compiler/src/main/java/org/apache/royale/compiler/internal/css/codegen/CSSCompilationSession.java
index a330003..82747b1 100644
---
a/compiler/src/main/java/org/apache/royale/compiler/internal/css/codegen/CSSCompilationSession.java
+++
b/compiler/src/main/java/org/apache/royale/compiler/internal/css/codegen/CSSCompilationSession.java
@@ -36,6 +36,7 @@ import org.antlr.runtime.tree.CommonTree;
import org.apache.royale.abc.visitors.IABCVisitor;
import org.apache.royale.compiler.css.ICSSDocument;
import org.apache.royale.compiler.css.ICSSFontFace;
+import org.apache.royale.compiler.css.ICSSMediaQueryCondition;
import org.apache.royale.compiler.css.ICSSProperty;
import org.apache.royale.compiler.css.ICSSRule;
import org.apache.royale.compiler.css.ICSSSelector;
@@ -231,7 +232,8 @@ public class CSSCompilationSession
*/
private void addRuleToCodeGeneration(final ICSSRule newRule)
{
- if (newRule.getMediaQueryConditions().isEmpty())
+ ImmutableList<ICSSMediaQueryCondition> mq =
newRule.getMediaQueryConditions();
+ if (mq.isEmpty() || (mq.size() == 1 &&
mq.get(0).getValue().toString().equals("-royale-swf")))
{
// Normalize the rule and clobber properties if the rule has no
media query.
final ImmutableList<CSSProperty> properties = ImmutableList.copyOf(
--
To stop receiving notification emails like this one, please contact
[email protected].
