You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2020/02/27 19:13:28 UTC
[royale-asjs] branch develop updated: a few more fixes for item
editing
This is an automated email from the ASF dual-hosted git repository.
aharui 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 8340149 a few more fixes for item editing
8340149 is described below
commit 8340149bbbe28983b1ac7048721d28cb55e2d602
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Feb 27 11:13:12 2020 -0800
a few more fixes for item editing
---
.../MXRoyale/src/main/royale/mx/controls/AdvancedDataGrid.as | 7 ++++---
.../projects/MXRoyale/src/main/royale/mx/events/KeyboardEvent.as | 2 ++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/AdvancedDataGrid.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/AdvancedDataGrid.as
index f62706b..274835f 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/AdvancedDataGrid.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/AdvancedDataGrid.as
@@ -10880,10 +10880,8 @@ public class AdvancedDataGrid extends AdvancedListBase implements IDataGrid
return;
}
- /*
- if (isDataEditable(newData))
+ //if (isDataEditable(newData))
break;
- */
} while (true);
@@ -10957,6 +10955,9 @@ public class AdvancedDataGrid extends AdvancedListBase implements IDataGrid
if (event.relatedObject && contains(event.relatedObject as IUIComponent))
return;
+ if (inEndEdit)
+ return;
+
COMPILE::SWF
{
// ignore textfields losing focus on mousedowns
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/events/KeyboardEvent.as b/frameworks/projects/MXRoyale/src/main/royale/mx/events/KeyboardEvent.as
index 3f2ca5b..3b23aab 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/events/KeyboardEvent.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/events/KeyboardEvent.as
@@ -187,6 +187,8 @@ public class KeyboardEvent extends org.apache.royale.events.KeyboardEvent
public function get charCode():uint
{
+ if (code == "Enter")
+ return 13;
return code.charCodeAt();
}
}