[royale-asjs] branch develop updated: todo-jewel-crux: make it work with sdk distribution
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new ac85b44 todo-jewel-crux: make it work with sdk distribution
ac85b44 is described below
commit ac85b44251a9879b3c475c9300ce6443ba65ac39
Author: Carlos Rovira
AuthorDate: Wed Mar 3 19:15:39 2021 +0100
todo-jewel-crux: make it work with sdk distribution
---
examples/crux/todomvc-jewel-crux/asconfig.json | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/examples/crux/todomvc-jewel-crux/asconfig.json
b/examples/crux/todomvc-jewel-crux/asconfig.json
index 14ab179..4453a5a 100644
--- a/examples/crux/todomvc-jewel-crux/asconfig.json
+++ b/examples/crux/todomvc-jewel-crux/asconfig.json
@@ -21,9 +21,19 @@
"compilerOptions": {
"debug": false,
"targets": ["JSRoyale"],
-"source-map": true
+"source-map": true,
+"library-path": [
+"${royalelib}/libs/MXRoyale.swc"
+],
+"js-library-path": [
+"${royalelib}/js/libs/MXRoyaleJS.swc"
+],
+"keep-as3-metadata": [
+"Inject", "Dispatcher", "EventHandler", "PostConstruct",
"PreDestroy", "ViewAdded", "ViewRemoved", "Bindable", "Transient"
+],
+"js-default-initializers": true
},
-"additionalOptions": "-remove-circulars
-js-output-optimization=skipAsCoercions",
+"additionalOptions":
"-compiler.exclude-defaults-css-files=MXRoyaleJS.swc:defaults.css",
"files":
[
"src/main/royale/App.mxml"
[royale-asjs] branch develop updated: maven: fix MXRoyale exclusion in examples and archetypes since are not distribution and use maven artifact with version included
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 46c66b4 maven: fix MXRoyale exclusion in examples and archetypes
since are not distribution and use maven artifact with version included
46c66b4 is described below
commit 46c66b42ff07e4226f0a060c361faa9348c5b870
Author: Carlos Rovira
AuthorDate: Tue Mar 2 13:21:30 2021 +0100
maven: fix MXRoyale exclusion in examples and archetypes since are not
distribution and use maven artifact with version included
---
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../src/main/resources/archetype-resources/__application__/pom.xml | 2 +-
.../src/main/resources/archetype-resources/__module__/pom.xml | 2 +-
examples/crux/CruxQuickStart/pom.xml| 2 +-
examples/crux/CruxQuickStartBasic/pom.xml | 2 +-
examples/crux/todomvc-jewel-crux/pom.xml| 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/archetypes/royale-jewel-application-archetype/src/main/resources/archetype-resources/pom.xml
b/archetypes/royale-jewel-application-archetype/src/main/resources/archetype-resources/pom.xml
index 4f63548..b425971 100644
---
a/archetypes/royale-jewel-application-archetype/src/main/resources/archetype-resources/pom.xml
+++
b/archetypes/royale-jewel-application-archetype/src/main/resources/archetype-resources/pom.xml
@@ -56,7 +56,7 @@
-source-map=true;
#if (${includeCrux} == 'true' || ${includeCrux} == 'yes' || ${includeCrux} ==
'y')
-js-default-initializers=true;
--compiler.exclude-defaults-css-files=MXRoyaleJS.swc:defaults.css;
+
-compiler.exclude-defaults-css-files=MXRoyale-${royale.framework.version}-js.swc:defaults.css;
-keep-as3-metadata+=Inject,Dispatcher,EventHandler,PostConstruct,PreDestroy,ViewAdded,ViewRemoved,Bindable,Transient;
-keep-code-with-metadata=Inject;
#end
diff --git
a/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/__application__/pom.xml
b/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/__application__/pom.xml
index cabb345..d784333 100644
---
a/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/__application__/pom.xml
+++
b/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/__application__/pom.xml
@@ -51,7 +51,7 @@
-js-compiler-option+=--property_map_output_file gccprops.txt;
#if (${includeCrux} == 'true' || ${includeCrux} == 'yes' || ${includeCrux} ==
'y')
-js-default-initializers=true;
--compiler.exclude-defaults-css-files=MXRoyaleJS.swc:defaults.css;
+
-compiler.exclude-defaults-css-files=MXRoyale-${royale.framework.version}-js.swc:defaults.css;
-keep-as3-metadata+=Inject,Dispatcher,EventHandler,PostConstruct,PreDestroy,ViewAdded,ViewRemoved,Bindable,Transient;
-keep-code-with-metadata=Inject;
#end
diff --git
a/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/__module__/pom.xml
b/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/__module__/pom.xml
index b53ec19..3700718 100644
---
a/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/__module__/pom.xml
+++
b/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/__module__/pom.xml
@@ -50,7 +50,7 @@
-js-compiler-option+=--property_map_input_file
../../../../../${application}/target/javascript/bin/js-release/gccprops.txt
#if (${includeCrux} == 'true' || ${includeCrux} == 'yes' || ${includeCrux} ==
'y')
-js-default-initializers=true;
--compiler.exclude-defaults-css-files=MXRoyaleJS.swc:defaults.css;
+
-compiler.exclude-defaults-css-files=MXRoyale-${royale.framework.version}-js.swc:defaults.css;
-keep-as3-metadata+=Inject,Dispatcher,EventHandler,PostConstruct,PreDestroy,ViewAdded,ViewRemoved,Bindable,Transient;
-keep-code-with-metadata=Inject;
#end
diff --git a/examples/crux/CruxQuickStart/pom.xml
b/examples/crux/CruxQuickStart/pom.xml
index 869b19b..c912b1e 100644
--- a/examples/crux/CruxQuickStart/pom.xml
+++ b/examples/crux/CruxQuickStart/pom.xml
@@ -44,7 +44,7 @@
-js-default-initializers=true;
-source-map=true;
--compiler.exclude-defaults-css-files=MXRoyaleJS.swc:defaults.css;
+
-compiler.exclude-defaults-css-files=MXRoyale-${royale.framework.version}-js.swc:defaults.css;
-keep
[royale-docs] branch master updated: fix link to jewel themes
This is an automated email from the ASF dual-hosted git repository. carlosrovira pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/royale-docs.git The following commit(s) were added to refs/heads/master by this push: new 3c8bb8a fix link to jewel themes 3c8bb8a is described below commit 3c8bb8aa36998531729a960feca4c488462dd4f7 Author: Carlos Rovira AuthorDate: Tue Mar 2 10:23:33 2021 +0100 fix link to jewel themes --- features/styles-skins-themes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/styles-skins-themes.md b/features/styles-skins-themes.md index 83fc59b..1606cc8 100644 --- a/features/styles-skins-themes.md +++ b/features/styles-skins-themes.md @@ -80,4 +80,4 @@ _More information on skinning, with examples, is coming soon._ In Apache Royale, a theme is a predefined CSS file (and optionally other assets like images) that holds the definitions of each component. When you add a theme to your application or replace the existing one, all the visuals (colors, fonts, lines, and drawings) in your your entire application change to the new theme at once. -In the [Jewel](component-sets/jewel) UI Set, themeing is one of the key concepts. You can learn more about it here: [Jewel Themes](component-sets/jewel/jewel-themes). +In the [Jewel](component-sets/jewel) UI Set, themeing is one of the key concepts. You can learn more about it here: [Jewel Themes](component-sets/jewel/themes).
[royale-asjs] branch develop updated: AppWithLib: fix project and and allow fx:Array
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 524dfd3 AppWithLib: fix project and and allow fx:Array
524dfd3 is described below
commit 524dfd33f695ba2fef8dcd3380b40b17b0b77bef
Author: Carlos Rovira
AuthorDate: Sun Feb 28 17:04:40 2021 +0100
AppWithLib: fix project and and allow fx:Array
---
examples/crux/SampleLib/pom.xml| 15 --
.../src/main/resources/samplelib-manifest.xml | 2 +-
.../royale/examples/config/ServicesConfig.mxml}| 23 +-
3 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/examples/crux/SampleLib/pom.xml b/examples/crux/SampleLib/pom.xml
index 822480f..8ab6447 100644
--- a/examples/crux/SampleLib/pom.xml
+++ b/examples/crux/SampleLib/pom.xml
@@ -27,14 +27,14 @@
examples-crux
0.9.8-SNAPSHOT
-
+
SampleLib
0.9.8-SNAPSHOT
swc
-true
-0.9.8-SNAPSHOT
+
${basedir}/target/javascript/bin/js-debug
${basedir}/target/javascript/bin/js-release
@@ -95,6 +95,7 @@
true
JSRoyale
+ false
library://ns.apache.org/royale/samplelib
@@ -124,10 +125,12 @@
../src/main/resources/js/*
-->
-
+
+
\ No newline at end of file
diff --git a/examples/crux/SampleLib/src/main/resources/samplelib-manifest.xml
b/examples/crux/SampleLib/src/main/royale/org/apache/royale/examples/config/ServicesConfig.mxml
similarity index 66%
copy from examples/crux/SampleLib/src/main/resources/samplelib-manifest.xml
copy to
examples/crux/SampleLib/src/main/royale/org/apache/royale/examples/config/ServicesConfig.mxml
index 351c690..a9ebf44 100644
--- a/examples/crux/SampleLib/src/main/resources/samplelib-manifest.xml
+++
b/examples/crux/SampleLib/src/main/royale/org/apache/royale/examples/config/ServicesConfig.mxml
@@ -1,4 +1,3 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+http://ns.adobe.com/mxml/2009;
+ xmlns:mx="library://ns.apache.org/royale/mx"
+ xmlns:crux="library://ns.apache.org/royale/crux">
+
+
+
+
+
+
+
+
+
\ No newline at end of file
[royale-asjs] branch develop updated: moving new example from examples/jewel to crux, since it will have some crux code
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new d588371 moving new example from examples/jewel to crux, since it will
have some crux code
d588371 is described below
commit d588371e98ec3e97f1d21e70c02ba702dd0d4bc6
Author: Carlos Rovira
AuthorDate: Sat Feb 27 17:55:57 2021 +0100
moving new example from examples/jewel to crux, since it will have some
crux code
---
.../{jewel => crux}/AppWithLib/AppWithLib.mxml.as3proj | 0
examples/{jewel => crux}/AppWithLib/asconfig.json | 0
examples/{jewel => crux}/AppWithLib/pom.xml| 8 +++-
.../AppWithLib/src/main/resources/default.css | 0
.../main/resources/jewel-example-index-template.html | 0
.../AppWithLib/src/main/royale/AppWithLib.mxml | 0
.../org/apache/royale/examples/config/Beans.mxml | 0
.../org/apache/royale/examples/events/SomeEvent.as | 0
.../org/apache/royale/examples/views/MainView.mxml | 0
.../AppWithLib/src/main/sass/_global.sass | 0
.../AppWithLib}/src/main/sass/default.sass | 0
.../{jewel => crux}/SampleLib/SampleLib.mxml.as3proj | 0
examples/{jewel => crux}/SampleLib/asconfig.json | 0
examples/{jewel => crux}/SampleLib/pom.xml | 18 --
.../SampleLib/src/main/resources/default.css | 0
.../src/main/resources/samplelib-as-manifest.xml | 0
.../src/main/resources/samplelib-manifest.xml | 1 +
.../SampleLib/src/main/royale/SampleLibClasses.as | 0
.../royale/org/apache/royale/examples/SampleClass.as | 0
.../SampleLib/src/main/sass/_global.sass | 0
.../SampleLib}/src/main/sass/default.sass | 0
21 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/examples/jewel/AppWithLib/AppWithLib.mxml.as3proj
b/examples/crux/AppWithLib/AppWithLib.mxml.as3proj
similarity index 100%
rename from examples/jewel/AppWithLib/AppWithLib.mxml.as3proj
rename to examples/crux/AppWithLib/AppWithLib.mxml.as3proj
diff --git a/examples/jewel/AppWithLib/asconfig.json
b/examples/crux/AppWithLib/asconfig.json
similarity index 100%
rename from examples/jewel/AppWithLib/asconfig.json
rename to examples/crux/AppWithLib/asconfig.json
diff --git a/examples/jewel/AppWithLib/pom.xml
b/examples/crux/AppWithLib/pom.xml
similarity index 97%
rename from examples/jewel/AppWithLib/pom.xml
rename to examples/crux/AppWithLib/pom.xml
index 03b87df..1196525 100644
--- a/examples/jewel/AppWithLib/pom.xml
+++ b/examples/crux/AppWithLib/pom.xml
@@ -23,13 +23,11 @@
4.0.0
-org.apache
-apache
-23
-
+org.apache.royale.examples
+examples-crux
+0.9.8-SNAPSHOT
- org.apache.royale.examples
AppWithLib
0.9.8-SNAPSHOT
swf
diff --git a/examples/jewel/AppWithLib/src/main/resources/default.css
b/examples/crux/AppWithLib/src/main/resources/default.css
similarity index 100%
rename from examples/jewel/AppWithLib/src/main/resources/default.css
rename to examples/crux/AppWithLib/src/main/resources/default.css
diff --git
a/examples/jewel/AppWithLib/src/main/resources/jewel-example-index-template.html
b/examples/crux/AppWithLib/src/main/resources/jewel-example-index-template.html
similarity index 100%
rename from
examples/jewel/AppWithLib/src/main/resources/jewel-example-index-template.html
rename to
examples/crux/AppWithLib/src/main/resources/jewel-example-index-template.html
diff --git a/examples/jewel/AppWithLib/src/main/royale/AppWithLib.mxml
b/examples/crux/AppWithLib/src/main/royale/AppWithLib.mxml
similarity index 100%
rename from examples/jewel/AppWithLib/src/main/royale/AppWithLib.mxml
rename to examples/crux/AppWithLib/src/main/royale/AppWithLib.mxml
diff --git
a/examples/jewel/AppWithLib/src/main/royale/org/apache/royale/examples/config/Beans.mxml
b/examples/crux/AppWithLib/src/main/royale/org/apache/royale/examples/config/Beans.mxml
similarity index 100%
rename from
examples/jewel/AppWithLib/src/main/royale/org/apache/royale/examples/config/Beans.mxml
rename to
examples/crux/AppWithLib/src/main/royale/org/apache/royale/examples/config/Beans.mxml
diff --git
a/examples/jewel/AppWithLib/src/main/royale/org/apache/royale/examples/events/SomeEvent.as
b/examples/crux/AppWithLib/src/main/royale/org/apache/royale/examples/events/SomeEvent.as
similarity index 100%
rename from
examples/jewel/AppWithLib/src/main/royale/org/apache/royale/examples/events/SomeEvent.as
rename to
examples/crux/AppWithLib/src/main/royale/org/apache/royale/examples/events/SomeEvent.as
diff --git
a/examples/jewel/AppWithLib/src/main/royale/org/apache/royale/examples/views/MainView.mxml
b/examples/crux/AppWithLib/src/main/royale/org/apache/royale/examples/views/MainView.mxml
similarity index 100%
rename from
examples/je
[royale-asjs] branch develop updated: AppWithLib: add SampleLib dependency to AppWithLib example app
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 3b03488 AppWithLib: add SampleLib dependency to AppWithLib example app
3b03488 is described below
commit 3b03488413cbea70c85443dc339ed7063a06a2fc
Author: Carlos Rovira
AuthorDate: Sat Feb 27 17:38:18 2021 +0100
AppWithLib: add SampleLib dependency to AppWithLib example app
---
examples/jewel/AppWithLib/asconfig.json | 9 -
examples/jewel/AppWithLib/pom.xml | 8
examples/jewel/AppWithLib/src/main/resources/default.css | 1 +
.../royale/org/apache/royale/examples/views/MainView.mxml | 15 ++-
examples/jewel/AppWithLib/src/main/sass/_global.sass | 1 +
5 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/examples/jewel/AppWithLib/asconfig.json
b/examples/jewel/AppWithLib/asconfig.json
index c7cd803..040debd 100644
--- a/examples/jewel/AppWithLib/asconfig.json
+++ b/examples/jewel/AppWithLib/asconfig.json
@@ -22,7 +22,14 @@
"debug": false,
"targets": ["JSRoyale"],
"source-path": [
-"src/main/resources"
+"src/main/resources",
+"../SampleLib/src/main/royale/"
+],
+"namespace": [
+{
+"uri": "library://ns.apache.org/royale/samplelib",
+"manifest":
"../SampleLib/src/main/resources/samplelib-manifest.xml"
+}
],
"source-map": true,
"html-template":
"src/main/resources/jewel-example-index-template.html",
diff --git a/examples/jewel/AppWithLib/pom.xml
b/examples/jewel/AppWithLib/pom.xml
index dbbb1b4..03b87df 100644
--- a/examples/jewel/AppWithLib/pom.xml
+++ b/examples/jewel/AppWithLib/pom.xml
@@ -100,6 +100,14 @@
+ org.apache.royale.examples
+ SampleLib
+ 0.9.8-SNAPSHOT
+ swc
+ js
+
+
+
org.apache.royale.framework
Core
0.9.8-SNAPSHOT
diff --git a/examples/jewel/AppWithLib/src/main/resources/default.css
b/examples/jewel/AppWithLib/src/main/resources/default.css
index 7497f0f..921f072 100644
--- a/examples/jewel/AppWithLib/src/main/resources/default.css
+++ b/examples/jewel/AppWithLib/src/main/resources/default.css
@@ -16,5 +16,6 @@
*/
@namespace "http://www.w3.org/1999/xhtml;;
@namespace j "library://ns.apache.org/royale/jewel";
+@namespace j "library://ns.apache.org/royale/samplelib";
/*# sourceMappingURL=default.css.map */
diff --git
a/examples/jewel/AppWithLib/src/main/royale/org/apache/royale/examples/views/MainView.mxml
b/examples/jewel/AppWithLib/src/main/royale/org/apache/royale/examples/views/MainView.mxml
index fcb3f77..8f4c888 100644
---
a/examples/jewel/AppWithLib/src/main/royale/org/apache/royale/examples/views/MainView.mxml
+++
b/examples/jewel/AppWithLib/src/main/royale/org/apache/royale/examples/views/MainView.mxml
@@ -19,8 +19,21 @@ limitations under the License.
-->
http://ns.adobe.com/mxml/2009;
xmlns:j="library://ns.apache.org/royale/jewel"
-xmlns:js="library://ns.apache.org/royale/basic">
+xmlns:js="library://ns.apache.org/royale/basic"
+initComplete="initView()">
+
+
+
+
diff --git a/examples/jewel/AppWithLib/src/main/sass/_global.sass
b/examples/jewel/AppWithLib/src/main/sass/_global.sass
index 4245094..450aa02 100644
--- a/examples/jewel/AppWithLib/src/main/sass/_global.sass
+++ b/examples/jewel/AppWithLib/src/main/sass/_global.sass
@@ -19,6 +19,7 @@
@namespace "http://www.w3.org/1999/xhtml;
@namespace j "library://ns.apache.org/royale/jewel"
+@namespace j "library://ns.apache.org/royale/samplelib"
// .jewel
// .label
[royale-asjs] branch develop updated: SampleLib: The lib part to use with AppWithLib example app, generated with the maven archetype "royale-jewel-library-archetype"
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 3022c9b SampleLib: The lib part to use with AppWithLib example app,
generated with the maven archetype "royale-jewel-library-archetype"
3022c9b is described below
commit 3022c9b41013efa531c6cf2ebbacc175ee985223
Author: Carlos Rovira
AuthorDate: Sat Feb 27 16:58:29 2021 +0100
SampleLib: The lib part to use with AppWithLib example app, generated with
the maven archetype "royale-jewel-library-archetype"
---
examples/jewel/SampleLib/SampleLib.mxml.as3proj| 117
examples/jewel/SampleLib/asconfig.json | 58
examples/jewel/SampleLib/pom.xml | 301 +
.../jewel/SampleLib/src/main/resources/default.css | 20 ++
.../src/main/resources/samplelib-as-manifest.xml | 26 ++
.../src/main/resources/samplelib-manifest.xml | 26 ++
.../SampleLib/src/main/royale/SampleLibClasses.as | 46
.../org/apache/royale/examples/SampleClass.as | 31 +++
.../jewel/SampleLib/src/main/sass/_global.sass | 25 ++
.../jewel/SampleLib/src/main/sass/default.sass | 21 ++
10 files changed, 671 insertions(+)
diff --git a/examples/jewel/SampleLib/SampleLib.mxml.as3proj
b/examples/jewel/SampleLib/SampleLib.mxml.as3proj
new file mode 100644
index 000..2a85f03
--- /dev/null
+++ b/examples/jewel/SampleLib/SampleLib.mxml.as3proj
@@ -0,0 +1,117 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ !-- Other classes to be compiled into your SWF --
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ null
+ null
+ False
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+null
+null
+null
+null
+
+
\ No newline at end of file
diff --git a/examples/jewel/SampleLib/asconfig.json
b/examples/jewel/SampleLib/asconfig.json
new file mode 100644
index 000..cdedb7a
--- /dev/null
+++ b/examples/jewel/SampleLib/asconfig.json
@@ -0,0 +1,58 @@
+
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+{
+"config": "royale",
+"type": "lib",
+"compilerOptions": {
+"debug": true,
+"targets": ["JSRoyale"],
+"source-path": [
+"src/main/royale"
+],
+"include-namespaces": [
+"library://ns.apache.org/royale/samplelib"
+],
+"namespace": [
+{
+"uri": "library://ns.apache.org/royale/samplelib",
+"manifest": "src/main/resources/samplelib-manifest.xml"
+}
+// ,{
+// "uri": "library://ns.apache.org/royale/samplelib",
+// "manifest": "src/main/resources/samplelib-as-manifest.xml"
+// }
+],
+"include-classes": [
+"SampleLibClasses"
+],
+"include-sources": [
+"src/main/royale"
+],
+// "library-path": [
+// "${royalelib}/js/libs/MXRoyaleJS.swc"
+// ],
+// "js-library-path": [
+// "${royalelib}/js/libs/MXRoyaleJS.swc"
+// ],
+"source-map": true,
+"output": "bin/SampleLib.swc"
+}
+// ,
+// "additionalOptions": "-js
[royale-asjs] branch develop updated: royale-jewel-library-archetype: few namespace fixes
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new f967d0b royale-jewel-library-archetype: few namespace fixes
f967d0b is described below
commit f967d0b0699bc84774a828a8ec88087e91282ebd
Author: Carlos Rovira
AuthorDate: Sat Feb 27 16:56:28 2021 +0100
royale-jewel-library-archetype: few namespace fixes
---
.../src/main/resources/archetype-resources/pom.xml| 4 ++--
.../src/main/resources/archetype-resources/src/main/sass/_global.sass | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/archetypes/royale-jewel-library-archetype/src/main/resources/archetype-resources/pom.xml
b/archetypes/royale-jewel-library-archetype/src/main/resources/archetype-resources/pom.xml
index d7c2863..031f19c 100644
---
a/archetypes/royale-jewel-library-archetype/src/main/resources/archetype-resources/pom.xml
+++
b/archetypes/royale-jewel-library-archetype/src/main/resources/archetype-resources/pom.xml
@@ -100,12 +100,12 @@
JSRoyale
- library://ns.apache.org/royale/jewel
+ library://ns.apache.org/royale/${artifactIdLowerCase}
${dollar}{project.basedir}/src/main/resources/${artifactIdLowerCase}-manifest.xml
diff --git
a/archetypes/royale-jewel-library-archetype/src/main/resources/archetype-resources/src/main/sass/_global.sass
b/archetypes/royale-jewel-library-archetype/src/main/resources/archetype-resources/src/main/sass/_global.sass
index 4245094..d9d5fb6 100644
---
a/archetypes/royale-jewel-library-archetype/src/main/resources/archetype-resources/src/main/sass/_global.sass
+++
b/archetypes/royale-jewel-library-archetype/src/main/resources/archetype-resources/src/main/sass/_global.sass
@@ -18,7 +18,7 @@
@namespace "http://www.w3.org/1999/xhtml;
-@namespace j "library://ns.apache.org/royale/jewel"
+@namespace j "library://ns.apache.org/royale/${artifactIdLowerCase}"
// .jewel
// .label
[royale-asjs] branch develop updated: add "royale-jewel-library-archetype" to modules
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-asjs.git The following commit(s) were added to refs/heads/develop by this push: new 000e902 add "royale-jewel-library-archetype" to modules 000e902 is described below commit 000e902fd3c48855d0d2c23b0cd57dd10188c038 Author: Carlos Rovira AuthorDate: Sat Feb 27 16:40:37 2021 +0100 add "royale-jewel-library-archetype" to modules --- archetypes/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 5675261..ebe582c 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -39,6 +39,7 @@ royale-simple-application-archetype royale-jewel-application-archetype +royale-jewel-library-archetype royale-jewel-module-application-archetype royale-simple-application-pure-js-archetype royale-simple-application-pure-swf-archetype
[royale-asjs] branch develop updated: maven-archetype: new "royale-jewel-library-archetype" to generate libraries quickly
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-asjs.git The following commit(s) were added to refs/heads/develop by this push: new e3eca48 maven-archetype: new "royale-jewel-library-archetype" to generate libraries quickly e3eca48 is described below commit e3eca4853449d41527defbfbaeefd133e5462742 Author: Carlos Rovira AuthorDate: Sat Feb 27 16:39:52 2021 +0100 maven-archetype: new "royale-jewel-library-archetype" to generate libraries quickly --- archetypes/royale-jewel-library-archetype/pom.xml | 45 +++ .../META-INF/archetype-post-generate.groovy| 71 + .../META-INF/maven/archetype-metadata.xml | 87 ++ .../archetype-resources/.vscode/tasks.json | 73 + .../__artifactId__.mxml.as3proj| 117 .../resources/archetype-resources/asconfig.json| 58 .../src/main/resources/archetype-resources/pom.xml | 312 + .../__artifactIdLowerCase__-as-manifest.xml| 26 ++ .../resources/__artifactIdLowerCase__-manifest.xml | 26 ++ .../src/main/royale/SampleClass.as | 31 ++ .../src/main/royale/__artifactId__Classes.as | 46 +++ .../archetype-resources/src/main/sass/_global.sass | 25 ++ .../archetype-resources/src/main/sass/default.sass | 21 ++ 13 files changed, 938 insertions(+) diff --git a/archetypes/royale-jewel-library-archetype/pom.xml b/archetypes/royale-jewel-library-archetype/pom.xml new file mode 100644 index 000..55948d8 --- /dev/null +++ b/archetypes/royale-jewel-library-archetype/pom.xml @@ -0,0 +1,45 @@ + +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> + 4.0.0 + + +org.apache.royale.framework +royale-maven-archetypes +0.9.8-SNAPSHOT + + + royale-jewel-library-archetype + 0.9.8-SNAPSHOT + maven-archetype + + Apache Royale: Framework: Archetypes: Jewel Royale Library + Maven archetype for creating Royale Maven project for building a Jewel Royale library for JavaScript output. + + + + +org.apache.maven.archetype +archetype-packaging +3.1.1 + + + + + diff --git a/archetypes/royale-jewel-library-archetype/src/main/resources/META-INF/archetype-post-generate.groovy b/archetypes/royale-jewel-library-archetype/src/main/resources/META-INF/archetype-post-generate.groovy new file mode 100644 index 000..a005cea --- /dev/null +++ b/archetypes/royale-jewel-library-archetype/src/main/resources/META-INF/archetype-post-generate.groovy @@ -0,0 +1,71 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +// This script will be executed upon creating a project from this archetype. +// https://maven.apache.org/archetype/maven-archetype-plugin/advanced-usage.html +// +// It will delete a the associated Crux folders if the value for the "includeCrux" property +// is set to false. + +import java.io.File +import java.nio.file.Files +import java.nio.file.Path +import java.nio.file.Paths +import org.apache.commons.io.FileUtils + +println "***" +println " groovy post processing" +println "***" +// println "artifactId: " + artifactId +// println "request: " + request +// println "archetypeArtifactId: " + request.getArchetypeArtifactId() +// println "archetypeGroupId: " + request.getArchetypeGroupId() +// println "archetypeVersion: " + request.getArchetypeVersion() +// println "archetypeName: " + request.getArchetypeName() +// println "artifactId: " + request.getArtifactId() +// println "groupId: " + request.getGroupId() +// println "version: " + request.getVersion() + +Properties properties = request.properties +// println "Properties: " + properties +// println "application: " + request.getP
[royale-asjs] branch develop updated: AppWithLib: start of an example that uses a library. This is just the app part, created with the maven archetype on the fly
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new de33c10 AppWithLib: start of an example that uses a library. This is
just the app part, created with the maven archetype on the fly
de33c10 is described below
commit de33c104744a1d39d0f52d63e07607e4d93da621
Author: Carlos Rovira
AuthorDate: Sat Feb 27 12:13:50 2021 +0100
AppWithLib: start of an example that uses a library. This is just the app
part, created with the maven archetype on the fly
---
examples/jewel/AppWithLib/AppWithLib.mxml.as3proj | 117
examples/jewel/AppWithLib/asconfig.json| 37
examples/jewel/AppWithLib/pom.xml | 196 +
.../AppWithLib/src/main/resources/default.css | 20 +++
.../resources/jewel-example-index-template.html| 30
.../AppWithLib/src/main/royale/AppWithLib.mxml | 51 ++
.../org/apache/royale/examples/config/Beans.mxml | 28 +++
.../org/apache/royale/examples/events/SomeEvent.as | 44 +
.../org/apache/royale/examples/views/MainView.mxml | 27 +++
.../jewel/AppWithLib/src/main/sass/_global.sass| 25 +++
.../jewel/AppWithLib/src/main/sass/default.sass| 21 +++
11 files changed, 596 insertions(+)
diff --git a/examples/jewel/AppWithLib/AppWithLib.mxml.as3proj
b/examples/jewel/AppWithLib/AppWithLib.mxml.as3proj
new file mode 100644
index 000..11c86c4
--- /dev/null
+++ b/examples/jewel/AppWithLib/AppWithLib.mxml.as3proj
@@ -0,0 +1,117 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ !-- Other classes to be compiled into your SWF --
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ null
+ null
+ False
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+null
+null
+null
+null
+
+
\ No newline at end of file
diff --git a/examples/jewel/AppWithLib/asconfig.json
b/examples/jewel/AppWithLib/asconfig.json
new file mode 100644
index 000..c7cd803
--- /dev/null
+++ b/examples/jewel/AppWithLib/asconfig.json
@@ -0,0 +1,37 @@
+
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+{
+"config": "royale",
+"compilerOptions": {
+"debug": false,
+"targets": ["JSRoyale"],
+"source-path": [
+"src/main/resources"
+],
+"source-map": true,
+"html-template":
"src/main/resources/jewel-example-index-template.html",
+"theme":
"${royalelib}/themes/JewelTheme/src/main/resources/defaults.css"
+},
+"copySourcePathAssets": true,
+"additionalOptions": "-js-dynamic-access-unknown-members=true",
+"files":
+[
+"src/main/royale/AppWithLib.mxml"
+]
+}
diff --git a/examples/jewel/AppWithLib/pom.xml
b/examples/jewel/AppWithLib/pom.xml
new file mode 100644
index 000..dbbb1b4
--- /dev/null
+++ b/examples/jewel/AppWithLib/pom.xml
@@ -0,0 +1,196 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+ 4.0.0
+
+
+org.apache
+apache
+23
+
+
+
+ org.apache.royale.examples
+ AppWithLib
+ 0.9.8-SNAPSHOT
+ swf
+
+
+true
+
+
+
+src/main/royale
+
+
+org.apache.royale.compiler
+royale-maven-plugin
+0.9.8-S
[royale-asjs] branch develop updated: fix typo
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-asjs.git The following commit(s) were added to refs/heads/develop by this push: new f12c405 fix typo f12c405 is described below commit f12c405715a684ebd8699a40c8b30b8a1dac78bb Author: Carlos Rovira AuthorDate: Sat Feb 27 12:11:51 2021 +0100 fix typo --- .../Core/src/main/royale/org/apache/royale/core/BrowserOrientation.as | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/BrowserOrientation.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/BrowserOrientation.as index 26359b0..08aecd2 100644 --- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/BrowserOrientation.as +++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/BrowserOrientation.as @@ -35,7 +35,7 @@ COMPILE::JS * The BrowserOrientation class listens for browser * resizing (only in devices) and dispatchh orientation change events. * - if orientation is portratit it dispatches: 'orientationPortrait' - * - if orientation is ladspace it dispatches: 'orientationLandscape' + * - if orientation is landspace it dispatches: 'orientationLandscape' * * @langversion 3.0 * @playerversion Flash 10.2
[royale-asjs] branch develop updated: jewel-tilelayouts: perform layout when changed at runtime 2
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-asjs.git The following commit(s) were added to refs/heads/develop by this push: new d247ab7 jewel-tilelayouts: perform layout when changed at runtime 2 d247ab7 is described below commit d247ab7c3d3e60e0c4878d130ad6283d40e1c999 Author: Carlos Rovira AuthorDate: Fri Feb 26 18:14:51 2021 +0100 jewel-tilelayouts: perform layout when changed at runtime 2 --- .../royale/org/apache/royale/jewel/beads/layouts/TileVerticalLayout.as | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/TileVerticalLayout.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/TileVerticalLayout.as index 802804a..7662a5d 100644 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/TileVerticalLayout.as +++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/TileVerticalLayout.as @@ -28,7 +28,7 @@ package org.apache.royale.jewel.beads.layouts import org.apache.royale.core.ValuesManager; import org.apache.royale.core.layout.EdgeData; import org.apache.royale.core.layout.ILayoutStyleProperties; - import org.apache.royale.events.Event + import org.apache.royale.events.Event; /** * The TileVerticalLayout class bead sizes and positions the elements it manages into rows and columns.
[royale-asjs] branch develop updated: jewel-tilelayouts: perform layout when changed at runtime
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 99470d4 jewel-tilelayouts: perform layout when changed at runtime
99470d4 is described below
commit 99470d44c7e4b99ac1c429dc4609cda0c8b5a1bc
Author: Carlos Rovira
AuthorDate: Fri Feb 26 18:10:42 2021 +0100
jewel-tilelayouts: perform layout when changed at runtime
---
.../royale/org/apache/royale/jewel/beads/layouts/TileHorizontalLayout.as | 1 +
.../royale/org/apache/royale/jewel/beads/layouts/TileVerticalLayout.as | 1 +
2 files changed, 2 insertions(+)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/TileHorizontalLayout.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/TileHorizontalLayout.as
index a6e4410..d44b695 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/TileHorizontalLayout.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/TileHorizontalLayout.as
@@ -73,6 +73,7 @@ package org.apache.royale.jewel.beads.layouts
super.beadsAddedHandler();
hostComponent.replaceClass("tile");
+ hostComponent.dispatchEvent(new Event("layoutNeeded"));
}
private var _columnCount:int = -1;
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/TileVerticalLayout.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/TileVerticalLayout.as
index 7b59ac4..802804a 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/TileVerticalLayout.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/TileVerticalLayout.as
@@ -78,6 +78,7 @@ package org.apache.royale.jewel.beads.layouts
super.beadsAddedHandler();
hostComponent.replaceClass("tile");
+ hostComponent.dispatchEvent(new Event("layoutNeeded"));
}
private var _columnCount:int = -1;
[royale-asjs] branch develop updated: tour-de-jewel: reduce code on h list
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-asjs.git The following commit(s) were added to refs/heads/develop by this push: new 3d020f4 tour-de-jewel: reduce code on h list 3d020f4 is described below commit 3d020f4ddae3c38a81cc3baa351e1732c7543a62 Author: Carlos Rovira AuthorDate: Thu Feb 25 21:16:55 2021 +0100 tour-de-jewel: reduce code on h list --- examples/jewel/TourDeJewel/src/main/royale/ListPlayGround.mxml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/examples/jewel/TourDeJewel/src/main/royale/ListPlayGround.mxml b/examples/jewel/TourDeJewel/src/main/royale/ListPlayGround.mxml index e002184..60f724f 100644 --- a/examples/jewel/TourDeJewel/src/main/royale/ListPlayGround.mxml +++ b/examples/jewel/TourDeJewel/src/main/royale/ListPlayGround.mxml @@ -322,9 +322,7 @@ limitations under the License. - - - +
[royale-asjs] branch develop updated: jewel-daterangerestriction: Fix logic when both min and max dates are set
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new e702f83 jewel-daterangerestriction: Fix logic when both min and max
dates are set
new 91e7c9b Merge pull request #1085 from brianraymes/develop
e702f83 is described below
commit e702f83482a9be4cb7cd9bba8bf30fda864974ef
Author: Brian Raymes
AuthorDate: Thu Feb 25 11:50:19 2021 -0800
jewel-daterangerestriction: Fix logic when both min and max dates are set
---
.../beads/controls/datechooser/DateChooserDateRangeRestriction.as | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateChooserDateRangeRestriction.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateChooserDateRangeRestriction.as
index 1992f99..7036ddc 100755
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateChooserDateRangeRestriction.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateChooserDateRangeRestriction.as
@@ -223,7 +223,7 @@ package org.apache.royale.jewel.beads.controls.datechooser
if (model.viewState == 0) // Day view
{
if (minDate && maxDate)
- disabled.disabled =
isLessThanDay(rendererDate, minDate) && isLessThanDay(maxDate, rendererDate);
+ disabled.disabled =
isLessThanDay(rendererDate, minDate) || isLessThanDay(maxDate, rendererDate);
else if (minDate)
disabled.disabled =
isLessThanDay(rendererDate, minDate);
else if (maxDate)
@@ -232,7 +232,7 @@ package org.apache.royale.jewel.beads.controls.datechooser
else if (model.viewState == 1) // Year view
{
if (minDate && maxDate)
- disabled.disabled =
isLessThanYear(rendererDate, minDate) && isLessThanYear(maxDate, rendererDate);
+ disabled.disabled =
isLessThanYear(rendererDate, minDate) || isLessThanYear(maxDate, rendererDate);
else if (minDate)
disabled.disabled =
isLessThanYear(rendererDate, minDate);
else if (maxDate)
@@ -241,7 +241,7 @@ package org.apache.royale.jewel.beads.controls.datechooser
else if (model.viewState == 2) // Month view
{
if (minDate && maxDate)
- disabled.disabled =
isLessThanMonth(rendererDate, minDate) && isLessThanMonth(maxDate,
rendererDate);
+ disabled.disabled =
isLessThanMonth(rendererDate, minDate) || isLessThanMonth(maxDate,
rendererDate);
else if (minDate)
disabled.disabled =
isLessThanMonth(rendererDate, minDate);
else if (maxDate)
[royale-asjs] branch develop updated (1146503 -> 140a013)
This is an automated email from the ASF dual-hosted git repository. carlosrovira pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git. from 1146503 - Added more manifest files to be copied to the manifest directory. new cb66abe Revert "- Added more manifest files to be copied to the manifest directory." new 140a013 Revert "- Hopefully fixed the (with-swf) distribution" The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: distribution/src/main/assembly/component-air.xml | 5 +- .../main/assembly/component-royale-with-swf.xml| 1 - .../src/main/assembly/component-royale.xml | 124 ++--- 3 files changed, 34 insertions(+), 96 deletions(-)
[royale-asjs] 01/02: Revert "- Added more manifest files to be copied to the manifest directory."
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-asjs.git commit cb66abeed634df8ca8f731830dd5db3ad34d296e Author: Carlos Rovira AuthorDate: Mon Feb 22 18:54:19 2021 +0100 Revert "- Added more manifest files to be copied to the manifest directory." This reverts commit 11465038de846de20a6d943702584c0c620d1b76. --- .../src/main/assembly/component-royale.xml | 120 ++--- 1 file changed, 30 insertions(+), 90 deletions(-) diff --git a/distribution/src/main/assembly/component-royale.xml b/distribution/src/main/assembly/component-royale.xml index 2312891..d066b82 100644 --- a/distribution/src/main/assembly/component-royale.xml +++ b/distribution/src/main/assembly/component-royale.xml @@ -255,9 +255,9 @@ under the License. - ../frameworks/projects/Basic/src/main/resources/basic-as-manifest.xml + ../frameworks/projects/Binding/src/main/resources/basic-manifest.xml frameworks/manifests - basic-as-manifest-basic.xml + basic-manifest-binding.xml ../frameworks/projects/Basic/src/main/resources/basic-manifest.xml @@ -265,14 +265,14 @@ under the License. basic-manifest-basic.xml - ../frameworks/projects/Basic/src/main/resources/svg-manifest.xml + ../frameworks/projects/Basic/src/main/resources/basic-as-manifest.xml frameworks/manifests - svg-manifest-basic.xml + basic-as-manifest-basic.xml - ../frameworks/projects/Binding/src/main/resources/basic-manifest.xml + ../frameworks/projects/Basic/src/main/resources/svg-manifest.xml frameworks/manifests - basic-manifest-binding.xml + svg-manifest-basic.xml ../frameworks/projects/Charts/src/main/resources/basic-manifest.xml @@ -295,11 +295,6 @@ under the License. createjs-manifest.xml - ../frameworks/projects/Crux/src/main/resources/crux-manifest.xml - frameworks/manifests - crux-manifest.xml - - ../frameworks/projects/DragDrop/src/main/resources/basic-manifest.xml frameworks/manifests basic-manifest-dragdrop.xml @@ -310,16 +305,6 @@ under the License. basic-manifest-effects.xml - ../frameworks/projects/Express/src/main/resources/express-as-manifest.xml - frameworks/manifests - express-as-manifest.xml - - - ../frameworks/projects/Express/src/main/resources/express-manifest.xml - frameworks/manifests - express-manifest.xml - - ../frameworks/projects/Flat/src/main/resources/flat-as-manifest.xml frameworks/manifests flat-as-manifest.xml @@ -330,16 +315,6 @@ under the License. flat-manifest.xml - ../frameworks/projects/FontAwesome/src/main/resources/fa-as-manifest.xml - frameworks/manifests - fa-as-manifest.xml - - - ../frameworks/projects/FontAwesome/src/main/resources/fa-manifest.xml - frameworks/manifests - fa-manifest.xml - - ../frameworks/projects/Formatters/src/main/resources/basic-manifest.xml frameworks/manifests basic-manifest-formatters.xml @@ -375,41 +350,11 @@ under the License. html5-manifest.xml - ../frameworks/projects/Icons/src/main/resources/icons-as-manifest.xml - frameworks/manifests - icons-as-manifest.xml - - - ../frameworks/projects/Icons/src/main/resources/icons-manifest.xml - frameworks/manifests - icons-manifest.xml - - - ../frameworks/projects/Jewel/src/main/resources/jewel-as-manifest.xml - frameworks/manifests - jewel-as-manifest.xml - - - ../frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml - frameworks/manifests - jewel-manifest.xml - - ../frameworks/projects/JQuery/src/main/resources/jquery-manifest.xml frameworks/manifests jquery-manifest.xml - ../frameworks/projects/MaterialDesignLite/src/main/resources/mdl-as-manifest.xml - frameworks/manifests - mdl-as-manifest.xml - - - ../frameworks/projects/MaterialDesignLite/src/main/resources/mdl-manifest.xml - frameworks/manifests - mdl-manifest.xml - - ../frameworks/projects/Mobile/src/main/resources/basic-manifest.xml frameworks/manifests basic-manifest-mobile.xml @@ -420,69 +365,64 @@ under the License. cordova-manifest.xml - ../frameworks/projects/MXRoyale/src/main/resources/mx-royale-as-manifest.xml - frameworks/manifests - mx-royale-as-manifest.xml - - - ../frameworks/projects/MXRoyale/src/main/resources/mx-royale-manifest.xml + ../frameworks/projects/Network/src/main/resources/basic-manifest.xml frameworks/manifests -
[royale-asjs] 02/02: Revert "- Hopefully fixed the (with-swf) distribution"
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-asjs.git
commit 140a013cc7e04e91879517facb53b82dedfeb2fb
Author: Carlos Rovira
AuthorDate: Mon Feb 22 18:54:37 2021 +0100
Revert "- Hopefully fixed the (with-swf) distribution"
This reverts commit c2a7d5e4761c37d1baddeb6b0cb2d897f45a28db.
---
distribution/src/main/assembly/component-air.xml | 5 ++---
distribution/src/main/assembly/component-royale-with-swf.xml | 1 -
distribution/src/main/assembly/component-royale.xml | 4 ++--
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/distribution/src/main/assembly/component-air.xml
b/distribution/src/main/assembly/component-air.xml
index faf1d3b..e24c2f4 100644
--- a/distribution/src/main/assembly/component-air.xml
+++ b/distribution/src/main/assembly/component-air.xml
@@ -41,18 +41,17 @@ under the License.
true
-
+
false
frameworks/libs/air
-
${artifact.artifactId}.${artifact.extension}
com.adobe.air.framework:*:swc
diff --git a/distribution/src/main/assembly/component-royale-with-swf.xml
b/distribution/src/main/assembly/component-royale-with-swf.xml
index 22b54b7..ac748cb 100644
--- a/distribution/src/main/assembly/component-royale-with-swf.xml
+++ b/distribution/src/main/assembly/component-royale-with-swf.xml
@@ -33,7 +33,6 @@ under the License.
false
frameworks/libs
-
${artifact.artifactId}.${artifact.extension}
org.apache.royale.framework:*:swc
diff --git a/distribution/src/main/assembly/component-royale.xml
b/distribution/src/main/assembly/component-royale.xml
index d066b82..25a7cf3 100644
--- a/distribution/src/main/assembly/component-royale.xml
+++ b/distribution/src/main/assembly/component-royale.xml
@@ -96,7 +96,7 @@ under the License.
-
+
[royale-asjs] branch develop updated: wrong literal
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new a6fe188 wrong literal
a6fe188 is described below
commit a6fe1884ceed91609f6a038f46520b81d688de87
Author: Carlos Rovira
AuthorDate: Mon Feb 22 17:13:58 2021 +0100
wrong literal
---
examples/mxroyale/RemoteObjectAMFTest/asconfig.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/mxroyale/RemoteObjectAMFTest/asconfig.json
b/examples/mxroyale/RemoteObjectAMFTest/asconfig.json
index e523ec9..70633a7 100644
--- a/examples/mxroyale/RemoteObjectAMFTest/asconfig.json
+++ b/examples/mxroyale/RemoteObjectAMFTest/asconfig.json
@@ -2,7 +2,7 @@
"config": "royale",
"compilerOptions": {
"debug": true,
-"targets": ["SWF"],
+"targets": ["JSRoyale"],
// "theme":
"${royalelib}/themes/JewelTheme/src/main/resources/styles.css",
"source-map": true,
"library-path": [
[royale-asjs] branch develop updated: examples-RemoteObjectAMFTest: fix asconfigc to build with Maven distribution
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new fa9b6cc examples-RemoteObjectAMFTest: fix asconfigc to build with
Maven distribution
fa9b6cc is described below
commit fa9b6cc60cdc6aa059234e399f6b367b5af54ffd
Author: Carlos Rovira
AuthorDate: Mon Feb 22 13:10:50 2021 +0100
examples-RemoteObjectAMFTest: fix asconfigc to build with Maven distribution
---
examples/mxroyale/RemoteObjectAMFTest/asconfig.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/mxroyale/RemoteObjectAMFTest/asconfig.json
b/examples/mxroyale/RemoteObjectAMFTest/asconfig.json
index a11dbb4..e523ec9 100644
--- a/examples/mxroyale/RemoteObjectAMFTest/asconfig.json
+++ b/examples/mxroyale/RemoteObjectAMFTest/asconfig.json
@@ -2,7 +2,7 @@
"config": "royale",
"compilerOptions": {
"debug": true,
-"targets": ["SWF","JSRoyale"],
+"targets": ["SWF"],
// "theme":
"${royalelib}/themes/JewelTheme/src/main/resources/styles.css",
"source-map": true,
"library-path": [
[royale-asjs] branch develop updated: maven-distribution: final fix in classpaths to make it work with the new name strategy without version number. Require latest changes in compiler
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 4251d94 maven-distribution: final fix in classpaths to make it work
with the new name strategy without version number. Require latest changes in
compiler
4251d94 is described below
commit 4251d9403d0420bdba56573c961b00f636927bb3
Author: Carlos Rovira
AuthorDate: Sun Feb 21 18:51:26 2021 +0100
maven-distribution: final fix in classpaths to make it work with the new
name strategy without version number. Require latest changes in compiler
---
distribution/jars/compiler-asc/pom.xml | 2 +-
distribution/jars/compiler-compc/pom.xml| 2 +-
distribution/jars/compiler-mxmlc/pom.xml| 2 +-
distribution/jars/mxmlc/pom.xml | 2 +-
distribution/pom.xml| 9 -
distribution/src/main/assembly/component-royale.xml | 4 ++--
6 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/distribution/jars/compiler-asc/pom.xml
b/distribution/jars/compiler-asc/pom.xml
index 7fbe168..9d5daa7 100644
--- a/distribution/jars/compiler-asc/pom.xml
+++ b/distribution/jars/compiler-asc/pom.xml
@@ -45,7 +45,7 @@
org.apache.royale.compiler.clients.ASC
- compc.jar compiler.jar compiler-common.jar
compiler-compc.jar compiler-compjsc.jar compiler-externc.jar
compiler-jburg-types.jar compiler-mxmlc.jar compiler-mxmljsc.jar
compiler-optimizer.jar compiler-swfdump.jar debugger.jar flex-compiler-oem.jar
mxmlc.jar royale-ant-tasks.jar swfutils.jar
+ compiler-common.jar compiler.jar
diff --git a/distribution/jars/compiler-compc/pom.xml
b/distribution/jars/compiler-compc/pom.xml
index 81bdb63..24a1d78 100644
--- a/distribution/jars/compiler-compc/pom.xml
+++ b/distribution/jars/compiler-compc/pom.xml
@@ -45,7 +45,7 @@
org.apache.royale.compiler.clients.COMPC
- compc.jar compiler.jar compiler-asc.jar
compiler-common.jar compiler-compjsc.jar compiler-externc.jar
compiler-jburg-types.jar compiler-mxmlc.jar compiler-mxmljsc.jar
compiler-optimizer.jar compiler-swfdump.jar debugger.jar flex-compiler-oem.jar
mxmlc.jar royale-ant-tasks.jar swfutils.jar
+ compiler-common.jar compiler.jar
diff --git a/distribution/jars/compiler-mxmlc/pom.xml
b/distribution/jars/compiler-mxmlc/pom.xml
index 046124c..139b3d8 100644
--- a/distribution/jars/compiler-mxmlc/pom.xml
+++ b/distribution/jars/compiler-mxmlc/pom.xml
@@ -45,7 +45,7 @@
org.apache.royale.compiler.clients.MXMLC
- compc.jar compiler.jar compiler-asc.jar
compiler-common.jar compiler-compc.jar compiler-compjsc.jar
compiler-externc.jar compiler-jburg-types.jar compiler-mxmljsc.jar
compiler-optimizer.jar compiler-swfdump.jar debugger.jar flex-compiler-oem.jar
mxmlc.jar royale-ant-tasks.jar swfutils.jar
+ compiler-common.jar compiler.jar
diff --git a/distribution/jars/mxmlc/pom.xml b/distribution/jars/mxmlc/pom.xml
index c3dc350..98b8132 100644
--- a/distribution/jars/mxmlc/pom.xml
+++ b/distribution/jars/mxmlc/pom.xml
@@ -45,7 +45,7 @@
org.apache.royale.compiler.clients.MXMLC
- compc.jar compiler.jar compiler-asc.jar
compiler-common.jar compiler-compc.jar compiler-compjsc.jar
compiler-externc.jar compiler-jburg-types.jar compiler-mxmlc.jar
compiler-mxmljsc.jar compiler-optimizer.jar compiler-swfdump.jar debugger.jar
flex-compiler-oem.jar royale-ant-tasks.jar swfutils.jar
+ compiler-common.jar compiler.jar
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 6edf262..889a223 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -398,7 +398,7 @@
${royale.compiler.version}
-
+
com.google.javascript
closure-compiler
@@ -449,9 +449,9 @@
unpack-closure-compiler
-process-resources
+package
- unpack
+ copy
@@ -460,8 +460,7 @@
closure-compiler
v20181210
jar
-
${project.build.directory}/closure-compiler-temp
- **
+ closure-compiler.jar
diff --git a/distribution/src/main/assembly/component-royale.xml
b/distribution/src/main/assembly/component-royale.xml
index d310e51..25a7cf3 100644
--- a/distribution/src/main/assembly/component-royale.xml
+++ b/distribution
[royale-compiler] branch develop updated: maven-distribution: final fix in classpaths to make it work with the new name strategy without version number
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 4270342 maven-distribution: final fix in classpaths to make it work with the new name strategy without version number 4270342 is described below commit 4270342907136e8cdb85bca39b3fae8f6fff247b Author: Carlos Rovira AuthorDate: Sun Feb 21 18:51:07 2021 +0100 maven-distribution: final fix in classpaths to make it work with the new name strategy without version number --- compiler-common/pom.xml | 17 + compiler-jx/pom.xml | 2 +- compiler/pom.xml| 3 +-- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/compiler-common/pom.xml b/compiler-common/pom.xml index 11bac54..79d5a8d 100644 --- a/compiler-common/pom.xml +++ b/compiler-common/pom.xml @@ -30,6 +30,23 @@ Apache Royale: Compiler: Compiler-Common The Apache Royale Compiler Common classes + + + + + org.apache.maven.plugins + maven-jar-plugin + + + +false +external/commons-cli.jar external/commons-io.jar external/ guava.jar .. + + + + + + diff --git a/compiler-jx/pom.xml b/compiler-jx/pom.xml index 99eecf6..565e942 100644 --- a/compiler-jx/pom.xml +++ b/compiler-jx/pom.xml @@ -39,7 +39,7 @@ false - commons-io.jar guava.jar ../../lib/external/antlr.jar ../../lib/external/commons-lang.jar google/closure-compiler/compiler.jar ../../lib/compiler.jar ../../lib/compiler-common.jar + commons-io.jar guava.jar ../../lib/external/antlr.jar ../../lib/external/antlr-runtime.jar ../..jar ../../compiler/lib/external/commons-lang-2.6.jar ../../lib/external/closure-compiler.jar ../../compiler/lib/compiler.jar ../../lib/compiler.jar ../../compiler/lib/compiler-common.jar ../../lib/compiler-common.jar diff --git a/compiler/pom.xml b/compiler/pom.xml index 76df53a..36693b0 100644 --- a/compiler/pom.xml +++ b/compiler/pom.xml @@ -39,8 +39,7 @@ -external/closure-compiler-v20181210.jar compiler-common.jar external/antlr-2.7.7.jar external/antlr-3.3.jar external/antlr-runtime-3.3.jar external/commons-cli-1.2.jar external/commons-io-2.4.jar external/guava-25.1-jre.jar external/lzma-sdk-4j-9.22.0.jar external/flex-tool-api-1.0.0.jar .. - +compiler-common.jar external/antlr.jar external/commons-cli.jar external/commons-io.jar external/guava.jar external/lzma-sdk.jar external/flex-tool-api.jar ..
[royale-compiler] branch develop updated: fix MANIFEST so distribution find common-lang without version number in classpath
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 80f1543 fix MANIFEST so distribution find common-lang without version number in classpath 80f1543 is described below commit 80f1543bfb127f91a305ebc88273ce27558b7642 Author: Carlos Rovira AuthorDate: Sun Feb 21 16:00:11 2021 +0100 fix MANIFEST so distribution find common-lang without version number in classpath --- compiler-jx/pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/compiler-jx/pom.xml b/compiler-jx/pom.xml index f720c31..99eecf6 100644 --- a/compiler-jx/pom.xml +++ b/compiler-jx/pom.xml @@ -39,8 +39,7 @@ false - commons-io.jar guava.jar ../../lib/external/antlr.jar ../../compiler/lib/external/antlr.jar ../../lib/external/commons-lang-2.6.jar ../../compiler/lib/external/commons-lang-2.6.jar google/closure-compiler/compiler.jar ../../compiler/lib/compiler.jar ../../lib/compiler.jar ../../compiler/lib/compiler-common.jar ../../lib/compiler-common.jar - + commons-io.jar guava.jar ../../lib/external/antlr.jar ../../lib/external/commons-lang.jar google/closure-compiler/compiler.jar ../../lib/compiler.jar ../../lib/compiler-common.jar
[royale-asjs] branch develop updated: ensure we still use last 0.9.8-SNAPSHOT
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-asjs.git The following commit(s) were added to refs/heads/develop by this push: new 93af0d0 ensure we still use last 0.9.8-SNAPSHOT 93af0d0 is described below commit 93af0d0f48cfc3e37b54e89cba84b67a1158b6c5 Author: Carlos Rovira AuthorDate: Sun Feb 21 13:58:30 2021 +0100 ensure we still use last 0.9.8-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c2c1585..89b4a08 100644 --- a/pom.xml +++ b/pom.xml @@ -54,8 +54,8 @@ UTF-8 3.5.4 -0.9.9-SNAPSHOT 1.2.1 +0.9.8-SNAPSHOT 0.9.8-SNAPSHOT JSRoyale
[royale-typedefs] branch develop updated: upgrade build-tools reference to latest 1.2.1 release
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-typedefs.git
The following commit(s) were added to refs/heads/develop by this push:
new 3d6360d upgrade build-tools reference to latest 1.2.1 release
3d6360d is described below
commit 3d6360dc16754e73e048af64e53e3a454610b398
Author: Carlos Rovira
AuthorDate: Sun Feb 21 13:45:12 2021 +0100
upgrade build-tools reference to latest 1.2.1 release
---
pom.xml | 72 -
1 file changed, 36 insertions(+), 36 deletions(-)
diff --git a/pom.xml b/pom.xml
index c369a5f..0067300 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,21 +1,21 @@
-http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
4.0.0
@@ -44,7 +44,7 @@
UTF-8
3.3.1
-1.1.0
+1.2.1
0.9.8-SNAPSHOT
apache-release
@@ -127,11 +127,11 @@
**/*.patch
-
**/target/**
**/release-dir/**
@@ -205,9 +205,9 @@
-
royale-release
@@ -222,11 +222,11 @@
apache.releases.https
Apache Release Distribution Repository
-
file://${maven.multiModuleProjectDirectory}/../local-release-dir
@@ -294,9 +294,9 @@
com.theoryinpractise
reproducible-maven-plugin
-
org.apache.maven.plugins
@@ -318,8 +318,8 @@
-
net.nicoulaj.maven.plugins
[royale-compiler] branch develop updated: setting versions back to 0.9.8-SNAPSHOT to avoid cross references between different royale repositories
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 2a24def setting versions back to 0.9.8-SNAPSHOT to avoid cross references between different royale repositories 2a24def is described below commit 2a24def44cdb76a02a105ca4ae56d3d7ba9edd90 Author: Carlos Rovira AuthorDate: Sun Feb 21 13:43:42 2021 +0100 setting versions back to 0.9.8-SNAPSHOT to avoid cross references between different royale repositories --- compiler-common/pom.xml | 4 ++-- compiler-externc/pom.xml | 8 compiler-jx/pom.xml | 14 +++--- compiler-test-utils/pom.xml | 4 ++-- compiler/pom.xml | 10 +- debugger/pom.xml | 8 flex-compiler-oem/pom.xml| 10 +- pom.xml | 2 +- royale-ant-tasks/pom.xml | 4 ++-- royale-maven-plugin/pom.xml | 4 ++-- royaleunit-ant-tasks/pom.xml | 4 ++-- swfutils/pom.xml | 4 ++-- 12 files changed, 38 insertions(+), 38 deletions(-) diff --git a/compiler-common/pom.xml b/compiler-common/pom.xml index 9e5c473..11bac54 100644 --- a/compiler-common/pom.xml +++ b/compiler-common/pom.xml @@ -22,11 +22,11 @@ org.apache.royale.compiler royale-compiler-parent -0.9.9-SNAPSHOT +0.9.8-SNAPSHOT compiler-common -0.9.9-SNAPSHOT +0.9.8-SNAPSHOT Apache Royale: Compiler: Compiler-Common The Apache Royale Compiler Common classes diff --git a/compiler-externc/pom.xml b/compiler-externc/pom.xml index 52f28da..94e2ff3 100644 --- a/compiler-externc/pom.xml +++ b/compiler-externc/pom.xml @@ -22,11 +22,11 @@ org.apache.royale.compiler royale-compiler-parent -0.9.9-SNAPSHOT +0.9.8-SNAPSHOT compiler-externc - 0.9.9-SNAPSHOT + 0.9.8-SNAPSHOT Apache Royale: Compiler: Externc The Apache Royale Compiler Externs Compiler @@ -242,7 +242,7 @@ org.apache.royale.compiler compiler-common - 0.9.9-SNAPSHOT + 0.9.8-SNAPSHOT com.google.javascript @@ -253,7 +253,7 @@ org.apache.royale.compiler compiler-test-utils - 0.9.9-SNAPSHOT + 0.9.8-SNAPSHOT test diff --git a/compiler-jx/pom.xml b/compiler-jx/pom.xml index 62ca1cc..f720c31 100644 --- a/compiler-jx/pom.xml +++ b/compiler-jx/pom.xml @@ -22,11 +22,11 @@ org.apache.royale.compiler royale-compiler-parent -0.9.9-SNAPSHOT +0.9.8-SNAPSHOT compiler-jx - 0.9.9-SNAPSHOT + 0.9.8-SNAPSHOT Apache Royale: Compiler: Compiler-JX @@ -178,17 +178,17 @@ org.apache.royale.compiler compiler-common - 0.9.9-SNAPSHOT + 0.9.8-SNAPSHOT org.apache.royale.compiler compiler-externc - 0.9.9-SNAPSHOT + 0.9.8-SNAPSHOT org.apache.royale.compiler compiler - 0.9.9-SNAPSHOT + 0.9.8-SNAPSHOT org.apache.commons @@ -220,7 +220,7 @@ org.apache.royale.compiler compiler-test-utils - 0.9.9-SNAPSHOT + 0.9.8-SNAPSHOT test @@ -232,7 +232,7 @@ org.apache.royale.compiler compiler-externc - 0.9.9-SNAPSHOT + 0.9.8-SNAPSHOT test-jar test diff --git a/compiler-test-utils/pom.xml b/compiler-test-utils/pom.xml index cb20c02..abf04f4 100644 --- a/compiler-test-utils/pom.xml +++ b/compiler-test-utils/pom.xml @@ -22,11 +22,11 @@ org.apache.royale.compiler royale-compiler-parent -0.9.9-SNAPSHOT +0.9.8-SNAPSHOT compiler-test-utils - 0.9.9-SNAPSHOT + 0.9.8-SNAPSHOT Apache Royale: Compiler: Test Utils diff --git a/compiler/pom.xml b/compiler/pom.xml index 337cc59..76df53a 100644 --- a/compiler/pom.xml +++ b/compiler/pom.xml @@ -22,11 +22,11 @@ org.apache.royale.compiler royale-compiler-parent -0.9.9-SNAPSHOT +0.9.8-SNAPSHOT compiler - 0.9.9-SNAPSHOT + 0.9.8-SNAPSHOT Apache Royale: Compiler: Compiler The Apache Royale Compiler @@ -565,7 +565,7 @@ org.apache.royale.compiler compiler-common - 0.9.9-SNAPSHOT + 0.9.8-SNAPSHOT org.apache.flex @@ -617,13 +617,13 @@ org.apache.royale.compiler compiler-test-utils - 0.9.9-SNAPSHOT + 0.9.8-SNAPSHOT test org.apache.royale.compiler compiler-externc - 0.9.9-SNAPSHOT + 0.9.8-SNAPSHOT junit diff --git a/debugger/pom.xml b/debugger/pom.xml index d6edf02..b19c7a9 100644 --- a/debugger/pom.xml +++ b/debugger/pom.xml @@ -22,11 +22,11 @@ org.apache.royale.compiler royale-compiler-parent -0.9.9-SNAPSHOT +0.9.8-SNAPSHOT debugger - 0.9.9-SNAPSHOT + 0.9.8
[royale-asjs] branch develop updated: tour-de-jewel: better consider ToggleButtonBar can have selectedIndex -1 and print in label when needed
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 7910e4f tour-de-jewel: better consider ToggleButtonBar can have
selectedIndex -1 and print in label when needed
7910e4f is described below
commit 7910e4f59ecaf691f5e16f7e40ee526245c977e7
Author: Carlos Rovira
AuthorDate: Sun Feb 14 11:36:31 2021 +0100
tour-de-jewel: better consider ToggleButtonBar can have selectedIndex -1
and print in label when needed
---
examples/jewel/TourDeJewel/src/main/royale/ButtonBarPlayGround.mxml | 2 ++
1 file changed, 2 insertions(+)
diff --git
a/examples/jewel/TourDeJewel/src/main/royale/ButtonBarPlayGround.mxml
b/examples/jewel/TourDeJewel/src/main/royale/ButtonBarPlayGround.mxml
index 686be8c..4fc370f 100644
--- a/examples/jewel/TourDeJewel/src/main/royale/ButtonBarPlayGround.mxml
+++ b/examples/jewel/TourDeJewel/src/main/royale/ButtonBarPlayGround.mxml
@@ -178,6 +178,8 @@ limitations under the License.
if(event.target.selectedIndex != -1) {
var selected:Boolean =
(event.target.getElementAt(event.target.selectedIndex) as ISelectable).selected;
tbb_label.text =
event.target.selectedItem.label + ' (icon: ' + event.target.selectedItem.icon +
'). isSelected? ' + selected;
+ } else {
+ tbb_label.text = "Nothing is selected";
}
}
]]>
[royale-asjs] branch develop updated: tour-de-jewel: fix ToggleButtonBar examples for the new behavior
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 2818fa8 tour-de-jewel: fix ToggleButtonBar examples for the new
behavior
2818fa8 is described below
commit 2818fa808ccfe8512d4282680f9bb80c1fde7a4f
Author: Carlos Rovira
AuthorDate: Sun Feb 14 11:31:50 2021 +0100
tour-de-jewel: fix ToggleButtonBar examples for the new behavior
---
examples/jewel/TourDeJewel/src/main/royale/ButtonBarPlayGround.mxml | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git
a/examples/jewel/TourDeJewel/src/main/royale/ButtonBarPlayGround.mxml
b/examples/jewel/TourDeJewel/src/main/royale/ButtonBarPlayGround.mxml
index 82e6d45..686be8c 100644
--- a/examples/jewel/TourDeJewel/src/main/royale/ButtonBarPlayGround.mxml
+++ b/examples/jewel/TourDeJewel/src/main/royale/ButtonBarPlayGround.mxml
@@ -175,8 +175,10 @@ limitations under the License.
public function tbbChangeHandler(event:Event):void
{
- var selected:Boolean =
(event.target.getElementAt(event.target.selectedIndex) as ISelectable).selected;
- tbb_label.text =
event.target.selectedItem.label + ' (icon: ' + event.target.selectedItem.icon +
'). isSelected? ' + selected;
+ if(event.target.selectedIndex != -1) {
+ var selected:Boolean =
(event.target.getElementAt(event.target.selectedIndex) as ISelectable).selected;
+ tbb_label.text =
event.target.selectedItem.label + ' (icon: ' + event.target.selectedItem.icon +
'). isSelected? ' + selected;
+ }
}
]]>
[royale-asjs] branch develop updated: BE004: simplify code removing dataproviderdince is DefaultProperty in Jewel List
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-asjs.git The following commit(s) were added to refs/heads/develop by this push: new efa7f22 BE004: simplify code removing dataproviderdince is DefaultProperty in Jewel List efa7f22 is described below commit efa7f22101a6ac01039e19650de678895f4fcc0e Author: Carlos Rovira AuthorDate: Sun Feb 14 10:21:27 2021 +0100 BE004: simplify code removing dataproviderdince is DefaultProperty in Jewel List --- .../src/main/royale/BE0004_Adding_an_item_to_a_Jewel_List.mxml| 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/examples/blog/BE0004_Adding_an_item_to_a_Jewel_List/src/main/royale/BE0004_Adding_an_item_to_a_Jewel_List.mxml b/examples/blog/BE0004_Adding_an_item_to_a_Jewel_List/src/main/royale/BE0004_Adding_an_item_to_a_Jewel_List.mxml index 2375792..4b6637c 100644 --- a/examples/blog/BE0004_Adding_an_item_to_a_Jewel_List/src/main/royale/BE0004_Adding_an_item_to_a_Jewel_List.mxml +++ b/examples/blog/BE0004_Adding_an_item_to_a_Jewel_List/src/main/royale/BE0004_Adding_an_item_to_a_Jewel_List.mxml @@ -46,9 +46,7 @@ - - - +
[royale-asjs] branch develop updated: jewel-daterangerestriction: Replace time calculation with appropriate filters per view state
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 85265ec jewel-daterangerestriction: Replace time calculation with
appropriate filters per view state
new 16d9cbd Merge pull request #1079 from brianraymes/develop
85265ec is described below
commit 85265ec3070cd19a467b92667190a395474754fa
Author: Brian Raymes
AuthorDate: Sat Feb 13 11:42:20 2021 -0800
jewel-daterangerestriction: Replace time calculation with appropriate
filters per view state
---
.../datechooser/DateChooserDateRangeRestriction.as | 196 +
.../datefield/DateFieldDateRangeRestriction.as | 70
2 files changed, 159 insertions(+), 107 deletions(-)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateChooserDateRangeRestriction.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateChooserDateRangeRestriction.as
old mode 100644
new mode 100755
index ac5e864..1992f99
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateChooserDateRangeRestriction.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateChooserDateRangeRestriction.as
@@ -18,19 +18,20 @@
package org.apache.royale.jewel.beads.controls.datechooser
{
-import org.apache.royale.core.DispatcherBead;
-import org.apache.royale.core.IStrand;
-import org.apache.royale.events.Event;
-import org.apache.royale.events.IEventDispatcher;
-import org.apache.royale.events.MouseEvent;
-import org.apache.royale.jewel.beads.controls.Disabled;
-import org.apache.royale.jewel.beads.itemRenderers.ITextItemRenderer;
-import org.apache.royale.jewel.beads.views.DateChooserView;
-import org.apache.royale.jewel.supportClasses.datechooser.DateChooserTable;
-import org.apache.royale.jewel.supportClasses.table.TBodyContentArea;
-import org.apache.royale.jewel.supportClasses.table.TableCell;
-import org.apache.royale.jewel.supportClasses.table.TableRow;
-
+ import org.apache.royale.core.DispatcherBead;
+ import org.apache.royale.core.IStrand;
+ import org.apache.royale.events.Event;
+ import org.apache.royale.events.IEventDispatcher;
+ import org.apache.royale.events.MouseEvent;
+ import org.apache.royale.jewel.beads.controls.Disabled;
+ import org.apache.royale.jewel.beads.itemRenderers.ITextItemRenderer;
+ import org.apache.royale.jewel.beads.models.DateChooserModel;
+ import org.apache.royale.jewel.beads.views.DateChooserView;
+ import
org.apache.royale.jewel.supportClasses.datechooser.DateChooserTable;
+ import org.apache.royale.jewel.supportClasses.table.TBodyContentArea;
+ import org.apache.royale.jewel.supportClasses.table.TableCell;
+ import org.apache.royale.jewel.supportClasses.table.TableRow;
+
/**
* Disable dates which are outside restriction provided by minDate and
maxDate properties
* in DateChooser component. User can set just one restriction
(minDate or maxDate), or both
@@ -47,7 +48,7 @@ package org.apache.royale.jewel.beads.controls.datechooser
*/
public class DateChooserDateRangeRestriction extends DispatcherBead
{
-/**
+ /**
* constructor.
*
* @langversion 3.0
@@ -58,16 +59,16 @@ package org.apache.royale.jewel.beads.controls.datechooser
public function DateChooserDateRangeRestriction()
{
}
-
+
private var _minDate:Date;
-/**
- * The minimun date
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.8
- */
+ /**
+* The minimun date
+*
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion Royale 0.9.8
+*/
[Bindable]
public function get minDate():Date
{
@@ -81,16 +82,16 @@ package org.apache.royale.jewel.beads.controls.datechooser
refreshDateRange();
}
}
-
+
private var _maxDate:Date;
-/**
- * The maximun date
- *
- * @langversion 3.0
[royale-asjs] branch develop updated: jewel-togglebuttonbar: fix NPE
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new d5e916d jewel-togglebuttonbar: fix NPE
d5e916d is described below
commit d5e916da64c5508e13d1fb567b299f6837df6c80
Author: Carlos Rovira
AuthorDate: Fri Feb 12 12:47:50 2021 +0100
jewel-togglebuttonbar: fix NPE
---
.../royale/jewel/beads/views/ToggleButtonBarView.as | 19 +++
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ToggleButtonBarView.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ToggleButtonBarView.as
index c90f645..e3a053b 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ToggleButtonBarView.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ToggleButtonBarView.as
@@ -62,16 +62,19 @@ package org.apache.royale.jewel.beads.views
var prev_ir:ToggleButtonBarItemRenderer =
dataGroup.getItemRendererAt(lastSelectedIndex) as ToggleButtonBarItemRenderer;
var ir:ToggleButtonBarItemRenderer =
dataGroup.getItemRendererAt(listModel.selectedIndex) as
ToggleButtonBarItemRenderer;
- if(prev_ir != ir)
+ if(listModel.selectedIndex != -1)
{
- if(prev_ir)
- prev_ir.selected = false;
- ir.selected = true;
- } else {
- if(listModel.selectedIndex == ir.index &&
ir.selected)
+ if(prev_ir != ir)
{
- ir.selected = false;
- listModel.selectedIndex = -1;
+ if(prev_ir)
+ prev_ir.selected = false;
+ ir.selected = true;
+ } else {
+ if(listModel.selectedIndex == ir.index
&& ir.selected)
+ {
+ ir.selected = false;
+ listModel.selectedIndex = -1;
+ }
}
}
[royale-docs] branch master updated: change test
This is an automated email from the ASF dual-hosted git repository. carlosrovira pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/royale-docs.git The following commit(s) were added to refs/heads/master by this push: new 200090b change test 200090b is described below commit 200090b6ca5170d7b3d47afa1619380fe200d94e Author: Carlos Rovira AuthorDate: Thu Feb 11 12:33:19 2021 +0100 change test --- get-started/frameworks.md | 1 + 1 file changed, 1 insertion(+) diff --git a/get-started/frameworks.md b/get-started/frameworks.md index c021589..404f0cf 100644 --- a/get-started/frameworks.md +++ b/get-started/frameworks.md @@ -50,6 +50,7 @@ Apache Royale supports its own [component sets](component-sets) of controls, opt Why would you use a third-party framework with Royale? Because you like the look and feel of that framework's user interface components but want to use ActionScript to handle the business logic and/or use MXML to set up the UI. + ### Other Component Sets These component sets are created under the Royale umbrella, but use or wrap existing external libraries or frameworks. Royale supports (to varying degrees):
[royale-asjs] branch develop updated: tour-de-jewel: reverse order examples
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-asjs.git The following commit(s) were added to refs/heads/develop by this push: new 39d04cb tour-de-jewel: reverse order examples 39d04cb is described below commit 39d04cbeb7af8ef8c63841912f5bd5a951b81dec Author: Carlos Rovira AuthorDate: Tue Feb 9 19:45:10 2021 +0100 tour-de-jewel: reverse order examples --- .../TourDeJewel/src/main/royale/CardPlayGround.mxml| 6 ++ .../TourDeJewel/src/main/royale/GridPlayGround.mxml| 18 +- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/examples/jewel/TourDeJewel/src/main/royale/CardPlayGround.mxml b/examples/jewel/TourDeJewel/src/main/royale/CardPlayGround.mxml index 8407003..9804710 100644 --- a/examples/jewel/TourDeJewel/src/main/royale/CardPlayGround.mxml +++ b/examples/jewel/TourDeJewel/src/main/royale/CardPlayGround.mxml @@ -65,6 +65,12 @@ limitations under the License. + + + + + + diff --git a/examples/jewel/TourDeJewel/src/main/royale/GridPlayGround.mxml b/examples/jewel/TourDeJewel/src/main/royale/GridPlayGround.mxml index 8e12af3..ab0fefd 100644 --- a/examples/jewel/TourDeJewel/src/main/royale/GridPlayGround.mxml +++ b/examples/jewel/TourDeJewel/src/main/royale/GridPlayGround.mxml @@ -385,7 +385,7 @@ limitations under the License. - + @@ -399,6 +399,22 @@ limitations under the License. + + + + + + + + + + + + + + + +
[royale-asjs] branch develop updated: jewel-togglebuttonbar: implement toggleOnClick and remove allowMultipleSelection until more investigation for the later. Still need to implement -1 when deselect
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new c239f63 jewel-togglebuttonbar: implement toggleOnClick and remove
allowMultipleSelection until more investigation for the later. Still need to
implement -1 when deselect the current button (partial #1074)
c239f63 is described below
commit c239f633932d74f3be466d07ee24ed3d3f9be401
Author: Carlos Rovira
AuthorDate: Mon Feb 8 23:46:42 2021 +0100
jewel-togglebuttonbar: implement toggleOnClick and remove
allowMultipleSelection until more investigation for the later. Still need to
implement -1 when deselect the current button (partial #1074)
---
.../src/main/royale/ButtonBarPlayGround.mxml | 9 ++---
.../projects/Jewel/src/main/resources/defaults.css | 6 ++-
.../royale/org/apache/royale/jewel/ToggleButton.as | 2 +-
.../org/apache/royale/jewel/ToggleButtonBar.as | 46 +++---
.../jewel/beads/views/ToggleButtonBarView.as | 17
.../itemRenderers/IconButtonBarItemRenderer.as | 1 -
.../itemRenderers/ToggleButtonBarItemRenderer.as | 32 ++-
.../Jewel/src/main/sass/components/_buttonbar.sass | 9 -
8 files changed, 90 insertions(+), 32 deletions(-)
diff --git
a/examples/jewel/TourDeJewel/src/main/royale/ButtonBarPlayGround.mxml
b/examples/jewel/TourDeJewel/src/main/royale/ButtonBarPlayGround.mxml
index 14b0e6a..82e6d45 100644
--- a/examples/jewel/TourDeJewel/src/main/royale/ButtonBarPlayGround.mxml
+++ b/examples/jewel/TourDeJewel/src/main/royale/ButtonBarPlayGround.mxml
@@ -147,7 +147,7 @@ limitations under the License.
-
+
-
-
-
+
+
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css
b/frameworks/projects/Jewel/src/main/resources/defaults.css
index aac03a3..631f6b6 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -293,9 +293,13 @@ j|IconButtonBar {
IItemRenderer:
ClassReference("org.apache.royale.jewel.itemRenderers.IconButtonBarItemRenderer");
}
+.jewel.buttonbar.toggle-on-click .jewel.togglebutton.selected {
+ pointer-events: none;
+}
+
j|ToggleButtonBar {
- IItemRenderer:
ClassReference("org.apache.royale.jewel.itemRenderers.ToggleButtonBarItemRenderer");
IBeadView:
ClassReference("org.apache.royale.jewel.beads.views.ToggleButtonBarView");
+ IItemRenderer:
ClassReference("org.apache.royale.jewel.itemRenderers.ToggleButtonBarItemRenderer");
}
.jewel.card {
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ToggleButton.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ToggleButton.as
index df3009c..131cb39 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ToggleButton.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ToggleButton.as
@@ -167,7 +167,7 @@ package org.apache.royale.jewel
}
COMPILE::JS
-private function clickHandler(event:Event):void
+protected function clickHandler(event:Event):void
{
selected = !selected;
}
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ToggleButtonBar.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ToggleButtonBar.as
index 5029666..f923366 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ToggleButtonBar.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ToggleButtonBar.as
@@ -18,6 +18,8 @@
package org.apache.royale.jewel
{
+ import org.apache.royale.core.ISelectionModel;
+
/**
* The Jewel ToggleButtonBar class is a component that displays a set
of ToggleButtons. The ToggleButtonBar
* is actually an IconButtonBar with an itemRenderer that produces
Jewel ToggleButtons.
@@ -52,19 +54,51 @@ package org.apache.royale.jewel
public function ToggleButtonBar()
{
super();
+
+ //ToggleButtonBar is always selected, so selectedIndex
can't be -1, at least it will default to 0
+ ISelectionModel(model).selectedIndex = 0;
+ toggleOnClick = false;
}
- private var _allowMultipleSelection:Boolean = false;
+
[royale-asjs] branch develop updated: tour-de-jewel: example of use new bead BadgeWithMouseClick
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-asjs.git The following commit(s) were added to refs/heads/develop by this push: new 793715c tour-de-jewel: example of use new bead BadgeWithMouseClick 793715c is described below commit 793715ca70cdba03bf3cb5bf894d4e99f717814f Author: Carlos Rovira AuthorDate: Mon Feb 8 18:37:01 2021 +0100 tour-de-jewel: example of use new bead BadgeWithMouseClick --- examples/jewel/TourDeJewel/src/main/royale/MainContent.mxml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/jewel/TourDeJewel/src/main/royale/MainContent.mxml b/examples/jewel/TourDeJewel/src/main/royale/MainContent.mxml index eb96f21..1d19544 100644 --- a/examples/jewel/TourDeJewel/src/main/royale/MainContent.mxml +++ b/examples/jewel/TourDeJewel/src/main/royale/MainContent.mxml @@ -30,6 +30,7 @@ limitations under the License.
[royale-asjs] branch develop updated: jewel-iconbuttonbar: remove unused code
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 7110f0f jewel-iconbuttonbar: remove unused code
7110f0f is described below
commit 7110f0fe1c3b58e6acbeb31143b7bca42bf95951
Author: Carlos Rovira
AuthorDate: Mon Feb 8 18:34:04 2021 +0100
jewel-iconbuttonbar: remove unused code
---
.../royale/org/apache/royale/jewel/IconButtonBar.as | 21 -
1 file changed, 21 deletions(-)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/IconButtonBar.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/IconButtonBar.as
index 11835cd..0c9a85b 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/IconButtonBar.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/IconButtonBar.as
@@ -99,26 +99,5 @@ package org.apache.royale.jewel
_iconField = value;
}
}
-
- private var _material:Boolean;
-/**
- * Use the Material Icons
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.7
- */
-public function get material():Boolean
-{
-return _material;
-}
-public function set material(value:Boolean):void
-{
-if (_material != value)
-{
-_material = value;
-}
-}
}
}
[royale-asjs] branch develop updated: New bead BadgeWithMouseClick, is a Jewel Badge extension that dispatches the MouseClick Event
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 094bb3e New bead BadgeWithMouseClick, is a Jewel Badge extension
that dispatches the MouseClick Event
new f924a23 Merge pull request #1078 from
mjesteve/Bead_BadgeWithMouseClick
094bb3e is described below
commit 094bb3e6b9deee1ab7cb93223ccfb44672611c70
Author: hiedra-iest
AuthorDate: Mon Feb 8 17:23:10 2021 +0100
New bead BadgeWithMouseClick, is a Jewel Badge extension that dispatches
the MouseClick Event
---
.../Jewel/src/main/resources/jewel-manifest.xml| 1 +
.../jewel/beads/controls/BadgeWithMouseClick.as| 71 ++
2 files changed, 72 insertions(+)
diff --git a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
index edf0e4d..5d95488 100644
--- a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
+++ b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
@@ -177,6 +177,7 @@
+
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/BadgeWithMouseClick.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/BadgeWithMouseClick.as
new file mode 100644
index 000..4797783
--- /dev/null
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/BadgeWithMouseClick.as
@@ -0,0 +1,71 @@
+
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+package org.apache.royale.jewel.beads.controls
+{
+ import org.apache.royale.jewel.Label;
+ import org.apache.royale.events.MouseEvent;
+ import org.apache.royale.jewel.beads.controls.Badge;
+
+ [Event(name="click", type="org.apache.royale.events.MouseEvent")]
+
+ /**
+* The Badge class provides a small status descriptors for UI elements.
+*
+* A Badge is an onscreen notification element consists of a small
circle,
+ * typically containing a number or other characters, that appears in
+ * proximity to another object
+*
+* The BadgeWithMouseClick class is a Badge extension that dispatches
the MouseClick Event.
+*
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion Royale 0.9.8
+*/
+ public class BadgeWithMouseClick extends
org.apache.royale.jewel.beads.controls.Badge
+ {
+ /**
+* constructor.
+*
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion Royale 0.9.8
+*/
+ public function BadgeWithMouseClick()
+ {
+ super();
+ }
+ /**
+* used to create the badge ui element
+* that will be a Label
+*/
+ override protected function createBadge():Label
+ {
+ var tmpbadge:Label = super.createBadge();
+
+ tmpbadge.addEventListener("click", function():void{
+ dispatchEvent(new MouseEvent("click"));
+ });
+ return tmpbadge;
+ }
+
+ }
+
+}
[royale-asjs] branch develop updated (da2716f -> e0d6723)
This is an automated email from the ASF dual-hosted git repository. carlosrovira pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git. from da2716f jewel-slider: HSlider Visibility Not Working (fix #1076) add e0d6723 jewel-tabbar: remove unneded code since "link" property was removed long time ago No new revisions were added by this update. Summary of changes: .../Jewel/src/main/royale/org/apache/royale/jewel/TabBar.as | 12 +--- 1 file changed, 1 insertion(+), 11 deletions(-)
[royale-asjs] branch develop updated: jewel-slider: HSlider Visibility Not Working (fix #1076)
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new da2716f jewel-slider: HSlider Visibility Not Working (fix #1076)
da2716f is described below
commit da2716fbfc7508e23d0eb9f22e25cbcf77d5e050
Author: Carlos Rovira
AuthorDate: Sat Feb 6 18:25:04 2021 +0100
jewel-slider: HSlider Visibility Not Working (fix #1076)
---
frameworks/projects/Jewel/src/main/resources/defaults.css | 2 +-
frameworks/projects/Jewel/src/main/sass/components/_slider.sass | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css
b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 60aeff7..aac03a3 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -3653,7 +3653,7 @@ j|ScrollableSectionContent {
.jewel.slider {
position: relative;
height: 27px;
- display: flex !important;
+ display: flex;
flex-direction: row;
background: none;
}
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_slider.sass
b/frameworks/projects/Jewel/src/main/sass/components/_slider.sass
index 8c51bfc..07e125a 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_slider.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_slider.sass
@@ -31,7 +31,7 @@ $slider-container-height: #{$slider-thumb-size +
round($slider-thumb-size/2)}
position: relative
height: $slider-container-height
- display: flex !important
+ display: flex
flex-direction: row
background: none
[royale-docs] branch master updated: Update build.md
This is an automated email from the ASF dual-hosted git repository. carlosrovira pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/royale-docs.git The following commit(s) were added to refs/heads/master by this push: new 5aac517 Update build.md 5aac517 is described below commit 5aac517e2691c093e1eee7913dfc86de06575c86 Author: Carlos Rovira AuthorDate: Fri Feb 5 16:06:44 2021 +0100 Update build.md Update js:VView to js:View --- create-an-application/application-tutorial/build.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/create-an-application/application-tutorial/build.md b/create-an-application/application-tutorial/build.md index 2a6b9ba..dc0b0b8 100644 --- a/create-an-application/application-tutorial/build.md +++ b/create-an-application/application-tutorial/build.md @@ -90,7 +90,7 @@ The main *MXML* file should now look like this: - + @@ -101,7 +101,7 @@ The main *MXML* file should now look like this: - + ```
[royale-docs] branch master updated: Update data-model.md
This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/royale-docs.git
The following commit(s) were added to refs/heads/master by this push:
new 041e069 Update data-model.md
041e069 is described below
commit 041e069d5f4a96fbd40232ca2e9d0b5596eb903a
Author: Carlos Rovira
AuthorDate: Fri Feb 5 16:03:40 2021 +0100
Update data-model.md
update commitService.source to commitsService.url =
"https://api.github.com/repos/; + repos[currentIndex] + "/commits"; as exposed
by David Slotemaker on list
---
create-an-application/application-tutorial/data-model.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/create-an-application/application-tutorial/data-model.md
b/create-an-application/application-tutorial/data-model.md
index a39ad06..7ff27a3 100644
--- a/create-an-application/application-tutorial/data-model.md
+++ b/create-an-application/application-tutorial/data-model.md
@@ -84,7 +84,7 @@ private var currentIndex:int = 0;
private function fetchCommits():void
{
commitsService.addEventListener("complete", gotCommits);
- commitsService.source = repos[currentIndex];
+ commitsService.url = "https://api.github.com/repos/; + repos[currentIndex] +
"/commits";
commitsService.send();
}
[royale-asjs] branch develop updated: tour-de-jewel: add example of togglebuttonbar with allowMultipleSelection true
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new d1813cb tour-de-jewel: add example of togglebuttonbar with
allowMultipleSelection true
d1813cb is described below
commit d1813cbdcf2e4a593b044cbeb90186c685c412ce
Author: Carlos Rovira
AuthorDate: Thu Feb 4 13:37:12 2021 +0100
tour-de-jewel: add example of togglebuttonbar with allowMultipleSelection
true
---
examples/jewel/TourDeJewel/src/main/royale/ButtonBarPlayGround.mxml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/examples/jewel/TourDeJewel/src/main/royale/ButtonBarPlayGround.mxml
b/examples/jewel/TourDeJewel/src/main/royale/ButtonBarPlayGround.mxml
index 135a0c2..14b0e6a 100644
--- a/examples/jewel/TourDeJewel/src/main/royale/ButtonBarPlayGround.mxml
+++ b/examples/jewel/TourDeJewel/src/main/royale/ButtonBarPlayGround.mxml
@@ -155,9 +155,9 @@ limitations under the License.
emphasis="primary" width="100%"
dataProvider="{listModel.iconButtonDataFW}"/>
-
+
-
[royale-asjs] branch develop updated: jewel-togglebuttonbar: add "allowMultipleSelection" to allow just one button selected or multiple (fix #1074)
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 8a0249e jewel-togglebuttonbar: add "allowMultipleSelection" to allow
just one button selected or multiple (fix #1074)
8a0249e is described below
commit 8a0249eb22eaea77230035c485d5bf74a6a3
Author: Carlos Rovira
AuthorDate: Thu Feb 4 13:24:57 2021 +0100
jewel-togglebuttonbar: add "allowMultipleSelection" to allow just one
button selected or multiple (fix #1074)
---
.../projects/Jewel/src/main/resources/defaults.css | 1 +
.../projects/Jewel/src/main/royale/JewelClasses.as | 1 +
.../org/apache/royale/jewel/ToggleButtonBar.as | 13 +
.../royale/jewel/beads/views/ButtonBarView.as | 1 -
.../apache/royale/jewel/beads/views/TabBarView.as | 5 +-
.../{ButtonBarView.as => ToggleButtonBarView.as} | 60 +-
.../itemRenderers/ToggleButtonBarItemRenderer.as | 8 +--
.../Jewel/src/main/sass/components/_buttonbar.sass | 4 +-
8 files changed, 55 insertions(+), 38 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css
b/frameworks/projects/Jewel/src/main/resources/defaults.css
index f9dd302..60aeff7 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -295,6 +295,7 @@ j|IconButtonBar {
j|ToggleButtonBar {
IItemRenderer:
ClassReference("org.apache.royale.jewel.itemRenderers.ToggleButtonBarItemRenderer");
+ IBeadView:
ClassReference("org.apache.royale.jewel.beads.views.ToggleButtonBarView");
}
.jewel.card {
diff --git a/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
b/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
index d4c1f0a..fba6408 100644
--- a/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
+++ b/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
@@ -72,6 +72,7 @@ import org.apache.royale.utils.observeElementSize;
import org.apache.royale.jewel.beads.views.AlertTitleBarView;
AlertTitleBarView;
import org.apache.royale.jewel.beads.views.ListView; ListView;
import org.apache.royale.jewel.beads.views.TabBarView; TabBarView;
+import org.apache.royale.jewel.beads.views.ToggleButtonBarView;
ToggleButtonBarView;
import org.apache.royale.jewel.beads.views.DropDownListView;
DropDownListView;
import org.apache.royale.jewel.beads.views.DropDownListView;
DropDownListView;
import org.apache.royale.jewel.beads.views.DateChooserView;
DateChooserView;
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ToggleButtonBar.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ToggleButtonBar.as
index 6481f78..5029666 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ToggleButtonBar.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ToggleButtonBar.as
@@ -53,5 +53,18 @@ package org.apache.royale.jewel
{
super();
}
+
+ private var _allowMultipleSelection:Boolean = false;
+ /**
+* if true, allow more than one button selected. If false, just
one button can be selected at a time
+*/
+ public function get allowMultipleSelection():Boolean
+ {
+ return _allowMultipleSelection;
+ }
+ public function set allowMultipleSelection(value:Boolean):void
+ {
+ _allowMultipleSelection = value;
+ }
}
}
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ButtonBarView.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ButtonBarView.as
index 2db439e..591d476 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ButtonBarView.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ButtonBarView.as
@@ -18,7 +18,6 @@
package org.apache.royale.jewel.beads.views
{
- import org.apache.royale.core.IStrand;
import org.apache.royale.jewel.ButtonBar;
/**
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/TabBarView.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/TabBarView.as
index c55b1c2..c95042b 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/TabBarView.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel
[royale-asjs] branch develop updated: tour-de-jewel:jewel-badge: make badge protected
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-asjs.git The following commit(s) were added to refs/heads/develop by this push: new 47edc21 tour-de-jewel:jewel-badge: make badge protected 47edc21 is described below commit 47edc21f521f1173ac8665f808aae55e144a7c20 Author: Carlos Rovira AuthorDate: Tue Feb 2 18:25:11 2021 +0100 tour-de-jewel:jewel-badge: make badge protected --- .../src/main/royale/org/apache/royale/jewel/beads/controls/Badge.as | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Badge.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Badge.as index b5a9570..d2112f9 100644 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Badge.as +++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Badge.as @@ -54,7 +54,7 @@ package org.apache.royale.jewel.beads.controls /** * the internal instance of the badge */ - private var badge:Label; + protected var badge:Label; /** * used to create the badge ui element
[royale-asjs] branch develop updated: jewel-layouts: consider "Gap" for "itemsReverse". This is for first question in #1070
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 18e4390 jewel-layouts: consider "Gap" for "itemsReverse". This is for
first question in #1070
18e4390 is described below
commit 18e43900af4842b69102a592e1b71a8db7efe5d8
Author: Carlos Rovira
AuthorDate: Sun Jan 31 19:48:37 2021 +0100
jewel-layouts: consider "Gap" for "itemsReverse". This is for first
question in #1070
---
.../projects/Jewel/src/main/resources/defaults.css | 120 +
.../Jewel/src/main/sass/components/_layout.sass| 18
2 files changed, 138 insertions(+)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css
b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 0ee8dcb..f9dd302 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -1157,6 +1157,66 @@ j|Label {
.layout.horizontal.gap-10x3px > * {
margin-left: 30px;
}
+.layout.horizontal.itemsReverse.gap-1x3px > *:last-child {
+ margin-left: 0px;
+}
+.layout.horizontal.itemsReverse.gap-1x3px > * {
+ margin-left: 3px;
+}
+.layout.horizontal.itemsReverse.gap-2x3px > *:last-child {
+ margin-left: 0px;
+}
+.layout.horizontal.itemsReverse.gap-2x3px > * {
+ margin-left: 6px;
+}
+.layout.horizontal.itemsReverse.gap-3x3px > *:last-child {
+ margin-left: 0px;
+}
+.layout.horizontal.itemsReverse.gap-3x3px > * {
+ margin-left: 9px;
+}
+.layout.horizontal.itemsReverse.gap-4x3px > *:last-child {
+ margin-left: 0px;
+}
+.layout.horizontal.itemsReverse.gap-4x3px > * {
+ margin-left: 12px;
+}
+.layout.horizontal.itemsReverse.gap-5x3px > *:last-child {
+ margin-left: 0px;
+}
+.layout.horizontal.itemsReverse.gap-5x3px > * {
+ margin-left: 15px;
+}
+.layout.horizontal.itemsReverse.gap-6x3px > *:last-child {
+ margin-left: 0px;
+}
+.layout.horizontal.itemsReverse.gap-6x3px > * {
+ margin-left: 18px;
+}
+.layout.horizontal.itemsReverse.gap-7x3px > *:last-child {
+ margin-left: 0px;
+}
+.layout.horizontal.itemsReverse.gap-7x3px > * {
+ margin-left: 21px;
+}
+.layout.horizontal.itemsReverse.gap-8x3px > *:last-child {
+ margin-left: 0px;
+}
+.layout.horizontal.itemsReverse.gap-8x3px > * {
+ margin-left: 24px;
+}
+.layout.horizontal.itemsReverse.gap-9x3px > *:last-child {
+ margin-left: 0px;
+}
+.layout.horizontal.itemsReverse.gap-9x3px > * {
+ margin-left: 27px;
+}
+.layout.horizontal.itemsReverse.gap-10x3px > *:last-child {
+ margin-left: 0px;
+}
+.layout.horizontal.itemsReverse.gap-10x3px > * {
+ margin-left: 30px;
+}
.layout.horizontal.sameWidths > * {
flex: 1 0 0;
}
@@ -1259,6 +1319,66 @@ j|Label {
.layout.vertical.gap-10x3px > * {
margin-top: 30px;
}
+.layout.vertical.itemsReverse.gap-1x3px > *:-child {
+ margin-top: 0px;
+}
+.layout.vertical.itemsReverse.gap-1x3px > * {
+ margin-top: 3px;
+}
+.layout.vertical.itemsReverse.gap-2x3px > *:-child {
+ margin-top: 0px;
+}
+.layout.vertical.itemsReverse.gap-2x3px > * {
+ margin-top: 6px;
+}
+.layout.vertical.itemsReverse.gap-3x3px > *:-child {
+ margin-top: 0px;
+}
+.layout.vertical.itemsReverse.gap-3x3px > * {
+ margin-top: 9px;
+}
+.layout.vertical.itemsReverse.gap-4x3px > *:-child {
+ margin-top: 0px;
+}
+.layout.vertical.itemsReverse.gap-4x3px > * {
+ margin-top: 12px;
+}
+.layout.vertical.itemsReverse.gap-5x3px > *:-child {
+ margin-top: 0px;
+}
+.layout.vertical.itemsReverse.gap-5x3px > * {
+ margin-top: 15px;
+}
+.layout.vertical.itemsReverse.gap-6x3px > *:-child {
+ margin-top: 0px;
+}
+.layout.vertical.itemsReverse.gap-6x3px > * {
+ margin-top: 18px;
+}
+.layout.vertical.itemsReverse.gap-7x3px > *:-child {
+ margin-top: 0px;
+}
+.layout.vertical.itemsReverse.gap-7x3px > * {
+ margin-top: 21px;
+}
+.layout.vertical.itemsReverse.gap-8x3px > *:-child {
+ margin-top: 0px;
+}
+.layout.vertical.itemsReverse.gap-8x3px > * {
+ margin-top: 24px;
+}
+.layout.vertical.itemsReverse.gap-9x3px > *:-child {
+ margin-top: 0px;
+}
+.layout.vertical.itemsReverse.gap-9x3px > * {
+ margin-top: 27px;
+}
+.layout.vertical.itemsReverse.gap-10x3px > *:-child {
+ margin-top: 0px;
+}
+.layout.vertical.itemsReverse.gap-10x3px > * {
+ margin-top: 30px;
+}
.layout.grid {
flex-flow: row wrap;
width: 100%;
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_layout.sass
b/frameworks/projects/Jewel/src/main/sass/components/_layout.sass
index 221fb41..fa02d33 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_layout.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_layout.sass
@@ -88,6 +88,15 @@ $gap-size: 10px !default
[royale-asjs] branch develop updated: jewel-layouts: implement "itemsReverse" to invert order of items, in vertical or horizontal align. Gap is not considered in this implementation and will require m
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 1c53cd8 jewel-layouts: implement "itemsReverse" to invert order of
items, in vertical or horizontal align. Gap is not considered in this
implementation and will require more improvements. This is for first question
in #1070
1c53cd8 is described below
commit 1c53cd884470578d788165360e604b2981fe1cf6
Author: Carlos Rovira
AuthorDate: Sun Jan 31 18:30:50 2021 +0100
jewel-layouts: implement "itemsReverse" to invert order of items, in
vertical or horizontal align. Gap is not considered in this implementation and
will require more improvements. This is for first question in #1070
---
.../projects/Jewel/src/main/resources/defaults.css | 6
.../royale/jewel/beads/layouts/StyledLayoutBase.as | 37 ++-
.../container/AlignmentItemsContainer.as | 42 ++
.../supportClasses/group/AlignmentItemsGroup.as| 30
.../Jewel/src/main/sass/components/_layout.sass| 6
5 files changed, 114 insertions(+), 7 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css
b/frameworks/projects/Jewel/src/main/resources/defaults.css
index e8da502..0ee8dcb 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -3192,6 +3192,9 @@ j|Label {
.layout.horizontal.itemsRight, .layout.grid.itemsRight {
justify-content: flex-end;
}
+.layout.horizontal.itemsReverse, .layout.grid.itemsReverse {
+ flex-direction: row-reverse;
+}
.layout.vertical.itemsCentered {
justify-content: center;
}
@@ -3210,6 +3213,9 @@ j|Label {
.layout.vertical.itemsRight {
align-items: flex-end;
}
+.layout.vertical.itemsReverse {
+ flex-direction: column-reverse;
+}
.layout.table table {
display: table;
}
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/StyledLayoutBase.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/StyledLayoutBase.as
index a14b340..9afc37f 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/StyledLayoutBase.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/StyledLayoutBase.as
@@ -97,6 +97,9 @@ package org.apache.royale.jewel.beads.layouts
{
applyStyleToLayout(hostComponent, "itemsExpand");
setHostComponentClass("itemsExpand", _itemsExpand ?
"itemsExpand":"");
+
+ applyStyleToLayout(hostComponent, "itemsReverse");
+ setHostComponentClass("itemsReverse", _itemsReverse ?
"itemsReverse":"");
applyStyleToLayout(hostComponent,
"itemsHorizontalAlign");
setHostComponentClass(_itemsHorizontalAlign,
_itemsHorizontalAlign);
@@ -128,6 +131,10 @@ package org.apache.royale.jewel.beads.layouts
if(!itemsExpandInitialized)
itemsExpand = "true" ==
cssValue;
break;
+ case "itemsReverse":
+ if(!itemsReverseInitialized)
+ itemsReverse = "true"
== cssValue;
+ break;
case "itemsHorizontalAlign":
if (!itemsHorizontalAlign)
itemsHorizontalAlign =
String(cssValue);
@@ -232,7 +239,6 @@ package org.apache.royale.jewel.beads.layouts
{
if (_itemsExpand != value)
{
-
COMPILE::JS
{
setHostComponentClass("itemsExpand", value ?
"itemsExpand" : "");
@@ -241,6 +247,35 @@ package org.apache.royale.jewel.beads.layouts
}
}
}
+
+ private var itemsReverseInitialized:Boolean;
+ private var _itemsReverse:Boolean = false;
+/**
+* A boolean flag to activate "itemsReverse" effect selector.
+* Make items to invert its order
+ *
+* @langversion 3.0
+* @playerversion Flash 10.2
+*
[royale-asjs] branch develop updated: maven-debugging: update to latest recommendations by Josh for maven's debug, but still doesn't work
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 92ffea6 maven-debugging: update to latest recommendations by Josh for
maven's debug, but still doesn't work
92ffea6 is described below
commit 92ffea625efe80d0d1a0579d96a01ec6c7ca2f0b
Author: Carlos Rovira
AuthorDate: Thu Jan 14 10:51:52 2021 +0100
maven-debugging: update to latest recommendations by Josh for maven's
debug, but still doesn't work
---
examples/jewel/TourDeJewel/pom.xml | 2 +-
frameworks/projects/Jewel/pom.xml | 6 +++---
frameworks/projects/pom.xml| 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/examples/jewel/TourDeJewel/pom.xml
b/examples/jewel/TourDeJewel/pom.xml
index 2faff50..9636053 100644
--- a/examples/jewel/TourDeJewel/pom.xml
+++ b/examples/jewel/TourDeJewel/pom.xml
@@ -956,9 +956,9 @@
-prevent-rename-public-static-methods=false
-prevent-rename-public-instance-methods=false
-
-source-map=true;
+
diff --git a/frameworks/projects/Jewel/pom.xml
b/frameworks/projects/Jewel/pom.xml
index a470851..e711617 100644
--- a/frameworks/projects/Jewel/pom.xml
+++ b/frameworks/projects/Jewel/pom.xml
@@ -64,10 +64,10 @@
true
true
${royale.skipAS}
-
+
diff --git a/frameworks/projects/pom.xml b/frameworks/projects/pom.xml
index 8e39df6..4959469 100644
--- a/frameworks/projects/pom.xml
+++ b/frameworks/projects/pom.xml
@@ -34,7 +34,7 @@
${repo.compiler.options};
-js-default-initializers=false;
-source-map=${source.map};
--source-map-source-root=/frameworks/projects/{$project.artifactId}/
+
-source-map-source-root=/frameworks/projects/{$project.artifactId}/src/main/royale/
-js-complex-implicit-coercions=false;
-js-vector-index-checks=false;
-js-resolve-uncertain=false;
[royale-website] branch asf-site updated: fix menu regression in TDJ
This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/royale-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 175dd2a fix menu regression in TDJ
175dd2a is described below
commit 175dd2af0eedc23d90c690844c9994922997fdb3
Author: Carlos Rovira
AuthorDate: Fri Jan 8 16:46:03 2021 +0100
fix menu regression in TDJ
---
tourdejewel/App.js | 5 ++---
tourdejewel/App.js.map | 6 +++---
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/tourdejewel/App.js b/tourdejewel/App.js
index 922ed86..16d913a 100644
--- a/tourdejewel/App.js
+++ b/tourdejewel/App.js
@@ -484,9 +484,8 @@
l=[];U=null!=h.buttonWidths;for(c=0;c>0;this.element.selectedIndex=this.model.selectedIndex+a};
M.La=function(){var a=this.D(jH);null==a&&(a=new kH,this.G(a));return
a};Object.defineProperties(TL.prototype,{dropDown:{get:TL.prototype.kG,set:TL.prototype.yO},labelField:{get:TL.prototype.Ga,set:TL.prototype.Ha},dataProvider:{get:TL.prototype.Ra,set:TL.prototype.Oa},selectedIndex:{get:TL.prototype.jb,set:TL.prototype.$a},selectedItem:{get:TL.prototype.kb,set:TL.prototype.ab},presentationModel:{get:TL.prototype.La}});TL.prototype.g={names:[{name:If,i:pt,kind:p}]};function
xI(){rH.call( [...]
Object.defineProperties(xI.prototype,{title:{get:xI.prototype.Cb,set:xI.prototype.Qb},htmlTitle:{get:xI.prototype.$e,set:xI.prototype.Nf},showCloseButton:{get:xI.prototype.Ep,set:xI.prototype.Au}});xI.prototype.g={names:[{name:'TitleBar',i:Zt,kind:p}],o:[XM]};function
mN(){}N(Wv,mN);mN.prototype.ZA=null;mN.prototype.Uw=function(){var
a,c=this.ZA,f=c.numElements;if(0!=f)for(var
h=0;h
[royale-asjs] branch develop updated: tour-de-jewel: update royalelib comment
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-asjs.git The following commit(s) were added to refs/heads/develop by this push: new 04379bd tour-de-jewel: update royalelib comment 04379bd is described below commit 04379bd878e192e8185db44949120695a18cd5aa Author: Carlos Rovira AuthorDate: Fri Jan 8 16:44:34 2021 +0100 tour-de-jewel: update royalelib comment --- examples/jewel/TourDeJewel/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/jewel/TourDeJewel/pom.xml b/examples/jewel/TourDeJewel/pom.xml index 20db0d6..2faff50 100644 --- a/examples/jewel/TourDeJewel/pom.xml +++ b/examples/jewel/TourDeJewel/pom.xml @@ -956,7 +956,7 @@ -prevent-rename-public-static-methods=false -prevent-rename-public-instance-methods=false - + -source-map=true;
[royale-asjs] branch develop updated: jewel-ResponsiveVisibility: fix regression
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 1249611 jewel-ResponsiveVisibility: fix regression
1249611 is described below
commit 12496110db8cb82335511248bd17b62e00d66f84
Author: Carlos Rovira
AuthorDate: Fri Jan 8 16:43:43 2021 +0100
jewel-ResponsiveVisibility: fix regression
---
.../jewel/beads/layouts/ResponsiveVisibility.as| 59 +-
1 file changed, 23 insertions(+), 36 deletions(-)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/ResponsiveVisibility.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/ResponsiveVisibility.as
index 9db7973..8fcbed6 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/ResponsiveVisibility.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/ResponsiveVisibility.as
@@ -46,7 +46,7 @@ package org.apache.royale.jewel.beads.layouts
{
}
- private var _phoneVisible:Boolean;
+ private var _phoneVisible:Boolean = true;
/**
* Makes the component to be visible or hidden in phone size
* Uses "visible-phone" and "hidden-phone" effect selectors.
@@ -75,7 +75,7 @@ package org.apache.royale.jewel.beads.layouts
}
}
- private var _tabletVisible:Boolean;
+ private var _tabletVisible:Boolean = true;
/**
* Makes the component to be visible or hidden in phone size
* Uses "visible-tablet" and "hidden-tablet" effect selectors.
@@ -104,7 +104,7 @@ package org.apache.royale.jewel.beads.layouts
}
}
- private var _desktopVisible:Boolean;
+ private var _desktopVisible:Boolean = true;
/**
* Makes the component to be visible or hidden in phone size
* Uses "visible-desktop" and "hidden-desktop" effect
selectors.
@@ -133,7 +133,7 @@ package org.apache.royale.jewel.beads.layouts
}
}
- private var _wideScreenVisible:Boolean;
+ private var _wideScreenVisible:Boolean = true;
/**
* Makes the component to be visible or hidden in phone size
* Uses "visible-widescreen" and "hidden-widescreen" effect
selectors.
@@ -185,38 +185,25 @@ package org.apache.royale.jewel.beads.layouts
var host:IClassSelectorListSupport = _strand as
IClassSelectorListSupport;
if (host)
{
- if(phoneVisible != null)
- {
- if(phoneVisible)
-
host.replaceClass("hidden-phone", "visible-phone");
- else
-
host.replaceClass("visible-phone", "hidden-phone");
- }
-
- if(tabletVisible != null)
- {
- if(tabletVisible)
-
host.replaceClass("hidden-tablet", "visible-tablet");
- else
-
host.replaceClass("visible-tablet", "hidden-tablet");
-
- }
-
- if(desktopVisible != null)
- {
- if(desktopVisible)
-
host.replaceClass("hidden-desktop", "visible-desktop");
- else
-
host.replaceClass("visible-desktop", "hidden-desktop");
- }
-
- if(wideScreenVisible != null)
- {
- if(wideScreenVisible)
-
host.replaceClass("hidden-widescreen", "visible-widescreen");
- else
-
host.replaceClass("visible-widescreen", "hidden-widescreen");
- }
+
[royale-asjs] branch develop updated: setting source-map-source-root for all framework projects at once
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 213dfaf setting source-map-source-root for all framework projects at
once
213dfaf is described below
commit 213dfaffe6d5883ca44cdb8d763988371b350aa4
Author: Carlos Rovira
AuthorDate: Thu Jan 7 20:09:18 2021 +0100
setting source-map-source-root for all framework projects at once
---
frameworks/projects/pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/frameworks/projects/pom.xml b/frameworks/projects/pom.xml
index 2b6f7b1..8e39df6 100644
--- a/frameworks/projects/pom.xml
+++ b/frameworks/projects/pom.xml
@@ -34,6 +34,7 @@
${repo.compiler.options};
-js-default-initializers=false;
-source-map=${source.map};
+-source-map-source-root=/frameworks/projects/{$project.artifactId}/
-js-complex-implicit-coercions=false;
-js-vector-index-checks=false;
-js-resolve-uncertain=false;
[royale-asjs] branch develop updated: jewel-pom.xml: remove +royalelib since is not needed in framework libs, just in apps
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 5bf4e17 jewel-pom.xml: remove +royalelib since is not needed in
framework libs, just in apps
5bf4e17 is described below
commit 5bf4e176b6871bb2e6ece4c7832848a1f31ed304
Author: Carlos Rovira
AuthorDate: Thu Jan 7 16:49:26 2021 +0100
jewel-pom.xml: remove +royalelib since is not needed in framework libs,
just in apps
---
frameworks/projects/Jewel/pom.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/frameworks/projects/Jewel/pom.xml
b/frameworks/projects/Jewel/pom.xml
index a1c86b2..a470851 100644
--- a/frameworks/projects/Jewel/pom.xml
+++ b/frameworks/projects/Jewel/pom.xml
@@ -65,7 +65,6 @@
true
${royale.skipAS}
-
-source-map=true;
-source-map-source-root=/frameworks/projects/Jewel/
[royale-asjs] branch develop updated: pom.xml: comment +royalelib waiting for others to see how to make this more general
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 74ec338 pom.xml: comment +royalelib waiting for others to see how to
make this more general
74ec338 is described below
commit 74ec3387247c41bc6f9cb7294d7c479303793953
Author: Carlos Rovira
AuthorDate: Thu Jan 7 15:30:07 2021 +0100
pom.xml: comment +royalelib waiting for others to see how to make this more
general
---
examples/jewel/TourDeJewel/pom.xml | 2 +-
frameworks/projects/Jewel/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/examples/jewel/TourDeJewel/pom.xml
b/examples/jewel/TourDeJewel/pom.xml
index 046c93a..20db0d6 100644
--- a/examples/jewel/TourDeJewel/pom.xml
+++ b/examples/jewel/TourDeJewel/pom.xml
@@ -956,7 +956,7 @@
-prevent-rename-public-static-methods=false
-prevent-rename-public-instance-methods=false
-+royalelib=/Users/carlosrovira/Dev/Royale/Sdks/apache-royale-maven
+
-source-map=true;
diff --git a/frameworks/projects/Jewel/pom.xml
b/frameworks/projects/Jewel/pom.xml
index 5a5183a..a1c86b2 100644
--- a/frameworks/projects/Jewel/pom.xml
+++ b/frameworks/projects/Jewel/pom.xml
@@ -65,7 +65,7 @@
true
${royale.skipAS}
-+royalelib=/Users/carlosrovira/Dev/Royale/Sdks/apache-royale-maven
+
-source-map=true;
-source-map-source-root=/frameworks/projects/Jewel/
[royale-asjs] branch develop updated: tour-de-jewel: change welcome version text to match current snapshot
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-asjs.git The following commit(s) were added to refs/heads/develop by this push: new 79e9ea8 tour-de-jewel: change welcome version text to match current snapshot 79e9ea8 is described below commit 79e9ea856f6bf6acc350c9ec40b6e3ef1f16a2f3 Author: Carlos Rovira AuthorDate: Thu Jan 7 15:29:14 2021 +0100 tour-de-jewel: change welcome version text to match current snapshot --- examples/jewel/TourDeJewel/src/main/royale/WelcomeSection.mxml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/jewel/TourDeJewel/src/main/royale/WelcomeSection.mxml b/examples/jewel/TourDeJewel/src/main/royale/WelcomeSection.mxml index a45177d..6d30c3b 100644 --- a/examples/jewel/TourDeJewel/src/main/royale/WelcomeSection.mxml +++ b/examples/jewel/TourDeJewel/src/main/royale/WelcomeSection.mxml @@ -74,7 +74,7 @@ limitations under the License. - +
[royale-website] branch asf-site updated: update tourdejewel welcome text to actual 0.9.8-SNAPSHOT version
This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/royale-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new b79712e update tourdejewel welcome text to actual 0.9.8-SNAPSHOT
version
b79712e is described below
commit b79712ececb9d2a33c20573522c7bee602928bcf
Author: Carlos Rovira
AuthorDate: Thu Jan 7 10:19:29 2021 +0100
update tourdejewel welcome text to actual 0.9.8-SNAPSHOT version
---
tourdejewel/App.js | 8
tourdejewel/App.js.map | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/tourdejewel/App.js b/tourdejewel/App.js
index 67eb224..922ed86 100644
--- a/tourdejewel/App.js
+++ b/tourdejewel/App.js
@@ -819,10 +819,10 @@
phoneVisible:{get:UO.prototype.fi,set:UO.prototype.zk},tabletVisible:{get:UO.pro
Object.defineProperties(IQ.prototype,{color:{get:L('ml'),set:function(a){if(a!=this.ml){var
c=this.ml;this.ml=a;this.dispatchEvent(R.s(this,'color',c,a)));IQ.prototype.K=function(a){eS(this,P.C(a.target.selectedItem),Jg,this.Sn)};IQ.prototype.S=function(a){eS(this,P.C(a.target.selectedItem),$g,this.Tn)};IQ.prototype.ca=function(a){eS(this,P.C(a.target.selectedItem),Lf,this.Rn)};
IQ.prototype.fa=function(a){this.hv=!!a.target.selected;eS(this,String(this.primary.selectedItem),Jg,this.Sn);eS(this,String(this.secondary.selectedItem),$g,this.Rn);eS(this,String(this.emphasized.selectedItem),Lf,this.Tn)};
Object.defineProperties(IQ.prototype,{primary:{get:L('AC'),set:function(a){a!=this.AC&&(this.AC=a,this.dispatchEvent(R.s(this,HA,null,a)))}},secondary:{get:L('NC'),set:function(a){a!=this.NC&&(this.NC=a,this.dispatchEvent(R.s(this,DB,null,a)))}},emphasized:{get:L('Sw'),set:function(a){a!=this.Sw&&(this.Sw=a,this.dispatchEvent(R.s(this,vk,null,a)))}},MXMLDescriptor:{get:function(){if(void
0==this.A){var
a=IQ.u.F.apply(this),c=[rH,2,m,!0,Ic,n,null,[fS,2,m,!0,ya,x,!0,9,0,0,null,NK,2,m,!0,vc
[...]
-0,0,null],0,0,[JJ,4,m,!0,Sc,tC,!0,'assets/apache-royale-logo.svg',yl,!0,300,n,null,[VN,3,m,!0,Hc,'phoneHeight',!0,200,'tabletHeight',!0,250,0,0,null],0,0,null,XO,3,m,!0,od,F,!0,'Welcome
to Apache Royale Tour de Jewel Component Explorer
v.0.9.7',n,null,[QH,2,m,!0,cd,Wh,!0,Wi,0,0,null],0,0,null,zI,3,m,!0,Ac,x,!0,3,en,!0,Wm,0,0,[T,2,m,!0,zd,F,!0,'Choose
your Jewel
Theme:',0,0,null,lR,1,m,!0,zc,0,0,[mR,2,m,!0,La,kn,!0,'Primary:',0,0,[TL,4,m,!0,HA,NB,!0,3,Lj,!1,[XH,2,m,!0,Kd,jC,!0,['Emerald',
[...]
-'Blue',Wg,'Violet',bf,'Red','Topaz','Orange',nh,'Yellow'],0,0,null],n,null,[UL,2,m,!0,Vd,bB,!0,!0,0,0,null],0,1,Xi,this.K,null],mR,2,m,!0,Fb,kn,!0,'Secondary:',0,0,[TL,4,m,!0,DB,NB,!0,8,Lj,!1,[XH,2,m,!0,Ya,jC,!0,['Emerald','Green',Ah,'Blue',Wg,'Violet',bf,'Red','Topaz','Orange',nh,'Yellow'],0,0,null],n,null,[UL,2,m,!0,ib,bB,!0,!0,0,0,null],0,1,Xi,this.S,null],mR,2,m,!0,uc,kn,!0,'Emphasized:',0,0,[TL,4,m,!0,vk,NB,!0,0,Lj,!1,[XH,2,m,!0,Qb,jC,!0,['Emerald','Green',Ah,'Blue',Wg,'Violet',bf,'
[...]
-'Orange',nh,'Yellow'],0,0,null],n,null,[UL,2,m,!0,ac,bB,!0,!0,0,0,null],0,1,Xi,this.ca,null],mR,2,m,!0,xc,kn,!0,'Flat?',0,0,[HI,1,m,!0,wc,0,1,Xi,this.fa,null]]],T,5,m,!0,Dc,H,!0,400,Vn,!0,!0,Ll,!0,"Jewel
is a themeable and responsive set of user interface components for Apache
Royale to help you quickly build the front end of your applications with
ActionScript & MXML.Check https://royale.apache.org",n,null,[$R,2,m,!0,Bc,bC,!0,'large',0,0,null,
[...]
-Cc,Wh,!0,Wi,0,0,null],0,0,null,T,4,m,!0,Gc,H,!0,400,Vn,!0,!0,n,null,[$R,2,m,!0,Ec,bC,!0,'small',0,0,null,QH,2,m,!0,Fc,Wh,!0,Wi,0,0,null],0,0,null]];this.A=a?a.concat(c):c}return
this.A}}});IQ.prototype._bindings=[1,function(){return'Jewel Browser support:
Chrome (v.44+), Firefox (v.34+), IE 11 & Edge 15+, Safari (v.11.1+), Opera.
Mobile: iOS (v.11.0), Android (v.5.0) & Windows Mobile.This OS:
'+uN.hd()+'
('+uN.bF()+')'},null,[Gc,Ll]];IQ.prototype._bindings=IQ.prototy [...]
+0,0,null],0,0,[JJ,4,m,!0,Sc,tC,!0,'assets/apache-royale-logo.svg',yl,!0,300,n,null,[VN,3,m,!0,Hc,'phoneHeight',!0,200,'tabletHeight',!0,250,0,0,null],0,0,null,XO,3,m,!0,od,F,!0,'Welcome
to Apache Royale Tour de Jewel Component Explorer
v.0.9.8-SNAPSHOT',n,null,[QH,2,m,!0,cd,Wh,!0,Wi,0,0,null],0,0,null,zI,3,m,!0,Ac,x,!0,3,en,!0,Wm,0,0,[T,2,m,!0,zd,F,!0,'Choose
your Jewel
Theme:',0,0,null,lR,1,m,!0,zc,0,0,[mR,2,m,!0,La,kn,!0,'Primary:',0,0,[TL,4,m,!0,HA,NB,!0,3,Lj,!1,[XH,2,m,!0,Kd,jC,!0,['
[...]
+'Green',Ah,'Blue',Wg,'Violet',bf,'Red','Topaz','Orange',nh,'Yellow'],0,0,null],n,null,[UL,2,m,!0,Vd,bB,!0,!0,0,0,null],0,1,Xi,this.K,null],mR,2,m,!0,Fb,kn,!0,'Secondary:',0,0,[TL,4,m,!0,DB,NB,!0,8,Lj,!1,[XH,2,m,!0,Ya,jC,!0,['Emerald','Green',Ah,'Blue',Wg,'Violet',bf,'Red','Topaz','Orange',nh,'Yellow'],0,0,null],n,null,[UL,2,m,!0,ib,bB,!0,!0,0,0,null],0,1,Xi,this.S,null],mR,2,m,!0,uc,kn,!0,'Emphasized:',0,0,[TL,4,m,!0,vk,NB,!0,0,Lj,!1,[XH,2,m,!0,Qb,jC,!0,[
[royale-asjs] branch develop updated: jewel-navigation: solve issue in Navigation list showing a primary color border line on focus
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 7122eab jewel-navigation: solve issue in Navigation list showing a
primary color border line on focus
7122eab is described below
commit 7122eab7e71a65e3ab41e12ea528f061fcc325af
Author: Carlos Rovira
AuthorDate: Wed Jan 6 12:39:44 2021 +0100
jewel-navigation: solve issue in Navigation list showing a primary color
border line on focus
---
frameworks/projects/Jewel/src/main/resources/defaults.css | 2 +-
frameworks/projects/Jewel/src/main/sass/_global.sass | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css
b/frameworks/projects/Jewel/src/main/resources/defaults.css
index db6d871..e8da502 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -28,7 +28,7 @@ html, body {
border: 0;
}
-input:focus, textarea:focus, select:focus, div:focus, label:focus, nav:focus,
li:focus {
+input:focus, textarea:focus, select:focus, div:focus, label:focus, nav:focus,
li:focus, a:focus {
outline: none;
}
diff --git a/frameworks/projects/Jewel/src/main/sass/_global.sass
b/frameworks/projects/Jewel/src/main/sass/_global.sass
index 522dd40..1258e32 100644
--- a/frameworks/projects/Jewel/src/main/sass/_global.sass
+++ b/frameworks/projects/Jewel/src/main/sass/_global.sass
@@ -32,7 +32,7 @@ html, body
::-moz-focus-inner, ::-moz-focus-outer
border: 0
-input:focus, textarea:focus, select:focus, div:focus, label:focus, nav:focus,
li:focus
+input:focus, textarea:focus, select:focus, div:focus, label:focus, nav:focus,
li:focus, a:focus
outline: none
select::-ms-expand
[royale-asjs] branch develop updated: jewel and TDJ: Make debug working again (thanks to Josh Tynjala for the solution)
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 17a6fd4 jewel and TDJ: Make debug working again (thanks to Josh
Tynjala for the solution)
17a6fd4 is described below
commit 17a6fd4f9eda75b8dc39ab9b049eed5abb0e5b6a
Author: Carlos Rovira
AuthorDate: Wed Jan 6 12:14:48 2021 +0100
jewel and TDJ: Make debug working again (thanks to Josh Tynjala for the
solution)
---
examples/jewel/TourDeJewel/pom.xml | 1 +
frameworks/projects/Jewel/pom.xml | 5 +
2 files changed, 6 insertions(+)
diff --git a/examples/jewel/TourDeJewel/pom.xml
b/examples/jewel/TourDeJewel/pom.xml
index 03aaa97..046c93a 100644
--- a/examples/jewel/TourDeJewel/pom.xml
+++ b/examples/jewel/TourDeJewel/pom.xml
@@ -956,6 +956,7 @@
-prevent-rename-public-static-methods=false
-prevent-rename-public-instance-methods=false
++royalelib=/Users/carlosrovira/Dev/Royale/Sdks/apache-royale-maven
-source-map=true;
diff --git a/frameworks/projects/Jewel/pom.xml
b/frameworks/projects/Jewel/pom.xml
index 99f4860..5a5183a 100644
--- a/frameworks/projects/Jewel/pom.xml
+++ b/frameworks/projects/Jewel/pom.xml
@@ -64,6 +64,11 @@
true
true
${royale.skipAS}
+
++royalelib=/Users/carlosrovira/Dev/Royale/Sdks/apache-royale-maven
+-source-map=true;
+-source-map-source-root=/frameworks/projects/Jewel/
+
[royale-asjs] branch develop updated: Reconcile Basic ContainerView for SWF and JS (emphasis on not changing JS side), and fix some issues on SWF side.
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 6d1c020 Reconcile Basic ContainerView for SWF and JS (emphasis on not
changing JS side), and fix some issues on SWF side.
new 9d3d030 Merge pull request #1041 from
estanglerbm/reconcile-basic-containerview
6d1c020 is described below
commit 6d1c020577cec69b6207a5b46356b6a2b74f308c
Author: Edward Stangler
AuthorDate: Wed Jan 6 01:18:49 2021 -0600
Reconcile Basic ContainerView for SWF and JS (emphasis on not changing JS
side), and fix some issues on SWF side.
---
.../org/apache/royale/html/beads/ContainerView.as | 307 ++---
1 file changed, 83 insertions(+), 224 deletions(-)
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ContainerView.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ContainerView.as
index 057b787..12af0d8 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ContainerView.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ContainerView.as
@@ -21,7 +21,7 @@ package org.apache.royale.html.beads
import org.apache.royale.html.beads.GroupView;
import org.apache.royale.core.ContainerBase;
import org.apache.royale.core.IBead;
-import org.apache.royale.core.IBorderPaddingMarginValuesImpl;
+ import org.apache.royale.core.IBorderPaddingMarginValuesImpl;
import org.apache.royale.core.IContainer;
import org.apache.royale.core.ILayoutChild;
import org.apache.royale.core.ILayoutView;
@@ -50,58 +50,64 @@ package org.apache.royale.html.beads
* placement of the elements in the contentView. When a Container does
not have an
* explicit size (including a percent size), the content dictates the
size of the
* Container.
- *
+*
* @viewbead
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.8
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion Royale 0.8
*/
- COMPILE::SWF
public class ContainerView extends GroupView
{
+ private var _viewport:IViewport;
+
/**
-* The ContainerView class is the default view for
- * the org.apache.royale.core.ContainerBase classes.
- * It lets you use some CSS styles to manage the border, background
- * and padding around the content area.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.8
- */
+* The ContainerView class is the default view for
+* the org.apache.royale.core.ContainerBase classes.
+* It lets you use some CSS styles to manage the border,
background
+* and padding around the content area.
+*
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion Royale 0.8
+*/
public function ContainerView()
{
super();
}
/**
-* The sub-element used as the parent of the container's
elements. This does not
-* include the chrome elements.
+* The viewport used to present the content and may display
+* scroll bars (depending on the actual type of viewport).
*
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.8
*/
- override public function get contentView():ILayoutView
+ protected function get viewport():IViewport
{
- return viewport.contentView as ILayoutView;
+ return _viewport;
}
/**
-* The viewport used to present the content and may display
-* scroll bars (depending on the actual type of viewport).
+* The sub-element used as the parent of the container's
elements. This does not
+* include the chrome elements.
*
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.8
+* @royaleignorecoercion org.apache.royale.core.ILayoutView
[royale-asjs] branch develop updated: Revert "Fix 2 AMF issues in JS build:"
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new a120059 Revert "Fix 2 AMF issues in JS build:"
a120059 is described below
commit a120059d9f6241f2d2b5903774ebc9061b2ac3c5
Author: Carlos Rovira
AuthorDate: Wed Jan 6 11:47:36 2021 +0100
Revert "Fix 2 AMF issues in JS build:"
This reverts commit 8df32a2c3359eebb661c0329557c6d59d0bdfe0e.
---
.../projects/MXRoyale/src/main/royale/mx/net/NetConnection.as | 3 +--
.../org/apache/royale/net/remoting/amf/AMFNetConnection.as | 10 +-
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git
a/frameworks/projects/MXRoyale/src/main/royale/mx/net/NetConnection.as
b/frameworks/projects/MXRoyale/src/main/royale/mx/net/NetConnection.as
index d0e84ac..fca0bdc 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/net/NetConnection.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/net/NetConnection.as
@@ -150,8 +150,7 @@ public class NetConnection extends EventDispatcher
var ncResponder:org.apache.royale.net.Responder =
new
org.apache.royale.net.Responder(responder.resultFunction,
responder.faultFunction);
-// Jim P: pass the AMF target URI in here
-nc.call(thisObject as String, ncResponder, message);
+nc.call(null, ncResponder, message);
}
}
diff --git
a/frameworks/projects/Network/src/main/royale/org/apache/royale/net/remoting/amf/AMFNetConnection.as
b/frameworks/projects/Network/src/main/royale/org/apache/royale/net/remoting/amf/AMFNetConnection.as
index a28538b..d176fcc 100644
---
a/frameworks/projects/Network/src/main/royale/org/apache/royale/net/remoting/amf/AMFNetConnection.as
+++
b/frameworks/projects/Network/src/main/royale/org/apache/royale/net/remoting/amf/AMFNetConnection.as
@@ -287,11 +287,7 @@ public class AMFNetConnection
* @productversion BlazeDS 4
* @productversion LCDS 3
*/
-/* JimP: params should match what is sent into NetConnection.call, which
is currently an IMessage.
- If a 'rest' variable is used then only the first member of a passed
array arrives. Fixed by
- changing to an Object.
-*/
-public function call(command:String, responder:Responder,
params:Object):void
+public function call(command:String, responder:Responder, ... params):void
{
COMPILE::SWF
{
@@ -305,8 +301,6 @@ public class AMFNetConnection
requestQueue.push(
{
url: url,
-/* JimP: this is the AMF URI */
-target: command,
responder: responder,
args: params
}
@@ -334,8 +328,6 @@ public class AMFNetConnection
var actionMessage:ActionMessage = new ActionMessage();
var messageBody:MessageBody = new MessageBody();
sequence++;
-/* insert the AMF URI into the body, otherwise it's always 'null'
*/
-messageBody.targetURI = call.item.target;
messageBody.responseURI = "/" + sequence.toString();
messageBody.data = args;
actionMessage.bodies = [ messageBody ];
[royale-asjs] branch develop updated: jewel-theme: finish Switch/SwitchRadio styles to make first more "squared" while radio remains "rounded"
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 9ee070d jewel-theme: finish Switch/SwitchRadio styles to make first
more "squared" while radio remains "rounded"
9ee070d is described below
commit 9ee070d695f9e20623539dde17797ae6e52dddff
Author: Carlos Rovira
AuthorDate: Tue Jan 5 15:57:17 2021 +0100
jewel-theme: finish Switch/SwitchRadio styles to make first more "squared"
while radio remains "rounded"
---
.../src/main/resources/defaults.css| 10 --
.../src/main/resources/defaults.css| 10 --
.../src/main/resources/defaults.css| 10 --
.../src/main/resources/defaults.css| 10 --
.../src/main/resources/defaults.css| 10 --
.../src/main/resources/defaults.css| 10 --
.../src/main/resources/defaults.css| 10 --
.../src/main/resources/defaults.css| 10 --
.../src/main/resources/defaults.css| 10 --
.../src/main/resources/defaults.css| 10 --
.../src/main/resources/defaults.css| 10 --
.../src/main/resources/defaults.css| 10 --
.../src/main/resources/defaults.css| 10 --
.../src/main/resources/defaults.css| 10 --
.../src/main/resources/defaults.css| 10 --
.../src/main/resources/defaults.css| 10 --
.../src/main/resources/defaults.css| 10 --
.../src/main/resources/defaults.css| 10 --
.../src/main/resources/defaults.css| 10 --
.../src/main/resources/defaults.css| 10 --
.../src/main/resources/defaults.css| 10 --
.../src/main/resources/defaults.css| 10 --
.../src/main/resources/defaults.css| 10 --
.../src/main/resources/defaults.css| 10 --
.../src/main/resources/defaults.css| 10 --
.../src/main/resources/defaults.css| 10 --
.../src/main/resources/defaults.css| 10 --
.../src/main/resources/defaults.css| 10 --
.../src/main/resources/defaults.css| 10 --
.../src/main/resources/defaults.css| 10 --
.../src/main/resources/defaults.css| 10 --
.../src/main/resources/defaults.css| 10 --
.../src/main/resources/defaults.css| 10 --
.../src/main/resources/defaults.css| 10 --
.../src/main/resources/defaults.css| 10 --
.../src/main/resources/defaults.css| 10 --
36 files changed, 288 insertions(+), 72 deletions(-)
diff --git
a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Amethyst-Theme/src/main/resources/defaults.css
b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Amethyst-Theme/src/main/resources/defaults.css
index c931f1b..7d1cf31 100644
---
a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Amethyst-Theme/src/main/resources/defaults.css
+++
b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Amethyst-Theme/src/main/resources/defaults.css
@@ -462,18 +462,24 @@ j|CardActions {
.jewel.switch .switch {
background: linear-gradient(#595959, #737373);
box-shadow: 0px 0px 0px 1px #4c4c4c;
- border-radius: 20px;
transition: 0.4s;
+ border-radius: 3px;
}
.jewel.switch .switch::before {
background: #f9e2f8;
box-shadow: 1px 0px 1px 0px rgba(0, 0, 0, 0.1);
transition: 0.4s;
- border-radius: 50%;
+ border-radius: 3px;
}
.jewel.switch .label {
padding-left: 8px;
}
+.jewel.switch.radio .switch {
+ border-radius: 20px;
+}
+.jewel.switch.radio .switch::before {
+ border-radius: 50%;
+}
.jewel.combobox .jewel.textinput input {
border-radius: 0.25rem 0px 0px 0.25rem;
diff --git
a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Blue-Theme/src/main/resources/defaults.css
b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Blue-Theme/src/main/resources/defaults.css
index 3ad216d..5c5dc84 100644
---
a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Blue-Theme/src/main/resourc
[royale-asjs] branch develop updated: jewel-switch: Rename SwitchCheckBox to just "Switch" and SwitchRadioButton to "SwitchRadio". Also make Switch more square while SwitchRadio is more rounded as sug
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 310532a jewel-switch: Rename SwitchCheckBox to just "Switch" and
SwitchRadioButton to "SwitchRadio". Also make Switch more square while
SwitchRadio is more rounded as suggested by Andrew Wetmore.
310532a is described below
commit 310532a946327e036ed77784fe6dfc178b49e595
Author: Carlos Rovira
AuthorDate: Tue Jan 5 15:48:58 2021 +0100
jewel-switch: Rename SwitchCheckBox to just "Switch" and SwitchRadioButton
to "SwitchRadio". Also make Switch more square while SwitchRadio is more
rounded as suggested by Andrew Wetmore.
---
.../TourDeJewel/src/main/royale/CheckBoxPlayGround.mxml | 14 +++---
.../src/main/royale/RadioButtonPlayGround.mxml | 16
.../projects/Jewel/src/main/resources/jewel-manifest.xml | 4 ++--
.../apache/royale/jewel/{SwitchCheckBox.as => Switch.as} | 10 +-
.../jewel/{SwitchRadioButton.as => SwitchRadio.as} | 14 +++---
.../themes/JewelTheme/src/main/resources/defaults.css| 10 --
.../src/main/sass/components-primary/_checkbox.sass | 13 ++---
7 files changed, 47 insertions(+), 34 deletions(-)
diff --git a/examples/jewel/TourDeJewel/src/main/royale/CheckBoxPlayGround.mxml
b/examples/jewel/TourDeJewel/src/main/royale/CheckBoxPlayGround.mxml
index df85d32..3fa1f31 100644
--- a/examples/jewel/TourDeJewel/src/main/royale/CheckBoxPlayGround.mxml
+++ b/examples/jewel/TourDeJewel/src/main/royale/CheckBoxPlayGround.mxml
@@ -72,24 +72,24 @@ limitations under the License.
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git
a/examples/jewel/TourDeJewel/src/main/royale/RadioButtonPlayGround.mxml
b/examples/jewel/TourDeJewel/src/main/royale/RadioButtonPlayGround.mxml
index f022e82..f4dc152 100644
--- a/examples/jewel/TourDeJewel/src/main/royale/RadioButtonPlayGround.mxml
+++ b/examples/jewel/TourDeJewel/src/main/royale/RadioButtonPlayGround.mxml
@@ -72,24 +72,24 @@ limitations under the License.
-
+
-
-
-
+
+
+
-
+
-
+
-
+
-
+
diff --git a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
index 88ef7a9..edf0e4d 100644
--- a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
+++ b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
@@ -79,9 +79,9 @@
-
+
-
+
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/SwitchChe
[royale-asjs] branch develop updated: jewel-beads: more changes to use DispatcherBead
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new c84f3c2 jewel-beads: more changes to use DispatcherBead
c84f3c2 is described below
commit c84f3c2b3a02252e743099e90d124b84bfdac53f
Author: Carlos Rovira
AuthorDate: Tue Jan 5 12:06:58 2021 +0100
jewel-beads: more changes to use DispatcherBead
---
.../royale/org/apache/royale/jewel/beads/controls/ToolTip.as | 9 -
.../apache/royale/jewel/beads/controls/button/InputButtonSize.as | 7 ---
.../royale/jewel/beads/controls/textinput/SearchFilterForList.as | 6 +++---
.../apache/royale/jewel/beads/controls/textinput/TextPrompt.as | 6 +++---
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/ToolTip.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/ToolTip.as
index 716b6be..76667a7 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/ToolTip.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/ToolTip.as
@@ -18,6 +18,7 @@
package org.apache.royale.jewel.beads.controls
{
+ import org.apache.royale.core.DispatcherBead;
import org.apache.royale.core.IBead;
import org.apache.royale.core.IParentIUIBase;
import org.apache.royale.core.IPopUpHost;
@@ -43,7 +44,7 @@ package org.apache.royale.jewel.beads.controls
* @playerversion AIR 2.6
* @productversion Royale 0.9.4
*/
- public class ToolTip implements IBead, IToolTipBead
+ public class ToolTip extends DispatcherBead implements IBead,
IToolTipBead
{
/**
* constructor.
@@ -135,8 +136,6 @@ package org.apache.royale.jewel.beads.controls
_yPos = pos;
}
- private var _strand:IStrand;
-
/**
* @copy org.apache.royale.core.IBead#strand
*
@@ -146,9 +145,9 @@ package org.apache.royale.jewel.beads.controls
* @productversion Royale 0.9.4
* @royaleignorecoercion
org.apache.royale.events.IEventDispatcher
*/
- public function set strand(value:IStrand):void
+ override public function set strand(value:IStrand):void
{
- _strand = value;
+ super.strand = value;
//ToolTip in iOS produces a bad behaviour, used in a
button and user has to do a second touch to trigger click event
if(OSUtils.getOS() != OSUtils.IOS_OS)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/button/InputButtonSize.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/button/InputButtonSize.as
index 23ffede..f04f719 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/button/InputButtonSize.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/button/InputButtonSize.as
@@ -18,7 +18,7 @@
package org.apache.royale.jewel.beads.controls.button
{
- import org.apache.royale.core.IBead;
+ import org.apache.royale.core.DispatcherBead;
import org.apache.royale.core.IStrand;
import org.apache.royale.core.StyledUIBase;
import org.apache.royale.events.Event;
@@ -35,7 +35,7 @@ package org.apache.royale.jewel.beads.controls.button
* @playerversion AIR 2.6
* @productversion Royale 0.9.7
*/
- public class InputButtonSize implements IBead
+ public class InputButtonSize extends DispatcherBead
{
public static const INPUTBUTTON_DEFAULT_SIZE:Number = 24;
@@ -114,8 +114,9 @@ package org.apache.royale.jewel.beads.controls.button
* @playerversion AIR 2.6
* @productversion Royale 0.9.7
*/
- public function set strand(value:IStrand):void
+ override public function set strand(value:IStrand):void
{
+ super.strand = value
host = value as IInputButton;
COMPILE::JS
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/textinput/SearchFilterForList.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/textinput/SearchFilterForList.as
index 48a4b32..b684b84 100644
---
a/frameworks
[royale-asjs] branch develop updated: jewel-beads: change to use DispatcherBead in some beads when there's a [Bindable] metadata an EventDispatcher is required, so when extending the code we don't hav
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 75b225e jewel-beads: change to use DispatcherBead in some beads when
there's a [Bindable] metadata an EventDispatcher is required, so when extending
the code we don't have any issue
75b225e is described below
commit 75b225ebc67cbd64600f1794165c505e57167783
Author: Carlos Rovira
AuthorDate: Tue Jan 5 11:49:48 2021 +0100
jewel-beads: change to use DispatcherBead in some beads when there's a
[Bindable] metadata an EventDispatcher is required, so when extending the code
we don't have any issue
---
.../royale/org/apache/royale/jewel/beads/controls/Badge.as | 12 +++-
.../org/apache/royale/jewel/beads/controls/Disabled.as | 2 +-
.../beads/controls/combobox/ComboBoxListCloseOnClick.as | 11 ++-
.../controls/datechooser/DateChooserDateRangeRestriction.as | 9 -
.../controls/datefield/DateFieldDateRangeRestriction.as | 12 +---
5 files changed, 23 insertions(+), 23 deletions(-)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Badge.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Badge.as
index 04d703f..b5a9570 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Badge.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Badge.as
@@ -18,7 +18,7 @@
package org.apache.royale.jewel.beads.controls
{
- import org.apache.royale.core.IBead;
+ import org.apache.royale.core.DispatcherBead;
import org.apache.royale.core.IStrand;
import org.apache.royale.core.UIBase;
import org.apache.royale.jewel.Label;
@@ -36,7 +36,7 @@ package org.apache.royale.jewel.beads.controls
* @playerversion AIR 2.6
* @productversion Royale 0.9.6
*/
- public class Badge implements IBead, IEmphasis
+ public class Badge extends DispatcherBead implements IEmphasis
{
/**
* constructor.
@@ -77,13 +77,15 @@ package org.apache.royale.jewel.beads.controls
* @playerversion AIR 2.6
* @productversion Royale 0.9.6
*/
- public function set strand(value:IStrand):void
+ public override function set strand(value:IStrand):void
{
+ super.strand = value;
+
host = value as UIBase;
COMPILE::JS
{
- host.element.classList.add("visible");
- host.element.classList.add("viewport");
+ host.element.classList.add("visible");
+ host.element.classList.add("viewport");
}
badge.toggleClass("preindex", _preindex);
badge.toggleClass("subindex", _subindex);
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Disabled.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Disabled.as
index 9694ada..b16863c 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Disabled.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Disabled.as
@@ -96,7 +96,7 @@ package org.apache.royale.jewel.beads.controls
*/
override public function set strand(value:IStrand):void
{
- _strand = value;
+ super.strand = value;
updateHost();
}
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxListCloseOnClick.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxListCloseOnClick.as
index 6ec5971..9bffe3e 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxListCloseOnClick.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxListCloseOnClick.as
@@ -18,7 +18,7 @@
package org.apache.royale.jewel.beads.controls.combobox
{
-import org.apache.royale.core.IBead;
+import org.apache.royale.core.DispatcherBead;
import org.apache.royale.core.IStrand;
import org.apache.royale.core.ValuesMa
[royale-asjs] branch develop updated: tour-de-jewel: updates to CheckBox and RadioButton pages
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-asjs.git The following commit(s) were added to refs/heads/develop by this push: new 1831252 tour-de-jewel: updates to CheckBox and RadioButton pages 1831252 is described below commit 1831252c5710a6613ddcb53f3c23675cdc525999 Author: Carlos Rovira AuthorDate: Mon Jan 4 19:27:54 2021 +0100 tour-de-jewel: updates to CheckBox and RadioButton pages --- .../src/main/royale/CheckBoxPlayGround.mxml| 135 - .../src/main/royale/RadioButtonPlayGround.mxml | 133 2 files changed, 161 insertions(+), 107 deletions(-) diff --git a/examples/jewel/TourDeJewel/src/main/royale/CheckBoxPlayGround.mxml b/examples/jewel/TourDeJewel/src/main/royale/CheckBoxPlayGround.mxml index 984d78f..df85d32 100644 --- a/examples/jewel/TourDeJewel/src/main/royale/CheckBoxPlayGround.mxml +++ b/examples/jewel/TourDeJewel/src/main/royale/CheckBoxPlayGround.mxml @@ -36,70 +36,97 @@ limitations under the License
[royale-asjs] branch develop updated: tour-de-jewel: date components page little tweaks
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-asjs.git The following commit(s) were added to refs/heads/develop by this push: new 2274a85 tour-de-jewel: date components page little tweaks 2274a85 is described below commit 2274a85bdb99cc6379c357c0428bab54ee0eaab5 Author: Carlos Rovira AuthorDate: Mon Jan 4 19:13:30 2021 +0100 tour-de-jewel: date components page little tweaks --- .../jewel/TourDeJewel/src/main/royale/DateComponentsPlayGround.mxml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/jewel/TourDeJewel/src/main/royale/DateComponentsPlayGround.mxml b/examples/jewel/TourDeJewel/src/main/royale/DateComponentsPlayGround.mxml index 7087e46..dee87c4 100644 --- a/examples/jewel/TourDeJewel/src/main/royale/DateComponentsPlayGround.mxml +++ b/examples/jewel/TourDeJewel/src/main/royale/DateComponentsPlayGround.mxml @@ -121,7 +121,7 @@ limitations under the License. - + @@ -137,8 +137,8 @@ limitations under the License. - +
[royale-asjs] branch develop updated: jewel-theme: finish Switch styles for flat and non flat themes
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new c72e569 jewel-theme: finish Switch styles for flat and non flat themes
c72e569 is described below
commit c72e569b97be62758383d652e13586447d70a9d5
Author: Carlos Rovira
AuthorDate: Mon Jan 4 19:12:48 2021 +0100
jewel-theme: finish Switch styles for flat and non flat themes
---
.../src/main/resources/defaults.css| 46 +--
.../src/main/resources/defaults.css| 46 +--
.../src/main/resources/defaults.css| 46 +--
.../src/main/resources/defaults.css| 46 +--
.../src/main/resources/defaults.css| 46 +--
.../src/main/resources/defaults.css| 46 +--
.../src/main/resources/defaults.css| 46 +--
.../src/main/resources/defaults.css| 46 +--
.../src/main/resources/defaults.css| 46 +--
.../src/main/resources/defaults.css| 46 +--
.../src/main/resources/defaults.css| 46 +--
.../src/main/resources/defaults.css| 46 +--
.../src/main/resources/defaults.css| 46 +--
.../src/main/resources/defaults.css| 46 +--
.../src/main/resources/defaults.css| 46 +--
.../src/main/resources/defaults.css| 46 +--
.../src/main/resources/defaults.css| 46 +--
.../src/main/resources/defaults.css| 46 +--
.../src/main/resources/defaults.css| 46 +--
.../src/main/resources/defaults.css| 46 +--
.../src/main/resources/defaults.css| 46 +--
.../src/main/resources/defaults.css| 46 +--
.../src/main/resources/defaults.css| 46 +--
.../src/main/resources/defaults.css| 46 +--
.../src/main/resources/defaults.css| 46 +--
.../src/main/resources/defaults.css| 46 +--
.../src/main/resources/defaults.css| 46 +--
.../src/main/resources/defaults.css| 46 +--
.../src/main/resources/defaults.css| 46 +--
.../src/main/resources/defaults.css| 46 +--
.../src/main/resources/defaults.css| 46 +--
.../src/main/resources/defaults.css| 46 +--
.../src/main/resources/defaults.css| 46 +--
.../src/main/resources/defaults.css| 46 +--
.../src/main/resources/defaults.css| 46 +--
.../src/main/resources/defaults.css| 46 +--
.../JewelTheme/src/main/resources/defaults.css | 14 --
.../main/sass/components-primary/_checkbox.sass| 53 --
38 files changed, 1595 insertions(+), 128 deletions(-)
diff --git
a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Amethyst-Theme/src/main/resources/defaults.css
b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Amethyst-Theme/src/main/resources/defaults.css
index ea74d3d..c931f1b 100644
---
a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Amethyst-Theme/src/main/resources/defaults.css
+++
b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Amethyst-Theme/src/main/resources/defaults.css
@@ -420,14 +420,14 @@ j|CardActions {
border: 1px solid #8a1e88;
border-radius: 3px;
}
+.jewel.checkbox input[disabled] + span {
+ color: #737373;
+}
.jewel.checkbox input[disabled] + span::before {
background: #404040;
border: 1px solid #0d0d0d;
border-radius: 3px;
}
-.jewel.checkbox input[disabled] + span {
- color: #737373;
-}
.jewel.checkbox input[disabled] + span::after {
background: url("data:image/svg+xml,%3Csvg viewBox='0 0 22 22' version='1.1'
xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='0' width='22' height='22'
fill-opacity='0'/%3E%3Cpolygon fill='%23191919' points='3.50018311 12.4854126
8.48547363 17.4989624 18.4641113 7.47589111 15.5010376 4.51739502 8.48547363
11.5650024 6.52087402 9.47265625'/%3E%3C/svg%3E") no-repeat center center;
}
@@ -435,6 +435,46 @@ j|CardActions {
padding-left: 8px;
}
+.jewel.switch input:checked + .switch {
+ background: linear-gradient(#c92cc6, #d94fd6);
+ box-shadow: 0px 0px 0px 1px #b427b1;
+}
+.jewel.switch input:focus + .switch {
+
[royale-asjs] branch develop updated: tour-de-jewel: add Jewel Switch examples in CheckBox and RadioButton pages
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-asjs.git The following commit(s) were added to refs/heads/develop by this push: new a3fbacd tour-de-jewel: add Jewel Switch examples in CheckBox and RadioButton pages a3fbacd is described below commit a3fbacd98731e54bf9a1e585b91061fc9b089b2c Author: Carlos Rovira AuthorDate: Mon Jan 4 16:20:46 2021 +0100 tour-de-jewel: add Jewel Switch examples in CheckBox and RadioButton pages --- .../src/main/royale/CheckBoxPlayGround.mxml| 27 -- .../src/main/royale/RadioButtonPlayGround.mxml | 24 ++- 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/examples/jewel/TourDeJewel/src/main/royale/CheckBoxPlayGround.mxml b/examples/jewel/TourDeJewel/src/main/royale/CheckBoxPlayGround.mxml index f2b30bb..984d78f 100644 --- a/examples/jewel/TourDeJewel/src/main/royale/CheckBoxPlayGround.mxml +++ b/examples/jewel/TourDeJewel/src/main/royale/CheckBoxPlayGround.mxml @@ -34,11 +34,11 @@ limitations under the License. - + - + @@ -56,11 +56,34 @@ limitations under the License. + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/jewel/TourDeJewel/src/main/royale/RadioButtonPlayGround.mxml b/examples/jewel/TourDeJewel/src/main/royale/RadioButtonPlayGround.mxml index 2451b49..003648c 100644 --- a/examples/jewel/TourDeJewel/src/main/royale/RadioButtonPlayGround.mxml +++ b/examples/jewel/TourDeJewel/src/main/royale/RadioButtonPlayGround.mxml @@ -34,7 +34,7 @@ limitations under the License. - + @@ -56,6 +56,28 @@ limitations under the License. + + + + + + + + + + + + + + + + + + + + + +
[royale-asjs] branch develop updated: jewel-theme: improve Switch styles for non-flat themes
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 61775d0 jewel-theme: improve Switch styles for non-flat themes
61775d0 is described below
commit 61775d07fb973d1c8302937431c55bbf2869787d
Author: Carlos Rovira
AuthorDate: Mon Jan 4 16:19:52 2021 +0100
jewel-theme: improve Switch styles for non-flat themes
---
.../JewelTheme/src/main/resources/defaults.css | 20 +++
.../main/sass/components-primary/_checkbox.sass| 30 ++
2 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index 381c8b7..5e569b7 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -436,16 +436,19 @@ j|CardActions {
}
.jewel.switch input:checked + .switch {
- background-color: #3CADF1;
+ background: linear-gradient(#3cadf1, #6cc1f4);
+ box-shadow: 0px 0px 0px 1px #24a3ef;
}
.jewel.switch input:focus + .switch {
- box-shadow: 0 0 1px #3CADF1;
+ box-shadow: 0px 0px 0px 1px #1198e9;
}
.jewel.switch input:checked + .switch::before {
+ background: white;
transform: translateX(20px);
}
.jewel.switch input[disabled]:checked + .switch {
- background-color: silver;
+ background: linear-gradient(silver, #d9d9d9);
+ box-shadow: 0px 0px 0px 1px #b3b3b3;
}
.jewel.switch input[disabled] + .switch {
color: silver;
@@ -454,16 +457,13 @@ j|CardActions {
background: #f3f3f3;
}
.jewel.switch .switch {
- background-color: #d9d9d9;
- transition: 0.4s;
+ background: linear-gradient(#d9d9d9, #f3f3f3);
+ box-shadow: 0px 0px 0px 1px #cc;
border-radius: 20px;
+ transition: 0.4s;
}
.jewel.switch .switch::before {
- height: 20px;
- width: 20px;
- left: 2px;
- bottom: 2px;
- background-color: white;
+ background: #fafdff;
transition: 0.4s;
border-radius: 50%;
}
diff --git
a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_checkbox.sass
b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_checkbox.sass
index 34ad2c4..1276dec 100644
---
a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_checkbox.sass
+++
b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_checkbox.sass
@@ -95,20 +95,29 @@ $switch-label-separation: 8px
input
&:checked
+ .switch
-background-color: $primary-color
+@if $flat
+background: $primary-color
+@else
+background: linear-gradient(lighten($primary-color, 0%),
lighten($primary-color, 10%))
+box-shadow: 0px 0px 0px 1px darken($primary-color, 5%)
&:focus
+ .switch
-box-shadow: 0 0 1px $primary-color
+box-shadow: 0px 0px 0px 1px darken($primary-color, 10%)
&:checked
+ .switch::before
+background: lighten($primary-color, 50%)
transform: translateX($switch-inner-size)
&[disabled]
&:checked
+ .switch
-background-color: $disabled-font-color
+@if $flat
+background: $disabled-font-color
+@else
+background:
linear-gradient(lighten($disabled-font-color, 0%),
lighten($disabled-font-color, 10%))
+box-shadow: 0px 0px 0px 1px darken($disabled-font-color,
5%)
& + .switch
color: $disabled-font-color
@@ -117,17 +126,16 @@ $switch-label-separation: 8px
background: $disabled-color
.switch
-background-color: $default-color
-transition: $switch-transition-delay
-
+@if $flat
+background: lighten($default-color, 15%)
+@else
+background: linear-gradient(lighten($default-color, 0%),
lighten($default-color, 10%))
+box-shadow: 0px 0px 0px 1px darken($default-color, 5%)
border-radius: $switch-inner-size
+transition: $switch-transition-delay
.switch::before
-height: $switch-inner-size
-width: $switch-inner-size
-left: $switch-button-offset
-bottom: $switch-button-offset
-background-color: lighten($primary-color, 50%)
+background: lighten($primary-color, 40%)
transition: $switch-transition-delay
border-radius: $switch-button-border-radius
[royale-asjs] branch develop updated: New Jewel constrols: SwitchCheckBox and SwitchRadioButton
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 3e67b84 New Jewel constrols: SwitchCheckBox and SwitchRadioButton
3e67b84 is described below
commit 3e67b84a3cbeabd0ad4b660ae4b88485256350cc
Author: Carlos Rovira
AuthorDate: Mon Jan 4 12:04:16 2021 +0100
New Jewel constrols: SwitchCheckBox and SwitchRadioButton
---
.../projects/Jewel/src/main/resources/defaults.css | 45 +++
.../Jewel/src/main/resources/jewel-manifest.xml| 2 +
.../royale/org/apache/royale/jewel/RadioButton.as | 3 +-
.../org/apache/royale/jewel/SwitchCheckBox.as | 121 +++
.../org/apache/royale/jewel/SwitchRadioButton.as | 129 +
.../Jewel/src/main/sass/components/_checkbox.sass | 50
.../JewelTheme/src/main/resources/defaults.css | 42 ++-
.../main/sass/components-primary/_checkbox.sass| 62 +-
8 files changed, 446 insertions(+), 8 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css
b/frameworks/projects/Jewel/src/main/resources/defaults.css
index e278045..db6d871 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -385,6 +385,51 @@ j|ToggleButtonBar {
width: inherit;
}
+.jewel.switch {
+ display: inline-flex;
+ position: relative;
+ height: auto;
+}
+.jewel.switch input {
+ -webkit-appearance: none;
+ -moz-appearance: none;
+ -o-appearance: none;
+ -ms-appearance: none;
+ appearance: none;
+ display: inline-flex;
+ opacity: 0;
+ width: 44px;
+ height: 24px;
+ margin: 0;
+ padding: 0;
+}
+.jewel.switch input[disabled] + span {
+ cursor: unset;
+}
+.jewel.switch .switch {
+ position: absolute;
+ cursor: pointer;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ width: 44px;
+ height: 24px;
+}
+.jewel.switch .switch::before {
+ position: absolute;
+ content: "";
+ height: 20px;
+ width: 20px;
+ left: 2px;
+ bottom: 2px;
+}
+.jewel.switch .label {
+ cursor: pointer;
+ margin: auto;
+ width: inherit;
+}
+
.jewel.combobox {
display: inline-flex;
}
diff --git a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
index 5ca4d25..88ef7a9 100644
--- a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
+++ b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
@@ -79,7 +79,9 @@
+
+
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/RadioButton.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/RadioButton.as
index de4eb69..f877303 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/RadioButton.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/RadioButton.as
@@ -42,7 +42,8 @@ package org.apache.royale.jewel
*
* A RadioButton consists of a circle and, typically, text that clearly
communicates a
* condition that will be set when the user clicks or touches it. Radio
buttons
- * always appear in groups of two or more with the same
groupName propert.
+ * always appear in groups of two or more with the same
groupName property.
+ *
* While they can be individually selected, can only be deselected by
selecting
* a different RadioButton in the same group (which deselects the rest of
RadioButton).
*
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/SwitchCheckBox.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/SwitchCheckBox.as
new file mode 100644
index 000..cb37524
--- /dev/null
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/SwitchCheckBox.as
@@ -0,0 +1,121 @@
+
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+//
[royale-asjs] branch develop updated: jewel-disabled: extend from DispatcherBead to allow extend this bead. This showcase a probem where we have [Bindable] but the class doesn't have EventDispatcher o
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 16663f4 jewel-disabled: extend from DispatcherBead to allow extend
this bead. This showcase a probem where we have [Bindable] but the class
doesn't have EventDispatcher on the hierarchy, so the compilation fails. Maybe
this could be solve in some way?
16663f4 is described below
commit 16663f4d02b9ec54e2acc67b0ba33c0a147c1ed3
Author: Carlos Rovira
AuthorDate: Mon Jan 4 10:03:22 2021 +0100
jewel-disabled: extend from DispatcherBead to allow extend this bead. This
showcase a probem where we have [Bindable] but the class doesn't have
EventDispatcher on the hierarchy, so the compilation fails. Maybe this could be
solve in some way?
---
.../main/royale/org/apache/royale/jewel/beads/controls/Disabled.as| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Disabled.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Disabled.as
index b0f530d..9694ada 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Disabled.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Disabled.as
@@ -23,7 +23,7 @@ package org.apache.royale.jewel.beads.controls
import org.apache.royale.core.HTMLElementWrapper;
import org.apache.royale.core.IUIBase;
}
- import org.apache.royale.core.Bead;
+ import org.apache.royale.core.DispatcherBead;
import org.apache.royale.core.IStrand;
import org.apache.royale.events.ValueEvent;
import org.apache.royale.utils.sendStrandEvent;
@@ -36,7 +36,7 @@ package org.apache.royale.jewel.beads.controls
* @playerversion AIR 2.6
* @productversion Royale 0.9.4
*/
- public class Disabled extends Bead
+ public class Disabled extends DispatcherBead
{
/**
* constructor.
[royale-compiler] branch develop updated: Fix quoting when getProperty() is added for indexed array syntax ([]) on Proxy using an already-quoted value.
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 2c4462f Fix quoting when getProperty() is added for indexed array
syntax ([]) on Proxy using an already-quoted value.
new cefb26b Merge pull request #172 from
estanglerbm/proxy-getproperty-quoting
2c4462f is described below
commit 2c4462f04bc4cce78c951b4b5a2151b62074791b
Author: Edward Stangler
AuthorDate: Sun Jan 3 00:14:48 2021 -0600
Fix quoting when getProperty() is added for indexed array syntax ([]) on
Proxy using an already-quoted value.
---
.../internal/codegen/js/jx/MemberAccessEmitter.java | 20
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git
a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/MemberAccessEmitter.java
b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/MemberAccessEmitter.java
index 274cd4f..1a18c26 100644
---
a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/MemberAccessEmitter.java
+++
b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/MemberAccessEmitter.java
@@ -265,21 +265,33 @@ public class MemberAccessEmitter extends JSSubEmitter
implements
{
writeLeftSide(node, leftNode, rightNode);
if (child)
- write(".getProperty('");
+ write(".getProperty(");
String s = fjs.stringifyNode(rightNode);
int dot = s.indexOf('.');
if (dot != -1)
{
String name = s.substring(0, dot);
String afterDot = s.substring(dot);
+ write("'");
write(name);
- write("')");
+ write("'");
+ write(")");
write(afterDot);
}
else
{
- write(s);
- write("')");
+ if ((s.startsWith("'") &&
s.endsWith("'")) || (s.startsWith("\"") && s.endsWith("\"")))
+ {
+ // already quoted
+ write(s);
+ }
+ else
+ {
+ write("'");
+ write(s);
+ write("'");
+ }
+ write(")");
}
return;
}
[royale-asjs] branch develop updated: Better error reporting for Vertical/HorizontalLayout
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 4ee682c Better error reporting for Vertical/HorizontalLayout
new a8072a7 Merge pull request #1028 from
stanislaw89/better-gap-error-reporting
4ee682c is described below
commit 4ee682c75e14e3e4f763d6f0cd595878b4f26e72
Author: sten
AuthorDate: Sat Jan 2 20:09:15 2021 -0500
Better error reporting for Vertical/HorizontalLayout
---
.../royale/org/apache/royale/jewel/beads/layouts/HorizontalLayout.as| 2 +-
.../main/royale/org/apache/royale/jewel/beads/layouts/VerticalLayout.as | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalLayout.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalLayout.as
index 8ebdb22..15c515e 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalLayout.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/HorizontalLayout.as
@@ -206,7 +206,7 @@ package org.apache.royale.jewel.beads.layouts
if(value != 0)
hostComponent.addClass("gap-" + value +
"x" + GapConstants.GAP_STEP + "px");
} else
- throw new Error("Gap needs to be between 0 and
" + GapConstants.GAPS);
+ throw new Error("Gap needs to be between 0 and
" + GapConstants.GAPS + ", got " + value);
}
private var variableRowHeightInitialized:Boolean;
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalLayout.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalLayout.as
index ffcdb2b..b907b81 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalLayout.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/VerticalLayout.as
@@ -206,7 +206,7 @@ package org.apache.royale.jewel.beads.layouts
if(value != 0)
hostComponent.addClass("gap-" + value +
"x" + GapConstants.GAP_STEP + "px");
} else
- throw new Error("Gap needs to be between 0 and
" + GapConstants.GAPS);
+ throw new Error("Gap needs to be between 0 and
" + GapConstants.GAPS + ", got " + value);
}
private var variableRowHeightInitialized:Boolean;
[royale-asjs] branch develop updated: jewel-theme: improve styles for disabled items in DateChooser, now getting disabled selections
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 5d4b103 jewel-theme: improve styles for disabled items in
DateChooser, now getting disabled selections
5d4b103 is described below
commit 5d4b1034392929bc58037f22f78ee33c85f17dd3
Author: Carlos Rovira
AuthorDate: Sat Jan 2 16:34:47 2021 +0100
jewel-theme: improve styles for disabled items in DateChooser, now getting
disabled selections
---
.../src/main/resources/defaults.css | 12
.../src/main/resources/defaults.css | 12
.../src/main/resources/defaults.css | 12
.../src/main/resources/defaults.css | 12
.../src/main/resources/defaults.css | 12
.../src/main/resources/defaults.css | 12
.../src/main/resources/defaults.css | 12
.../src/main/resources/defaults.css | 12
.../src/main/resources/defaults.css | 12
.../src/main/resources/defaults.css | 12
.../src/main/resources/defaults.css | 12
.../src/main/resources/defaults.css | 12
.../src/main/resources/defaults.css | 12
.../src/main/resources/defaults.css | 12
.../src/main/resources/defaults.css | 12
.../src/main/resources/defaults.css | 12
.../src/main/resources/defaults.css | 12
.../src/main/resources/defaults.css | 12
.../src/main/resources/defaults.css | 12
.../src/main/resources/defaults.css | 12
.../src/main/resources/defaults.css | 12
.../src/main/resources/defaults.css | 12
.../src/main/resources/defaults.css | 12
.../src/main/resources/defaults.css | 12
.../src/main/resources/defaults.css | 12
.../src/main/resources/defaults.css | 12
.../src/main/resources/defaults.css | 12
.../src/main/resources/defaults.css | 12
.../src/main/resources/defaults.css | 12
.../src/main/resources/defaults.css | 12
.../src/main/resources/defaults.css | 12
.../src/main/resources/defaults.css | 12
.../src/main/resources/defaults.css | 12
.../src/main/resources/defaults.css | 12
.../src/main/resources/defaults.css | 12
.../src/main/resources/defaults.css | 12
36 files changed, 288 insertions(+), 144 deletions(-)
diff --git
a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Amethyst-Theme/src/main/resources/defaults.css
b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Amethyst-Theme/src/main/resources/defaults.css
index 80a2203..ea74d3d 100644
---
a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Amethyst-Theme/src/main/resources/defaults.css
+++
b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Amethyst-Theme/src/main/resources/defaults.css
@@ -632,10 +632,6 @@ j|CardActions {
.calendar.item.date {
color: grey;
}
-.calendar[disabled] {
- color: #737373;
- pointer-events: none;
-}
.jewel.datefield .jewel.textinput input {
border-radius: 0.25rem 0px 0px 0.25rem;
@@ -1302,9 +1298,17 @@ j|TabBar {
.jewel.tableitem.calendar {
border-radius: 4px;
}
+.jewel.tableitem.calendar[disabled] {
+ color: #737373;
+ pointer-events: none;
+}
.jewel.tableitem.calendar.selected {
font-weight: bold;
}
+.jewel.tableitem.calendar.selected[disabled] {
+ color: #FF;
+ background: #191919;
+}
a:link {
color: #C92CC6;
diff --git
a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Blue-Theme/src/main/resources/defaults.css
b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Blue-Theme/src/main/resources/defaults.css
index adc7360..1608182 100644
---
a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Blue-Theme/src/main/resources/defaults.css
+++
b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Blue-Theme/src/main/resources/defaults.css
@@ -632,10
[royale-asjs] branch develop updated: jewel-DateChooserDateRangeRestriction: comment the "ensure no selection remains in dates out of the range" and left for an extension of this bead. The styles now
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 81eff74 jewel-DateChooserDateRangeRestriction: comment the "ensure no
selection remains in dates out of the range" and left for an extension of this
bead. The styles now shows selection disabled.
81eff74 is described below
commit 81eff74e9bdf1a187622d68975229786230189a0
Author: Carlos Rovira
AuthorDate: Sat Jan 2 16:22:49 2021 +0100
jewel-DateChooserDateRangeRestriction: comment the "ensure no selection
remains in dates out of the range" and left for an extension of this bead. The
styles now shows selection disabled.
---
.../datechooser/DateChooserDateRangeRestriction.as | 21 -
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateChooserDateRangeRestriction.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateChooserDateRangeRestriction.as
index db4be5c..ed674d7 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateChooserDateRangeRestriction.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateChooserDateRangeRestriction.as
@@ -19,7 +19,6 @@
package org.apache.royale.jewel.beads.controls.datechooser
{
import org.apache.royale.core.IBead;
-import org.apache.royale.core.ISelectableItemRenderer;
import org.apache.royale.core.IStrand;
import org.apache.royale.events.Event;
import org.apache.royale.events.IEventDispatcher;
@@ -31,11 +30,15 @@ package org.apache.royale.jewel.beads.controls.datechooser
import org.apache.royale.jewel.supportClasses.table.TBodyContentArea;
import org.apache.royale.jewel.supportClasses.table.TableCell;
import org.apache.royale.jewel.supportClasses.table.TableRow;
-import org.apache.royale.utils.getSelectionRenderBead;
/**
* Disable dates which are outside restriction provided by minDate and
maxDate properties
-* in DateChooser component
+* in DateChooser component. User can set just one restriction
(minDate or maxDate), or both
+* for a complete Range.
+*
+* If a selectionDate is set this bead doesn't affect it and the
component just represent the selected
+* date as disabled. An extension could be done to remove selectedDate
and not allow selections on
+* ranges outside the restriction.
*
* @langversion 3.0
* @playerversion Flash 10.2
@@ -193,12 +196,12 @@ package org.apache.royale.jewel.beads.controls.datechooser
disabled.disabled = itemTime > minTime ? false
: true;
// ensure no selection remains in dates out of the range
- if(disabled.disabled)
- {
- var selectionBead:ISelectableItemRenderer =
getSelectionRenderBead(renderer);
- if(selectionBead && selectionBead.selected)
- selectionBead.selected = false;
- }
+ // if(disabled.disabled)
+ // {
+ // var selectionBead:ISelectableItemRenderer =
getSelectionRenderBead(renderer);
+ // if(selectionBead && selectionBead.selected)
+ // selectionBead.selected = false;
+ // }
}
}
}
\ No newline at end of file
[royale-asjs] branch develop updated: jewel-datechooser: improve styles for disabled selected dates
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 223de78 jewel-datechooser: improve styles for disabled selected dates
223de78 is described below
commit 223de78cbf7699d0100789af1c0ad9eb801e7797
Author: Carlos Rovira
AuthorDate: Sat Jan 2 16:21:29 2021 +0100
jewel-datechooser: improve styles for disabled selected dates
---
frameworks/themes/JewelTheme/src/main/resources/defaults.css | 12
.../src/main/sass/components-primary/_datechooser.sass | 5 +
.../JewelTheme/src/main/sass/components-primary/_table.sass | 8
3 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index 47ae867..d768e91 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -632,10 +632,6 @@ j|CardActions {
.calendar.item.date {
color: grey;
}
-.calendar[disabled] {
- color: silver;
- pointer-events: none;
-}
.jewel.datefield .jewel.textinput input {
border-radius: 0.25rem 0px 0px 0.25rem;
@@ -1302,9 +1298,17 @@ j|TabBar {
.jewel.tableitem.calendar {
border-radius: 4px;
}
+.jewel.tableitem.calendar[disabled] {
+ color: silver;
+ pointer-events: none;
+}
.jewel.tableitem.calendar.selected {
font-weight: bold;
}
+.jewel.tableitem.calendar.selected[disabled] {
+ color: #FF;
+ background: #cc;
+}
a:link {
color: #3CADF1;
diff --git
a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_datechooser.sass
b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_datechooser.sass
index baf6ada..7e6af67 100644
---
a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_datechooser.sass
+++
b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_datechooser.sass
@@ -141,7 +141,4 @@ $datechooser-buttons-border-radius: 50%
&.date
color: grey
-
-&[disabled]
-color: $disabled-font-color
-pointer-events: none
\ No newline at end of file
+
\ No newline at end of file
diff --git
a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_table.sass
b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_table.sass
index 27ba248..ccb0989 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_table.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_table.sass
@@ -158,5 +158,13 @@ $table-border-radius: $border-radius
&.calendar
border-radius: 4px
+&[disabled]
+color: $disabled-font-color
+pointer-events: none
+
&.selected
font-weight: bold
+
+&[disabled]
+color: $font-theme-color
+background: darken($disabled-color, 15%)
\ No newline at end of file
[royale-asjs] branch develop updated: jewel-DateChooserDateRangeRestriction: ensure no selection remains in dates out of the range
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new ca895af jewel-DateChooserDateRangeRestriction: ensure no selection
remains in dates out of the range
ca895af is described below
commit ca895af8de9a790abb3fa7e84f7a87e445be25ec
Author: Carlos Rovira
AuthorDate: Sat Jan 2 15:23:20 2021 +0100
jewel-DateChooserDateRangeRestriction: ensure no selection remains in dates
out of the range
---
.../controls/datechooser/DateChooserDateRangeRestriction.as| 10 ++
1 file changed, 10 insertions(+)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateChooserDateRangeRestriction.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateChooserDateRangeRestriction.as
index 1a76d39..db4be5c 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateChooserDateRangeRestriction.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateChooserDateRangeRestriction.as
@@ -19,6 +19,7 @@
package org.apache.royale.jewel.beads.controls.datechooser
{
import org.apache.royale.core.IBead;
+import org.apache.royale.core.ISelectableItemRenderer;
import org.apache.royale.core.IStrand;
import org.apache.royale.events.Event;
import org.apache.royale.events.IEventDispatcher;
@@ -30,6 +31,7 @@ package org.apache.royale.jewel.beads.controls.datechooser
import org.apache.royale.jewel.supportClasses.table.TBodyContentArea;
import org.apache.royale.jewel.supportClasses.table.TableCell;
import org.apache.royale.jewel.supportClasses.table.TableRow;
+import org.apache.royale.utils.getSelectionRenderBead;
/**
* Disable dates which are outside restriction provided by minDate and
maxDate properties
@@ -189,6 +191,14 @@ package org.apache.royale.jewel.beads.controls.datechooser
else if(minDate && !maxDate)
// only minDate
disabled.disabled = itemTime > minTime ? false
: true;
+
+ // ensure no selection remains in dates out of the range
+ if(disabled.disabled)
+ {
+ var selectionBead:ISelectableItemRenderer =
getSelectionRenderBead(renderer);
+ if(selectionBead && selectionBead.selected)
+ selectionBead.selected = false;
+ }
}
}
}
\ No newline at end of file
[royale-asjs] branch develop updated: jewel-DateChooserDateRangeRestriction: allow to setup only one limit (min or max) or both.
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 118f7e0 jewel-DateChooserDateRangeRestriction: allow to setup only
one limit (min or max) or both.
118f7e0 is described below
commit 118f7e07d73a288715679773955e13d936e3f884
Author: Carlos Rovira
AuthorDate: Sat Jan 2 12:08:32 2021 +0100
jewel-DateChooserDateRangeRestriction: allow to setup only one limit (min
or max) or both.
---
.../datechooser/DateChooserDateRangeRestriction.as | 39 +-
1 file changed, 23 insertions(+), 16 deletions(-)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateChooserDateRangeRestriction.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateChooserDateRangeRestriction.as
index 77150b4..1a76d39 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateChooserDateRangeRestriction.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateChooserDateRangeRestriction.as
@@ -133,17 +133,19 @@ package org.apache.royale.jewel.beads.controls.datechooser
view.nextButton.addEventListener(MouseEvent.CLICK,
refreshDateRange);
view.viewSelector.addEventListener(MouseEvent.CLICK,
refreshDateRange);
- table = view.table;
- view.table.addEventListener(Event.CHANGE,
refreshDateRange);
-
-tableContent = table.getBeadByType(TBodyContentArea) as
TBodyContentArea;
-
refreshDateRange();
}
public function refreshDateRange():void
{
-if (!minDate || !maxDate) return;
+ if(!view) return;
+if (!minDate && !maxDate) return;
+
+ if(view.table)
+ view.table.removeEventListener(Event.CHANGE,
refreshDateRange);
+ table = view.table;
+ view.table.addEventListener(Event.CHANGE,
refreshDateRange);
+tableContent = table.getBeadByType(TBodyContentArea) as
TBodyContentArea;
var n:int = table.dataProvider.length;
for (var i:int = 0; i < tableContent.numElements; i++)
@@ -163,8 +165,12 @@ package org.apache.royale.jewel.beads.controls.datechooser
var rendererDate:Date =
renderer.data[renderer.labelField];
if (!rendererDate) return;
- var minTime:Number = minDate.getTime();
- var maxTime:Number = maxDate.getTime();
+ var minTime:Number;
+ var maxTime:Number;
+ if(minDate)
+ minTime = minDate.getTime();
+ if(maxDate)
+ maxTime = maxDate.getTime();
var itemTime:Number = rendererDate.getTime();
var disabled:Disabled = (renderer as
IStrand).getBeadByType(Disabled) as Disabled;
@@ -174,14 +180,15 @@ package org.apache.royale.jewel.beads.controls.datechooser
(renderer as IStrand).addBead(disabled);
}
- if ((itemTime > minTime) && (maxTime > itemTime))
- {
-disabled.disabled = false;
- }
- else
- {
-disabled.disabled = true;
- }
+ if(minDate && maxDate)
+ // both minDate and maxDate
+ disabled.disabled = (itemTime > minTime) &&
(maxTime > itemTime) ? false : true;
+ else if(!minDate && maxDate)
+ // only maxDate
+ disabled.disabled = maxTime > itemTime ? false
: true;
+ else if(minDate && !maxDate)
+ // only minDate
+ disabled.disabled = itemTime > minTime ? false
: true;
}
}
}
\ No newline at end of file
[royale-asjs] branch develop updated: Fix DataBindingBase.deferredBindings supporting only a single (last) property
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 726a3b4 Fix DataBindingBase.deferredBindings supporting only a single
(last) property
new 7e47432 Merge pull request #1024 from
stanislaw89/bug/deferred-bindings-multiple-properties
726a3b4 is described below
commit 726a3b4498529da9439852542d81c5c7dbcb1808
Author: sten
AuthorDate: Wed Dec 30 21:06:19 2020 -0500
Fix DataBindingBase.deferredBindings supporting only a single (last)
property
---
.../org/apache/royale/binding/DataBindingBase.as | 30 --
1 file changed, 22 insertions(+), 8 deletions(-)
diff --git
a/frameworks/projects/Binding/src/main/royale/org/apache/royale/binding/DataBindingBase.as
b/frameworks/projects/Binding/src/main/royale/org/apache/royale/binding/DataBindingBase.as
index 832b73b..2adf3bb 100644
---
a/frameworks/projects/Binding/src/main/royale/org/apache/royale/binding/DataBindingBase.as
+++
b/frameworks/projects/Binding/src/main/royale/org/apache/royale/binding/DataBindingBase.as
@@ -171,11 +171,17 @@ package org.apache.royale.binding
deferredBindings = {};
IEventDispatcher(_strand).addEventListener("valueChange",
deferredBindingsHandler);
}
-deferredBindings[bindingObject.destination[0]] = binding;
+var propertyBindings:Array =
deferredBindings[bindingObject.destination[0]];
+if (!propertyBindings)
+{
+propertyBindings = [];
+deferredBindings[bindingObject.destination[0]] =
propertyBindings;
+}
+propertyBindings.push(binding);
}
}
}
-
+
private function watcherChildrenRelevantToIndex(children:Object,
index:int):Boolean{
var watchers:Array = children ? children.watchers : null;
var hasValidWatcherChild:Boolean = false;
@@ -276,7 +282,7 @@ package org.apache.royale.binding
{
pw.parentChanged(parentObj);
}
-
+
if (parentWatcher)
{
parentWatcher.addChild(pw);
@@ -286,7 +292,7 @@ package org.apache.royale.binding
pw.addBinding(gb);
}
}
-
+
if (hasWatcherChildren)
{
setupWatchers(gb, index, watcher.children.watchers,
watcher.watcher);
@@ -310,7 +316,7 @@ package org.apache.royale.binding
}
private function watcherChildIsXML(watcher:Object):Boolean
- {
+ {
return (watcher.children.watchers.length == 1 &&
watcher.children.watchers[0].type == "xml");
}
@@ -425,18 +431,26 @@ package org.apache.royale.binding
{
if (_strand[p] != null)
{
+var propertyBindings:Array = deferredBindings[p];
+
var destination:IStrand = _strand[p] as IStrand;
if (destination)
{
-destination.addBead(deferredBindings[p]);
+for each (var bindingBead:IBead in propertyBindings)
+{
+destination.addBead(bindingBead);
+}
}
else
{
var destObject:Object = _strand[p];
if (destObject)
{
-deferredBindings[p].destination = destObject;
-_strand.addBead(deferredBindings[p]);
+for each (var binding:IBinding in propertyBindings)
+{
+binding.destination = destObject;
+_strand.addBead(IBead(binding));
+}
}
else
{
[royale-asjs] branch develop updated: Fix 2 AMF issues in JS build: 1) pass in the AMF URI, as currently it's always NULL, and set it in the messageBody 2) fix the 'params' parameter in AMFNetConnecti
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 8df32a2 Fix 2 AMF issues in JS build: 1) pass in the AMF URI, as
currently it's always NULL, and set it in the messageBody 2) fix the 'params'
parameter in AMFNetConnection.call, as otherwise it's not possible to send in
an array of optional parameters
new 2f45293 Merge pull request #1023 from
SemiConscious/feature/AMF-fixes-for-target-URI-and-params
8df32a2 is described below
commit 8df32a2c3359eebb661c0329557c6d59d0bdfe0e
Author: Jim Page
AuthorDate: Wed Dec 30 17:54:47 2020 +
Fix 2 AMF issues in JS build:
1) pass in the AMF URI, as currently it's always NULL, and set it in the
messageBody
2) fix the 'params' parameter in AMFNetConnection.call, as otherwise it's
not possible to send in an array of optional parameters
---
.../projects/MXRoyale/src/main/royale/mx/net/NetConnection.as | 3 ++-
.../org/apache/royale/net/remoting/amf/AMFNetConnection.as | 10 +-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git
a/frameworks/projects/MXRoyale/src/main/royale/mx/net/NetConnection.as
b/frameworks/projects/MXRoyale/src/main/royale/mx/net/NetConnection.as
index fca0bdc..d0e84ac 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/net/NetConnection.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/net/NetConnection.as
@@ -150,7 +150,8 @@ public class NetConnection extends EventDispatcher
var ncResponder:org.apache.royale.net.Responder =
new
org.apache.royale.net.Responder(responder.resultFunction,
responder.faultFunction);
-nc.call(null, ncResponder, message);
+// Jim P: pass the AMF target URI in here
+nc.call(thisObject as String, ncResponder, message);
}
}
diff --git
a/frameworks/projects/Network/src/main/royale/org/apache/royale/net/remoting/amf/AMFNetConnection.as
b/frameworks/projects/Network/src/main/royale/org/apache/royale/net/remoting/amf/AMFNetConnection.as
index d176fcc..a28538b 100644
---
a/frameworks/projects/Network/src/main/royale/org/apache/royale/net/remoting/amf/AMFNetConnection.as
+++
b/frameworks/projects/Network/src/main/royale/org/apache/royale/net/remoting/amf/AMFNetConnection.as
@@ -287,7 +287,11 @@ public class AMFNetConnection
* @productversion BlazeDS 4
* @productversion LCDS 3
*/
-public function call(command:String, responder:Responder, ... params):void
+/* JimP: params should match what is sent into NetConnection.call, which
is currently an IMessage.
+ If a 'rest' variable is used then only the first member of a passed
array arrives. Fixed by
+ changing to an Object.
+*/
+public function call(command:String, responder:Responder,
params:Object):void
{
COMPILE::SWF
{
@@ -301,6 +305,8 @@ public class AMFNetConnection
requestQueue.push(
{
url: url,
+/* JimP: this is the AMF URI */
+target: command,
responder: responder,
args: params
}
@@ -328,6 +334,8 @@ public class AMFNetConnection
var actionMessage:ActionMessage = new ActionMessage();
var messageBody:MessageBody = new MessageBody();
sequence++;
+/* insert the AMF URI into the body, otherwise it's always 'null'
*/
+messageBody.targetURI = call.item.target;
messageBody.responseURI = "/" + sequence.toString();
messageBody.data = args;
actionMessage.bodies = [ messageBody ];
[royale-asjs] branch develop updated: tour-de-jewel: example for DateField with DateFieldDateRangeRestriction bead to limit the possible range of dates that can be selected on the calendar
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-asjs.git The following commit(s) were added to refs/heads/develop by this push: new ab51337 tour-de-jewel: example for DateField with DateFieldDateRangeRestriction bead to limit the possible range of dates that can be selected on the calendar ab51337 is described below commit ab51337d43bce0599fb9c95b714929db513c7444 Author: Carlos Rovira AuthorDate: Thu Dec 31 17:20:23 2020 +0100 tour-de-jewel: example for DateField with DateFieldDateRangeRestriction bead to limit the possible range of dates that can be selected on the calendar --- .../src/main/royale/DateComponentsPlayGround.mxml | 22 ++ 1 file changed, 22 insertions(+) diff --git a/examples/jewel/TourDeJewel/src/main/royale/DateComponentsPlayGround.mxml b/examples/jewel/TourDeJewel/src/main/royale/DateComponentsPlayGround.mxml index bb1e7da..7087e46 100644 --- a/examples/jewel/TourDeJewel/src/main/royale/DateComponentsPlayGround.mxml +++ b/examples/jewel/TourDeJewel/src/main/royale/DateComponentsPlayGround.mxml @@ -289,6 +289,28 @@ limitations under the License. + + + + + + + + + + + + + + + + + + + + + +
[royale-asjs] branch develop updated: jewel-DateFieldDateRangeRestriction: new bead to add date range restrictions to DateField
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new e8476d9 jewel-DateFieldDateRangeRestriction: new bead to add date
range restrictions to DateField
e8476d9 is described below
commit e8476d9b94324126ae28f58d311b0c8810bcfd75
Author: Carlos Rovira
AuthorDate: Thu Dec 31 17:19:34 2020 +0100
jewel-DateFieldDateRangeRestriction: new bead to add date range
restrictions to DateField
---
.../Jewel/src/main/resources/jewel-manifest.xml| 1 +
.../datechooser/DateChooserDateRangeRestriction.as | 6 +-
.../DateFieldDateRangeRestriction.as} | 100 +++--
3 files changed, 38 insertions(+), 69 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
index 9422b31..5ca4d25 100644
--- a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
+++ b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
@@ -135,6 +135,7 @@
+
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateChooserDateRangeRestriction.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateChooserDateRangeRestriction.as
index 6f2bd76..77150b4 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateChooserDateRangeRestriction.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateChooserDateRangeRestriction.as
@@ -123,7 +123,11 @@ package org.apache.royale.jewel.beads.controls.datechooser
private function handleDateChooserInitComplete(event:Event):void
{
(_strand as
IEventDispatcher).removeEventListener("initComplete",
handleDateChooserInitComplete);
-
+ setUpBead();
+ }
+
+ public function setUpBead():void
+ {
view = _strand.getBeadByType(DateChooserView) as
DateChooserView;
view.previousButton.addEventListener(MouseEvent.CLICK,
refreshDateRange);
view.nextButton.addEventListener(MouseEvent.CLICK,
refreshDateRange);
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateChooserDateRangeRestriction.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datefield/DateFieldDateRangeRestriction.as
similarity index 53%
copy from
frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateChooserDateRangeRestriction.as
copy to
frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datefield/DateFieldDateRangeRestriction.as
index 6f2bd76..811c1a2 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateChooserDateRangeRestriction.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datefield/DateFieldDateRangeRestriction.as
@@ -16,31 +16,27 @@
// limitations under the License.
//
-package org.apache.royale.jewel.beads.controls.datechooser
+package org.apache.royale.jewel.beads.controls.datefield
{
import org.apache.royale.core.IBead;
import org.apache.royale.core.IStrand;
import org.apache.royale.events.Event;
import org.apache.royale.events.IEventDispatcher;
-import org.apache.royale.events.MouseEvent;
-import org.apache.royale.jewel.beads.controls.Disabled;
import org.apache.royale.jewel.beads.itemRenderers.ITextItemRenderer;
-import org.apache.royale.jewel.beads.views.DateChooserView;
-import org.apache.royale.jewel.supportClasses.datechooser.DateChooserTable;
-import org.apache.royale.jewel.supportClasses.table.TBodyContentArea;
-import org.apache.royale.jewel.supportClasses.table.TableCell;
-import org.apache.royale.jewel.supportClasses.table.TableRow;
+import org.apache.royale.jewel.beads.views.DateFieldView;
+import org.apache.royale.jewel.DateChooser;
+import
org.apache.royale.jewel.beads.controls.datechooser.DateChooserDateRangeRestriction;
/**
* Disable dates which are outside restriction provided by minDate and
maxDate properties
-* in DateChooser component
-*
+* in DateField component
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @pla
[royale-asjs] branch develop updated: jewel-DateRangeRestriction: Rename to DateChooserDateRangeRestriction to make room for another bead for DateField
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new af6ed13 jewel-DateRangeRestriction: Rename to
DateChooserDateRangeRestriction to make room for another bead for DateField
af6ed13 is described below
commit af6ed13288126b833316020b1926a891e2dda434
Author: Carlos Rovira
AuthorDate: Thu Dec 31 17:15:07 2020 +0100
jewel-DateRangeRestriction: Rename to DateChooserDateRangeRestriction to
make room for another bead for DateField
---
.../src/main/royale/DateComponentsPlayGround.mxml | 4 ++--
.../projects/Jewel/src/main/resources/jewel-manifest.xml| 2 +-
...ngeRestriction.as => DateChooserDateRangeRestriction.as} | 13 +++--
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git
a/examples/jewel/TourDeJewel/src/main/royale/DateComponentsPlayGround.mxml
b/examples/jewel/TourDeJewel/src/main/royale/DateComponentsPlayGround.mxml
index 1316af3..bb1e7da 100644
--- a/examples/jewel/TourDeJewel/src/main/royale/DateComponentsPlayGround.mxml
+++ b/examples/jewel/TourDeJewel/src/main/royale/DateComponentsPlayGround.mxml
@@ -270,10 +270,10 @@ limitations under the License.
-
+
-
+
diff --git a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
index 9e8ac6e..9422b31 100644
--- a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
+++ b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
@@ -134,7 +134,7 @@
-
+
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateRangeRestriction.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateChooserDateRangeRestriction.as
similarity index 94%
rename from
frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateRangeRestriction.as
rename to
frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateChooserDateRangeRestriction.as
index 87553db..6f2bd76 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateRangeRestriction.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateChooserDateRangeRestriction.as
@@ -33,13 +33,14 @@ package org.apache.royale.jewel.beads.controls.datechooser
/**
* Disable dates which are outside restriction provided by minDate and
maxDate properties
+* in DateChooser component
*
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9.8
*/
- public class DateRangeRestriction implements IBead
+ public class DateChooserDateRangeRestriction implements IBead
{
/**
* constructor.
@@ -49,7 +50,7 @@ package org.apache.royale.jewel.beads.controls.datechooser
* @playerversion AIR 2.6
* @productversion Royale 0.9.8
*/
- public function DateRangeRestriction()
+ public function DateChooserDateRangeRestriction()
{
}
@@ -112,16 +113,16 @@ package org.apache.royale.jewel.beads.controls.datechooser
public function set strand(value:IStrand):void
{
_strand = value;
- (_strand as
IEventDispatcher).addEventListener("initComplete",
handlerDateChooserInitComplete);
+ (_strand as
IEventDispatcher).addEventListener("initComplete",
handleDateChooserInitComplete);
}
private var view:DateChooserView;
private var table:DateChooserTable;
private var tableContent:TBodyContentArea;
- private function
handlerDateChooserInitComplete(event:Event):void
+ private function handleDateChooserInitComplete(event:Event):void
{
- (_strand as
IEventDispatcher).removeEventListener("initComplete",
handlerDateChooserInitComplete);
+ (_strand as
IEventDispatcher).
[royale-asjs] branch develop updated: jewel-datefield: add "popUpOpened" and "popUpClosed" to hook actions when open the datechooser popup. This is the same we do in ComboBox
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 8da9b34 jewel-datefield: add "popUpOpened" and "popUpClosed" to hook
actions when open the datechooser popup. This is the same we do in ComboBox
8da9b34 is described below
commit 8da9b34976f5a86d4eb9e08747f805b8e139f4a4
Author: Carlos Rovira
AuthorDate: Thu Dec 31 17:13:36 2020 +0100
jewel-datefield: add "popUpOpened" and "popUpClosed" to hook actions when
open the datechooser popup. This is the same we do in ComboBox
---
.../royale/org/apache/royale/jewel/DateField.as| 22 ++
.../royale/jewel/beads/views/DateFieldView.as | 9 +++--
2 files changed, 29 insertions(+), 2 deletions(-)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/DateField.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/DateField.as
index 5297208..0d6fa25 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/DateField.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/DateField.as
@@ -29,6 +29,28 @@ package org.apache.royale.jewel
* The change event is dispatched when the selectedDate is changed.
*/
[Event(name="change", type="org.apache.royale.events.Event")]
+
+ /**
+ * Dispatched when the popup is opened.
+ *
+ * @toplevel
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.8
+ */
+ [Event(name="popUpOpened", type="org.apache.royale.events.Event")]
+
+ /**
+ * Dispatched when the popup is closed.
+ *
+ * @toplevel
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.8
+ */
+ [Event(name="popUpClosed", type="org.apache.royale.events.Event")]
/**
* The DateField class provides an input field where a date can be
entered
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateFieldView.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateFieldView.as
index 0209ec3..7831c2c 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateFieldView.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateFieldView.as
@@ -49,6 +49,7 @@ package org.apache.royale.jewel.beads.views
import
org.apache.royale.jewel.beads.controls.textinput.MaxNumberCharacters;
import org.apache.royale.jewel.beads.views.DateChooserView;
import org.apache.royale.utils.UIUtils;
+ import org.apache.royale.utils.sendStrandEvent;
/**
* The DateFieldView class is a bead for DateField that creates the
@@ -267,13 +268,16 @@ package org.apache.royale.jewel.beads.views
table = (popUp.view as
DateChooserView).table;
// rq =
requestAnimationFrame(prepareForPopUp); // not work in Chrome/Firefox, while
works in Safari, IE11, setInterval/Timer as well doesn't work right in Firefox
- setTimeout(prepareForPopUp, 300);
-
+
COMPILE::JS
{
window.addEventListener('resize',
autoResizeHandler, false);
}
+ prepareForPopUp();
+
+ sendStrandEvent(_strand, "popUpOpened");
+
autoResizeHandler();
}
else
@@ -286,6 +290,7 @@ package org.apache.royale.jewel.beads.views
}
_popUp.removeEventListener("initComplete", handlePopUpInitComplete);
_popUp = null;
+ sendStrandEvent(_strand, "popUpClosed");
}
}
_showingPopup = false;
[royale-asjs] branch develop updated: jewel-datefield-beads: organize and clean imports
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new cadad31 jewel-datefield-beads: organize and clean imports
cadad31 is described below
commit cadad319cad2334ee956f126fe81b80d51e4feb3
Author: Carlos Rovira
AuthorDate: Thu Dec 31 10:01:24 2020 +0100
jewel-datefield-beads: organize and clean imports
---
.../beads/controls/datefield/DateFieldMaskedTextInput.as| 13 +++--
.../jewel/beads/controls/datefield/DateFieldTextPrompt.as | 2 +-
.../beads/controls/datefield/SpanishDateComponentConfig.as | 2 +-
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datefield/DateFieldMaskedTextInput.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datefield/DateFieldMaskedTextInput.as
index b35c602..1643cbf 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datefield/DateFieldMaskedTextInput.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datefield/DateFieldMaskedTextInput.as
@@ -25,15 +25,16 @@ package org.apache.royale.jewel.beads.controls.datefield
COMPILE::SWF
{
import flash.events.TextEvent;
- import org.apache.royale.core.CSSTextField;
- import org.apache.royale.html.beads.ITextFieldView;
+
+ import org.apache.royale.core.CSSTextField;
+ import org.apache.royale.events.Event;
+ import org.apache.royale.events.IEventDispatcher;
+ import org.apache.royale.html.beads.ITextFieldView;
}
import org.apache.royale.core.IBead;
- import org.apache.royale.core.IStrand;
-import org.apache.royale.core.UIBase;
- import org.apache.royale.events.Event;
- import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.core.IFormatter;
+ import org.apache.royale.core.IStrand;
+ import org.apache.royale.core.UIBase;
/**
* The DateFieldMaskedTextInput class is a specialty bead that is used
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datefield/DateFieldTextPrompt.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datefield/DateFieldTextPrompt.as
index 229d413..1cc0b82 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datefield/DateFieldTextPrompt.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datefield/DateFieldTextPrompt.as
@@ -20,7 +20,7 @@ package org.apache.royale.jewel.beads.controls.datefield
{
COMPILE::SWF
{
- import flash.utils.setTimeout;
+ import flash.utils.setTimeout;
}
import org.apache.royale.core.UIBase;
import org.apache.royale.jewel.beads.controls.textinput.TextPrompt;
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datefield/SpanishDateComponentConfig.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datefield/SpanishDateComponentConfig.as
index 5fb16bc..e6b16ee 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datefield/SpanishDateComponentConfig.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datefield/SpanishDateComponentConfig.as
@@ -20,8 +20,8 @@ package org.apache.royale.jewel.beads.controls.datefield
{
import org.apache.royale.core.IDateControlConfigBead;
import org.apache.royale.core.IStrand;
-import org.apache.royale.jewel.beads.models.DateChooserModel;
import org.apache.royale.jewel.DateField;
+import org.apache.royale.jewel.beads.models.DateChooserModel;
/**
* The SpanishDateFieldConfig class is a specialty bead that is used
[royale-asjs] branch develop updated: tour-de-jewel: example for DateChooser with DateRangeRestriction bead to limit the possible range of dates that can be selected on the calendar
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-asjs.git The following commit(s) were added to refs/heads/develop by this push: new 10cca08 tour-de-jewel: example for DateChooser with DateRangeRestriction bead to limit the possible range of dates that can be selected on the calendar 10cca08 is described below commit 10cca08e9724226f93cd299449c4d61a876a8e3d Author: Carlos Rovira AuthorDate: Wed Dec 30 16:56:48 2020 +0100 tour-de-jewel: example for DateChooser with DateRangeRestriction bead to limit the possible range of dates that can be selected on the calendar --- .../src/main/royale/DateComponentsPlayGround.mxml | 28 ++ 1 file changed, 28 insertions(+) diff --git a/examples/jewel/TourDeJewel/src/main/royale/DateComponentsPlayGround.mxml b/examples/jewel/TourDeJewel/src/main/royale/DateComponentsPlayGround.mxml index b6a3ba6..1316af3 100644 --- a/examples/jewel/TourDeJewel/src/main/royale/DateComponentsPlayGround.mxml +++ b/examples/jewel/TourDeJewel/src/main/royale/DateComponentsPlayGround.mxml @@ -86,6 +86,12 @@ limitations under the License. [Bindable] public var promptText:String = "DD/MM/"; + + [Bindable] + public var minDate:Date = new Date(2020, 11, 13); + + [Bindable] + public var maxDate:Date = new Date(); ]]> @@ -262,6 +268,28 @@ limitations under the License. + + + + + + + + + + + + + + + + + + + + + +
[royale-asjs] branch develop updated: jewel-DateRangeRestriction: Fix the enabled/disable for cells since it wasn't taking the right ones.
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new acc6457 jewel-DateRangeRestriction: Fix the enabled/disable for cells
since it wasn't taking the right ones.
acc6457 is described below
commit acc645790fd32ade843e7a77624b478c0b4570b2
Author: Carlos Rovira
AuthorDate: Wed Dec 30 16:43:19 2020 +0100
jewel-DateRangeRestriction: Fix the enabled/disable for cells since it
wasn't taking the right ones.
---
.../jewel/beads/controls/datechooser/DateRangeRestriction.as | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateRangeRestriction.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateRangeRestriction.as
index de7bc62..87553db 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateRangeRestriction.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateRangeRestriction.as
@@ -169,15 +169,13 @@ package org.apache.royale.jewel.beads.controls.datechooser
(renderer as IStrand).addBead(disabled);
}
- if ((itemTime > minTime) && (itemTime > maxTime))
+ if ((itemTime > minTime) && (maxTime > itemTime))
{
-trace("disabling ", rendererDate.day, rendererDate.month,
rendererDate.fullYear, " -- ", minDate.day, minDate.month, minDate.fullYear, "
-- ", maxDate.day, maxDate.month, maxDate.fullYear);
- disabled.disabled = true;
+disabled.disabled = false;
}
else
{
-trace(" - ENABLING ", rendererDate.day, rendererDate.month,
rendererDate.fullYear, " -- ", minDate.day, minDate.month, minDate.fullYear, "
-- ", maxDate.day, maxDate.month, maxDate.fullYear);
- disabled.disabled = false;
+disabled.disabled = true;
}
}
}
[royale-asjs] branch develop updated: jewel-DateRangeRestriction: Run the enable/disable code when click on datechooser navigation buttons or change selected date
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 1bc478e jewel-DateRangeRestriction: Run the enable/disable code when
click on datechooser navigation buttons or change selected date
1bc478e is described below
commit 1bc478e928bec3e8bb7905181df8e7aa5a581f9c
Author: Carlos Rovira
AuthorDate: Wed Dec 30 16:35:47 2020 +0100
jewel-DateRangeRestriction: Run the enable/disable code when click on
datechooser navigation buttons or change selected date
---
.../controllers/DateChooserMouseController.as | 3 +--
.../controls/datechooser/DateRangeRestriction.as | 25 +++---
2 files changed, 18 insertions(+), 10 deletions(-)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/DateChooserMouseController.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/DateChooserMouseController.as
index 7720df1..36e9fcb 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/DateChooserMouseController.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/DateChooserMouseController.as
@@ -23,7 +23,6 @@ package org.apache.royale.jewel.beads.controllers
import org.apache.royale.core.IBeadView;
import org.apache.royale.core.IStrand;
import org.apache.royale.events.Event;
- import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.events.MouseEvent;
import org.apache.royale.jewel.beads.models.DateChooserModel;
import org.apache.royale.jewel.beads.views.DateChooserView;
@@ -76,7 +75,7 @@ package org.apache.royale.jewel.beads.controllers
view.nextButton.addEventListener(MouseEvent.CLICK,
nextButtonClickHandler);
view.viewSelector.addEventListener(MouseEvent.CLICK,
viewSelectorClickHandler);
-IEventDispatcher(view.table).addEventListener(Event.CHANGE,
tableHandler);
+view.table.addEventListener(Event.CHANGE, tableHandler);
}
/**
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateRangeRestriction.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateRangeRestriction.as
index 94beccb..de7bc62 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateRangeRestriction.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateRangeRestriction.as
@@ -22,9 +22,9 @@ package org.apache.royale.jewel.beads.controls.datechooser
import org.apache.royale.core.IStrand;
import org.apache.royale.events.Event;
import org.apache.royale.events.IEventDispatcher;
+import org.apache.royale.events.MouseEvent;
import org.apache.royale.jewel.beads.controls.Disabled;
import org.apache.royale.jewel.beads.itemRenderers.ITextItemRenderer;
-import org.apache.royale.jewel.beads.models.DateChooserModel;
import org.apache.royale.jewel.beads.views.DateChooserView;
import org.apache.royale.jewel.supportClasses.datechooser.DateChooserTable;
import org.apache.royale.jewel.supportClasses.table.TBodyContentArea;
@@ -114,11 +114,25 @@ package org.apache.royale.jewel.beads.controls.datechooser
_strand = value;
(_strand as
IEventDispatcher).addEventListener("initComplete",
handlerDateChooserInitComplete);
}
-
+
+ private var view:DateChooserView;
+ private var table:DateChooserTable;
+ private var tableContent:TBodyContentArea;
+
private function
handlerDateChooserInitComplete(event:Event):void
{
(_strand as
IEventDispatcher).removeEventListener("initComplete",
handlerDateChooserInitComplete);
+ view = _strand.getBeadByType(DateChooserView) as
DateChooserView;
+ view.previousButton.addEventListener(MouseEvent.CLICK,
refreshDateRange);
+ view.nextButton.addEventListener(MouseEvent.CLICK,
refreshDateRange);
+ view.viewSelector.addEventListener(MouseEvent.CLICK,
refreshDateRange);
+
+ table = view.table;
+ view.table.addEventListener(Event.CHANGE,
refreshDateRange);
+
+tableContent = table.getBeadByType(TBodyContentArea) as
TBodyContentArea;
+
refreshDateRange();
}
[royale-asjs] branch develop updated: jewel-theme: adding styles for disabled items in DateChooser
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 1ab4251 jewel-theme: adding styles for disabled items in DateChooser
1ab4251 is described below
commit 1ab425171b084b4fc1427becbdb179bf5c3045a1
Author: Carlos Rovira
AuthorDate: Wed Dec 30 15:18:12 2020 +0100
jewel-theme: adding styles for disabled items in DateChooser
---
.../src/main/resources/defaults.css | 4
.../src/main/resources/defaults.css | 4
.../src/main/resources/defaults.css | 4
.../src/main/resources/defaults.css | 4
.../src/main/resources/defaults.css | 4
.../src/main/resources/defaults.css | 4
.../src/main/resources/defaults.css | 4
.../src/main/resources/defaults.css | 4
.../src/main/resources/defaults.css | 4
.../src/main/resources/defaults.css | 4
.../src/main/resources/defaults.css | 4
.../src/main/resources/defaults.css | 4
.../src/main/resources/defaults.css | 4
.../src/main/resources/defaults.css | 4
.../src/main/resources/defaults.css | 4
.../src/main/resources/defaults.css | 4
.../src/main/resources/defaults.css | 4
.../src/main/resources/defaults.css | 4
.../src/main/resources/defaults.css | 4
.../src/main/resources/defaults.css | 4
.../src/main/resources/defaults.css | 4
.../src/main/resources/defaults.css | 4
.../src/main/resources/defaults.css | 4
.../src/main/resources/defaults.css | 4
.../src/main/resources/defaults.css | 4
.../src/main/resources/defaults.css | 4
.../src/main/resources/defaults.css | 4
.../src/main/resources/defaults.css | 4
.../src/main/resources/defaults.css | 4
.../src/main/resources/defaults.css | 4
.../src/main/resources/defaults.css | 4
.../src/main/resources/defaults.css | 4
.../src/main/resources/defaults.css | 4
.../src/main/resources/defaults.css | 4
.../src/main/resources/defaults.css | 4
.../src/main/resources/defaults.css | 4
36 files changed, 144 insertions(+)
diff --git
a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Amethyst-Theme/src/main/resources/defaults.css
b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Amethyst-Theme/src/main/resources/defaults.css
index 809eaae..80a2203 100644
---
a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Amethyst-Theme/src/main/resources/defaults.css
+++
b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Amethyst-Theme/src/main/resources/defaults.css
@@ -632,6 +632,10 @@ j|CardActions {
.calendar.item.date {
color: grey;
}
+.calendar[disabled] {
+ color: #737373;
+ pointer-events: none;
+}
.jewel.datefield .jewel.textinput input {
border-radius: 0.25rem 0px 0px 0.25rem;
diff --git
a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Blue-Theme/src/main/resources/defaults.css
b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Blue-Theme/src/main/resources/defaults.css
index d5c3288..adc7360 100644
---
a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Blue-Theme/src/main/resources/defaults.css
+++
b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Blue-Theme/src/main/resources/defaults.css
@@ -632,6 +632,10 @@ j|CardActions {
.calendar.item.date {
color: grey;
}
+.calendar[disabled] {
+ color: #737373;
+ pointer-events: none;
+}
.jewel.datefield .jewel.textinput input {
border-radius: 0.25rem 0px 0px 0.25rem;
diff --git
a/frameworks/themes/Jewel-Dark-NoFlat-Primary-Emerald-Theme/src/main/resources/defaults.css
b/frameworks/themes/Jewel-Dark-NoFlat-Primary-Emerald-Theme/src/main/resources/defaults.css
index 04e3762..833ffdd
[royale-asjs] branch develop updated: jewel-datechooser: New DateRangeRestriction by Piotr with some updates and styles in JewelTheme. Still need work to disable/enable the right cells
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 77284e1 jewel-datechooser: New DateRangeRestriction by Piotr with
some updates and styles in JewelTheme. Still need work to disable/enable the
right cells
77284e1 is described below
commit 77284e1959824c7a1b87461587e6de535344c08e
Author: Carlos Rovira
AuthorDate: Wed Dec 30 14:35:10 2020 +0100
jewel-datechooser: New DateRangeRestriction by Piotr with some updates and
styles in JewelTheme. Still need work to disable/enable the right cells
---
.../Jewel/src/main/resources/jewel-manifest.xml| 1 +
.../controls/datechooser/DateRangeRestriction.as | 175 +
.../JewelTheme/src/main/resources/defaults.css | 4 +
.../main/sass/components-primary/_datechooser.sass | 6 +-
4 files changed, 185 insertions(+), 1 deletion(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
index 1e6f2e5..9e8ac6e 100644
--- a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
+++ b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
@@ -134,6 +134,7 @@
+
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateRangeRestriction.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateRangeRestriction.as
new file mode 100644
index 000..94beccb
--- /dev/null
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datechooser/DateRangeRestriction.as
@@ -0,0 +1,175 @@
+
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+package org.apache.royale.jewel.beads.controls.datechooser
+{
+import org.apache.royale.core.IBead;
+import org.apache.royale.core.IStrand;
+import org.apache.royale.events.Event;
+import org.apache.royale.events.IEventDispatcher;
+import org.apache.royale.jewel.beads.controls.Disabled;
+import org.apache.royale.jewel.beads.itemRenderers.ITextItemRenderer;
+import org.apache.royale.jewel.beads.models.DateChooserModel;
+import org.apache.royale.jewel.beads.views.DateChooserView;
+import org.apache.royale.jewel.supportClasses.datechooser.DateChooserTable;
+import org.apache.royale.jewel.supportClasses.table.TBodyContentArea;
+import org.apache.royale.jewel.supportClasses.table.TableCell;
+import org.apache.royale.jewel.supportClasses.table.TableRow;
+
+ /**
+* Disable dates which are outside restriction provided by minDate and
maxDate properties
+*
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion Royale 0.9.8
+*/
+ public class DateRangeRestriction implements IBead
+ {
+/**
+* constructor.
+*
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion Royale 0.9.8
+*/
+ public function DateRangeRestriction()
+ {
+ }
+
+ private var _minDate:Date;
+/**
+ * The minimun date
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.8
+ */
+ [Bindable]
+ public function get minDate():Date
+ {
+ return _minDate;
+ }
+ public function set minD
[royale-asjs] branch develop updated: jewel-listview-tableview: fix issue in DateChooser reported by Piotr when click on years button. there was a problem caused by recent fix on listview selection an
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new f7f0b97 jewel-listview-tableview: fix issue in DateChooser reported
by Piotr when click on years button. there was a problem caused by recent fix
on listview selection and scrolltoIndex performed by non clicked actions
f7f0b97 is described below
commit f7f0b97a7349c0f530e3fb9fc1c0da7a9c63cf9b
Author: Carlos Rovira
AuthorDate: Wed Dec 30 13:02:55 2020 +0100
jewel-listview-tableview: fix issue in DateChooser reported by Piotr when
click on years button. there was a problem caused by recent fix on listview
selection and scrolltoIndex performed by non clicked actions
---
.../royale/org/apache/royale/jewel/beads/views/ListView.as | 14 +-
.../org/apache/royale/jewel/beads/views/TableView.as | 5 +
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ListView.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ListView.as
index b33a069..dfba1ee 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ListView.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ListView.as
@@ -133,7 +133,14 @@ package org.apache.royale.jewel.beads.views
lastSelectedIndex = listModel.selectedIndex;
- // if the selection was not from a user click
selection, then scrol to index
+ itemClickedAction();
+ }
+
+ /**
+* if the selection was not from a user click selection, then
scrol to index
+*/
+ protected function itemClickedAction():void
+ {
if(!(listModel as IJewelSelectionModel).isItemClicked)
{
scrollToIndex(lastSelectedIndex);
@@ -306,6 +313,11 @@ package org.apache.royale.jewel.beads.views
lastSelectedIndex = listModel.selectedIndex;
}
+ protected function itemClickedAction():void
+ {
+
+ }
+
protected var lastRollOverIndex:int = -1;
/**
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/TableView.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/TableView.as
index 569ff9e..165fae2 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/TableView.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/TableView.as
@@ -61,6 +61,11 @@ package org.apache.royale.jewel.beads.views
listModel.addEventListener("columnsChanged",
columnsChangedHandler);
}
+ override protected function itemClickedAction():void
+ {
+ // nothing to do
+ }
+
/**
* When columns change, trigger a data provider change to redo
all table
*/
[royale-docs] branch master updated: fix the relative path, should not be start with /
This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/royale-docs.git
The following commit(s) were added to refs/heads/master by this push:
new 8573e9a fix the relative path, should not be start with /
new 4a9219f Merge pull request #27 from yestaro/patch-2
8573e9a is described below
commit 8573e9a513d0e18fc1d8f91b7667792978189b5d
Author: yestaro
AuthorDate: Sun Dec 27 15:28:58 2020 +0800
fix the relative path, should not be start with /
---
frameworks-and-libraries.md | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/frameworks-and-libraries.md b/frameworks-and-libraries.md
index 7ba9121..2fabeae 100644
--- a/frameworks-and-libraries.md
+++ b/frameworks-and-libraries.md
@@ -39,11 +39,11 @@ Apache Royale itself is a framework. It can play well with
other frameworks to h
## Libraries
-* There are a large number of [ActionScript3](/features/as3) libraries that
should "just work" when you import them into your Royale application. Others
may need adjustment if they presume that your application will run on Flash,
not in a modern browser.
-* Use the [ExternalInterface](/features/external-interface) class to connect
with and use external JavaScript libraries in your Royale project.
-* An even more robust method for connecting with and using external JavaScript
libraries is [externs](/features/externs).
-* Use Adobe's [Spectrum with Royale](/libraries/spectrum-royale). Spectrum
supports large application ecosystems.
-* You can use [Material Design Lite (MDL) with Royale](/libraries/mdl-royale).
MDL is a library/CSS structure that follows the Material Design principles that
Google developed.
+* There are a large number of [ActionScript3](features/as3) libraries that
should "just work" when you import them into your Royale application. Others
may need adjustment if they presume that your application will run on Flash,
not in a modern browser.
+* Use the [ExternalInterface](features/external-interface) class to connect
with and use external JavaScript libraries in your Royale project.
+* An even more robust method for connecting with and using external JavaScript
libraries is [externs](features/externs).
+* Use Adobe's [Spectrum with Royale](libraries/spectrum-royale). Spectrum
supports large application ecosystems.
+* You can use [Material Design Lite (MDL) with Royale](libraries/mdl-royale).
MDL is a library/CSS structure that follows the Material Design principles that
Google developed.
See a working example of [Using external JavaScript libraries in Apache
Royale](https://royale.apache.org/using-external-javascript-libraries-in-apache-royale/){:target="_blank"}.
[royale-asjs] branch develop updated: jewel-VirtualComboBoxPopUpView: fix Event problem
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 6944e40 jewel-VirtualComboBoxPopUpView: fix Event problem
6944e40 is described below
commit 6944e409fd5056b38056e0b00cbaa5aa2beb18b6
Author: Carlos Rovira
AuthorDate: Fri Dec 25 10:29:32 2020 +0100
jewel-VirtualComboBoxPopUpView: fix Event problem
---
.../org/apache/royale/jewel/beads/views/VirtualComboBoxPopUpView.as | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/VirtualComboBoxPopUpView.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/VirtualComboBoxPopUpView.as
index 849e964..c66c968 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/VirtualComboBoxPopUpView.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/VirtualComboBoxPopUpView.as
@@ -18,10 +18,11 @@
package org.apache.royale.jewel.beads.views
{
+import org.apache.royale.core.IStrand;
+import org.apache.royale.events.Event;
import org.apache.royale.jewel.List;
import org.apache.royale.jewel.VirtualList;
-import org.apache.royale.core.IStrand;
- import org.apache.royale.jewel.beads.models.IJewelSelectionModel;
+import org.apache.royale.jewel.beads.models.IJewelSelectionModel;
/**
* The VirtualComboBoxPopUpView class is a view bead for the
VirtualComboBoxPopUp.
[royale-asjs] branch develop updated: tour-de-jewel: add update example to datagrid from collection. check that sorting columns refresh the grid.
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new ee70b51 tour-de-jewel: add update example to datagrid from
collection. check that sorting columns refresh the grid.
ee70b51 is described below
commit ee70b51bcbfb53e7cd2e4bfacc3e7bf8897e8bc5
Author: Carlos Rovira
AuthorDate: Mon Dec 21 22:19:56 2020 +0100
tour-de-jewel: add update example to datagrid from collection. check that
sorting columns refresh the grid.
---
.../jewel/TourDeJewel/src/main/royale/DataGridPlayGround.mxml | 10 ++
1 file changed, 10 insertions(+)
diff --git a/examples/jewel/TourDeJewel/src/main/royale/DataGridPlayGround.mxml
b/examples/jewel/TourDeJewel/src/main/royale/DataGridPlayGround.mxml
index e411bc7..fc9b30e 100644
--- a/examples/jewel/TourDeJewel/src/main/royale/DataGridPlayGround.mxml
+++ b/examples/jewel/TourDeJewel/src/main/royale/DataGridPlayGround.mxml
@@ -32,6 +32,7 @@ limitations under the License.
import org.apache.royale.collections.ArrayList;
import org.apache.royale.collections.ArrayListView;
+import org.apache.royale.collections.IArrayListView;
import org.apache.royale.html.util.getLabelFromData;
import org.apache.royale.jewel.supportClasses.datagrid.DataGridColumn;
import
org.apache.royale.jewel.supportClasses.datagrid.IDataGridColumnList;
@@ -198,6 +199,13 @@ limitations under the License.
grid.columns = cols;
}
+ private function updateSelectedItem():void
+ {
+ var selectedProduct:Product = (dg2.dataProvider as
IArrayListView).getItemAt(dg2.selectedIndex) as Product;
+ selectedProduct.title = "NEW-" +
(Math.floor(Math.random()*1000));
+ (dg2.dataProvider as
IArrayListView).itemUpdated(selectedProduct);
+ }
+
]]>
@@ -307,6 +315,8 @@ limitations under the License.
+
+
[royale-asjs] branch develop updated: jewel-arrayselectionmodel: fix update from collection and refactor to use refresh() (a.k.a COLLECTION_CHANGE) in DataGridSort. Removed "sortChanged" event. Added
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 8835228 jewel-arrayselectionmodel: fix update from collection and
refactor to use refresh() (a.k.a COLLECTION_CHANGE) in DataGridSort. Removed
"sortChanged" event. Added setDataProvider__NoCheck() to
IJewelSelectionModel/ArrayListSelectionModel
8835228 is described below
commit 8835228669680482358f8a7c6e40813748862da7
Author: Carlos Rovira
AuthorDate: Mon Dec 21 22:10:56 2020 +0100
jewel-arrayselectionmodel: fix update from collection and refactor to use
refresh() (a.k.a COLLECTION_CHANGE) in DataGridSort. Removed "sortChanged"
event. Added setDataProvider__NoCheck() to
IJewelSelectionModel/ArrayListSelectionModel
---
.../jewel/beads/controls/datagrid/DataGridSort.as | 34 +++--
.../jewel/beads/models/ArrayListSelectionModel.as | 27 +++--
.../jewel/beads/models/IJewelSelectionModel.as | 2 ++
.../royale/jewel/beads/views/DataGridView.as | 35 --
4 files changed, 58 insertions(+), 40 deletions(-)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datagrid/DataGridSort.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datagrid/DataGridSort.as
index 1a688f5..1e349ee 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datagrid/DataGridSort.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datagrid/DataGridSort.as
@@ -21,13 +21,15 @@ package org.apache.royale.jewel.beads.controls.datagrid
import org.apache.royale.collections.IArrayListView;
import org.apache.royale.collections.Sort;
import org.apache.royale.collections.SortField;
- import org.apache.royale.core.IBead;
import org.apache.royale.core.IDataGrid;
import org.apache.royale.core.IDataGridHeader;
+ import org.apache.royale.core.ISelectionModel;
import org.apache.royale.core.IStrand;
import org.apache.royale.core.UIBase;
+ import org.apache.royale.events.CollectionEvent;
import org.apache.royale.events.Event;
import org.apache.royale.events.MouseEvent;
+ import org.apache.royale.html.beads.EasyDataProviderChangeNotifier;
import org.apache.royale.jewel.beads.views.DataGridView;
import org.apache.royale.jewel.supportClasses.datagrid.IDataGridColumn;
@@ -42,7 +44,7 @@ package org.apache.royale.jewel.beads.controls.datagrid
* @playerversion AIR 2.6
* @productversion Royale 0.9.8
*/
- public class DataGridSort implements IBead
+ public class DataGridSort extends EasyDataProviderChangeNotifier
{
public function DataGridSort()
{
@@ -51,7 +53,7 @@ package org.apache.royale.jewel.beads.controls.datagrid
private var dg:IDataGrid;
private var header:IDataGridHeader;
-
+ private var dgView:DataGridView;
private var descending:Boolean;
/**
@@ -62,10 +64,12 @@ package org.apache.royale.jewel.beads.controls.datagrid
* @playerversion AIR 2.6
* @productversion Royale 0.9.8
*/
- public function set strand(value:IStrand):void
+ override public function set strand(value:IStrand):void
{
+ super.strand = value;
+
dg = value as IDataGrid;
- var dgView:DataGridView = (dg as UIBase).view as
DataGridView;
+ dgView = (dg as UIBase).view as DataGridView;
header = dgView.header;
header.addEventListener(MouseEvent.CLICK,
mouseClickHandler, false);
}
@@ -96,11 +100,23 @@ package org.apache.royale.jewel.beads.controls.datagrid
sort.fields = [ sortField ];
collection.sort = sort;
- // force redraw of column headers
collection.refresh();
-
- dg.model.dispatchEvent(new
Event("sortChanged"));
- header.model.dispatchEvent(new
Event("dataProviderChanged"));
+ // header.model.dispatchEvent(new
Event("dataProviderChanged"));
+ }
+ }
+
+ /**
+* @royaleignorecoercion
org.apache.royale.core.ISelectionModel
+*/
+ override protected fun
[royale-asjs] branch develop updated: DataProviderChangeNotifier: make handleDataProviderChanges protected
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 891f018 DataProviderChangeNotifier: make handleDataProviderChanges
protected
891f018 is described below
commit 891f01895202eddd871ede9e354d9b37b4c07d4b
Author: Carlos Rovira
AuthorDate: Mon Dec 21 22:03:09 2020 +0100
DataProviderChangeNotifier: make handleDataProviderChanges protected
---
.../royale/org/apache/royale/html/beads/DataProviderChangeNotifier.as | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataProviderChangeNotifier.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataProviderChangeNotifier.as
index db3e8a4..4275ffe 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataProviderChangeNotifier.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataProviderChangeNotifier.as
@@ -63,11 +63,11 @@ package org.apache.royale.html.beads
dataProvider = object[propertyName] as IArrayList;
attachEventListeners();
}
-
+
/**
* @royaleignorecoercion
org.apache.royale.core.ISelectionModel
*/
- private function handleDataProviderChanges(event:Event):void
+ protected function handleDataProviderChanges(event:Event):void
{
var selectionModel:ISelectionModel =
_strand.getBeadByType(ISelectionModel) as ISelectionModel;
selectionModel.dispatchEvent(new
Event("dataProviderChanged"));
[royale-asjs] branch develop updated: basic-dataprovidernotifier: use interface IArrayList instead of ArrayList, clean imports and add a bit more docs
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 070b662 basic-dataprovidernotifier: use interface IArrayList instead
of ArrayList, clean imports and add a bit more docs
070b662 is described below
commit 070b662247bb026969f0d8ee661879728499371a
Author: Carlos Rovira
AuthorDate: Mon Dec 21 19:06:10 2020 +0100
basic-dataprovidernotifier: use interface IArrayList instead of ArrayList,
clean imports and add a bit more docs
---
.../html/beads/DataProviderChangeNotifier.as | 13 ++-
.../html/beads/DataProviderItemsChangeNotifier.as | 10 ++---
.../html/beads/EasyDataProviderChangeNotifier.as | 7 +++---
.../supportClasses/DataProviderNotifierBase.as | 26 --
4 files changed, 31 insertions(+), 25 deletions(-)
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataProviderChangeNotifier.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataProviderChangeNotifier.as
index f30f90a..db3e8a4 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataProviderChangeNotifier.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataProviderChangeNotifier.as
@@ -18,11 +18,10 @@
package org.apache.royale.html.beads
{
+ import org.apache.royale.collections.IArrayList;
import org.apache.royale.core.ISelectionModel;
- import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.events.Event;
- import org.apache.royale.collections.ArrayList;
-import org.apache.royale.html.supportClasses.DataProviderNotifierBase;
+ import org.apache.royale.html.supportClasses.DataProviderNotifierBase;
/**
* The DataProviderChangeNotifier notifies listeners when a selection
model's
@@ -48,8 +47,9 @@ package org.apache.royale.html.beads
}
/**
-* @royaleignorecoercion
org.apache.royale.collections.ArrayList
-*
+* The change handler function that will be called when
change event is thrown
+*
+* @royaleignorecoercion
org.apache.royale.collections.IArrayList
*/
override protected function
destinationChangedHandler(event:Event):void
{
@@ -60,9 +60,10 @@ package org.apache.royale.html.beads
return;
detachEventListeners();
}
- dataProvider = object[propertyName] as ArrayList;
+ dataProvider = object[propertyName] as IArrayList;
attachEventListeners();
}
+
/**
* @royaleignorecoercion
org.apache.royale.core.ISelectionModel
*/
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataProviderItemsChangeNotifier.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataProviderItemsChangeNotifier.as
index 53ccde9..8c77262 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataProviderItemsChangeNotifier.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataProviderItemsChangeNotifier.as
@@ -19,9 +19,8 @@
package org.apache.royale.html.beads
{
import org.apache.royale.core.ISelectionModel;
- import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.events.Event;
- import org.apache.royale.collections.ArrayList;
+ import org.apache.royale.collections.IArrayList;
import org.apache.royale.events.CollectionEvent;
import org.apache.royale.html.supportClasses.DataProviderNotifierBase;
@@ -48,6 +47,11 @@ package org.apache.royale.html.beads
{
}
+ /**
+* The change handler function that will be called when
change event is thrown
+*
+* @royaleignorecoercion
org.apache.royale.collections.IArrayList
+*/
override protected function
destinationChangedHandler(event:Event):void
{
var object:Object = document[sourceID];
@@ -59,7 +63,7 @@ package org.apache.royale.html.beads
dataProvider.removeEventListener(CollectionEvent.ITEM_REMOVED,
handleItemRemoved);
dataProvider.removeEventListener(CollectionEvent.ITEM_UPDATED,
handleItemUpdated
[royale-asjs] branch develop updated: tour-de-jewel: organize imports in dg playground
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-asjs.git The following commit(s) were added to refs/heads/develop by this push: new 7f7c225 tour-de-jewel: organize imports in dg playground 7f7c225 is described below commit 7f7c225914a05a5f8085aabde470a8af51eefca2 Author: Carlos Rovira AuthorDate: Sat Dec 19 17:25:27 2020 +0100 tour-de-jewel: organize imports in dg playground --- examples/jewel/TourDeJewel/src/main/royale/DataGridPlayGround.mxml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/jewel/TourDeJewel/src/main/royale/DataGridPlayGround.mxml b/examples/jewel/TourDeJewel/src/main/royale/DataGridPlayGround.mxml index 62c09ff..e411bc7 100644 --- a/examples/jewel/TourDeJewel/src/main/royale/DataGridPlayGround.mxml +++ b/examples/jewel/TourDeJewel/src/main/royale/DataGridPlayGround.mxml @@ -31,14 +31,14 @@ limitations under the License. import models.ProductModel; import org.apache.royale.collections.ArrayList; +import org.apache.royale.collections.ArrayListView; import org.apache.royale.html.util.getLabelFromData; +import org.apache.royale.jewel.supportClasses.datagrid.DataGridColumn; import org.apache.royale.jewel.supportClasses.datagrid.IDataGridColumnList; import org.apache.royale.jewel.supportClasses.datagrid.IDataGridPresentationModel; - import org.apache.royale.jewel.supportClasses.datagrid.DataGridColumn; import vos.IconListVO; import vos.Product; -import org.apache.royale.collections.ArrayListView; [Bindable] public var listModel:ListsModel = new ListsModel();
[royale-asjs] branch develop updated: jewel-textinputbase: remove enter's event.preventDefault() since TextArea can't break line.
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new f8aaa12 jewel-textinputbase: remove enter's event.preventDefault()
since TextArea can't break line.
f8aaa12 is described below
commit f8aaa1220b2d93da5249f72973ebd33db9af3093
Author: Carlos Rovira
AuthorDate: Tue Dec 15 19:50:54 2020 +0100
jewel-textinputbase: remove enter's event.preventDefault() since TextArea
can't break line.
---
.../org/apache/royale/jewel/supportClasses/textinput/TextInputBase.as | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/textinput/TextInputBase.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/textinput/TextInputBase.as
index 67ef204..b4e2fb5 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/textinput/TextInputBase.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/textinput/TextInputBase.as
@@ -198,7 +198,7 @@ package org.apache.royale.jewel.supportClasses.textinput
{
if (event.key === WhitespaceKeys.ENTER) {
// Cancel the default action, if needed
-event.preventDefault();
+//event.preventDefault();
dispatchEvent(new Event("enter"));
}
}
[royale-asjs] branch develop updated: ComboBoxListCloseOnClick: add a bit more of info and organize imports
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-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 88e76bf ComboBoxListCloseOnClick: add a bit more of info and organize
imports
88e76bf is described below
commit 88e76bf4a1e1fa440aa4b19b7eecce313ed92404
Author: Carlos Rovira
AuthorDate: Fri Dec 11 09:20:41 2020 +0100
ComboBoxListCloseOnClick: add a bit more of info and organize imports
---
.../controls/combobox/ComboBoxListCloseOnClick.as | 22 --
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxListCloseOnClick.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxListCloseOnClick.as
index 374b0f1..6ec5971 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxListCloseOnClick.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxListCloseOnClick.as
@@ -19,18 +19,21 @@
package org.apache.royale.jewel.beads.controls.combobox
{
import org.apache.royale.core.IBead;
-import org.apache.royale.jewel.beads.views.ComboBoxView;
import org.apache.royale.core.IStrand;
+import org.apache.royale.core.ValuesManager;
+import org.apache.royale.events.IEventDispatcher;
+import org.apache.royale.events.MouseEvent;
import org.apache.royale.jewel.ComboBox;
import org.apache.royale.jewel.List;
-import org.apache.royale.events.MouseEvent;
-import org.apache.royale.events.IEventDispatcher;
-import org.apache.royale.core.ValuesManager;
-
+import org.apache.royale.jewel.beads.views.ComboBoxView;
/**
* The ComboBoxListCloseOnClick bead class is a specialty bead that
can be used with
- * a Jewel ComboBox to allow closing ComBox popup in combobox with custom
item renderer
+ * a Jewel ComboBox with a custom renderer to allow closing the popup
list in when click renderer.
+ *
+ * The default combobox has just a label and the list is closed on click.
A Custom renderer
+ * doesn't close by default (we can have complex items with inputs and
other controls that we want to clisk and operate),
+ * os is up to the developer add this bead if wants to close the popup
list on click
*
* @langversion 3.0
* @playerversion Flash 10.2
@@ -59,12 +62,11 @@ package org.apache.royale.jewel.beads.controls.combobox
var comboBox:ComboBox = (value as ComboBox);
comboView = (comboBox.view as ComboBoxView);
var itemRendererClass:Class =
ValuesManager.valuesImpl.getValue(comboView.host, "iItemRenderer") as Class;
-// Apart from checking that the bead is applied to a Jewel
ComboBox,
-// it is checked that the combobox has a custom item renderer
assigned and that it does not have the SearchFilter bead
- if (comboView && (comboBox.itemRenderer || itemRendererClass !=
null)){
+// Checking that the bead is applied to a Jewel ComboBox and has a
custom item renderer assigned
+if (comboView && (comboBox.itemRenderer || itemRendererClass !=
null)){
(value as IEventDispatcher).addEventListener('popUpOpened',
popUpOpenedHandler, false);
(value as IEventDispatcher).addEventListener('popUpClosed',
popUpClosedHandler, false);
- }
+}
}
protected function popUpOpenedHandler():void {
