You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2013/06/24 08:53:25 UTC
git commit: [flex-sdk] [refs/heads/develop] - Stop RTE when
itemToLabel (a user defined function) returns null
Updated Branches:
refs/heads/develop 2ee032783 -> c1df40b0a
Stop RTE when itemToLabel (a user defined function) returns null
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/c1df40b0
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/c1df40b0
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/c1df40b0
Branch: refs/heads/develop
Commit: c1df40b0a002857c574dd95b31df5b29b4889408
Parents: 2ee0327
Author: Justin Mclean <jm...@apache.org>
Authored: Mon Jun 24 16:51:46 2013 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Mon Jun 24 16:51:46 2013 +1000
----------------------------------------------------------------------
.../mx/controls/listClasses/AdvancedListBase.as | 42 +++++++++++---------
1 file changed, 23 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c1df40b0/frameworks/projects/advancedgrids/src/mx/controls/listClasses/AdvancedListBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/advancedgrids/src/mx/controls/listClasses/AdvancedListBase.as b/frameworks/projects/advancedgrids/src/mx/controls/listClasses/AdvancedListBase.as
index 317cee3..858151b 100644
--- a/frameworks/projects/advancedgrids/src/mx/controls/listClasses/AdvancedListBase.as
+++ b/frameworks/projects/advancedgrids/src/mx/controls/listClasses/AdvancedListBase.as
@@ -7542,25 +7542,29 @@ public class AdvancedListBase extends ScrollControlBase
for (i; i != stopIndex; i++)
{
var itmStr:String = itemToLabel(iterator.current);
-
- itmStr = itmStr.substring(0, str.length);
- if (str == itmStr || str.toUpperCase() == itmStr.toUpperCase())
- {
- iterator.seek(cursorPos, 0);
- scrollToIndex(i);
- commitSelectedIndex(i);
- var item:IListItemRenderer = indexToItemRenderer(i);
- var pt:Point = itemRendererToIndices(item);
- var evt:ListEvent = new ListEvent(ListEvent.CHANGE);
- evt.itemRenderer = item;
- if (pt)
- {
- evt.columnIndex = pt.x;
- evt.rowIndex = pt.y;
- }
- dispatchEvent(evt);
- return true;
- }
+
+ if (itmStr)
+ {
+ itmStr = itmStr.substring(0, str.length);
+
+ if (str == itmStr || str.toUpperCase() == itmStr.toUpperCase())
+ {
+ iterator.seek(cursorPos, 0);
+ scrollToIndex(i);
+ commitSelectedIndex(i);
+ var item:IListItemRenderer = indexToItemRenderer(i);
+ var pt:Point = itemRendererToIndices(item);
+ var evt:ListEvent = new ListEvent(ListEvent.CHANGE);
+ evt.itemRenderer = item;
+ if (pt)
+ {
+ evt.columnIndex = pt.x;
+ evt.rowIndex = pt.y;
+ }
+ dispatchEvent(evt);
+ return true;
+ }
+ }
try
{