[royale-asjs] branch develop updated: Fix an issue following recent changes: data setter needs to dispatch 'dataChange' *after* any binding support has been added to the renderer.
This is an automated email from the ASF dual-hosted git repository. gregdove 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 3789597 Fix an issue following recent changes: data setter needs to dispatch 'dataChange' *after* any binding support has been added to the renderer. new 2dc71da Merge branch 'develop' of https://github.com/apache/royale-asjs into develop 3789597 is described below commit 3789597c425ed4028bc61106e1fe238c18a9d00d Author: greg-dove AuthorDate: Sat Mar 14 10:44:30 2020 +1300 Fix an issue following recent changes: data setter needs to dispatch 'dataChange' *after* any binding support has been added to the renderer. --- .../royale/html/beads/DataItemRendererFactoryForCollectionView.as | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForCollectionView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForCollectionView.as index 1acd539..4adf50c 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForCollectionView.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForCollectionView.as @@ -96,10 +96,8 @@ package org.apache.royale.html.beads var data:Object = event.item; (itemRendererInitializer as IIndexedItemRendererInitializer).initializeIndexedItemRenderer(ir, data, event.index); - ir.data = data; - dataGroup.addItemRendererAt(ir, event.index); - + ir.data = data; // update the index values in the itemRenderers to correspond to their shifted positions. var n:int = dataGroup.numItemRenderers; for (var i:int = event.index; i < n; i++)
[MAVEN-BUILD] Royale-asjs - Build # 2812 - Fixed
The Apache Jenkins build system has built Royale-asjs (build #2812) Status: Fixed Check console output at https://builds.apache.org/job/Royale-asjs/2812/ to view the results.
[royale-asjs] branch develop updated: jewel-layouts: fix swf
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 78872e3 jewel-layouts: fix swf
78872e3 is described below
commit 78872e39513afb8422482355d8bd67b9fbca2d49
Author: Carlos Rovira
AuthorDate: Fri Mar 13 20:35:04 2020 +0100
jewel-layouts: fix swf
---
.../royale/org/apache/royale/jewel/beads/layouts/HorizontalLayout.as | 1 -
.../main/royale/org/apache/royale/jewel/beads/layouts/VerticalLayout.as | 1 -
2 files changed, 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 8ba50f6..e869404 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
@@ -138,7 +138,6 @@ package org.apache.royale.jewel.beads.layouts
* @playerversion AIR 2.6
* @productversion Royale 0.9.4
*/
- COMPILE::JS
public function applyStyleToLayout(component:IUIBase,
cssProperty:String):void
{
var cssValue:* =
ValuesManager.valuesImpl.getValue(component, cssProperty);
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 97fe5b1..d8eb478 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
@@ -138,7 +138,6 @@ package org.apache.royale.jewel.beads.layouts
* @playerversion AIR 2.6
* @productversion Royale 0.9.4
*/
- COMPILE::JS
public function applyStyleToLayout(component:IUIBase,
cssProperty:String):void
{
var cssValue:* =
ValuesManager.valuesImpl.getValue(component, cssProperty);
[MAVEN-BUILD] Royale-asjs - Build # 2811 - Still Failing
The Apache Jenkins build system has built Royale-asjs (build #2811) Status: Still Failing Check console output at https://builds.apache.org/job/Royale-asjs/2811/ to view the results.
[royale-asjs] branch develop updated: jewel-dropdownlist: fix var declared after use
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 440ceec jewel-dropdownlist: fix var declared after use
440ceec is described below
commit 440ceece65df98986e361f2ee946a6e0c7cb3512
Author: Carlos Rovira
AuthorDate: Fri Mar 13 19:39:50 2020 +0100
jewel-dropdownlist: fix var declared after use
---
.../DropDownListItemRendererFactoryForCollectionView.as | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DropDownListItemRendererFactoryForCollectionView.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DropDownListItemRendererFactoryForCollectionView.as
index 26c1205..eff6149 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DropDownListItemRendererFactoryForCollectionView.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DropDownListItemRendererFactoryForCollectionView.as
@@ -18,7 +18,6 @@
package org.apache.royale.jewel.beads.itemRenderers
{
- import org.apache.royale.collections.ICollectionView;
import org.apache.royale.core.IIndexedItemRenderer;
import org.apache.royale.core.IIndexedItemRendererInitializer;
import org.apache.royale.core.IItemRendererOwnerView;
@@ -30,7 +29,6 @@ package org.apache.royale.jewel.beads.itemRenderers
import org.apache.royale.html.beads.IListView;
import org.apache.royale.jewel.beads.models.IDropDownListModel;
import org.apache.royale.jewel.itemRenderers.DropDownListItemRenderer;
- import
org.apache.royale.jewel.supportClasses.list.IListPresentationModel;
/**
* This class creates itemRenderer instances from the data contained
within an ICollectionView
@@ -64,6 +62,7 @@ package org.apache.royale.jewel.beads.itemRenderers
return;
var offset:int = (dataProviderModel as
IDropDownListModel).offset;
+ var data:Object;
if(offset == 1) {
promptRender =
itemRendererFactory.createItemRenderer() as IIndexedItemRenderer;
data = DropDownListItemRenderer.OPTION_DISABLED;
@@ -72,12 +71,12 @@ package org.apache.royale.jewel.beads.itemRenderers
dataGroup.addItemRenderer(promptRender, false);
}
- var n:int = dataProviderLength;
+ var n:int = dataProviderLength;
+ var ir:IIndexedItemRenderer;
for (var i:int = 0; i < n; i++)
{
- var ir:IIndexedItemRenderer =
itemRendererFactory.createItemRenderer() as IIndexedItemRenderer;
-
- var data:Object = getItemAt(i);
+ ir = itemRendererFactory.createItemRenderer()
as IIndexedItemRenderer;
+ data = getItemAt(i);
(itemRendererInitializer as
IIndexedItemRendererInitializer).initializeIndexedItemRenderer(ir, data, i +
offset);
ir.data = data;
dataGroup.addItemRenderer(ir, false);
[MAVEN-BUILD] Royale-asjs - Build # 2810 - Failure
The Apache Jenkins build system has built Royale-asjs (build #2810) Status: Failure Check console output at https://builds.apache.org/job/Royale-asjs/2810/ to view the results.
[royale-asjs] branch develop updated: jewel-themes: update for List variableRowHeight
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 45aaa00 jewel-themes: update for List variableRowHeight 45aaa00 is described below commit 45aaa000b57d5e74390a58ebbd83f46c827663c1 Author: Carlos Rovira AuthorDate: Fri Mar 13 16:56:24 2020 +0100 jewel-themes: update for List variableRowHeight --- .../themes/Jewel-Light-Flat-Primary-Amethyst-Theme/defaults.css | 4 .../assets/themes/Jewel-Light-Flat-Primary-Blue-Theme/defaults.css| 4 .../assets/themes/Jewel-Light-Flat-Primary-Emerald-Theme/defaults.css | 4 .../assets/themes/Jewel-Light-Flat-Primary-Green-Theme/defaults.css | 4 .../assets/themes/Jewel-Light-Flat-Primary-Orange-Theme/defaults.css | 4 .../assets/themes/Jewel-Light-Flat-Primary-Red-Theme/defaults.css | 4 .../themes/Jewel-Light-Flat-Primary-Sapphire-Theme/defaults.css | 4 .../themes/Jewel-Light-Flat-Primary-Sunflower-Theme/defaults.css | 4 .../assets/themes/Jewel-Light-Flat-Primary-Topaz-Theme/defaults.css | 4 .../themes/Jewel-Light-Flat-Primary-Turquoise-Theme/defaults.css | 4 .../assets/themes/Jewel-Light-Flat-Primary-Violet-Theme/defaults.css | 4 .../assets/themes/Jewel-Light-Flat-Primary-Yellow-Theme/defaults.css | 4 .../themes/Jewel-Light-NoFlat-Primary-Amethyst-Theme/defaults.css | 4 .../assets/themes/Jewel-Light-NoFlat-Primary-Blue-Theme/defaults.css | 4 .../themes/Jewel-Light-NoFlat-Primary-Emerald-Theme/defaults.css | 4 .../assets/themes/Jewel-Light-NoFlat-Primary-Green-Theme/defaults.css | 4 .../themes/Jewel-Light-NoFlat-Primary-Orange-Theme/defaults.css | 4 .../assets/themes/Jewel-Light-NoFlat-Primary-Red-Theme/defaults.css | 4 .../themes/Jewel-Light-NoFlat-Primary-Sapphire-Theme/defaults.css | 4 .../themes/Jewel-Light-NoFlat-Primary-Sunflower-Theme/defaults.css| 4 .../assets/themes/Jewel-Light-NoFlat-Primary-Topaz-Theme/defaults.css | 4 .../themes/Jewel-Light-NoFlat-Primary-Turquoise-Theme/defaults.css| 4 .../themes/Jewel-Light-NoFlat-Primary-Violet-Theme/defaults.css | 4 .../themes/Jewel-Light-NoFlat-Primary-Yellow-Theme/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
[royale-asjs] branch develop updated: jewel-layouts: add variableRowHeight to Horizontal and Vertical Layouts. Defaults to false. List defaults to 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 137b7f7 jewel-layouts: add variableRowHeight to Horizontal and
Vertical Layouts. Defaults to false. List defaults to true
137b7f7 is described below
commit 137b7f7eda60fa9a15cdc6d1d26d1062621f6dd5
Author: Carlos Rovira
AuthorDate: Fri Mar 13 16:45:48 2020 +0100
jewel-layouts: add variableRowHeight to Horizontal and Vertical Layouts.
Defaults to false. List defaults to true
---
.../projects/Jewel/src/main/resources/defaults.css | 6 +++
.../main/royale/org/apache/royale/jewel/VGroup.as | 28 ++-
.../royale/jewel/beads/layouts/HorizontalLayout.as | 48 +-
.../royale/jewel/beads/layouts/VerticalLayout.as | 57 +-
.../Jewel/src/main/sass/components/_layout.sass| 8 +++
.../JewelTheme/src/main/resources/defaults.css | 4 ++
.../src/main/sass/components-primary/_list.sass| 4 +-
7 files changed, 150 insertions(+), 5 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css
b/frameworks/projects/Jewel/src/main/resources/defaults.css
index aa75a97..089e0bb 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -1026,6 +1026,9 @@ j|Label {
.layout.horizontal > * {
flex: 0 1 auto;
}
+.layout.horizontal.variableRowHeight > * {
+ flex: 0 0 auto;
+}
.layout.horizontal.flow {
flex-wrap: wrap;
max-width: 100%;
@@ -1125,6 +1128,9 @@ j|Label {
.layout.vertical > * {
flex: 0 1 auto;
}
+.layout.vertical.variableRowHeight > * {
+ flex: 0 0 auto;
+}
.layout.vertical.flow {
flex-wrap: wrap;
}
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/VGroup.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/VGroup.as
index 4b3dcd7..1e97a83 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/VGroup.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/VGroup.as
@@ -74,7 +74,6 @@ package org.apache.royale.jewel
{
return layout.gap;
}
-
public function set gap(value:Number):void
{
typeNames = StringUtil.removeWord(typeNames, " gap-" +
layout.gap + "x" + VerticalLayout.GAP_STEP + "px");
@@ -89,5 +88,32 @@ package org.apache.royale.jewel
layout.gap = value;
}
+
+/**
+*
+*
+* @langversion 3.0
+* @playerversion Flash 10.2
+* @playerversion AIR 2.6
+* @productversion Royale 0.9.7
+*/
+public function get variableRowHeight():Boolean
+{
+return layout.variableRowHeight;
+}
+public function set variableRowHeight(value:Boolean):void
+{
+ typeNames = StringUtil.removeWord(typeNames, "
variableRowHeight");
+ if(value)
+ typeNames += " variableRowHeight";
+
+ COMPILE::JS
+{
+ if (parent)
+ setClassName(computeFinalClassNames());
+ }
+
+ layout.variableRowHeight = value;
+}
}
}
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 9e03829..8ba50f6 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
@@ -77,10 +77,11 @@ package org.apache.royale.jewel.beads.layouts
{
applyStyleToLayout(hostComponent, "gap");
setGap(_gap);
+ applyStyleToLayout(hostComponent,
"variableRowHeight");
+ setVariableRowHeight(_variableRowHeight);
}
}
- private var gapInitialized:Boolean;
// private var _gap:Boolean;
/**
* Assigns variable gap to grid from 1 to 20
@@ -137,6 +138,7 @@ package org.apache.royale.jewel.beads.layouts
* @playerversion AIR 2.6
* @productversion Royale 0.9.4
*/
+ COMPILE::JS
public function applyStyleToLayout(component:IUIBase,
cssProperty:String):void
{
var
[royale-asjs] branch develop updated: jewel-card: fix height in primarycontent
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 db3ee36 jewel-card: fix height in primarycontent
db3ee36 is described below
commit db3ee36107dd19aa9d86ab48c936ebb4a4ad9776
Author: Carlos Rovira
AuthorDate: Fri Mar 13 16:36:20 2020 +0100
jewel-card: fix height in primarycontent
---
frameworks/projects/Jewel/src/main/resources/defaults.css | 2 +-
frameworks/projects/Jewel/src/main/sass/components/_card.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 e05a0d2..aa75a97 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -313,7 +313,7 @@ j|ToggleButtonBar {
color: inherit;
text-decoration: none;
overflow: hidden;
- flex: 1 1 auto;
+ flex: 1 1 0%;
}
.jewel.card .cardActions {
width: 100%;
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_card.sass
b/frameworks/projects/Jewel/src/main/sass/components/_card.sass
index af6224d..2a2edd1 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_card.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_card.sass
@@ -48,7 +48,7 @@ $card-primary-content-minheight: 152px !default
text-decoration: none
overflow: hidden
-flex: 1 1 auto
+flex: 1 1 0%
.cardActions
width: 100%
[royale-asjs] branch develop updated: Revert "jewel-dropdownlist: 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 b400eaa Revert "jewel-dropdownlist: clean imports"
b400eaa is described below
commit b400eaacb72f681c99197334785c62382fafb0e4
Author: Carlos Rovira
AuthorDate: Fri Mar 13 16:19:24 2020 +0100
Revert "jewel-dropdownlist: clean imports"
This reverts commit b36628e5ddc52f7d9fa24dc72356e572c32eab77.
---
.../itemRenderers/DropDownListItemRendererFactoryForCollectionView.as | 2 ++
1 file changed, 2 insertions(+)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DropDownListItemRendererFactoryForCollectionView.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DropDownListItemRendererFactoryForCollectionView.as
index 568d880..26c1205 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DropDownListItemRendererFactoryForCollectionView.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DropDownListItemRendererFactoryForCollectionView.as
@@ -18,6 +18,7 @@
package org.apache.royale.jewel.beads.itemRenderers
{
+ import org.apache.royale.collections.ICollectionView;
import org.apache.royale.core.IIndexedItemRenderer;
import org.apache.royale.core.IIndexedItemRendererInitializer;
import org.apache.royale.core.IItemRendererOwnerView;
@@ -29,6 +30,7 @@ package org.apache.royale.jewel.beads.itemRenderers
import org.apache.royale.html.beads.IListView;
import org.apache.royale.jewel.beads.models.IDropDownListModel;
import org.apache.royale.jewel.itemRenderers.DropDownListItemRenderer;
+ import
org.apache.royale.jewel.supportClasses.list.IListPresentationModel;
/**
* This class creates itemRenderer instances from the data contained
within an ICollectionView
[royale-asjs] branch develop updated: Add additional example to depict DataGrid real use case
This is an automated email from the ASF dual-hosted git repository. piotrz 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 f47ce4d Add additional example to depict DataGrid real use case f47ce4d is described below commit f47ce4dfe8e9806f5c83e426ff16f713fd07568f Author: Piotr Zarzycki AuthorDate: Fri Mar 13 15:15:50 2020 +0100 Add additional example to depict DataGrid real use case --- .../src/main/royale/DataGridPlayGround.mxml| 27 +- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/examples/royale/TourDeJewel/src/main/royale/DataGridPlayGround.mxml b/examples/royale/TourDeJewel/src/main/royale/DataGridPlayGround.mxml index 4608f65..7774fc3 100644 --- a/examples/royale/TourDeJewel/src/main/royale/DataGridPlayGround.mxml +++ b/examples/royale/TourDeJewel/src/main/royale/DataGridPlayGround.mxml @@ -432,7 +432,32 @@ limitations under the License. - + + + + + + + + + + + + + + + + + + +
[royale-asjs] branch develop updated: jewel-dropdownlist: 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 b36628e jewel-dropdownlist: clean imports
b36628e is described below
commit b36628e5ddc52f7d9fa24dc72356e572c32eab77
Author: Carlos Rovira
AuthorDate: Fri Mar 13 13:54:26 2020 +0100
jewel-dropdownlist: clean imports
---
.../itemRenderers/DropDownListItemRendererFactoryForCollectionView.as | 2 --
1 file changed, 2 deletions(-)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DropDownListItemRendererFactoryForCollectionView.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DropDownListItemRendererFactoryForCollectionView.as
index 26c1205..568d880 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DropDownListItemRendererFactoryForCollectionView.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DropDownListItemRendererFactoryForCollectionView.as
@@ -18,7 +18,6 @@
package org.apache.royale.jewel.beads.itemRenderers
{
- import org.apache.royale.collections.ICollectionView;
import org.apache.royale.core.IIndexedItemRenderer;
import org.apache.royale.core.IIndexedItemRendererInitializer;
import org.apache.royale.core.IItemRendererOwnerView;
@@ -30,7 +29,6 @@ package org.apache.royale.jewel.beads.itemRenderers
import org.apache.royale.html.beads.IListView;
import org.apache.royale.jewel.beads.models.IDropDownListModel;
import org.apache.royale.jewel.itemRenderers.DropDownListItemRenderer;
- import
org.apache.royale.jewel.supportClasses.list.IListPresentationModel;
/**
* This class creates itemRenderer instances from the data contained
within an ICollectionView
[royale-asjs] branch develop updated: jewel: remove jewel DataItemRendererFactoryForCollectionView
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 af83174 jewel: remove jewel DataItemRendererFactoryForCollectionView
af83174 is described below
commit af8317433dba1b4ce92b66f15487d0ccdb99486d
Author: Carlos Rovira
AuthorDate: Fri Mar 13 13:16:56 2020 +0100
jewel: remove jewel DataItemRendererFactoryForCollectionView
---
.../DataItemRendererFactoryForCollectionView.as| 319 -
1 file changed, 319 deletions(-)
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DataItemRendererFactoryForCollectionView.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DataItemRendererFactoryForCollectionView.as
deleted file mode 100644
index 8afc1d3..000
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DataItemRendererFactoryForCollectionView.as
+++ /dev/null
@@ -1,319 +0,0 @@
-
-//
-// 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.itemRenderers
-{
- import org.apache.royale.collections.ICollectionView;
- import org.apache.royale.core.IBead;
- import org.apache.royale.core.IBeadModel;
- import org.apache.royale.core.IDataProviderItemRendererMapper;
- import org.apache.royale.core.IDataProviderModel;
- import org.apache.royale.core.IIndexedItemRenderer;
- import org.apache.royale.core.IItemRendererClassFactory;
- import org.apache.royale.core.IItemRendererOwnerView;
- import org.apache.royale.core.ILabelFieldItemRenderer;
- import org.apache.royale.core.IStrand;
- import org.apache.royale.core.UIBase;
- import org.apache.royale.events.Event;
- import org.apache.royale.events.EventDispatcher;
- import org.apache.royale.events.IEventDispatcher;
- import org.apache.royale.html.beads.IListView;
-import org.apache.royale.core.IOwnerViewItemRenderer;
- import
org.apache.royale.jewel.supportClasses.list.IListPresentationModel;
- import org.apache.royale.utils.loadBeadFromValuesManager;
- import org.apache.royale.utils.sendStrandEvent;
-
- /**
-* This class creates itemRenderer instances from the data contained
within an ICollectionView
-*/
- public class DataItemRendererFactoryForCollectionView extends
EventDispatcher implements IBead, IDataProviderItemRendererMapper
- {
- public function
DataItemRendererFactoryForCollectionView(target:Object = null)
- {
- super(target);
- }
-
- protected var _strand:IStrand;
-
- /**
-* @copy org.apache.royale.core.IBead#strand
-*
-* @langversion 3.0
-* @playerversion Flash 10.2
-* @playerversion AIR 2.6
-* @productversion Royale 0.9.4
-* @royaleignorecoercion
org.apache.royale.events.IEventDispatcher
-*/
- public function set strand(value:IStrand):void
- {
- _strand = value;
-
IEventDispatcher(value).addEventListener("initComplete", initComplete);
- }
-
- /**
-* finish setup
-*
-* @langversion 3.0
-* @playerversion Flash 10.2
-* @playerversion AIR 2.6
-* @productversion Royale 0.9.4
-* @royaleignorecoercion
org.apache.royale.events.IEventDispatcher
-* @royaleignorecoercion org.apache.royale.html.beads.IListView
-*/
- protected function initComplete(event:Event):void
-
[royale-asjs] branch develop updated: jewel-dropdownlist: change mapper to basic one, and add its own render initializer
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 6efdb47 jewel-dropdownlist: change mapper to basic one, and add its
own render initializer
6efdb47 is described below
commit 6efdb47863a9752dd97b33959e47adc70f71b39d
Author: Carlos Rovira
AuthorDate: Fri Mar 13 13:16:30 2020 +0100
jewel-dropdownlist: change mapper to basic one, and add its own render
initializer
---
.../projects/Jewel/src/main/resources/defaults.css | 1 +
.../projects/Jewel/src/main/royale/JewelClasses.as | 1 +
...DownListItemRendererFactoryForCollectionView.as | 67 ---
.../DropDownListItemRendererInitializer.as | 76 ++
.../src/main/sass/components/_dropdownlist.sass| 4 +-
5 files changed, 122 insertions(+), 27 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css
b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 0b80757..e05a0d2 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -844,6 +844,7 @@ j|DropDownList {
IBeadModel:
ClassReference("org.apache.royale.jewel.beads.models.DropDownListModel");
IDataProviderItemRendererMapper:
ClassReference("org.apache.royale.jewel.beads.itemRenderers.DropDownListItemRendererFactoryForCollectionView");
IItemRendererClassFactory:
ClassReference("org.apache.royale.core.ItemRendererClassFactory");
+ IItemRendererInitializer:
ClassReference("org.apache.royale.jewel.beads.itemRenderers.DropDownListItemRendererInitializer");
IItemRenderer:
ClassReference("org.apache.royale.jewel.itemRenderers.DropDownListItemRenderer");
IBeadController:
ClassReference("org.apache.royale.jewel.beads.controllers.DropDownListController");
}
diff --git a/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
b/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
index f5fb7e2..09ea966 100644
--- a/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
+++ b/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
@@ -139,6 +139,7 @@ package
import
org.apache.royale.jewel.beads.itemRenderers.ButtonBarItemRendererInitializer;
ButtonBarItemRendererInitializer;
import
org.apache.royale.jewel.beads.itemRenderers.TabBarItemRendererInitializer;
TabBarItemRendererInitializer;
import
org.apache.royale.jewel.beads.itemRenderers.NavigationItemRendererInitializer;
NavigationItemRendererInitializer;
+import
org.apache.royale.jewel.beads.itemRenderers.DropDownListItemRendererInitializer;
DropDownListItemRendererInitializer;
}
}
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DropDownListItemRendererFactoryForCollectionView.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DropDownListItemRendererFactoryForCollectionView.as
index f6b7b55..26c1205 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DropDownListItemRendererFactoryForCollectionView.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DropDownListItemRendererFactoryForCollectionView.as
@@ -20,8 +20,14 @@ package org.apache.royale.jewel.beads.itemRenderers
{
import org.apache.royale.collections.ICollectionView;
import org.apache.royale.core.IIndexedItemRenderer;
+ import org.apache.royale.core.IIndexedItemRendererInitializer;
+ import org.apache.royale.core.IItemRendererOwnerView;
+ import org.apache.royale.core.IStrandWithModelView;
+ import org.apache.royale.events.CollectionEvent;
import org.apache.royale.events.Event;
import org.apache.royale.events.IEventDispatcher;
+ import
org.apache.royale.html.beads.DataItemRendererFactoryForCollectionView;
+ import org.apache.royale.html.beads.IListView;
import org.apache.royale.jewel.beads.models.IDropDownListModel;
import org.apache.royale.jewel.itemRenderers.DropDownListItemRenderer;
import
org.apache.royale.jewel.supportClasses.list.IListPresentationModel;
@@ -47,37 +53,49 @@ package org.apache.royale.jewel.beads.itemRenderers
{
if (!dataProviderModel)
return;
- var dp:ICollectionView = dataProviderModel.dataProvider
as ICollectionView;
+
+ var view:IListView = (_strand as
IStrandWithModelView).view as IListView;
+ var dataGroup:IItemRendererOwnerView = view.dataGroup;
+
+ removeAllItemRenderers(dataGroup);
+
+ dp = dataProviderModel.dataProvider;
[royale-asjs] branch develop updated: basic: some simplifications for the relation between DataItemRendererFactoryForCollectionView and DataItemRendererFactoryBase
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 077f404 basic: some simplifications for the relation between
DataItemRendererFactoryForCollectionView and DataItemRendererFactoryBase
077f404 is described below
commit 077f4040d61d8bb608c85b8ea47b9b23f587a6ca
Author: Carlos Rovira
AuthorDate: Fri Mar 13 13:12:32 2020 +0100
basic: some simplifications for the relation between
DataItemRendererFactoryForCollectionView and DataItemRendererFactoryBase
---
.../royale/html/beads/DataItemRendererFactoryBase.as | 7 ++-
.../html/beads/DataItemRendererFactoryForCollectionView.as | 14 --
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryBase.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryBase.as
index b213992..fc0758f 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryBase.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryBase.as
@@ -50,6 +50,11 @@ package org.apache.royale.html.beads
{
super(target);
}
+
+ /**
+* the dataProvider
+*/
+ protected var dp:Object;
/**
* This Factory deletes all renderers, and generates a renderer
@@ -72,7 +77,7 @@ package org.apache.royale.html.beads
removeAllItemRenderers(dataGroup);
- var dp:Object = dataProviderModel.dataProvider;
+ dp = dataProviderModel.dataProvider;
if (!dp)
return;
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForCollectionView.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForCollectionView.as
index 42ae674..1acd539 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForCollectionView.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForCollectionView.as
@@ -40,7 +40,11 @@ package org.apache.royale.html.beads
super(target);
}
- private var dped:IEventDispatcher;
+ /**
+* the dataProvider as a dispatcher
+*/
+ protected var dped:IEventDispatcher;
+
/**
* @private
* @royaleignorecoercion
org.apache.royale.collections.ICollectionView
@@ -52,7 +56,6 @@ package org.apache.royale.html.beads
{
if (!dataProviderModel)
return;
- dp = dataProviderModel.dataProvider as ICollectionView;
super.dataProviderChangeHandler(event);
@@ -90,11 +93,12 @@ package org.apache.royale.html.beads
var dataGroup:IItemRendererOwnerView = view.dataGroup;
var ir:IIndexedItemRenderer =
itemRendererFactory.createItemRenderer() as IIndexedItemRenderer;
- dataGroup.addItemRendererAt(ir, event.index);
var data:Object = event.item;
(itemRendererInitializer as
IIndexedItemRendererInitializer).initializeIndexedItemRenderer(ir, data,
event.index);
- ir.data = data;
+ ir.data = data;
+
+ dataGroup.addItemRendererAt(ir, event.index);
// update the index values in the itemRenderers to
correspond to their shifted positions.
var n:int = dataGroup.numItemRenderers;
@@ -113,8 +117,6 @@ package org.apache.royale.html.beads
sendStrandEvent(_strand,"layoutNeeded");
}
- private var dp:ICollectionView;
-
/**
* @private
* @royaleignorecoercion
org.apache.royale.collections.ICollectionView
[royale-asjs] branch develop updated: tour-de-jewel: fix a slider example
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 e769eb1 tour-de-jewel: fix a slider example e769eb1 is described below commit e769eb120a11703aa8996d18d522322a754980d7 Author: Carlos Rovira AuthorDate: Fri Mar 13 11:13:03 2020 +0100 tour-de-jewel: fix a slider example --- examples/royale/TourDeJewel/src/main/royale/ButtonPlayGround.mxml | 2 +- examples/royale/TourDeJewel/src/main/royale/SliderPlayGround.mxml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/royale/TourDeJewel/src/main/royale/ButtonPlayGround.mxml b/examples/royale/TourDeJewel/src/main/royale/ButtonPlayGround.mxml index acd5a34..42ca93a 100644 --- a/examples/royale/TourDeJewel/src/main/royale/ButtonPlayGround.mxml +++ b/examples/royale/TourDeJewel/src/main/royale/ButtonPlayGround.mxml @@ -313,7 +313,7 @@ limitations under the License. - + diff --git a/examples/royale/TourDeJewel/src/main/royale/SliderPlayGround.mxml b/examples/royale/TourDeJewel/src/main/royale/SliderPlayGround.mxml index 8d04f26..ae48086 100644 --- a/examples/royale/TourDeJewel/src/main/royale/SliderPlayGround.mxml +++ b/examples/royale/TourDeJewel/src/main/royale/SliderPlayGround.mxml @@ -106,7 +106,7 @@ limitations under the License. - +
[royale-asjs] branch develop updated: jewel-slider: temporal fix for sliders on table-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 12b99fa jewel-slider: temporal fix for sliders on table-cells.
12b99fa is described below
commit 12b99faba6744667a08920439fc299642b187803
Author: Carlos Rovira
AuthorDate: Fri Mar 13 11:12:17 2020 +0100
jewel-slider: temporal fix for sliders on table-cells.
---
frameworks/projects/Jewel/src/main/resources/defaults.css | 5 -
.../projects/Jewel/src/main/sass/components/_vslider.sass | 13 -
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css
b/frameworks/projects/Jewel/src/main/resources/defaults.css
index a005b9d..0b80757 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -3592,7 +3592,6 @@ j|HSlider {
left: 0;
right: 0;
top: 0;
- height: 27px;
position: absolute;
}
.vslider .jewel.slider input {
@@ -3607,6 +3606,10 @@ j|HSlider {
padding-right: 5px;
}
+.jewel.tablecell .vslider .transform-container {
+ margin-left: calc(50% - 27px/2*2);
+}
+
.jewel.snackbar {
bottom: 0;
position: fixed;
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_vslider.sass
b/frameworks/projects/Jewel/src/main/sass/components/_vslider.sass
index ff7676f..7a69fe3 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_vslider.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_vslider.sass
@@ -52,7 +52,7 @@ $vslider-container-min-height: 150px
left: 0
right: 0
top: 0
- height: $slider-container-height
+ // height: $slider-container-height
position: absolute
input
@@ -64,3 +64,14 @@ $vslider-container-min-height: 150px
width: 100%
padding-left: 5px
padding-right: 5px
+
+// weird issues with table cells and margins:
+// maybe this could be investigated more to see a better solution
+$vslider-margin-left-tablecell: calc(50% - #{$vslider-half-width}*2)
+.jewel.tablecell
+ .vslider
+ .transform-container
+ margin-left: $vslider-margin-left-tablecell
+ // .jewel
+ // &.slider
+
[MAVEN-BUILD] Royale-asjs - Build # 2804 - Fixed
The Apache Jenkins build system has built Royale-asjs (build #2804) Status: Fixed Check console output at https://builds.apache.org/job/Royale-asjs/2804/ to view the results.
