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/09/04 11:15:38 UTC
[GitHub] alinakazi closed pull request #284: changes on 4.sep.2018 newbranch8
alinakazi closed pull request #284: changes on 4.sep.2018 newbranch8
URL: https://github.com/apache/royale-asjs/pull/284
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 e94501403..81e28b43e 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/MXRoyaleClasses.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/MXRoyaleClasses.as
@@ -144,6 +144,7 @@ internal class MXRoyaleClasses
import mx.events.HTTPStatusEvent; HTTPStatusEvent;
import mx.net.FileReference; FileReference;
import mx.net.FileFilter; FileFilter;
+ import mx.events.ProgressEvent; ProgressEvent;
import mx.controls.advancedDataGridClasses.MXAdvancedDataGridItemRenderer; MXAdvancedDataGridItemRenderer;
COMPILE::JS
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/events/ModuleEvent.as b/frameworks/projects/MXRoyale/src/main/royale/mx/events/ModuleEvent.as
index 2ad9a6719..d0a3ba6a4 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/events/ModuleEvent.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/events/ModuleEvent.as
@@ -24,7 +24,8 @@ package mx.events
//import flash.events.ProgressEvent;
import mx.modules.IModuleInfo;
import org.apache.royale.events.Event;
-import org.apache.royale.events.ProgressEvent;
+import mx.events.ProgressEvent;
+//import org.apache.royale.events.ProgressEvent;
/**
* The ModuleEvent class represents the event object passed to the event listener
@@ -35,7 +36,7 @@ import org.apache.royale.events.ProgressEvent;
* @playerversion AIR 1.1
* @productversion Royale 0.9.3
*/
-public class ModuleEvent extends ProgressEvent
+public class ModuleEvent extends import mx.events.ProgressEvent
{
//
// include "../core/Version.as";
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/events/ProgressEvent.as b/frameworks/projects/MXRoyale/src/main/royale/mx/events/ProgressEvent.as
new file mode 100644
index 000000000..6cfba50e7
--- /dev/null
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/events/ProgressEvent.as
@@ -0,0 +1,68 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package mx.events
+{
+ import org.apache.royale.events.ProgressEvent;
+ /**
+ * The ProgressEvent
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.0
+ *
+ * @royalesuppresspublicvarwarning
+ */
+ public class ProgressEvent extends org.apache.royale.events.ProgressEvent
+ {
+ /**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.0
+ */
+ public function ProgressEvent(type:String, bubbles:Boolean=false, cancelable:Boolean=false,
+ current:Number = NaN, total:Number = NaN)
+ {
+ super(total);
+ }
+
+
+
+
+
+ public function get bytesTotal():Number{
+ return null;
+ }
+
+ public function set bytesTotal(value:Number):void{
+ }
+
+
+
+ public function get bytesLoaded():Number{
+ return null;
+ }
+
+ public function set bytesLoaded(value:Number):void{
+ }
+ }
+}
diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/DataRenderer.as b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/DataRenderer.as
index 515f5a7e7..f4163832c 100644
--- a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/DataRenderer.as
+++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/DataRenderer.as
@@ -21,7 +21,8 @@ package spark.components {
import mx.core.IDataRenderer;
import mx.events.FlexEvent;
-import org.apache.royale.events.EventDispatcher;
+//import org.apache.royale.events.EventDispatcher;
+import mx.core.UIComponent;
/**
* Dispatched when the <code>data</code> property changes.
*
@@ -58,7 +59,8 @@ import org.apache.royale.events.EventDispatcher;
* @playerversion AIR 1.5
* @productversion Royale 0.9.4
*/
-public class DataRenderer extends EventDispatcher implements IDataRenderer
+public class DataRenderer extends UIComponent implements IDataRenderer //extends EventDispatcher
+
{ // replacing extends Group with extends EventDispatcher for now
// include "../core/Version.as";
diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/controls/advancedDataGridClasses/MXAdvancedDataGridItemRenderer.as b/frameworks/projects/SparkRoyale/src/main/royale/spark/controls/advancedDataGridClasses/MXAdvancedDataGridItemRenderer.as
new file mode 100644
index 000000000..9098a1b0b
--- /dev/null
+++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/controls/advancedDataGridClasses/MXAdvancedDataGridItemRenderer.as
@@ -0,0 +1,342 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+package spark.controls.advancedDataGridClasses
+{
+import mx.events.MouseEvent;
+
+import mx.controls.AdvancedDataGrid;
+import mx.controls.listClasses.AdvancedListBase;
+import mx.controls.listClasses.BaseListData;
+//import mx.controls.listClasses.IDropInListItemRenderer;
+//import mx.controls.listClasses.IListItemRenderer;
+import mx.core.mx_internal;
+import mx.managers.IFocusManagerComponent;
+
+import spark.components.Group;
+import spark.components.supportClasses.ItemRenderer;
+
+use namespace mx_internal;
+
+/**
+ * The MXAdvancedDataGridItemRenderer class defines the Spark item renderer class
+ * for use with the MX AdvancedDataGrid control.
+ * This class lets you use the Spark item renderer architecture with the
+ * MX AdvancedDataGrid control.
+ *
+ * @mxml
+ *
+ * <p>The <code><s:MXAdvancedDataGridItemRenderer></code> tag inherits all of the tag
+ * attributes of its superclass and adds the following tag attributes:</p>
+ *
+ * <pre>
+ * <s:MXAdvancedDataGridItemRenderer
+ * <strong>Properties</strong>
+ * />
+ * </pre>
+ *
+ * @see mx.controls.AdvancedDataGrid
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4
+ */
+public class MXAdvancedDataGridItemRenderer extends ItemRenderer //implements IListItemRenderer, IDropInListItemRenderer
+{
+ //--------------------------------------------------------------------------
+ //
+ // Constructor
+ //
+ //--------------------------------------------------------------------------
+
+ /**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4
+ */
+ public function MXAdvancedDataGridItemRenderer()
+ {
+ super();
+ // focusEnabled = false;
+ }
+
+ //----------------------------------
+ // listData
+ //----------------------------------
+
+ /**
+ * @private
+ * Storage for the listData property.
+ */
+ /* private var _listData:BaseListData;
+
+ [Bindable("dataChange")]
+ */
+ /**
+ * The implementation of the <code>listData</code> property
+ * as defined by the IDropInListItemRenderer interface.
+ * Use this property to access information about the
+ * data item displayed by the item renderer.
+ *
+ * @see mx.controls.listClasses.IDropInListItemRenderer
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4
+ */
+ /* public function get listData():BaseListData
+ {
+ return _listData;
+ } */
+
+ /**
+ * @private
+ */
+ /* public function set listData(value:BaseListData):void
+ {
+ _listData = value;
+
+ invalidateProperties();
+ }
+ */
+ //----------------------------------
+ // editor
+ //----------------------------------
+
+ /**
+ * The ID of the component that receives focus as the item editor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4
+ */
+ // public var editor:IFocusManagerComponent;
+
+ //----------------------------------
+ // text
+ //----------------------------------
+
+ /**
+ * The <code>text</code> property of
+ * the component specified by <code>editorID</code>.
+ * This is a convenience property to
+ * let the item editor of the MX control,
+ * specified by the <code>itemEditor</code> property,
+ * pull the value from most item editors
+ * without having to propagate a property
+ * to the item renderer.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4
+ */
+ /* public function get text():String
+ {
+ if (editor && ("text" in editor))
+ return editor["text"];
+
+ return null;
+ } */
+
+ //----------------------------------
+ // disclosureGroup
+ //----------------------------------
+
+ /**
+ * storage for disclosureGroup
+ */
+ // private var _disclosureGroup:Group;
+
+ /**
+ * The ID of the component that receives focus as the item editor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4
+ */
+ /* public function get disclosureGroup():Group
+ {
+ return _disclosureGroup;
+ } */
+
+ /**
+ * @private
+ */
+ /* public function set disclosureGroup(value:Group):void
+ {
+ if (value != _disclosureGroup)
+ {
+ if (_disclosureGroup)
+ {
+ _disclosureGroup.removeEventListener(MouseEvent.MOUSE_DOWN,
+ disclosureGroup_mouseDownHandler);
+ _disclosureGroup.removeEventListener(MouseEvent.CLICK,
+ disclosureGroup_clickHandler);
+ }
+ _disclosureGroup = value;
+ if (_disclosureGroup)
+ {
+ _disclosureGroup.addEventListener(MouseEvent.MOUSE_DOWN,
+ disclosureGroup_mouseDownHandler);
+ _disclosureGroup.addEventListener(MouseEvent.CLICK,
+ disclosureGroup_clickHandler);
+ }
+ }
+ }
+ */
+ //---------------------------------
+ // advancedDataGridListData
+ //----------------------------------
+
+ //[Bindable("dataChange")]
+
+ /**
+ * The implementation of the <code>listData</code> property
+ * as defined by the IDropInListItemRenderer interface.
+ *
+ * @see mx.controls.listClasses.IDropInListItemRenderer
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @productversion Flex 4
+ */
+ /* public function get advancedDataGridListData():AdvancedDataGridListData
+ {
+ return listData as AdvancedDataGridListData;
+ } */
+
+ //--------------------------------------------------------------------------
+ //
+ // Methods
+ //
+ //--------------------------------------------------------------------------
+
+ /**
+ * @private
+ * Handle special behavior when clicking on the disclosure icon
+ */
+ /* protected function disclosureGroup_mouseDownHandler(event:MouseEvent):void
+ {
+ event.stopPropagation();
+
+ var adg:AdvancedDataGrid = listData.owner as AdvancedDataGrid;
+
+ if (adg.isOpening || !adg.enabled)
+ return;
+
+ advancedDataGridListData.open = !advancedDataGridListData.open;
+
+ adg.dispatchAdvancedDataGridEvent("itemOpening",
+ data, //item
+ this, //renderer
+ event, //trigger
+ advancedDataGridListData.open, //opening
+ true, //animate
+ true); //dispatch
+ }
+ */
+ /**
+ * @private
+ * Handle special behavior when clicking on the disclosure icon
+ */
+ /* protected function disclosureGroup_clickHandler(event:MouseEvent):void
+ { */
+ // stop this event from bubbling up because the click is
+ // for item selection and clicking on the disclosureIcon doesn't
+ // select the items (only expands/closes them).
+ /* event.stopPropagation();
+ } */
+
+ //--------------------------------------------------------------------------
+ //
+ // Overridden Methods
+ //
+ //--------------------------------------------------------------------------
+
+ /**
+ * @private
+ */
+ /* override public function invalidateDisplayList():void
+ {
+ if (listData)
+ { */
+ // see if we need to change state. This is the only invalidation method guaranteed to be
+ // called. We set up the renderers properties here so no matter what validation method gets
+ // called first, the properties are set up accordingly.
+ /* var listBase:AdvancedListBase = listData.owner as AdvancedListBase;
+ if (listBase)
+ {
+ showsCaret = listBase.isItemShowingCaret(data);
+ selected = listBase.isItemSelected(data);
+ super.hovered = listBase.isItemHighlighted(data);
+ }
+ }
+
+ super.invalidateDisplayList();
+ }
+ */
+ /**
+ * @private
+ */
+ /* override protected function set hovered(value:Boolean):void
+ {
+ if (listData)
+ { */
+ // see if we need to change state.
+ // in Halo list, you can rollout of the renderer and onto the padding area
+ // and you should still be hovered, so we double check and override here.
+ // then we get all the other state-related variables updated so the state
+ // calculation will do the right thing.
+ /* var listBase:AdvancedListBase = listData.owner as AdvancedListBase;
+ if (listBase)
+ {
+ selected = listBase.isItemSelected(data);
+ value = listBase.isItemHighlighted(data);
+ }
+ }
+ super.hovered = value;
+ }
+ */
+ /**
+ * @private
+ */
+ /* override protected function commitProperties():void
+ {
+ if (listData)
+ { */
+ // make sure itemIndex is correct before the base class does any computation
+ // based on it
+ /* var listBase:Object = listData.owner;
+ itemIndex = listData.rowIndex + listBase.verticalScrollPosition;
+ }
+
+ super.commitProperties();
+ } */
+
+}
+}
----------------------------------------------------------------
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