You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ha...@apache.org on 2019/12/29 10:31:02 UTC

[royale-asjs] branch develop updated: Use wrapped event in KeyboardEvent

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 7eb3ce1  Use wrapped event in KeyboardEvent
     new 436a45a  Merge branch 'develop' of https://github.com/apache/royale-asjs into develop
7eb3ce1 is described below

commit 7eb3ce1e61055a42dc85bb14d6c199044dddebb4
Author: Harbs <ha...@in-tools.com>
AuthorDate: Sun Dec 29 12:30:48 2019 +0200

    Use wrapped event in KeyboardEvent
---
 .../org/apache/royale/events/KeyboardEvent.as      | 86 ++++++++++++++++++++--
 1 file changed, 79 insertions(+), 7 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 f8c9ab0..a2436e7 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
@@ -158,42 +158,114 @@ package org.apache.royale.events
         {
             _code = value;
         }
-        
-        private var _shiftKey:Boolean;
-        public function get shiftKey():Boolean
-        {
-            return _shiftKey;
-        }
 
         private var _altKey:Boolean;
+
+        COMPILE::SWF
         public function get altKey():Boolean
         {
             return _altKey;
         }
+        
+        COMPILE::JS
+        public function get altKey():Boolean
+        {
+        	return wrappedEvent ? wrappedEvent.altKey : _altKey;
+        }
+        COMPILE::SWF
         public function set altKey(value:Boolean):void
         {
             _altKey = value;
         }
-        
+
+        COMPILE::JS
+        public function set altKey(value:Boolean):void
+        {
+            if(wrappedEvent)wrappedEvent.altKey = value;
+            else _altKey = value;
+        }
+
         private var _ctrlKey:Boolean;
+        
+        COMPILE::SWF
         public function get ctrlKey():Boolean
         {
             return _ctrlKey;
         }
+
+        COMPILE::JS
+        public function get ctrlKey():Boolean
+        {
+        	return wrappedEvent ? wrappedEvent.ctrlKey : _ctrlKey;
+        }
+
+        COMPILE::SWF
         public function set ctrlKey(value:Boolean):void
         {
             _ctrlKey = value;
         }
 
+        COMPILE::JS
+        public function set ctrlKey(value:Boolean):void
+        {
+            if(wrappedEvent)
+                wrappedEvent.ctrlKey = value;
+            else 
+                _ctrlKey = value;
+        }
         private var _metaKey:Boolean;
+
+        COMPILE::SWF
         public function get metaKey():Boolean
         {
             return _metaKey;
         }
+        
+        COMPILE::JS
+        public function get metaKey():Boolean
+        {
+            return wrappedEvent ? wrappedEvent.metaKey : _metaKey;
+        }
+
+        COMPILE::SWF
         public function set metaKey(value:Boolean):void
         {
             _metaKey = value;
         }
+
+        COMPILE::JS
+        public function set metaKey(value:Boolean):void
+        {
+            if(wrappedEvent)wrappedEvent.metaKey = value;
+            else _metaKey = value;
+        }
+
+        private var _shiftKey:Boolean;
+
+        COMPILE::SWF
+        public function get shiftKey():Boolean
+        {
+            return _shiftKey;
+        }
+        
+        COMPILE::JS
+        public function get shiftKey():Boolean
+        {
+        	return wrappedEvent ? wrappedEvent.shiftKey : _shiftKey;
+        }
+
+        COMPILE::SWF
+        public function set shiftKey(value:Boolean):void
+        {
+            _shiftKey = value;
+        }
+
+        COMPILE::JS
+        public function set shiftKey(value:Boolean):void
+        {
+            if(wrappedEvent)wrappedEvent.shiftKey = value;
+            else _shiftKey = value;
+        }
         
         public function get modifierKey():Boolean
         {