[GitHub] alinakazi closed pull request #309: Changes on 10.oct.2018

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

alinakazi closed pull request #309: Changes on 10.oct.2018
URL: https://github.com/apache/royale-asjs/pull/309
 
 
   

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/containers/DividedBox.as b/frameworks/projects/MXRoyale/src/main/royale/mx/containers/DividedBox.as
index 81a9ec98c..40da77dd8 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/containers/DividedBox.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/containers/DividedBox.as
@@ -100,7 +100,7 @@ use namespace mx_internal;
  *  @playerversion AIR 1.1
  *  @productversion Flex 3
  */
-//[Event(name="dividerRelease", type="mx.events.DividerEvent")]
+ Event(name="dividerRelease", type="mx.events.DividerEvent")]
 
 /**
  *  A DividedBox container measures and lays out its children
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 6d5b4cc3e..a06395413 100644
--- a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/SkinnableContainer.as
+++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/SkinnableContainer.as
@@ -524,45 +524,18 @@ public class SkinnableContainer extends SkinnableComponent
      *  @playerversion AIR 1.5
      *  @productversion Royale 0.9.4
      */
-    /* public function get creationPolicy():String
+     public function get creationPolicy():String
     {
-        // Use an inheriting style as the backing storage for this property.
-        // This allows the property to be inherited by either mx or spark
-        // containers, and also to correctly cascade through containers that
-        // don't have this property (ie Group).
-        // This style is an implementation detail and should be considered
-        // private. Do not set it from CSS.
-        var result:String = getStyle("_creationPolicy");
-        
-        if (result == null)
-            result = ContainerCreationPolicy.AUTO;
-        
-        if (creationPolicyNone)
-            result = ContainerCreationPolicy.NONE;
-        
-        return result;
+       return "";
     }
-     */
+     
     /**
      *  @private
      */
-    /* public function set creationPolicy(value:String):void
+     public function set creationPolicy(value:String):void
     {
-        if (value == ContainerCreationPolicy.NONE)
-        {
-            // creationPolicy of none is not inherited by descendants.
-            // In this case, set the style to "auto" and set a local
-            // flag for subsequent access to the creationPolicy property.
-            creationPolicyNone = true;
-            value = ContainerCreationPolicy.AUTO;
-        }
-        else
-        {
-            creationPolicyNone = false;
-        }
         
-        setStyle("_creationPolicy", value);
-    } */
+    } 
 
     //--------------------------------------------------------------------------
     //
diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/supportClasses/SkinnableTextBase.as b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/supportClasses/SkinnableTextBase.as
index d7da04931..970ed2085 100644
--- a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/supportClasses/SkinnableTextBase.as
+++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/supportClasses/SkinnableTextBase.as
@@ -474,6 +474,14 @@ public class SkinnableTextBase extends SkinnableComponent
     {
     }
     
+    public function get textAlignLast():String
+    {
+	return "";
+    }
+    public function set textAlignLast(val:String):void
+    {
+    }
+    
     //--------------------------------------------------------------------------
     //
     //  Variables


 

----------------------------------------------------------------
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