You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2018/08/16 08:13:49 UTC
[royale-asjs] branch develop updated: some fixes in table and
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 f33eb0e some fixes in table and datechooser
f33eb0e is described below
commit f33eb0e247333606c3a121d3a54f1b0e2a3f22ec
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Thu Aug 16 10:13:44 2018 +0200
some fixes in table and datechooser
---
.../controllers/DateChooserMouseController.as | 1 +
.../TableCellSelectionMouseController.as | 9 +++---
.../royale/jewel/beads/models/DateChooserModel.as | 7 +----
.../apache/royale/jewel/beads/models/TableModel.as | 22 ---------------
.../royale/jewel/beads/views/DateChooserView.as | 2 +-
.../apache/royale/jewel/beads/views/TableView.as | 33 +++++-----------------
.../jewel/supportClasses/table/TBodyContentArea.as | 3 +-
7 files changed, 16 insertions(+), 61 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 863a8e5..4198565 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
@@ -82,6 +82,7 @@ package org.apache.royale.jewel.beads.controllers
{
var table:DateChooserTable = event.target as DateChooserTable;
model.selectedDate = table.selectedItem[table.model.labelField] as Date;
+ trace("tableHandler - model.selectedDate: " + model.selectedDate);
}
/**
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/TableCellSelectionMouseController.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/TableCellSelectionMouseController.as
index bfeb988..f385b4d 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/TableCellSelectionMouseController.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/TableCellSelectionMouseController.as
@@ -141,15 +141,14 @@ package org.apache.royale.jewel.beads.controllers
// if (renderer) {
// trace(renderer.rowIndex + ", " + renderer.columnIndex + " :: " + renderer.dataField + ", " + renderer.labelField);
// }
- (model as TableModel).selectedCellRenderer = renderer;
- model.labelField = renderer.labelField;
- (model as TableModel).selectedCellItem = event.data[model.labelField];
+ model.labelField = renderer.labelField;
+ //event.data[model.labelField];
trace("model.labelField: " + model.labelField);
model.selectedIndex = event.index;
- trace(model.selectedIndex);
+ trace("model.selectedIndex: " + model.selectedIndex);
model.selectedItem = event.data;
- trace(model.selectedItem);
+ trace("model.selectedItem: " + model.selectedItem);
view.host.dispatchEvent(new Event("change"));
}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/DateChooserModel.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/DateChooserModel.as
index 48d241a..5d937be 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/DateChooserModel.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/DateChooserModel.as
@@ -265,24 +265,19 @@ package org.apache.royale.jewel.beads.models
*/
public function getIndexForSelectedDate():Number
{
- trace("getIndexForSelectedDate");
if (!_selectedDate) return -1;
- trace("getIndexForSelectedDate 1");
var str:String = _selectedDate.toDateString();
- trace("getIndexForSelectedDate 2");
for(var i:int=0; i < _days.length; i++) {
- trace("getIndexForSelectedDate - i");
var test:Date = _days[i] as Date;
if (test && test.toDateString() == str)
{
- trace("getIndexForSelectedDate - index: " + i);
+ trace("getIndexForSelectedDate, index: " + i);
return i;
}
}
- trace("getIndexForSelectedDate 3");
return -1;
}
}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/TableModel.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/TableModel.as
index 5444181..922b1e5 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/TableModel.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/TableModel.as
@@ -37,27 +37,5 @@ package org.apache.royale.jewel.beads.models
{
_columns = value;
}
-
- private var _selectedCellItem:Object;
- public function get selectedCellItem():Object
- {
- return _selectedCellItem;
- }
- public function set selectedCellItem(value:Object):void
- {
- _selectedCellItem = value;
- }
-
- private var _selectedCellRenderer:DataItemRenderer;
- public function get selectedCellRenderer():DataItemRenderer
- {
- return _selectedCellRenderer;
- }
- public function set selectedCellRenderer(value:DataItemRenderer):void
- {
- _selectedCellRenderer = value;
- }
-
-
}
}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateChooserView.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateChooserView.as
index 42b63f4..ecb1945 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateChooserView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateChooserView.as
@@ -266,7 +266,7 @@ package org.apache.royale.jewel.beads.views
*/
private function selectionChangeHandler(event:Event):void
{
- trace("*selectionChangeHandler*");
+ trace("DateChooserView - selectionChangeHandler");
updateDisplay();
getHost().dispatchEvent(new Event("selectedDateChanged"));
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 3c3435c..d19fac3 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
@@ -100,35 +100,16 @@ package org.apache.royale.jewel.beads.views
*/
override protected function selectionChangeHandler(event:Event):void
{
- trace("selectionChangeHandler 1");
- if(lastSelectedRenderer)
- lastSelectedRenderer.selected = false;
-
- // var tbody:TBodyContentArea = contentView as TBodyContentArea;
- // var renderers:Array = tbody.itemRenderers;
+ var ir:ISelectableItemRenderer = dataGroup.getItemRendererForIndex(lastSelectedIndex) as ISelectableItemRenderer;
+ if (ir)
+ ir.selected = false;
- var ir:ISelectableItemRenderer = model.selectedCellRenderer as ISelectableItemRenderer;
+ trace("TableView - selectionChangeHandler - listModel.selectedIndex: " + listModel.selectedIndex);
+ ir = dataGroup.getItemRendererForIndex(listModel.selectedIndex) as ISelectableItemRenderer;
trace(ir);
- if(ir)
+ if (ir)
ir.selected = true;
-
- lastSelectedRenderer = ir;
- trace(lastSelectedRenderer);
- // trace(event);
- // trace("lastSelectedIndex: " + lastSelectedIndex);
-
- // // var ir:ISelectableItemRenderer = dataGroup.getItemRendererForIndex(lastSelectedIndex) as ISelectableItemRenderer;
- // var ir:ISelectableItemRenderer = renderers[lastSelectedIndex] as ISelectableItemRenderer;
- // trace(ir);
- // if(ir)
- // ir.selected = false;
- // // ir = dataGroup.getItemRendererForIndex(listModel.selectedIndex) as ISelectableItemRenderer;
- // ir = renderers[listModel.selectedIndex] as ISelectableItemRenderer;
- // trace(ir);
- // if(ir)
- // ir.selected = true;
-
- // lastSelectedIndex = listModel.selectedIndex;
+ lastSelectedIndex = listModel.selectedIndex;
}
}
}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/table/TBodyContentArea.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/table/TBodyContentArea.as
index 40bbf85..c72cf05 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/table/TBodyContentArea.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/table/TBodyContentArea.as
@@ -165,7 +165,8 @@ package org.apache.royale.jewel.supportClasses.table
*/
public function getItemRendererForIndex(index:int):IItemRenderer
{
- if (index < 0 || index >= numElements) return null;
+ if (index < 0 || index >= itemRenderers.length) return null;
+ // if (index < 0 || index >= numElements) return null;
// return getElementAt(index) as IItemRenderer;
return itemRenderers[index] as IItemRenderer;
}