You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2018/05/22 18:16:56 UTC
[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
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 <ah...@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.
Re: [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 way...
Posted by Carlos Rovira <ca...@apache.org>.
Thanks Alex! I can confirm that now build is passing ok localy
Carlos
2018-05-23 8:26 GMT+02:00 Alex Harui <ah...@adobe.com.invalid>:
> Hi Carlos,
>
> Yes you are correct. I pushed a change that hopefully fixes that.
>
> Thanks,
> -Alex
>
> On 5/22/18, 3:31 PM, "carlos.rovira@gmail.com on behalf of Carlos
> Rovira" <carlos.rovira@gmail.com on behalf of carlosrovira@apache.org>
> wrote:
>
> Hi Alex
>
> I think this change makes this happen, can take a look at it? I was
> looking
> but my fixes seems not be the right ones so maybe is better to look in
> the
> compiler
>
> 189970 bytes written to
> /Users/carlosrovira/Dev/Royale/Source/royale-asjs/
> examples/royale/MobileStocks/target/MobileStocks-0.9.4-SNAPSHOT.swf
> in 1.880 seconds
>
> /Users/carlosrovira/Dev/Royale/Source/royale-asjs/
> examples/royale/MobileStocks/src/main/royale/MyInitialView.mxml(151):
> col: 23 Error: org.apache.royale.html.beads.BackgroundImageBead is not
> defined.
>
>
> font-size: 18pt;
>
> ^
>
>
> /Users/carlosrovira/Dev/Royale/Source/royale-asjs/
> examples/royale/MobileStocks/src/main/royale/MyInitialView.mxml(151):
> col: 23 Error: org.apache.royale.html.beads.BackgroundImageBead is not
> defined.
>
>
> font-size: 18pt;
>
> ^
>
> [*INFO*]
> *-----------------------------------------------------------
> -------------*
>
> [*INFO*] *Reactor Summary:*
>
> [*INFO*]
>
> [*INFO*] Apache Royale: Examples: Royale: MobileStocks 0.9.4-SNAPSHOT
> *FAILURE* [ 4.364 s]
>
> [*INFO*] Apache Royale: Examples: Royale: MobileTrader ...... *SKIPPED*
>
> [*INFO*] Apache Royale: Examples: Royale: ModuleExample ..... *SKIPPED*
>
> [*INFO*] Apache Royale: Examples: Royale: ModuleExample: MainApp
> *SKIPPED*
> *...*
>
> *thanks*
>
> *Carlos*
>
>
>
> 2018-05-22 20:16 GMT+02:00 <ah...@apache.org>:
>
> > This is an automated email from the ASF dual-hosted git repository.
> >
> > aharui pushed a commit to branch develop
> > in repository https://na01.safelinks.protection.outlook.com/?url=
> https%3A%2F%2Fgitbox.apache.org%2Frepos%2Fasf%2Froyale-
> compiler.git&data=02%7C01%7Caharui%40adobe.com%
> 7C150325e868c5440d727d08d5c033bdcf%7Cfa7b1b5a7b34438794aed2c178de
> cee1%7C0%7C0%7C636626250827688276&sdata=Wm5Ia%
> 2Fx35TiKtX4CLVK2Gyi5s4RMyRBQAKmOWOSnJw8%3D&reserved=0
> >
> >
> > 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 <ah...@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.
> >
>
>
>
> --
> Carlos Rovira
> https://na01.safelinks.protection.outlook.com/?url=
> http%3A%2F%2Fabout.me%2Fcarlosrovira&data=02%7C01%7Caharui%40adobe.com%
> 7C150325e868c5440d727d08d5c033bdcf%7Cfa7b1b5a7b34438794aed2c178de
> cee1%7C0%7C0%7C636626250827688276&sdata=B8xycT05HBEoE54GgG6tkHdL3L7mQh
> ivARL3Ia9bHPM%3D&reserved=0
>
>
>
--
Carlos Rovira
http://about.me/carlosrovira
Re: [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 way...
Posted by Alex Harui <ah...@adobe.com.INVALID>.
Hi Carlos,
Yes you are correct. I pushed a change that hopefully fixes that.
Thanks,
-Alex
On 5/22/18, 3:31 PM, "carlos.rovira@gmail.com on behalf of Carlos Rovira" <carlos.rovira@gmail.com on behalf of carlosrovira@apache.org> wrote:
Hi Alex
I think this change makes this happen, can take a look at it? I was looking
but my fixes seems not be the right ones so maybe is better to look in the
compiler
189970 bytes written to
/Users/carlosrovira/Dev/Royale/Source/royale-asjs/examples/royale/MobileStocks/target/MobileStocks-0.9.4-SNAPSHOT.swf
in 1.880 seconds
/Users/carlosrovira/Dev/Royale/Source/royale-asjs/examples/royale/MobileStocks/src/main/royale/MyInitialView.mxml(151):
col: 23 Error: org.apache.royale.html.beads.BackgroundImageBead is not
defined.
font-size: 18pt;
^
/Users/carlosrovira/Dev/Royale/Source/royale-asjs/examples/royale/MobileStocks/src/main/royale/MyInitialView.mxml(151):
col: 23 Error: org.apache.royale.html.beads.BackgroundImageBead is not
defined.
font-size: 18pt;
^
[*INFO*]
*------------------------------------------------------------------------*
[*INFO*] *Reactor Summary:*
[*INFO*]
[*INFO*] Apache Royale: Examples: Royale: MobileStocks 0.9.4-SNAPSHOT
*FAILURE* [ 4.364 s]
[*INFO*] Apache Royale: Examples: Royale: MobileTrader ...... *SKIPPED*
[*INFO*] Apache Royale: Examples: Royale: ModuleExample ..... *SKIPPED*
[*INFO*] Apache Royale: Examples: Royale: ModuleExample: MainApp *SKIPPED*
*...*
*thanks*
*Carlos*
2018-05-22 20:16 GMT+02:00 <ah...@apache.org>:
> This is an automated email from the ASF dual-hosted git repository.
>
> aharui pushed a commit to branch develop
> in repository https://na01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitbox.apache.org%2Frepos%2Fasf%2Froyale-compiler.git&data=02%7C01%7Caharui%40adobe.com%7C150325e868c5440d727d08d5c033bdcf%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C636626250827688276&sdata=Wm5Ia%2Fx35TiKtX4CLVK2Gyi5s4RMyRBQAKmOWOSnJw8%3D&reserved=0
>
>
> 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 <ah...@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.
>
--
Carlos Rovira
https://na01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fabout.me%2Fcarlosrovira&data=02%7C01%7Caharui%40adobe.com%7C150325e868c5440d727d08d5c033bdcf%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C636626250827688276&sdata=B8xycT05HBEoE54GgG6tkHdL3L7mQhivARL3Ia9bHPM%3D&reserved=0
Re: [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
Posted by Carlos Rovira <ca...@apache.org>.
Hi Alex
I think this change makes this happen, can take a look at it? I was looking
but my fixes seems not be the right ones so maybe is better to look in the
compiler
189970 bytes written to
/Users/carlosrovira/Dev/Royale/Source/royale-asjs/examples/royale/MobileStocks/target/MobileStocks-0.9.4-SNAPSHOT.swf
in 1.880 seconds
/Users/carlosrovira/Dev/Royale/Source/royale-asjs/examples/royale/MobileStocks/src/main/royale/MyInitialView.mxml(151):
col: 23 Error: org.apache.royale.html.beads.BackgroundImageBead is not
defined.
font-size: 18pt;
^
/Users/carlosrovira/Dev/Royale/Source/royale-asjs/examples/royale/MobileStocks/src/main/royale/MyInitialView.mxml(151):
col: 23 Error: org.apache.royale.html.beads.BackgroundImageBead is not
defined.
font-size: 18pt;
^
[*INFO*]
*------------------------------------------------------------------------*
[*INFO*] *Reactor Summary:*
[*INFO*]
[*INFO*] Apache Royale: Examples: Royale: MobileStocks 0.9.4-SNAPSHOT
*FAILURE* [ 4.364 s]
[*INFO*] Apache Royale: Examples: Royale: MobileTrader ...... *SKIPPED*
[*INFO*] Apache Royale: Examples: Royale: ModuleExample ..... *SKIPPED*
[*INFO*] Apache Royale: Examples: Royale: ModuleExample: MainApp *SKIPPED*
*...*
*thanks*
*Carlos*
2018-05-22 20:16 GMT+02:00 <ah...@apache.org>:
> 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 <ah...@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.
>
--
Carlos Rovira
http://about.me/carlosrovira