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 1cd837f updates for Jewel Table
1cd837f is described below
commit 1cd837f336118d57f876bd226b6a70a349f17420
Author: Carlos Rovira <carlosrov...@apache.org>
AuthorDate: Sat Aug 11 09:36:55 2018 +0200
updates for Jewel Table
---
.../projects/Jewel/src/main/royale/JewelClasses.as | 6 ++----
.../royale/jewel/beads/models/ArrayListSelectionModel.as | 1 +
.../royale/jewel/itemRenderers/ListItemRenderer.as | 2 +-
.../apache/royale/jewel/supportClasses/table/TBody.as | 1 -
.../apache/royale/jewel/supportClasses/table/TFoot.as | 3 ++-
.../apache/royale/jewel/supportClasses/table/THead.as | 3 ++-
.../royale/jewel/supportClasses/util/getLabelFromData.as | 16 +++++++++++-----
7 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
b/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
index 6d5bc64..f103b9e 100644
--- a/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
+++ b/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
@@ -40,6 +40,7 @@ package
import
org.apache.royale.jewel.beads.controllers.DateChooserMouseController;
DateChooserMouseController;
import
org.apache.royale.jewel.beads.controllers.DateFieldMouseController;
DateFieldMouseController;
import org.apache.royale.jewel.beads.controllers.AlertController;
AlertController;
+ import
org.apache.royale.jewel.beads.controllers.ItemRendererMouseController;
ItemRendererMouseController;
import
org.apache.royale.jewel.beads.controllers.ListSingleSelectionMouseController;
ListSingleSelectionMouseController;
import org.apache.royale.jewel.beads.views.ImageView; ImageView;
@@ -81,12 +82,9 @@ package
import org.apache.royale.jewel.supportClasses.datagrid.DataGridColumn;
DataGridColumn;
- import org.apache.royale.jewel.supportClasses.table.TBody;
- import org.apache.royale.jewel.supportClasses.table.THead;
- import org.apache.royale.jewel.supportClasses.table.TFoot;
+ import org.apache.royale.jewel.supportClasses.table.TBodyContentArea;
TBodyContentArea;
//import org.apache.royale.jewel.beads.views.JewelLabelViewBead;
JewelLabelViewBead;
- import
org.apache.royale.jewel.beads.controllers.ItemRendererMouseController;
ItemRendererMouseController;
}
}
\ No newline at end of file
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/ArrayListSelectionModel.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/ArrayListSelectionModel.as
index 2e0628c..1239f9b 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/ArrayListSelectionModel.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/ArrayListSelectionModel.as
@@ -66,6 +66,7 @@ package org.apache.royale.jewel.beads.models
private var _dataProvider:IArrayList;
+ [Bindable("dataProviderChanged")]
/**
* @copy org.apache.royale.core.ISelectionModel#dataProvider
*
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ListItemRenderer.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ListItemRenderer.as
index 7bfca40..20e4bec 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ListItemRenderer.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/ListItemRenderer.as
@@ -73,7 +73,7 @@ package org.apache.royale.jewel.itemRenderers
}
COMPILE::JS
- private var textNode:Text;
+ protected var textNode:Text;
/**
* Sets the data value and uses the String version of the data
for display.
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/table/TBody.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/table/TBody.as
index c421057..ced797c 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/table/TBody.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/table/TBody.as
@@ -19,7 +19,6 @@
package org.apache.royale.jewel.supportClasses.table
{
import org.apache.royale.jewel.Group;
-
COMPILE::JS
{
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/table/TFoot.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/table/TFoot.as
index 1f656fe..408c7a7 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/table/TFoot.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/table/TFoot.as
@@ -19,6 +19,7 @@
package org.apache.royale.jewel.supportClasses.table
{
import org.apache.royale.jewel.Group;
+ import org.apache.royale.core.IChrome;
COMPILE::JS
{
@@ -36,7 +37,7 @@ package org.apache.royale.jewel.supportClasses.table
* @playerversion AIR 2.6
* @productversion Royale 0.9.3
*/
- public class TFoot extends Group
+ public class TFoot extends Group implements IChrome
{
/**
* constructor.
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/table/THead.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/table/THead.as
index b66a212..489bb07 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/table/THead.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/table/THead.as
@@ -19,6 +19,7 @@
package org.apache.royale.jewel.supportClasses.table
{
import org.apache.royale.jewel.Group;
+ import org.apache.royale.core.IChrome;
COMPILE::JS
{
@@ -36,7 +37,7 @@ package org.apache.royale.jewel.supportClasses.table
* @playerversion AIR 2.6
* @productversion Royale 0.9.3
*/
- public class THead extends Group
+ public class THead extends Group implements IChrome
{
/**
* constructor.
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/util/getLabelFromData.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/util/getLabelFromData.as
index 1dc8cab..60172d7 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/util/getLabelFromData.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/util/getLabelFromData.as
@@ -23,17 +23,23 @@ package org.apache.royale.jewel.supportClasses.util
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9.3
- * Utility function to get a label string from a value object
+ *
+ * Utility function to get a label string from a value object
*/
- public function getLabelFromData(obj:Object,data:Object):String
+ public function getLabelFromData(obj:Object, data:Object):String
{
// slightly more code, but we bail early if it's a string which is
often
if (data is String) return "" + data;
if(!data) return "";
- if (obj["labelField"]) return "" + data[obj["labelField"]];
- if (obj["dataField"]) return "" + data[obj["dataField"]];
- if (data.hasOwnProperty("label")) return "" + data["label"];
+ if (obj["labelField"])
+ return "" + data[obj["labelField"]];
+
+ if (obj["dataField"])
+ return "" + data[obj["dataField"]];
+
+ if (data.hasOwnProperty("label"))
+ return "" + data["label"];
return "" + data;
