[royale-compiler] branch develop updated: remove grayscale so DataBindingExample_Flat compile ok

[ca...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

carlosrovira 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 730c5a9  remove grayscale so DataBindingExample_Flat compile ok
730c5a9 is described below

commit 730c5a9d9aed1ee3b3f3e5e732cf6e4a7d44f6bc
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Sun Apr 8 12:07:20 2018 +0200

    remove grayscale so DataBindingExample_Flat compile ok
---
 .../internal/driver/js/royale/JSCSSCompilationSession.java        | 8 +++++---
 1 file changed, 5 insertions(+), 3 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 73093e6..46fa813 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
@@ -51,13 +51,15 @@ public class JSCSSCompilationSession extends CSSCompilationSession
              "brightness",
              "contrast",
              "drop-shadow",
-             "grayscale",
              "hue-rotate",
              "invert",
              "saturate",
              "sepia"
-	);
-	
+    );
+    //  this two conflicts with other css functions with the same name - comment for now
+    //  "grayscale",
+    //  "opacity",
+
     private ArrayList<String> requires;
     
     public String getEncodedCSS()

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