[GitHub] alinakazi closed pull request #295: changes on 14-sep-2018

[GitBox <gi...@apache.org>]

alinakazi closed pull request #295: changes on 14-sep-2018
URL: https://github.com/apache/royale-asjs/pull/295
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/core/Container.as b/frameworks/projects/MXRoyale/src/main/royale/mx/core/Container.as
index e07ed4983..eafa3dea8 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/core/Container.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/core/Container.as
@@ -209,7 +209,7 @@ use namespace mx_internal;
  *  @playerversion AIR 1.1
  *  @productversion Royale 0.9.3
  */
-//[Event(name="scroll", type="mx.events.ScrollEvent")]
+[Event(name="scroll", type="mx.events.ScrollEvent")]
 
 /**
  * The default property uses when additional MXML content appears within an element's
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as b/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
index 5a1469076..26695da8c 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
@@ -73,6 +73,22 @@ import org.apache.royale.html.supportClasses.ContainerContentArea;
 import org.apache.royale.utils.PointUtils;
 import org.apache.royale.utils.loadBeadFromValuesManager;
 
+/**
+ *  Dispatched when the component has finished its construction
+ *  and has all initialization properties set.
+ *
+ *  <p>After the initialization phase, properties are processed, the component
+ *  is measured, laid out, and drawn, after which the
+ *  <code>creationComplete</code> event is dispatched.</p>
+ * 
+ *  @eventType = mx.events.FlexEvent.SHOW
+ *  
+ *  @langversion 3.0
+ *  @playerversion Flash 9
+ *  @playerversion AIR 1.1
+ *  @productversion Flex 3
+ */
+[Event(name="show", type="= mx.events.FlexEvent")]
 
 /**
  *  Dispatched when the component has finished its construction
@@ -508,7 +524,14 @@ public class UIComponent extends UIBase
     //  Variables: Creation
     //
     //--------------------------------------------------------------------------
-
+    public function get maintainAspectRatio():Boolean
+	{
+	   return true;
+	}
+    public function set maintainAspectRatio(value:Boolean):void
+	{
+	
+	}
     //----------------------------------
     //  initialized
     //----------------------------------
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 5f8ccb8b1..272944a10 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/events/KeyboardEvent.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/events/KeyboardEvent.as
@@ -66,7 +66,11 @@ public class KeyboardEvent extends flash.events.KeyboardEvent
     private static function platformConstant1(s:String):String
         {
             return s;
-        }	
+        }
+    public static function get capsLock():Boolean
+	{
+	    return true;
+	}
 }
 
 /**
@@ -108,7 +112,11 @@ public class KeyboardEvent extends org.apache.royale.events.KeyboardEvent
 		 private static function platformConstant1(s:String):String
         	{
             	return s;
-        	}		
+        	}
+		public static function get capsLock():Boolean
+	        {
+	        return true;
+	        }
 	//--------------------------------------------------------------------------
 	//
 	//  Class constants
diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/SkinnableContainer.as b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/SkinnableContainer.as
index ce7debb8a..6d5b4cc3e 100644
--- a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/SkinnableContainer.as
+++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/SkinnableContainer.as
@@ -383,7 +383,14 @@ public class SkinnableContainer extends SkinnableComponent
     {
         super();
     }
-    
+        public function get blockProgression():String 
+	{
+		return "";
+	}
+	public function set blockProgression(val:String):void
+	{
+	
+	}
     
      public function get backgroundColor():uint {
 		return 0;


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services