You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@royale.apache.org by GitBox <gi...@apache.org> on 2018/10/03 11:14:00 UTC
[GitHub] pashminakazi closed pull request #310: Changes on 3.Oct.2018
pashminakazi closed pull request #310: Changes on 3.Oct.2018
URL: https://github.com/apache/royale-asjs/pull/310
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/MXRoyaleClasses.as b/frameworks/projects/MXRoyale/src/main/royale/MXRoyaleClasses.as
index ca4b8a447..5647e136c 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/MXRoyaleClasses.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/MXRoyaleClasses.as
@@ -152,6 +152,7 @@ internal class MXRoyaleClasses
import mx.formatters.IFormatter; IFormatter;
import mx.events.CalendarLayoutChangeEvent; CalendarLayoutChangeEvent;
import mx.net.SharedObject; SharedObject;
+ import mx.modules.ModuleManager; ModuleManager;
COMPILE::JS
{
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/AdvancedListBase.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/AdvancedListBase.as
index 69d5e5d61..7389926b5 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/AdvancedListBase.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/AdvancedListBase.as
@@ -1598,7 +1598,7 @@ public class AdvancedListBase extends ScrollControlBase /* extends UIComponent
} */
- //----------------------------------
+ /* //----------------------------------
// borderVisible
//----------------------------------
public function get borderVisible():Boolean
@@ -1607,7 +1607,7 @@ public class AdvancedListBase extends ScrollControlBase /* extends UIComponent
}
public function set borderVisible(value:Boolean):void
{
- }
+ } */
//----------------------------------
// verticalScrollPolicy
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/ListBase.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/ListBase.as
index ea2cad635..d6ecb6a83 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/ListBase.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/ListBase.as
@@ -32,6 +32,7 @@ import mx.core.UIComponent;
import mx.core.mx_internal;
import mx.events.CollectionEvent;
import mx.utils.UIDUtil;
+import mx.core.ScrollControlBase;
import org.apache.royale.core.ContainerBaseStrandChildren;
import org.apache.royale.core.IBeadLayout;
@@ -86,8 +87,8 @@ use namespace mx_internal;
* @productversion Royale 0.0
* @royalesuppresspublicvarwarning
*/
- public class ListBase extends UIComponent implements IContainerBaseStrandChildrenHost, IContainer, ILayoutParent, ILayoutView
- {
+ public class ListBase extends ScrollControlBase implements IContainerBaseStrandChildrenHost, IContainer, ILayoutParent, ILayoutView
+ { //extends UIComponent
//----------------------------------
// dragEnabled
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/core/ScrollControlBase.as b/frameworks/projects/MXRoyale/src/main/royale/mx/core/ScrollControlBase.as
index f37361546..33962495a 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/core/ScrollControlBase.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/core/ScrollControlBase.as
@@ -317,7 +317,35 @@ public class ScrollControlBase extends UIComponent
// Properties
//
//--------------------------------------------------------------------------
+
+ //----------------------------------
+ // contentBackgroundColor
+ //----------------------------------
+
+ public function get contentBackgroundColor():uint
+ {
+ return null;
+ }
+ public function set contentBackgroundColor(value:uint):void
+ {
+
+ }
+
+ //----------------------------------
+ // borderVisible
+ //----------------------------------
+
+ public function get borderVisible():Boolean
+ {
+ return 0;
+ }
+
+ public function set borderVisible(value:Boolean):void
+ {
+
+ }
+
//----------------------------------
// borderMetrics
//----------------------------------
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 bf36c6695..8a406676a 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
@@ -495,6 +495,7 @@ public class UIComponent extends UIBase
//
//--------------------------------------------------------------------------
+
//--------------------------------------------------------------------------
//
// Class methods
@@ -3484,6 +3485,18 @@ COMPILE::JS
return 0;
}
+
+
+ //--------------------------------------------------------------------------
+ // Method: getFocus
+ //--------------------------------------------------------------------------
+
+ public function getFocus():UIComponent
+ {
+ return null;
+ }
+
+
/**
* Detects changes to style properties. When any style property is set,
* Flex calls the <code>styleChanged()</code> method,
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/modules/ModuleManager.as b/frameworks/projects/MXRoyale/src/main/royale/mx/modules/ModuleManager.as
index e2cdac58c..cf787986c 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/modules/ModuleManager.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/modules/ModuleManager.as
@@ -19,7 +19,7 @@
package mx.modules
{
-
+ import mx.modules.IModuleInfo;
/* import flash.utils.ByteArray;
import mx.core.IFlexModuleFactory;
@@ -64,7 +64,7 @@ public class ModuleManager
* @playerversion AIR 1.1
* @productversion Royale 0.9.3
*/
- public static function getModule(url:String):Object //:IModuleInfo
+ public static function getModule(url:String):IModuleInfo
{
return null;
//return getSingleton().getModule(url);
----------------------------------------------------------------
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