This is an automated email from the ASF dual-hosted git repository.
harbs 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 80843e9 Removed redundent constants
80843e9 is described below
commit 80843e934ef73ed3b3aee8146aadd35ededbd8f5
Author: Harbs <[email protected]>
AuthorDate: Fri Jun 12 01:31:45 2020 +0300
Removed redundent constants
---
.../src/main/royale/org/apache/royale/events/KeyboardEvent.as | 9 ---------
.../royale/jewel/beads/controllers/ComboBoxController.as | 6 ++++--
.../royale/jewel/beads/controllers/ListKeyDownController.as | 8 +++++---
.../jewel/beads/controllers/VirtualListKeyDownController.as | 3 ++-
.../jewel/beads/controls/textinput/SearchFilterForList.as | 10 ++++++----
.../royale/jewel/supportClasses/textinput/TextInputBase.as | 5 +++--
6 files changed, 20 insertions(+), 21 deletions(-)
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/events/KeyboardEvent.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/events/KeyboardEvent.as
index 4ce4ddf..d313c72 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/events/KeyboardEvent.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/events/KeyboardEvent.as
@@ -49,15 +49,6 @@ package org.apache.royale.events
COMPILE::JS
public static const KEY_UP:String = "keyup";
- // these are the ones reported by browsers directly
- public static const KEYCODE__UP:String = "ArrowUp";
- public static const KEYCODE__DOWN:String = "ArrowDown";
- public static const KEYCODE__LEFT:String = "ArrowLeft";
- public static const KEYCODE__RIGHT:String = "ArrowRight";
- public static const KEYCODE__ENTER:String = "Enter";
- public static const KEYCODE__TAB:String = "Tab";
-
- // these ones only exists on nativeEvent object
public static const KEYCODE_UP:uint = 38;
public static const KEYCODE_DOWN:uint = 40;
public static const KEYCODE_LEFT:uint = 37;
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ComboBoxController.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ComboBoxController.as
index 905c333..b637f3c 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ComboBoxController.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ComboBoxController.as
@@ -38,6 +38,8 @@ package org.apache.royale.jewel.beads.controllers
import org.apache.royale.jewel.beads.models.IJewelSelectionModel;
import org.apache.royale.jewel.beads.views.ComboBoxPopUpView;
import org.apache.royale.jewel.supportClasses.combobox.ComboBoxPopUp;
+ import org.apache.royale.events.utils.NavigationKeys;
+ import org.apache.royale.events.utils.WhitespaceKeys;
/**
* The ComboBoxController class is responsible for listening to
@@ -157,7 +159,7 @@ package org.apache.royale.jewel.beads.controllers
// from this point we don't want to perform this
actions if textinput is not active
- if(event.key === KeyboardEvent.KEYCODE__DOWN)
+ if(event.key === NavigationKeys.DOWN)
{
keyPressed = true;
var view:IListView = list.view as IListView;
@@ -185,7 +187,7 @@ package org.apache.royale.jewel.beads.controllers
*/
protected function listKeyEventHandler(event:KeyboardEvent):void
{
- if(event.key === KeyboardEvent.KEYCODE__ENTER ||
event.key === KeyboardEvent.KEYCODE__TAB)
+ if(event.key === WhitespaceKeys.ENTER || event.key ===
WhitespaceKeys.TAB)
{
dismissPopUp();
}
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ListKeyDownController.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ListKeyDownController.as
index 8403763..92c272a 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ListKeyDownController.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ListKeyDownController.as
@@ -29,6 +29,8 @@ package org.apache.royale.jewel.beads.controllers
import org.apache.royale.html.beads.IListView;
import org.apache.royale.jewel.beads.views.IScrollToIndexView;
import org.apache.royale.utils.sendEvent;
+ import org.apache.royale.events.utils.WhitespaceKeys;
+ import org.apache.royale.events.utils.NavigationKeys;
/**
* The Jewel ListSingleSelectionMouseController class is a controller for
@@ -122,19 +124,19 @@ package org.apache.royale.jewel.beads.controllers
protected function keyDownEventHandler(event:KeyboardEvent):void
{
// avoid Tab loose the normal behaviour, for navigation
we don't want build int scrolling support in browsers
- if(event.key === KeyboardEvent.KEYCODE__TAB)
+ if(event.key === WhitespaceKeys.TAB)
return;
event.preventDefault();
var index:int = listModel.selectedIndex;
- if(event.key === KeyboardEvent.KEYCODE__UP || event.key
=== KeyboardEvent.KEYCODE__LEFT)
+ if(event.key === NavigationKeys.UP || event.key ===
NavigationKeys.LEFT)
{
if(index > 0)
listModel.selectedIndex--;
}
- else if(event.key === KeyboardEvent.KEYCODE__DOWN ||
event.key === KeyboardEvent.KEYCODE__RIGHT)
+ else if(event.key === NavigationKeys.DOWN || event.key
=== NavigationKeys.RIGHT)
{
listModel.selectedIndex++;
}
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/VirtualListKeyDownController.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/VirtualListKeyDownController.as
index 9ea923a..cb164e5 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/VirtualListKeyDownController.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/VirtualListKeyDownController.as
@@ -29,6 +29,7 @@ package org.apache.royale.jewel.beads.controllers
import org.apache.royale.html.beads.IListView;
import org.apache.royale.jewel.beads.views.IScrollToIndexView;
import org.apache.royale.utils.sendEvent;
+ import org.apache.royale.events.utils.WhitespaceKeys;
/**
* The Jewel ListSingleSelectionMouseController class is a controller for
@@ -122,7 +123,7 @@ package org.apache.royale.jewel.beads.controllers
protected function keyDownEventHandler(event:KeyboardEvent):void
{
// avoid Tab loose the normal behaviour, for navigation
we don't want build int scrolling support in browsers
- if(event.key === KeyboardEvent.KEYCODE__TAB)
+ if(event.key === WhitespaceKeys.TAB)
return;
event.preventDefault();
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/textinput/SearchFilterForList.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/textinput/SearchFilterForList.as
index c601e6f..dee4770 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/textinput/SearchFilterForList.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/textinput/SearchFilterForList.as
@@ -34,6 +34,8 @@ package org.apache.royale.jewel.beads.controls.textinput
import
org.apache.royale.jewel.supportClasses.list.IListPresentationModel;
import org.apache.royale.jewel.supportClasses.textinput.TextInputBase;
import org.apache.royale.utils.sendEvent;
+ import org.apache.royale.events.utils.WhitespaceKeys;
+ import org.apache.royale.events.utils.NavigationKeys;
/**
* The SearchFilterForList bead class is a specialty bead that can be
used with
@@ -110,19 +112,19 @@ package org.apache.royale.jewel.beads.controls.textinput
protected function keyDownEventHandler(event:KeyboardEvent):void
{
// avoid Tab loose the normal behaviour, for navigation
we don't want build int scrolling support in browsers
- if(event.key === KeyboardEvent.KEYCODE__TAB)
+ if(event.key === WhitespaceKeys.TAB)
return;
event.preventDefault();
var index:int =
visibleIndexes.indexOf(list.selectedIndex);
- if(event.key === KeyboardEvent.KEYCODE__UP || event.key
=== KeyboardEvent.KEYCODE__LEFT)
+ if(event.key === NavigationKeys.UP || event.key ===
NavigationKeys.LEFT)
{
if(index > 0)
list.selectedIndex =
visibleIndexes[index - 1];
}
- else if(event.key === KeyboardEvent.KEYCODE__DOWN ||
event.key === KeyboardEvent.KEYCODE__RIGHT)
+ else if(event.key === NavigationKeys.DOWN || event.key
=== NavigationKeys.RIGHT)
{
if(index < visibleIndexes.length - 1)
list.selectedIndex =
visibleIndexes[index + 1];
@@ -247,7 +249,7 @@ package org.apache.royale.jewel.beads.controls.textinput
protected function
textInputKeyUpHandler(event:KeyboardEvent):void
{
- if(event.key === KeyboardEvent.KEYCODE__TAB)
+ if(event.key === WhitespaceKeys.TAB)
return;
const inputBase:TextInputBase = event.target as
TextInputBase;
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/textinput/TextInputBase.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/textinput/TextInputBase.as
index 9bd24b7..67ef204 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/textinput/TextInputBase.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/textinput/TextInputBase.as
@@ -31,6 +31,7 @@ package org.apache.royale.jewel.supportClasses.textinput
import org.apache.royale.events.Event;
import org.apache.royale.events.KeyboardEvent;
import org.apache.royale.jewel.supportClasses.textinput.ITextInput;
+ import org.apache.royale.events.utils.WhitespaceKeys;
/**
* Dispatched when text in the control changes through user input.
@@ -45,7 +46,7 @@ package org.apache.royale.jewel.supportClasses.textinput
/**
* Dispatched when the user presses the Enter key.
*
- * @eventType org.apache.royale.events.KeyboardEvent.KEYCODE__ENTER
+ * @eventType org.apache.royale.events.utils.WhitespaceKeys.ENTER
*
* @langversion 3.0
* @playerversion Flash 10.2
@@ -195,7 +196,7 @@ package org.apache.royale.jewel.supportClasses.textinput
{
COMPILE::JS
{
- if (event.key === KeyboardEvent.KEYCODE__ENTER) {
+ if (event.key === WhitespaceKeys.ENTER) {
// Cancel the default action, if needed
event.preventDefault();
dispatchEvent(new Event("enter"));
