You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by yi...@apache.org on 2017/09/27 08:42:42 UTC
[1/4] git commit: [flex-asjs] [refs/heads/develop] - Add a parent to
mock layout parent as there's a RTE otherwise in EasyAccordionBead
Repository: flex-asjs
Updated Branches:
refs/heads/develop 64e9f0c08 -> 90886a1dc
Add a parent to mock layout parent as there's a RTE otherwise in
EasyAccordionBead
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8648c6fa
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8648c6fa
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8648c6fa
Branch: refs/heads/develop
Commit: 8648c6faf4819be6469c03ed4e8d516be7ecd75d
Parents: 814b90d
Author: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
Authored: Tue Sep 26 10:46:15 2017 +0300
Committer: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
Committed: Tue Sep 26 10:46:15 2017 +0300
----------------------------------------------------------------------
.../src/main/flex/org/apache/flex/utils/MockLayoutParent.as | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8648c6fa/frameworks/projects/Effects/src/main/flex/org/apache/flex/utils/MockLayoutParent.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Effects/src/main/flex/org/apache/flex/utils/MockLayoutParent.as b/frameworks/projects/Effects/src/main/flex/org/apache/flex/utils/MockLayoutParent.as
index a07a1d4..562ba1e 100644
--- a/frameworks/projects/Effects/src/main/flex/org/apache/flex/utils/MockLayoutParent.as
+++ b/frameworks/projects/Effects/src/main/flex/org/apache/flex/utils/MockLayoutParent.as
@@ -43,6 +43,7 @@ package org.apache.flex.utils
{
private var _layoutHost:ILayoutHost;
private var _source:ILayoutParent;
+ private var _parent:IParent;
public function MockLayoutParent(source:ILayoutParent)
{
_layoutHost = new MockLayoutHost(source.getLayoutHost());
@@ -61,8 +62,11 @@ package org.apache.flex.utils
public function get parent():IParent
{
- // TODO Auto Generated method stub
- return null;
+ if (!_parent)
+ {
+ _parent = new MockParent();
+ }
+ return _parent;
}
Re: [3/4] git commit: [flex-asjs] [refs/heads/develop] - Allow drag
and drop item renderers to be more that simpkle labels.
Posted by Piotr Zarzycki <pi...@gmail.com>.
Yishay,
Thank you! I found that the docs when I'm doing something with unknown
components helped me to get an idea how to use it. That is why I'm pushing
about that whenever I can. Btw. I like this new name for the function. :)
Piotr
2017-09-27 16:29 GMT+02:00 yishayw <yi...@hotmail.com>:
> Thanks Piotr, done. Time to get docs in better shape.
>
>
>
> --
> Sent from: http://apache-flex-development.2333347.n4.nabble.com/
>
--
Piotr Zarzycki
mobile: +48 880 859 557
skype: zarzycki10
LinkedIn: http://www.linkedin.com/piotrzarzycki
<https://pl.linkedin.com/in/piotr-zarzycki-92a53552>
GitHub: https://github.com/piotrzarzycki21
Re: [3/4] git commit: [flex-asjs] [refs/heads/develop] - Allow drag
and drop item renderers to be more that simpkle labels.
Posted by yishayw <yi...@hotmail.com>.
Thanks Piotr, done. Time to get docs in better shape.
--
Sent from: http://apache-flex-development.2333347.n4.nabble.com/
Re: [3/4] git commit: [flex-asjs] [refs/heads/develop] - Allow drag
and drop item renderers to be more that simpkle labels.
Posted by Piotr Zarzycki <pi...@gmail.com>.
Hi Yishay,
Could you please add some description for getByType function with version
information etc.
Thanks,
Piotr
2017-09-27 11:11 GMT+02:00 Yishay Weiss <yi...@hotmail.com>:
> Possibly. Which part adds overhead in your opinion?
>
> From: Justin Mclean<ma...@me.com>
> Sent: Wednesday, September 27, 2017 11:59 AM
> To: dev@flex.apache.org<ma...@flex.apache.org>
> Subject: Re: [3/4] git commit: [flex-asjs] [refs/heads/develop] - Allow
> drag and drop item renderers to be more that simpkle labels.
>
> Hi,
>
> This doesn’t look very PAYG to me. Wouldn’t the code be better off in
> another class?
>
> Thanks,
> Justin
>
>
--
Piotr Zarzycki
mobile: +48 880 859 557
skype: zarzycki10
LinkedIn: http://www.linkedin.com/piotrzarzycki
<https://pl.linkedin.com/in/piotr-zarzycki-92a53552>
GitHub: https://github.com/piotrzarzycki21
RE: [3/4] git commit: [flex-asjs] [refs/heads/develop] - Allow drag
and drop item renderers to be more that simpkle labels.
Posted by Yishay Weiss <yi...@hotmail.com>.
There’s no change in PAYG rules. My guideline was to not add anything significant to runtime cost or download size by enhancing the bead. I may have missed something, so if there’s a specific line number that you see which is adding to either of those please let me know.
We did have a concern regarding elements being swapped In runtime, but that is fixed in 95922ad776e39208e3d515bd7a484219779271d1.
Thanks.
From: Justin Mclean<ma...@me.com>
Sent: Friday, September 29, 2017 4:22 AM
To: dev@flex.apache.org<ma...@flex.apache.org>
Subject: Re: [3/4] git commit: [flex-asjs] [refs/heads/develop] - Allow drag and drop item renderers to be more that simpkle labels.
Hi,
> Possibly. Which part adds overhead in your opinion?
In that it a feature that not all users may use that's being implemented by conditional logic so it adds to both run time and possibly size cost. While that cost would be small in the past on the Flex list code similar to this has been called out as not PAYG and it’s been suggested to move it to a new class. It may however be that PAYG is now less strict and that adding new features in this way is now acceptable?
Thanks,
Justin
Re: [3/4] git commit: [flex-asjs] [refs/heads/develop] - Allow drag
and drop item renderers to be more that simpkle labels.
Posted by Justin Mclean <ju...@me.com>.
Hi,
> Possibly. Which part adds overhead in your opinion?
In that it a feature that not all users may use that's being implemented by conditional logic so it adds to both run time and possibly size cost. While that cost would be small in the past on the Flex list code similar to this has been called out as not PAYG and it’s been suggested to move it to a new class. It may however be that PAYG is now less strict and that adding new features in this way is now acceptable?
Thanks,
Justin
RE: [3/4] git commit: [flex-asjs] [refs/heads/develop] - Allow drag
and drop item renderers to be more that simpkle labels.
Posted by Yishay Weiss <yi...@hotmail.com>.
Possibly. Which part adds overhead in your opinion?
From: Justin Mclean<ma...@me.com>
Sent: Wednesday, September 27, 2017 11:59 AM
To: dev@flex.apache.org<ma...@flex.apache.org>
Subject: Re: [3/4] git commit: [flex-asjs] [refs/heads/develop] - Allow drag and drop item renderers to be more that simpkle labels.
Hi,
This doesn’t look very PAYG to me. Wouldn’t the code be better off in another class?
Thanks,
Justin
Re: [3/4] git commit: [flex-asjs] [refs/heads/develop] - Allow drag
and drop item renderers to be more that simpkle labels.
Posted by Justin Mclean <ju...@me.com>.
Hi,
This doesn’t look very PAYG to me. Wouldn’t the code be better off in another class?
Thanks,
Justin
[3/4] git commit: [flex-asjs] [refs/heads/develop] - Allow drag and
drop item renderers to be more that simpkle labels.
Posted by yi...@apache.org.
Allow drag and drop item renderers to be more that simpkle labels.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/74100f07
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/74100f07
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/74100f07
Branch: refs/heads/develop
Commit: 74100f07d7b084f836cb10f401579e395349820c
Parents: 157927e
Author: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
Authored: Wed Sep 27 11:41:22 2017 +0300
Committer: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
Committed: Wed Sep 27 11:41:22 2017 +0300
----------------------------------------------------------------------
.../projects/Core/src/main/flex/CoreClasses.as | 1 +
.../flex/org/apache/flex/utils/getByType.as | 39 +++++++++++++++++
.../html/beads/SingleSelectionDragImageBead.as | 46 ++++++++++++--------
.../html/beads/SingleSelectionDragSourceBead.as | 16 +++----
4 files changed, 76 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/74100f07/frameworks/projects/Core/src/main/flex/CoreClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/CoreClasses.as b/frameworks/projects/Core/src/main/flex/CoreClasses.as
index e616bb1..8654fb5 100644
--- a/frameworks/projects/Core/src/main/flex/CoreClasses.as
+++ b/frameworks/projects/Core/src/main/flex/CoreClasses.as
@@ -175,6 +175,7 @@ internal class CoreClasses
}
import org.apache.flex.utils.BrowserUtils; BrowserUtils;
import org.apache.flex.utils.callLater; callLater;
+ import org.apache.flex.utils.getByType; getByType;
import org.apache.flex.utils.CompressionUtils; CompressionUtils;
import org.apache.flex.utils.Endian; Endian;
import org.apache.flex.utils.JXON; JXON;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/74100f07/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/getByType.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/getByType.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/getByType.as
new file mode 100644
index 0000000..6d9f9d6
--- /dev/null
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/getByType.as
@@ -0,0 +1,39 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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 org.apache.flex.utils
+{
+ import org.apache.flex.core.IChild;
+
+ public function getByType(startChild:IChild, classOrInterface:Class):Object
+ {
+ while (startChild)
+ {
+ if (startChild is classOrInterface)
+ {
+ return startChild;
+ }
+ if (startChild.parent is classOrInterface)
+ {
+ return startChild.parent;
+ }
+ startChild = startChild.parent as IChild;
+ }
+ return null;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/74100f07/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/SingleSelectionDragImageBead.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/SingleSelectionDragImageBead.as b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/SingleSelectionDragImageBead.as
index 70effee..91b704e 100644
--- a/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/SingleSelectionDragImageBead.as
+++ b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/SingleSelectionDragImageBead.as
@@ -18,8 +18,10 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.html.beads
{
+
import org.apache.flex.collections.ArrayList;
import org.apache.flex.core.IBead;
+ import org.apache.flex.core.IChild;
import org.apache.flex.core.IDataProviderModel;
import org.apache.flex.core.IDocument;
import org.apache.flex.core.IDragInitiator;
@@ -41,6 +43,12 @@ package org.apache.flex.html.beads
import org.apache.flex.html.Label;
import org.apache.flex.html.beads.controllers.DragMouseController;
import org.apache.flex.utils.PointUtils;
+ import org.apache.flex.utils.getByType;
+
+ COMPILE::JS
+ {
+ import org.apache.flex.core.WrappedHTMLElement;
+ }
/**
@@ -92,6 +100,7 @@ package org.apache.flex.html.beads
* @param ir IItemRenderer The itemRenderer to be used as a template.
* @return UIBase The "dragImage" to use.
*
+ * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
@@ -103,40 +112,43 @@ package org.apache.flex.html.beads
dragImage.className = "DragImage";
dragImage.width = (ir as IUIBase).width;
dragImage.height = (ir as IUIBase).height;
-
- var label:Label = new Label();
- if (ir is ISelectableItemRenderer) {
- var selIR:ISelectableItemRenderer = ir as ISelectableItemRenderer;
- if (selIR.labelField != null && selIR.data != null) {
- label.text = selIR.data[selIR.labelField].toString();
- } else {
- label.text = selIR.data.toString();
+ COMPILE::SWF
+ {
+ var label:Label = new Label();
+ if (ir is ISelectableItemRenderer) {
+ var selIR:ISelectableItemRenderer = ir as ISelectableItemRenderer;
+ if (selIR.labelField != null && selIR.data != null) {
+ label.text = selIR.data[selIR.labelField].toString();
+ } else {
+ label.text = selIR.data.toString();
+ }
+ }
+ dragImage.addElement(label);
}
- }
COMPILE::JS {
+ var clone:UIBase = new UIBase();
+ clone.element = clone.positioner = ir.element.cloneNode(true) as WrappedHTMLElement;
+ clone.element.flexjs_wrapper = clone;
+ dragImage.addElement(clone);
dragImage.element.style.position = 'absolute';
dragImage.element.style.cursor = 'pointer';
}
- dragImage.addElement(label);
-
return dragImage;
}
/**
* @private
+ *
*/
private function handleDragStart(event:DragEvent):void
{
trace("SingleSelectionDragImageBead received the DragStart via: "+event.target.toString());
- var startHere:Object = event.target;
-
- if (startHere is IItemRenderer) {
- var ir:IItemRenderer = startHere as IItemRenderer;
- //DragEvent.dragSource = ir.data;
- DragMouseController.dragImage = createDragImage(ir);
+ var renderer:IItemRenderer = getByType(event.target as IChild, IItemRenderer) as IItemRenderer;
+ if (renderer) {
+ DragMouseController.dragImage = createDragImage(renderer);
}
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/74100f07/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/SingleSelectionDragSourceBead.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/SingleSelectionDragSourceBead.as b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/SingleSelectionDragSourceBead.as
index 6a2d6f1..b38111f 100644
--- a/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/SingleSelectionDragSourceBead.as
+++ b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/SingleSelectionDragSourceBead.as
@@ -20,13 +20,13 @@ package org.apache.flex.html.beads
{
import org.apache.flex.collections.ArrayList;
import org.apache.flex.core.IBead;
+ import org.apache.flex.core.IChild;
import org.apache.flex.core.IDataProviderModel;
import org.apache.flex.core.IDocument;
import org.apache.flex.core.IDragInitiator;
import org.apache.flex.core.IItemRenderer;
import org.apache.flex.core.IItemRendererParent;
import org.apache.flex.core.IParent;
- import org.apache.flex.core.IChild;
import org.apache.flex.core.IStrand;
import org.apache.flex.core.IUIBase;
import org.apache.flex.core.UIBase;
@@ -42,6 +42,7 @@ package org.apache.flex.html.beads
import org.apache.flex.html.supportClasses.DataItemRenderer;
import org.apache.flex.utils.PointUtils;
import org.apache.flex.utils.UIUtils;
+ import org.apache.flex.utils.getByType;
/**
@@ -125,15 +126,12 @@ package org.apache.flex.html.beads
DragMouseController.dragImageOffsetX = 0;
DragMouseController.dragImageOffsetY = -30;
- var startHere:Object = event.target;
- while (!(startHere is IItemRenderer) && startHere != null) {
- startHere = startHere.itemRendererParent;
- }
+ var itemRenderer:IItemRenderer = getByType(event.target as IChild, IItemRenderer) as IItemRenderer;
- if (startHere is IItemRenderer) {
- var p:UIBase = startHere.itemRendererParent as UIBase;
- indexOfDragSource = p.getElementIndex(startHere as IChild);
- DragEvent.dragSource = (startHere as IItemRenderer).data;
+ if (itemRenderer) {
+ var p:UIBase = itemRenderer.itemRendererParent as UIBase;
+ indexOfDragSource = p.getElementIndex(itemRenderer as IChild);
+ DragEvent.dragSource = (itemRenderer as IItemRenderer).data;
}
}
[4/4] git commit: [flex-asjs] [refs/heads/develop] - Merge branch
'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into develop
Posted by yi...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/90886a1d
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/90886a1d
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/90886a1d
Branch: refs/heads/develop
Commit: 90886a1dc49f7c9b2249a6952d9aa6e84a007124
Parents: 74100f0 64e9f0c
Author: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
Authored: Wed Sep 27 11:42:22 2017 +0300
Committer: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
Committed: Wed Sep 27 11:42:22 2017 +0300
----------------------------------------------------------------------
.../ASDoc/src/main/config/asdoc-config.xml | 23 +++++++++++++++++++-
.../ASDoc/src/main/flex/ASDocMainView.mxml | 12 +++++-----
2 files changed, 28 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[2/4] git commit: [flex-asjs] [refs/heads/develop] - Merge branch
'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into develop
Posted by yi...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/157927e3
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/157927e3
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/157927e3
Branch: refs/heads/develop
Commit: 157927e3a28c1c7740d91c43a303a41dd87b5689
Parents: 8648c6f 49585ec
Author: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
Authored: Tue Sep 26 11:01:35 2017 +0300
Committer: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
Committed: Tue Sep 26 11:01:35 2017 +0300
----------------------------------------------------------------------
examples/build.xml | 3 +
examples/express/DataGridExample/README.txt | 30 ++
examples/express/DataGridExample/build.xml | 66 ++++
examples/express/DataGridExample/pom.xml | 62 ++++
.../src/main/flex/DataGridExample.mxml | 36 ++
.../src/main/flex/MyInitialView.mxml | 67 ++++
.../src/main/flex/models/ProductsModel.as | 52 +++
.../src/main/flex/products/Product.as | 43 +++
.../main/flex/products/ProductItemRenderer.as | 66 ++++
.../src/main/resources/assets/smallbluerect.jpg | Bin 0 -> 13500 bytes
.../main/resources/assets/smallgreenrect.jpg | Bin 0 -> 13542 bytes
.../main/resources/assets/smallorangerect.gif | Bin 0 -> 821 bytes
.../main/resources/assets/smallorangerect.jpg | Bin 0 -> 13571 bytes
.../main/resources/assets/smallpurplerect.jpg | Bin 0 -> 13517 bytes
.../src/main/resources/assets/smallredrect.jpg | Bin 0 -> 13477 bytes
.../main/resources/assets/smallyellowrect.jpg | Bin 0 -> 13598 bytes
.../src/main/flex/MyInitialView.mxml | 36 +-
frameworks/downloads.xml | 2 +
.../org/apache/flex/html/beads/DataGridView.as | 131 +++----
.../TextItemRendererFactoryForArrayData.as | 62 ++--
.../beads/models/ArrayListSelectionModel.as | 4 +-
.../html/beads/models/ArraySelectionModel.as | 4 +-
.../flex/html/beads/models/DataGridModel.as | 46 ++-
.../html/supportClasses/DataGridColumnList.as | 2 +
.../supportClasses/TextButtonItemRenderer.as | 77 ++--
.../flex/org/apache/flex/core/IDataGridModel.as | 15 +-
.../DragDrop/src/main/flex/DragDropClasses.as | 14 +-
.../flex/html/beads/ButtonBarReorderBead.as | 368 +++++++++++++++++++
.../DataGridButtonBarViewForMovableColumns.as | 53 +++
.../html/beads/DataGridColumnReorderView.as | 100 +++++
.../beads/DataGridWithDrawingLayerLayout.as | 38 +-
.../apache/flex/html/beads/DragDropListView.as | 35 +-
.../html/beads/SingleSelectionDragImageBead.as | 58 +--
.../html/beads/SingleSelectionDragSourceBead.as | 73 ++--
.../html/beads/SingleSelectionDropTargetBead.as | 187 +++++-----
.../src/main/resources/basic-manifest.xml | 4 +
.../Express/src/main/flex/ExpressClasses.as | 1 +
.../flex/org/apache/flex/express/DataGrid.as | 49 +++
.../Express/src/main/resources/defaults.css | 4 +
.../src/main/resources/express-manifest.xml | 6 +-
frameworks/projects/XML/src/main/flex/XML.as | 314 +++++++++++-----
.../src/marmotinni/DispatchMouseClickEvent.java | 6 +-
42 files changed, 1685 insertions(+), 429 deletions(-)
----------------------------------------------------------------------