[Harbs/TLF-Table-Work] 0e384f: Delete CNAME
Branch: refs/heads/master Home: https://github.com/Harbs/TLF-Table-Work Commit: 0e384f5723ac0f8c509e1bb5a5da1c67867f9a82 https://github.com/Harbs/TLF-Table-Work/commit/0e384f5723ac0f8c509e1bb5a5da1c67867f9a82 Author: Harbs <ha...@in-tools.com> Date: 2017-10-04 (Wed, 04 Oct 2017) Changed paths: R CNAME Log Message: --- Delete CNAME
[Harbs/TLF-Table-Work] 278605: Create CNAME
Branch: refs/heads/master Home: https://github.com/Harbs/TLF-Table-Work Commit: 278605e03d44d9f10fde68da138d9f6b160ac872 https://github.com/Harbs/TLF-Table-Work/commit/278605e03d44d9f10fde68da138d9f6b160ac872 Author: Harbs <ha...@in-tools.com> Date: 2017-10-04 (Wed, 04 Oct 2017) Changed paths: A CNAME Log Message: --- Create CNAME
[7/8] git commit: [flex-asjs] [refs/heads/feature/flexjs_wrapper] - Merge branch 'develop' into feature/flexjs_wrapper
Merge branch 'develop' into feature/flexjs_wrapper * develop: Adds missing dependency for commit 8648c6faf4819be6469c03ed4e8d516be7ecd75d Allow drag and drop item renderers to be more that simpkle labels. revert 235ce5860bafe7de1a5aa2ed92ea10ee1aa07674. It caused TopContainer to actually have 0 height in Safari 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/72303bcb Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/72303bcb Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/72303bcb Branch: refs/heads/feature/flexjs_wrapper Commit: 72303bcba0e9770b1383078a58a8f9e02de6f43c Parents: 609f10d 1be5293 Author: Harbs <ha...@in-tools.com> Authored: Wed Sep 27 13:20:15 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Wed Sep 27 13:20:15 2017 +0300 -- .../ASDoc/src/main/flex/ASDocMainView.mxml | 12 ++-- .../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 ++--- .../org/apache/flex/utils/MockLayoutParent.as | 8 ++- .../flex/org/apache/flex/utils/MockParent.as| 69 7 files changed, 157 insertions(+), 34 deletions(-) --
[2/8] git commit: [flex-asjs] [refs/heads/feature/flexjs_wrapper] - Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into develop
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/feature/flexjs_wrapper Commit: 157927e3a28c1c7740d91c43a303a41dd87b5689 Parents: 8648c6f 49585ec Author: DESKTOP-RH4S838\YishayAuthored: Tue Sep 26 11:01:35 2017 +0300 Committer: DESKTOP-RH4S838\Yishay 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(-) --
[6/8] git commit: [flex-asjs] [refs/heads/feature/flexjs_wrapper] - Adds missing dependency for commit 8648c6faf4819be6469c03ed4e8d516be7ecd75d
Adds missing dependency for commit 8648c6faf4819be6469c03ed4e8d516be7ecd75d Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/1be52939 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/1be52939 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/1be52939 Branch: refs/heads/feature/flexjs_wrapper Commit: 1be5293930cbe841ca45d2bf212602c0e7393382 Parents: 90886a1 Author: DESKTOP-RH4S838\YishayAuthored: Wed Sep 27 12:42:42 2017 +0300 Committer: DESKTOP-RH4S838\Yishay Committed: Wed Sep 27 12:42:42 2017 +0300 -- .../flex/org/apache/flex/utils/MockParent.as| 69 1 file changed, 69 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1be52939/frameworks/projects/Effects/src/main/flex/org/apache/flex/utils/MockParent.as -- diff --git a/frameworks/projects/Effects/src/main/flex/org/apache/flex/utils/MockParent.as b/frameworks/projects/Effects/src/main/flex/org/apache/flex/utils/MockParent.as new file mode 100644 index 000..8ed2027 --- /dev/null +++ b/frameworks/projects/Effects/src/main/flex/org/apache/flex/utils/MockParent.as @@ -0,0 +1,69 @@ + +// +// 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; + import org.apache.flex.core.IParent; + import org.apache.flex.events.EventDispatcher; + + public class MockParent extends EventDispatcher implements IParent + { + public function MockParent() + { + super(); + } + + public function addElement(c:IChild, dispatchEvent:Boolean=true):void + { + // TODO Auto Generated method stub + + } + + public function addElementAt(c:IChild, index:int, dispatchEvent:Boolean=true):void + { + // TODO Auto Generated method stub + + } + + public function getElementAt(index:int):IChild + { + // TODO Auto Generated method stub + return null; + } + + public function getElementIndex(c:IChild):int + { + // TODO Auto Generated method stub + return 0; + } + + public function get numElements():int + { + // TODO Auto Generated method stub + return 0; + } + + public function removeElement(c:IChild, dispatchEvent:Boolean=true):void + { + // TODO Auto Generated method stub + + } + + } +}
[4/8] git commit: [flex-asjs] [refs/heads/feature/flexjs_wrapper] - Allow drag and drop item renderers to be more that simpkle labels.
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/feature/flexjs_wrapper Commit: 74100f07d7b084f836cb10f401579e395349820c Parents: 157927e Author: DESKTOP-RH4S838\YishayAuthored: Wed Sep 27 11:41:22 2017 +0300 Committer: DESKTOP-RH4S838\Yishay 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 000..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 @@
[3/8] git commit: [flex-asjs] [refs/heads/feature/flexjs_wrapper] - revert 235ce5860bafe7de1a5aa2ed92ea10ee1aa07674. It caused TopContainer to actually have 0 height in Safari
revert 235ce5860bafe7de1a5aa2ed92ea10ee1aa07674. It caused TopContainer to actually have 0 height in Safari Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/64e9f0c0 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/64e9f0c0 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/64e9f0c0 Branch: refs/heads/feature/flexjs_wrapper Commit: 64e9f0c08761e9b1201568ed6b5e1a163cb0ccdf Parents: 21be9bc Author: Alex HaruiAuthored: Tue Sep 26 12:40:14 2017 -0700 Committer: Alex Harui Committed: Tue Sep 26 12:40:14 2017 -0700 -- examples/flexjs/ASDoc/src/main/flex/ASDocMainView.mxml | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/64e9f0c0/examples/flexjs/ASDoc/src/main/flex/ASDocMainView.mxml -- diff --git a/examples/flexjs/ASDoc/src/main/flex/ASDocMainView.mxml b/examples/flexjs/ASDoc/src/main/flex/ASDocMainView.mxml index 4df58a6..d1b7158 100644 --- a/examples/flexjs/ASDoc/src/main/flex/ASDocMainView.mxml +++ b/examples/flexjs/ASDoc/src/main/flex/ASDocMainView.mxml @@ -59,19 +59,19 @@ limitations under the License. - + - + - + - + - + @@ -81,7 +81,7 @@ limitations under the License. - +
[1/8] git commit: [flex-asjs] [refs/heads/feature/flexjs_wrapper] - Add a parent to mock layout parent as there's a RTE otherwise in EasyAccordionBead
Repository: flex-asjs Updated Branches: refs/heads/feature/flexjs_wrapper 609f10da1 -> ad9458ee7 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/feature/flexjs_wrapper Commit: 8648c6faf4819be6469c03ed4e8d516be7ecd75d Parents: 814b90d Author: DESKTOP-RH4S838\YishayAuthored: Tue Sep 26 10:46:15 2017 +0300 Committer: DESKTOP-RH4S838\Yishay 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; }
[8/8] git commit: [flex-asjs] [refs/heads/feature/flexjs_wrapper] - Added UIElement and Lookalike
Added UIElement and Lookalike Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ad9458ee Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ad9458ee Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ad9458ee Branch: refs/heads/feature/flexjs_wrapper Commit: ad9458ee7e671e574ee77993c65ba6a09748ff9d Parents: 72303bc Author: Harbs <ha...@in-tools.com> Authored: Wed Sep 27 13:21:15 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Wed Sep 27 13:21:15 2017 +0300 -- .../Basic/src/main/flex/BasicClasses.as | 5 ++ .../main/flex/org/apache/flex/core/Lookalike.as | 53 .../main/flex/org/apache/flex/core/UIElement.as | 33 3 files changed, 91 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ad9458ee/frameworks/projects/Basic/src/main/flex/BasicClasses.as -- diff --git a/frameworks/projects/Basic/src/main/flex/BasicClasses.as b/frameworks/projects/Basic/src/main/flex/BasicClasses.as index 9abaf14..4a86307 100644 --- a/frameworks/projects/Basic/src/main/flex/BasicClasses.as +++ b/frameworks/projects/Basic/src/main/flex/BasicClasses.as @@ -202,8 +202,13 @@ internal class BasicClasses import org.apache.flex.html.beads.models.WebBrowserModel; WebBrowserModel; import org.apache.flex.core.ListBase; ListBase; + import org.apache.flex.core.Lookalike; Lookalike; import org.apache.flex.core.FilledRectangle; FilledRectangle; import org.apache.flex.core.UIBase; UIBase; + COMPILE::JS + { + import org.apache.flex.core.UIElement; UIElement; + } import org.apache.flex.core.SimpleApplication; SimpleApplication; import org.apache.flex.svg.GraphicContainer; GraphicContainer; import org.apache.flex.svg.DOMWrapper; DOMWrapper; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ad9458ee/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Lookalike.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Lookalike.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Lookalike.as new file mode 100644 index 000..3a54cd9 --- /dev/null +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Lookalike.as @@ -0,0 +1,53 @@ +package org.apache.flex.core +{ +COMPILE::SWF +{ +import flash.display.BitmapData; +import flash.display.DisplayObject; +import flash.display.Bitmap; +} + +/** + * The UIElement class Takes an IRenderedObject and creates a new UIBase + * which has the *appearance* of the original object. + * It *does not* have any of the orginal object's functionality. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.9 + */ + +public class Lookalike extends UIBase +{ +/** + * Constructor. + * + * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.9 + */ +public function Lookalike(original:IRenderedObject) +{ +COMPILE::SWF +{ +var dObj:DisplayObject = original.$displayObject; + var bd:BitmapData = new BitmapData(dObj.width,dObj.height); + bd.draw(dObj); +addChild(new Bitmap(bd)); +} +COMPILE::JS +{ +element = original.element.cloneNode(true) as WrappedHTMLElement; +} +super(); +} +COMPILE::JS +override protected function createElement():WrappedHTMLElement +{ +return element; +} +} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ad9458ee/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIElement.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIElement.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIElement.as new file mode 100644 index 000..1f42d2d --- /dev/null +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIElement.as @@ -0,0 +1,33 @@ +package org.apache.flex.core +{ +/** + * The UIElement class is an HTML-only class which creates a UIBase wrapper around an HTML element. + * The constructor accepts an HTMLElement
git commit: [flex-asjs] [refs/heads/feature/flexjs_wrapper] - missed some changes
Repository: flex-asjs Updated Branches: refs/heads/feature/flexjs_wrapper 47c718619 -> 609f10da1 missed some changes Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/609f10da Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/609f10da Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/609f10da Branch: refs/heads/feature/flexjs_wrapper Commit: 609f10da1ff63502167825d827827b495fead068 Parents: 47c7186 Author: Harbs <ha...@in-tools.com> Authored: Wed Sep 27 00:28:24 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Wed Sep 27 00:28:24 2017 +0300 -- .../Basic/src/main/flex/org/apache/flex/core/UIBase.as| 7 ++- .../Core/src/main/flex/org/apache/flex/core/ElementWrapper.as | 1 + .../projects/HTML/src/main/resources/basic-manifest.xml | 2 ++ 3 files changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/609f10da/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as index 8e11974..fa773a7 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as @@ -1479,16 +1479,13 @@ package org.apache.flex.core dispatchEvent(event); } -COMPILE::JS -private var _positioner:WrappedHTMLElement; - /** * The HTMLElement used to position the component. */ COMPILE::JS public function get positioner():WrappedHTMLElement { -return _positioner; +return element; } /** @@ -1497,7 +1494,7 @@ package org.apache.flex.core COMPILE::JS public function set positioner(value:WrappedHTMLElement):void { -_positioner = value; +element = value; } /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/609f10da/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ElementWrapper.as -- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ElementWrapper.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ElementWrapper.as index 61c48f2..03d77e3 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ElementWrapper.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ElementWrapper.as @@ -228,6 +228,7 @@ package org.apache.flex.core public function set element(value:WrappedHTMLElement):void { _element = value; +_element.flexjs_wrapper = this; } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/609f10da/frameworks/projects/HTML/src/main/resources/basic-manifest.xml -- diff --git a/frameworks/projects/HTML/src/main/resources/basic-manifest.xml b/frameworks/projects/HTML/src/main/resources/basic-manifest.xml index 67b248f..428a6a8 100644 --- a/frameworks/projects/HTML/src/main/resources/basic-manifest.xml +++ b/frameworks/projects/HTML/src/main/resources/basic-manifest.xml @@ -28,10 +28,12 @@ + +
flex-asjs git commit: And HTML (with a couple of extra elements — still needs work)…
Repository: flex-asjs Updated Branches: refs/heads/feature/flexjs_wrapper 02655c9aa -> 4897085b8 And HTML (with a couple of extra elements â still needs work)⦠Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/4897085b Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/4897085b Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/4897085b Branch: refs/heads/feature/flexjs_wrapper Commit: 4897085b82a9a60fbaefa765971bd2bb1f8bcf4e Parents: 02655c9 Author: Harbs <ha...@in-tools.com> Authored: Tue Sep 26 21:48:50 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Tue Sep 26 21:48:50 2017 +0300 -- .../src/main/flex/org/apache/flex/html/A.as | 9 +- .../src/main/flex/org/apache/flex/html/H1.as| 10 +- .../src/main/flex/org/apache/flex/html/H2.as| 10 +- .../src/main/flex/org/apache/flex/html/H3.as| 10 +- .../src/main/flex/org/apache/flex/html/H4.as| 10 +- .../src/main/flex/org/apache/flex/html/H5.as| 10 +- .../src/main/flex/org/apache/flex/html/H6.as| 10 +- .../main/flex/org/apache/flex/html/HTMLText.as | 5 +- .../src/main/flex/org/apache/flex/html/I.as | 8 +- .../src/main/flex/org/apache/flex/html/Input.as | 123 +++ .../src/main/flex/org/apache/flex/html/Li.as| 9 +- .../src/main/flex/org/apache/flex/html/Ol.as| 61 + .../main/flex/org/apache/flex/html/Option.as| 12 +- .../src/main/flex/org/apache/flex/html/P.as | 10 +- .../main/flex/org/apache/flex/html/Select.as| 10 +- .../src/main/flex/org/apache/flex/html/Span.as | 10 +- .../src/main/flex/org/apache/flex/html/Td.as| 10 +- .../src/main/flex/org/apache/flex/html/Th.as| 10 +- .../src/main/flex/org/apache/flex/html/Ul.as| 10 +- 19 files changed, 235 insertions(+), 112 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4897085b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/A.as -- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/A.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/A.as index 23c0cde..9f55127 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/A.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/A.as @@ -20,7 +20,8 @@ package org.apache.flex.html { COMPILE::JS { -import org.apache.flex.core.WrappedHTMLElement; +import org.apache.flex.core.WrappedHTMLElement; + import org.apache.flex.html.addElementToWrapper; } /** @@ -111,12 +112,8 @@ package org.apache.flex.html COMPILE::JS override protected function createElement():WrappedHTMLElement { -element = document.createElement('a') as WrappedHTMLElement; + addElementToWrapper(this,'a'); element.setAttribute('href', href); - -positioner = element; - element.flexjs_wrapper = this; - return element; } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4897085b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/H1.as -- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/H1.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/H1.as index 6a7d274..b969adc 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/H1.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/H1.as @@ -22,7 +22,8 @@ package org.apache.flex.html COMPILE::JS { -import org.apache.flex.core.WrappedHTMLElement; +import org.apache.flex.core.WrappedHTMLElement; + import org.apache.flex.html.addElementToWrapper; } /** @@ -94,15 +95,10 @@ package org.apache.flex.html COMPILE::JS override protected function createElement():WrappedHTMLElement { -element = document.createElement('h1') as WrappedHTMLElement; + addElementToWrapper(this,'h1'); textNode = document.createTextNode('') as Text; element.appendChild(textNode); - -positioner = element; - element.flexjs_wrapper = this; - -//className = typeNames = 'H1'; return element; } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4897085b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/H2.as -- diff --git a/frameworks/pr
git commit: [flex-asjs] [refs/heads/feature/flexjs_wrapper] - FontAwesome too
Repository: flex-asjs Updated Branches: refs/heads/feature/flexjs_wrapper ce4469e73 -> 02655c9aa FontAwesome too Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/02655c9a Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/02655c9a Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/02655c9a Branch: refs/heads/feature/flexjs_wrapper Commit: 02655c9aaedcf9bb3ffa7ab4d75ad8647b11f515 Parents: ce4469e Author: Harbs <ha...@in-tools.com> Authored: Tue Sep 26 21:45:36 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Tue Sep 26 21:45:36 2017 +0300 -- .../main/flex/org/apache/flex/fa/FontAwesomeIcon.as | 15 +-- 1 file changed, 5 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/02655c9a/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/FontAwesomeIcon.as -- diff --git a/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/FontAwesomeIcon.as b/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/FontAwesomeIcon.as index 5fd8192..94c9806 100644 --- a/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/FontAwesomeIcon.as +++ b/frameworks/projects/FontAwesome/src/main/flex/org/apache/flex/fa/FontAwesomeIcon.as @@ -22,7 +22,8 @@ package org.apache.flex.fa COMPILE::JS { -import org.apache.flex.core.WrappedHTMLElement; +import org.apache.flex.core.WrappedHTMLElement; +import org.apache.flex.html.addElementToWrapper; } /** @@ -69,24 +70,18 @@ package org.apache.flex.fa /** * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement -* @flexjsignorecoercion HTMLElement +* @flexjsignorecoercion Text */ COMPILE::JS override protected function createElement():WrappedHTMLElement { typeNames = "fa"; - var i:HTMLElement = document.createElement('i') as HTMLElement; + var i:WrappedHTMLElement = addElementToWrapper(this,'i'); textNode = document.createTextNode(iconType) as Text; textNode.textContent = ''; -i.appendChild(textNode); - - element = i as WrappedHTMLElement; - -positioner = element; - element.flexjs_wrapper = this; - +i.appendChild(textNode); return element; }
git commit: [flex-asjs] [refs/heads/feature/flexjs_wrapper] - Removed setting flexjs_wrapper from Flat
Repository: flex-asjs Updated Branches: refs/heads/feature/flexjs_wrapper 386dc04dd -> ce4469e73 Removed setting flexjs_wrapper from Flat Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ce4469e7 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ce4469e7 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ce4469e7 Branch: refs/heads/feature/flexjs_wrapper Commit: ce4469e7393550511b8500fbad97302f89aeee8f Parents: 386dc04 Author: Harbs <ha...@in-tools.com> Authored: Tue Sep 26 21:39:56 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Tue Sep 26 21:39:56 2017 +0300 -- .../main/flex/org/apache/flex/flat/CheckBox.as | 7 +--- .../flex/org/apache/flex/flat/DropDownList.as | 39 .../flex/org/apache/flex/flat/RadioButton.as| 8 ++-- 3 files changed, 21 insertions(+), 33 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ce4469e7/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/CheckBox.as -- diff --git a/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/CheckBox.as b/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/CheckBox.as index 497ea48..1c4a947 100644 --- a/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/CheckBox.as +++ b/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/CheckBox.as @@ -27,6 +27,7 @@ package org.apache.flex.flat import org.apache.flex.core.UIBase; import org.apache.flex.core.WrappedHTMLElement; import org.apache.flex.events.Event; +import org.apache.flex.html.addElementToWrapper; } /** @@ -87,8 +88,7 @@ package org.apache.flex.flat */ override protected function createElement():WrappedHTMLElement { -label = document.createElement('label') as HTMLLabelElement; -element = label as WrappedHTMLElement; +label = addElementToWrapper(this,'label') as HTMLLabelElement; input = document.createElement('input') as HTMLInputElement; input.type = 'checkbox'; @@ -107,12 +107,9 @@ package org.apache.flex.flat label.className = 'CheckBox'; typeNames = 'CheckBox'; -positioner = element; positioner.style.position = 'relative'; (input as WrappedHTMLElement).flexjs_wrapper = this; (checkbox as WrappedHTMLElement).flexjs_wrapper = this; -element.flexjs_wrapper = this; - return element; }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ce4469e7/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/DropDownList.as -- diff --git a/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/DropDownList.as b/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/DropDownList.as index 4e876e2..c80d6e6 100644 --- a/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/DropDownList.as +++ b/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/DropDownList.as @@ -27,6 +27,7 @@ package org.apache.flex.flat COMPILE::JS { import goog.events; +import org.apache.flex.html.addElementToWrapper; import org.apache.flex.html.List; import org.apache.flex.core.WrappedHTMLElement; import org.apache.flex.core.ISelectionModel; @@ -105,40 +106,32 @@ package org.apache.flex.flat */ override protected function createElement():WrappedHTMLElement { -var button:HTMLButtonElement; -var outer:HTMLDivElement; -var caret:HTMLSpanElement; - -this.element = document.createElement('div') as WrappedHTMLElement; -outer = this.element as HTMLDivElement; +addElementToWrapper(this,'div'); -this.button = button = document.createElement('button') as HTMLButtonElement; +button = document.createElement('button') as HTMLButtonElement; button.className = 'dropdown-toggle-open-btn'; if (this.className) button.className += ' ' + this.className; goog.events.listen(button, 'click', buttonClicked); -outer.appendChild(button); +element.appendChild(button); -this.label = document.createElement('span') as HTMLSpanElement; -this.label.className = 'dropdown-label'; +label = document.createElement('span') as HTMLSpanElement; +
git commit: [flex-asjs] [refs/heads/feature/flexjs_wrapper] - Removed code for setting flexjs_wrapper in CreateJS
Repository: flex-asjs Updated Branches: refs/heads/feature/flexjs_wrapper f00227649 -> 386dc04dd Removed code for setting flexjs_wrapper in CreateJS Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/386dc04d Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/386dc04d Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/386dc04d Branch: refs/heads/feature/flexjs_wrapper Commit: 386dc04dd35eb36f07bd54aba60c37c381314315 Parents: f002276 Author: Harbs <ha...@in-tools.com> Authored: Tue Sep 26 21:08:27 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Tue Sep 26 21:08:27 2017 +0300 -- .../src/main/flex/org/apache/flex/createjs/Application.as | 1 - .../src/main/flex/org/apache/flex/createjs/Container.as | 10 ++ .../src/main/flex/org/apache/flex/createjs/Label.as | 4 .../src/main/flex/org/apache/flex/createjs/TextButton.as | 3 +-- .../src/main/flex/org/apache/flex/createjs/core/UIBase.as | 3 --- .../src/main/flex/org/apache/flex/createjs/core/View.as | 10 ++ .../org/apache/flex/createjs/graphics/GraphicShape.as | 4 7 files changed, 5 insertions(+), 30 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/386dc04d/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Application.as -- diff --git a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Application.as b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Application.as index d778020..98b0e17 100644 --- a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Application.as +++ b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Application.as @@ -202,7 +202,6 @@ package org.apache.flex.createjs // and it provides convenient access to the stage. element = document.createElement('canvas') as WrappedHTMLElement; -element.flexjs_wrapper = this; canvas = element as HTMLCanvasElement; canvas.id = 'flexjsCanvas'; canvas.width = 700; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/386dc04d/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Container.as -- diff --git a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Container.as b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Container.as index 5b2ca3f..9314fac 100644 --- a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Container.as +++ b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Container.as @@ -98,18 +98,12 @@ package org.apache.flex.createjs */ override protected function createElement():WrappedHTMLElement { - if (element == null) { + if (!element) { var container:createjs.Container = new createjs.Container(); container.name = 'container'; element = container as WrappedHTMLElement; } - if (positioner == null) { - positioner = element; - } - - element.flexjs_wrapper = this; - - return positioner; + return element; } /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/386dc04d/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Label.as -- diff --git a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Label.as b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Label.as index 577e6da..be13bea 100644 --- a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Label.as +++ b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Label.as @@ -143,10 +143,6 @@ package org.apache.flex.createjs text.textBaseline = 'alphabetic'; element = text as WrappedHTMLElement; - element.flexjs_wrapper = this; - - positioner = element; - return element; } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/386dc04d/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createj
[2/2] git commit: [flex-asjs] [refs/heads/feature/flexjs_wrapper] - Removed the need to set flexjs_wrapper positioner is just a pointer to element unless needed to be separate Modified classes in Basi
Removed the need to set flexjs_wrapper positioner is just a pointer to element unless needed to be separate Modified classes in Basic and MDL to use addElementToWrapper() Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f0022764 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f0022764 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f0022764 Branch: refs/heads/feature/flexjs_wrapper Commit: f002276492e1b095ac27800e81e917eb1dcbb3a5 Parents: 49585ec Author: Harbs <ha...@in-tools.com> Authored: Tue Sep 26 20:52:47 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Tue Sep 26 20:52:47 2017 +0300 -- .../flex/org/apache/flex/core/Application.as| 1 - .../main/flex/org/apache/flex/core/GroupBase.as | 12 - .../org/apache/flex/core/HTMLElementWrapper.as | 1 + .../org/apache/flex/core/SimpleApplication.as | 5 ++-- .../main/flex/org/apache/flex/core/UIBase.as| 12 +++-- .../main/flex/org/apache/flex/html/ButtonBar.as | 9 +-- .../flex/org/apache/flex/html/ButtonBase.as | 7 + .../flex/org/apache/flex/html/CSSCheckBox.as| 5 +--- .../main/flex/org/apache/flex/html/CheckBox.as | 6 + .../flex/org/apache/flex/html/ControlBar.as | 5 +--- .../flex/org/apache/flex/html/DropDownList.as | 8 +- .../src/main/flex/org/apache/flex/html/Form.as | 8 +- .../src/main/flex/org/apache/flex/html/HRule.as | 6 + .../src/main/flex/org/apache/flex/html/Image.as | 7 + .../org/apache/flex/html/ImageAndTextButton.as | 7 + .../flex/org/apache/flex/html/ImageButton.as| 7 + .../src/main/flex/org/apache/flex/html/Label.as | 4 +-- .../flex/org/apache/flex/html/MultilineLabel.as | 4 +-- .../flex/org/apache/flex/html/NumericStepper.as | 7 + .../flex/org/apache/flex/html/RadioButton.as| 7 + .../flex/org/apache/flex/html/SimpleList.as | 6 + .../main/flex/org/apache/flex/html/Slider.as| 8 +- .../main/flex/org/apache/flex/html/Spacer.as| 13 - .../main/flex/org/apache/flex/html/Spinner.as | 6 + .../src/main/flex/org/apache/flex/html/Table.as | 7 + .../main/flex/org/apache/flex/html/TableCell.as | 7 + .../flex/org/apache/flex/html/TableHeader.as| 7 + .../main/flex/org/apache/flex/html/TableRow.as | 7 + .../main/flex/org/apache/flex/html/TextArea.as | 8 +- .../flex/org/apache/flex/html/TextButton.as | 3 +-- .../main/flex/org/apache/flex/html/TextInput.as | 7 + .../main/flex/org/apache/flex/html/TitleBar.as | 7 + .../main/flex/org/apache/flex/html/ToolTip.as | 2 +- .../src/main/flex/org/apache/flex/html/VRule.as | 17 +--- .../flex/org/apache/flex/html/WebBrowser.as | 9 ++- .../org/apache/flex/html/addElementToWrapper.as | 3 +-- .../flex/html/supportClasses/CheckBoxIcon.as| 6 - .../html/supportClasses/DataItemRenderer.as | 8 ++ .../flex/html/supportClasses/RadioButtonIcon.as | 17 ++-- .../html/supportClasses/StringItemRenderer.as | 6 - .../main/flex/org/apache/flex/svg/DOMWrapper.as | 4 --- .../org/apache/flex/svg/GraphicContainer.as | 7 - .../flex/org/apache/flex/svg/GraphicShape.as| 4 --- .../src/main/flex/org/apache/flex/svg/Image.as | 3 --- .../flex/org/apache/flex/core/ElementWrapper.as | 1 + .../apache/flex/core/UIHTMLElementWrapper.as| 7 ++--- .../main/flex/org/apache/flex/events/Event.as | 5 ++-- .../flex/org/apache/flex/events/MouseEvent.as | 5 ++-- .../src/main/flex/org/apache/flex/mdl/Button.as | 8 ++ .../main/flex/org/apache/flex/mdl/ButtonChip.as | 10 ++- .../src/main/flex/org/apache/flex/mdl/Card.as | 9 ++- .../flex/org/apache/flex/mdl/CardActions.as | 9 ++- .../main/flex/org/apache/flex/mdl/CardMedia.as | 9 ++- .../main/flex/org/apache/flex/mdl/CardMenu.as | 9 ++- .../org/apache/flex/mdl/CardSupportingText.as | 9 ++- .../main/flex/org/apache/flex/mdl/CardTitle.as | 9 ++- .../flex/org/apache/flex/mdl/CardTitleText.as | 10 +++ .../main/flex/org/apache/flex/mdl/CheckBox.as | 8 +++--- .../src/main/flex/org/apache/flex/mdl/Chip.as | 8 ++ .../src/main/flex/org/apache/flex/mdl/Dialog.as | 8 ++ .../flex/org/apache/flex/mdl/DialogActions.as | 9 ++- .../flex/org/apache/flex/mdl/DialogContent.as | 9 ++- .../flex/org/apache/flex/mdl/DialogTitle.as | 10 +++ .../src/main/flex/org/apache/flex/mdl/Drawer.as | 9 ++- .../flex/org/apache/flex/mdl/DropDownList.as| 10 +++ .../src/main/flex/org/apache/flex/mdl/Footer.as | 9 ++- .../org/apache/flex/mdl/FooterBottomSection.as | 9 ++- .../apache/flex/mdl/FooterDropDownSection.as| 9 ++- .../flex/org/apache/flex/mdl/FooterHeading.as | 10 +++ .../org/apa
[1/2] git commit: [flex-asjs] [refs/heads/feature/flexjs_wrapper] - Removed the need to set flexjs_wrapper positioner is just a pointer to element unless needed to be separate Modified classes in Basi
Repository: flex-asjs Updated Branches: refs/heads/feature/flexjs_wrapper [created] f00227649 http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f0022764/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterLeftSection.as -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterLeftSection.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterLeftSection.as index e4dab7a..ecffbe2 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterLeftSection.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterLeftSection.as @@ -24,6 +24,7 @@ package org.apache.flex.mdl COMPILE::JS { import org.apache.flex.core.WrappedHTMLElement; + import org.apache.flex.html.addElementToWrapper; } /** @@ -59,13 +60,7 @@ package org.apache.flex.mdl override protected function createElement():WrappedHTMLElement { typeNames = "mdl-mega-footer__left-section"; - -element = document.createElement('div') as WrappedHTMLElement; - - positioner = element; -element.flexjs_wrapper = this; - -return element; + return addElementToWrapper(this,'div'); } /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f0022764/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterLinkList.as -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterLinkList.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterLinkList.as index 970b4e3..d34d0b2 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterLinkList.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterLinkList.as @@ -23,7 +23,8 @@ package org.apache.flex.mdl COMPILE::JS { -import org.apache.flex.core.WrappedHTMLElement; +import org.apache.flex.core.WrappedHTMLElement; +import org.apache.flex.html.addElementToWrapper; } /** @@ -61,13 +62,7 @@ package org.apache.flex.mdl override protected function createElement():WrappedHTMLElement { typeNames = "mdl-mega-footer__link-list"; - -element = document.createElement('ul') as WrappedHTMLElement; - -positioner = element; -element.flexjs_wrapper = this; - -return positioner; + return addElementToWrapper(this,'ul'); } /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f0022764/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterLogo.as -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterLogo.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterLogo.as index 12f7b14..fbf1bb9 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterLogo.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterLogo.as @@ -23,6 +23,7 @@ package org.apache.flex.mdl COMPILE::JS { import org.apache.flex.core.WrappedHTMLElement; + import org.apache.flex.html.addElementToWrapper; } /** @@ -58,13 +59,7 @@ package org.apache.flex.mdl override protected function createElement():WrappedHTMLElement { typeNames = "mdl-logo"; - -element = document.createElement('div') as WrappedHTMLElement; - - positioner = element; -element.flexjs_wrapper = this; - -return element; + return addElementToWrapper(this,'div'); } /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f0022764/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterMiddleSection.as -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterMiddleSection.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterMiddleSection.as index de74530..6256b33 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterMiddleSection.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterMiddleSection.as @@ -24,6 +24,7 @@ package org.apache.flex.mdl COMPILE::JS {
git commit: [flex-asjs] [refs/heads/develop] - Added version info for method
Repository: flex-asjs Updated Branches: refs/heads/develop ccde57d11 -> 008ff2872 Added version info for method Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/008ff287 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/008ff287 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/008ff287 Branch: refs/heads/develop Commit: 008ff287264cd2561ae8489e9c892a4836915e15 Parents: ccde57d Author: Harbs <ha...@in-tools.com> Authored: Tue Sep 19 12:28:04 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Tue Sep 19 12:28:04 2017 +0300 -- frameworks/projects/XML/src/main/flex/XML.as | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/008ff287/frameworks/projects/XML/src/main/flex/XML.as -- diff --git a/frameworks/projects/XML/src/main/flex/XML.as b/frameworks/projects/XML/src/main/flex/XML.as index 229d5f6..ae88d61 100644 --- a/frameworks/projects/XML/src/main/flex/XML.as +++ b/frameworks/projects/XML/src/main/flex/XML.as @@ -60,12 +60,14 @@ package /** * Method to free up references to shared QName objects. * Probably only worth doing if most or all XML instances can be garbage-collected. +* @langversion 3.0 +* @productversion FlexJS 0.9 */ static public function clearQNameCache():void { _nameMap = {}; } - + static private var defaultNamespace:Namespace; static public function setDefaultNamespace(ns:*):void
[1/2] git commit: [flex-asjs] [refs/heads/develop] - Added method for garbage-collecting QNames
Repository: flex-asjs Updated Branches: refs/heads/develop b217e2760 -> ccde57d11 Added method for garbage-collecting QNames Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/6d63604c Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/6d63604c Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/6d63604c Branch: refs/heads/develop Commit: 6d63604cee888fe0c37f116ec8a781307bfe60e4 Parents: 94754e0 Author: Harbs <ha...@in-tools.com> Authored: Tue Sep 19 10:43:33 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Tue Sep 19 10:43:33 2017 +0300 -- frameworks/projects/XML/src/main/flex/XML.as | 10 ++ 1 file changed, 10 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6d63604c/frameworks/projects/XML/src/main/flex/XML.as -- diff --git a/frameworks/projects/XML/src/main/flex/XML.as b/frameworks/projects/XML/src/main/flex/XML.as index ccaa67f..229d5f6 100644 --- a/frameworks/projects/XML/src/main/flex/XML.as +++ b/frameworks/projects/XML/src/main/flex/XML.as @@ -56,6 +56,16 @@ package } return qname; } + + /** +* Method to free up references to shared QName objects. +* Probably only worth doing if most or all XML instances can be garbage-collected. +*/ + static public function clearQNameCache():void + { + _nameMap = {}; + } + static private var defaultNamespace:Namespace; static public function setDefaultNamespace(ns:*):void
[2/2] git commit: [flex-asjs] [refs/heads/develop] - Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into develop
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into develop * 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs: try to fix build. CI server gets a different version of GCL from the Falcon jenkins.xml Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ccde57d1 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ccde57d1 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ccde57d1 Branch: refs/heads/develop Commit: ccde57d110b1775b46cf9fc90a5fb6850fe8aa8d Parents: 6d63604 b217e27 Author: Harbs <ha...@in-tools.com> Authored: Tue Sep 19 11:34:55 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Tue Sep 19 11:34:55 2017 +0300 -- frameworks/downloads.xml | 2 ++ 1 file changed, 2 insertions(+) --
git commit: [flex-asjs] [refs/heads/develop] - Cleaned up import
Repository: flex-asjs Updated Branches: refs/heads/develop 4159881e9 -> 94754e00e Cleaned up import Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/94754e00 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/94754e00 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/94754e00 Branch: refs/heads/develop Commit: 94754e00e681616b7e94f6c8501b5a37b0bb9dc0 Parents: 4159881 Author: Harbs <ha...@in-tools.com> Authored: Tue Sep 19 09:19:55 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Tue Sep 19 09:19:55 2017 +0300 -- frameworks/projects/XML/src/main/flex/XML.as | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/94754e00/frameworks/projects/XML/src/main/flex/XML.as -- diff --git a/frameworks/projects/XML/src/main/flex/XML.as b/frameworks/projects/XML/src/main/flex/XML.as index 1c8946e..ccaa67f 100644 --- a/frameworks/projects/XML/src/main/flex/XML.as +++ b/frameworks/projects/XML/src/main/flex/XML.as @@ -23,7 +23,6 @@ package { import org.apache.flex.debugging.assert; import org.apache.flex.debugging.assertType; - import org.apache.flex.utils.ObjectMap; /* * Dealing with namespaces: * If the name is qualified, it has a prefix. Otherwise, the prefix is null. @@ -34,7 +33,7 @@ package /** * Memory optimization. * Creating a new QName for each XML instance significantly adds memory usage. -* The XML Qname can be a significant percentage of an XML object size. +* The XML QName can be a significant percentage of an XML object size. * By retaining a lookup of QNames and reusing QName objects, we can save quite a bit of memory. */ static private var _nameMap:Object = {};
git commit: [flex-asjs] [refs/heads/develop] - Lazy initialize _attributes array. Observed reduction of another ~10% of memory usage. Total memory usage appears to be less than half of what it was ori
Repository: flex-asjs Updated Branches: refs/heads/develop 572b371ed -> 4159881e9 Lazy initialize _attributes array. Observed reduction of another ~10% of memory usage. Total memory usage appears to be less than half of what it was originally. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/4159881e Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/4159881e Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/4159881e Branch: refs/heads/develop Commit: 4159881e95235d6ef698d5a931af1ddbeac6191a Parents: 572b371 Author: Harbs <ha...@in-tools.com> Authored: Tue Sep 19 08:50:04 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Tue Sep 19 08:50:04 2017 +0300 -- frameworks/projects/XML/src/main/flex/XML.as | 22 -- 1 file changed, 12 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4159881e/frameworks/projects/XML/src/main/flex/XML.as -- diff --git a/frameworks/projects/XML/src/main/flex/XML.as b/frameworks/projects/XML/src/main/flex/XML.as index 4fd596b..1c8946e 100644 --- a/frameworks/projects/XML/src/main/flex/XML.as +++ b/frameworks/projects/XML/src/main/flex/XML.as @@ -421,7 +421,7 @@ package } private var _children:Array; - private var _attributes:Array = []; + private var _attributes:Array; private var _processingInstructions:Array; private var _parent:XML; private var _value:String; @@ -462,13 +462,7 @@ package assertType(child,XML,"Type must be XML"); child.setParent(this); if(child.nodeKind() =="attribute") - { - if(!_attributes) - _attributes = []; - - _attributes.push(child); - - } + getAttributes().push(child); else getChildren().push(child); @@ -482,6 +476,14 @@ package return _children; } + private function getAttributes():Array + { + if(!_attributes) + _attributes = []; + + return _attributes; + } + /** * Adds a namespace to the set of in-scope namespaces for the XML object. * @@ -1903,8 +1905,8 @@ package public function setAttribute(attr:*,value:String):String { var i:int; - if(!_attributes) - _attributes = []; + //make sure _attributes is not null + getAttributes(); if(attr is XML) {
flex-asjs git commit: Observed drastic reduction of memory usage of XML objects of close to 50% (~43,000 XML objects ~37MB down to 20MB) Still opportunity to optimize _attributes Worth looking into de
Repository: flex-asjs Updated Branches: refs/heads/develop 8616f4ebc -> 572b371ed Observed drastic reduction of memory usage of XML objects of close to 50% (~43,000 XML objects ~37MB down to 20MB) Still opportunity to optimize _attributes Worth looking into default value for _nodeKind Currently thereâs no way to garbage-collect unused QNames due to references for QName re-usage. The tradeoff seems to be worthwhile. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/572b371e Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/572b371e Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/572b371e Branch: refs/heads/develop Commit: 572b371ed1530411100a8643b8aaea92e91d3c5a Parents: 8616f4e Author: Harbs <ha...@in-tools.com> Authored: Tue Sep 19 00:55:14 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Tue Sep 19 00:55:14 2017 +0300 -- frameworks/projects/XML/src/main/flex/XML.as | 285 +++--- 1 file changed, 198 insertions(+), 87 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/572b371e/frameworks/projects/XML/src/main/flex/XML.as -- diff --git a/frameworks/projects/XML/src/main/flex/XML.as b/frameworks/projects/XML/src/main/flex/XML.as index fff4cfa..4fd596b 100644 --- a/frameworks/projects/XML/src/main/flex/XML.as +++ b/frameworks/projects/XML/src/main/flex/XML.as @@ -23,6 +23,7 @@ package { import org.apache.flex.debugging.assert; import org.apache.flex.debugging.assertType; + import org.apache.flex.utils.ObjectMap; /* * Dealing with namespaces: * If the name is qualified, it has a prefix. Otherwise, the prefix is null. @@ -30,6 +31,32 @@ package * the prefix together with the namespaceURI form a QName */ + /** +* Memory optimization. +* Creating a new QName for each XML instance significantly adds memory usage. +* The XML Qname can be a significant percentage of an XML object size. +* By retaining a lookup of QNames and reusing QName objects, we can save quite a bit of memory. +*/ + static private var _nameMap:Object = {}; + static private function getQName(localName:String,prefix:String,uri:String,isAttribute:Boolean):QName{ + localName = localName || ""; + prefix = prefix || ""; + uri = uri || ""; + var key:String = localName + ":" + prefix + ":" + uri + ":" + isAttribute; + var qname:QName = _nameMap[key]; + if(!qname){ + qname = new QName(); + if(prefix) + qname.prefix = prefix; + if(uri) + qname.uri = uri; + if(localName) + qname.localName = localName; + qname.isAttribute = isAttribute; + _nameMap[key] = qname; + } + return qname; + } static private var defaultNamespace:Namespace; static public function setDefaultNamespace(ns:*):void @@ -37,7 +64,7 @@ package if(!ns) defaultNamespace = null; else - ns = new Namespace(ns); + defaultNamespace = new Namespace(ns); } /** @@ -184,8 +211,7 @@ package var xml:XML; var i:int; var data:* = node.nodeValue; - var qname:QName = new QName(node.namespaceURI,node.nodeName); - qname.prefix = node.prefix; + var qname:QName = getQName(node.nodeName, node.prefix, node.namespaceURI,false); switch(node.nodeType) { case 1: @@ -314,7 +340,7 @@ package public function XML(xml:* = null) { // _origStr = xml; - _children = []; + // _children = []; if(xml) {
git commit: [flex-asjs] [refs/heads/develop] - selectedItem should be set to null
Repository: flex-asjs Updated Branches: refs/heads/develop 814b90d7d -> d2d4789fb selectedItem should be set to null Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d2d4789f Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d2d4789f Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d2d4789f Branch: refs/heads/develop Commit: d2d4789fb17bea1fcbd717c7933ba432f04f0d61 Parents: 814b90d Author: Harbs <ha...@in-tools.com> Authored: Mon Sep 18 10:27:59 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Mon Sep 18 10:27:59 2017 +0300 -- .../org/apache/flex/html/beads/models/ArrayListSelectionModel.as | 4 ++-- .../org/apache/flex/html/beads/models/ArraySelectionModel.as | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d2d4789f/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/ArrayListSelectionModel.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/ArrayListSelectionModel.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/ArrayListSelectionModel.as index 950e350..9bcbb72 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/ArrayListSelectionModel.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/ArrayListSelectionModel.as @@ -89,8 +89,8 @@ package org.apache.flex.html.beads.models _dataProvider = value as IArrayList; if(!_dataProvider || _selectedIndex >= _dataProvider.length) _selectedIndex = -1; -if (_selectedIndex != -1) -_selectedItem = _dataProvider.getItemAt(_selectedIndex); + + _selectedItem = _selectedIndex == -1 ? null : _dataProvider.getItemAt(_selectedIndex); dispatchEvent(new Event("dataProviderChanged")); } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d2d4789f/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/ArraySelectionModel.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/ArraySelectionModel.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/ArraySelectionModel.as index 9e3b806..629ac13 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/ArraySelectionModel.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/ArraySelectionModel.as @@ -90,8 +90,8 @@ package org.apache.flex.html.beads.models _dataProvider = value; if(!_dataProvider || _selectedIndex >= _dataProvider.length) _selectedIndex = -1; - if (_selectedIndex != -1) - _selectedItem = _dataProvider[_selectedIndex]; + + _selectedItem = _selectedIndex == -1 ? null : _dataProvider[_selectedIndex]; dispatchEvent(new Event("dataProviderChanged")); }
git commit: [flex-asjs] [refs/heads/develop] - Handle Chrome and Firefox on iOS
Repository: flex-asjs Updated Branches: refs/heads/develop bba2f29e7 -> 5109c4022 Handle Chrome and Firefox on iOS Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/5109c402 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/5109c402 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/5109c402 Branch: refs/heads/develop Commit: 5109c40228a31d124ac55a3716ae251ef44713ef Parents: bba2f29 Author: Harbs <ha...@in-tools.com> Authored: Wed Sep 13 12:15:49 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Wed Sep 13 12:15:49 2017 +0300 -- .../flex/org/apache/flex/utils/BrowserInfo.as | 32 1 file changed, 26 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5109c402/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/BrowserInfo.as -- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/BrowserInfo.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/BrowserInfo.as index 59f4052..7f265f7 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/BrowserInfo.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/BrowserInfo.as @@ -124,16 +124,18 @@ var m = str.match(/\brv[ :]+[\d\.]+/g) { var ua:String = window["navigator"]["userAgent"]; //Figure out formFactor -if(ua.indexOf("Mobile") != -1) -_formFactor = "Mobile"; -else if(ua.indexOf("Tablet") != -1) -_formFactor = "Tablet"; -else if(ua.indexOf("iPad") != -1) +if(ua.indexOf("iPad") != -1) _formFactor = "iPad"; else if(ua.indexOf("iPhone") != -1) _formFactor = "iPhone"; else if(ua.indexOf("iPod") != -1) _formFactor = "iPod"; +else if(ua.indexOf("Tablet") != -1) +_formFactor = "Tablet"; +else if(ua.indexOf("Mobile") != -1) +_formFactor = "Mobile"; +else if(ua.indexOf("Android") != -1) +_formFactor = "Tablet"; else if(ua.indexOf("TV;") != -1) _formFactor = "TV"; else @@ -209,7 +211,25 @@ var m = str.match(/\brv[ :]+[\d\.]+/g) _engine = "WebKit"; else _engine = "Blink"; -} +} +else if(ua.indexOf("CriOS") != -1)// CriOS is Chrome on mobile devices +{ +_browser = "Chrome"; +verMatch = ua.match(/CriOS\/[\d\.]+/i); +if(verMatch) +_version = _engineVersion = verMatch[0].split("/")[1]; + + _engine = "WebKit"; +} +else if(ua.indexOf("FxiOS") != -1)// FxiOS is Firefox on mobile devices +{ +_browser = "Firefox"; +verMatch = ua.match(/FxiOS\/[\d\.]+/i); +if(verMatch) +_version = _engineVersion = verMatch[0].split("/")[1]; + + _engine = "WebKit"; +} } } }
git commit: [flex-asjs] [refs/heads/develop] - Fixed moving child xml between parents
Repository: flex-asjs Updated Branches: refs/heads/develop 6000f360d -> f92aba37f Fixed moving child xml between parents Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f92aba37 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f92aba37 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f92aba37 Branch: refs/heads/develop Commit: f92aba37f7ba9435cb6929dab61a7c85dfa65d0a Parents: 6000f36 Author: Harbs <ha...@in-tools.com> Authored: Wed Sep 6 10:56:23 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Wed Sep 6 10:56:23 2017 +0300 -- frameworks/projects/XML/src/main/flex/XML.as | 3 +-- manualtests/XMLTest/src/MyInitialView.mxml | 12 +++- 2 files changed, 12 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f92aba37/frameworks/projects/XML/src/main/flex/XML.as -- diff --git a/frameworks/projects/XML/src/main/flex/XML.as b/frameworks/projects/XML/src/main/flex/XML.as index 7e749fc..fff4cfa 100644 --- a/frameworks/projects/XML/src/main/flex/XML.as +++ b/frameworks/projects/XML/src/main/flex/XML.as @@ -2121,10 +2121,9 @@ package if(parent == _parent) return; var oldParent:XML = _parent; - _parent = parent; - //assign first to prevent the possiblity of a recursive loop if(oldParent) oldParent.removeChild(this); + _parent = parent; } public function setValue(value:String):void http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f92aba37/manualtests/XMLTest/src/MyInitialView.mxml -- diff --git a/manualtests/XMLTest/src/MyInitialView.mxml b/manualtests/XMLTest/src/MyInitialView.mxml index 851aeac..6746727 100644 --- a/manualtests/XMLTest/src/MyInitialView.mxml +++ b/manualtests/XMLTest/src/MyInitialView.mxml @@ -122,6 +122,16 @@ limitations under the License. trace(pop.toString()); trace(xml1.toString()); +var parent:XML = ; +var childXML:XML = ; +parent.appendChild(childXML); +trace(childXML.toXMLString() + " is child of" + parent.toXMLString() + "? " + (childXML.parent() == parent)); +var newParent:XML = ; +newParent.appendChild(childXML); +trace("moving to "); +trace(childXML.toXMLString() + " is child of" + parent.toXMLString() + "? " + (childXML.parent() == parent)); +trace(childXML.toXMLString() + " is child of" + newParent.toXMLString() + "? " + (childXML.parent() == newParent)); + var xmlString:String = xml.toXMLString(); var script:XML = xml..script[0].children()[0]; @@ -266,4 +276,4 @@ limitations under the License. - + \ No newline at end of file
git commit: [flex-asjs] [refs/heads/develop] - Misssing reference to DragDropJS
Repository: flex-asjs Updated Branches: refs/heads/develop fc3b4840b -> 6000f360d Misssing reference to DragDropJS Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/6000f360 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/6000f360 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/6000f360 Branch: refs/heads/develop Commit: 6000f360d44c5a0f6c3a1f2c7431cc81df3e438c Parents: fc3b484 Author: Harbs <ha...@in-tools.com> Authored: Sun Sep 3 14:59:42 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Sun Sep 3 14:59:42 2017 +0300 -- .../src/main/config/compile-js-config.xml | 1 + .../main/flex/org/apache/flex/express/List.as | 24 ++-- 2 files changed, 13 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6000f360/frameworks/js/FlexJS/projects/ExpressJS/src/main/config/compile-js-config.xml -- diff --git a/frameworks/js/FlexJS/projects/ExpressJS/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/ExpressJS/src/main/config/compile-js-config.xml index 95a0f22..00bfae6 100644 --- a/frameworks/js/FlexJS/projects/ExpressJS/src/main/config/compile-js-config.xml +++ b/frameworks/js/FlexJS/projects/ExpressJS/src/main/config/compile-js-config.xml @@ -65,6 +65,7 @@ ../../../../../libs/GraphicsJS.swc ../../../../../libs/CollectionsJS.swc ../../../../../libs/BasicJS.swc +../../../../../libs/DragDropJS.swc http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6000f360/frameworks/projects/Express/src/main/flex/org/apache/flex/express/List.as -- diff --git a/frameworks/projects/Express/src/main/flex/org/apache/flex/express/List.as b/frameworks/projects/Express/src/main/flex/org/apache/flex/express/List.as index c454641..530d27a 100644 --- a/frameworks/projects/Express/src/main/flex/org/apache/flex/express/List.as +++ b/frameworks/projects/Express/src/main/flex/org/apache/flex/express/List.as @@ -26,10 +26,10 @@ package org.apache.flex.express import org.apache.flex.html.beads.DataItemRendererFactoryForArrayList; import org.apache.flex.html.beads.models.ArrayListSelectionModel; import org.apache.flex.html.beads.models.ArraySelectionModel; -// import org.apache.flex.html.beads.SingleSelectionDragSourceBead; -// import org.apache.flex.html.beads.SingleSelectionDragImageBead; -// import org.apache.flex.html.beads.SingleSelectionDropTargetBead; -// import org.apache.flex.html.beads.SingleSelectionDropIndicatorBead; + import org.apache.flex.html.beads.SingleSelectionDragSourceBead; + import org.apache.flex.html.beads.SingleSelectionDragImageBead; + import org.apache.flex.html.beads.SingleSelectionDropTargetBead; + import org.apache.flex.html.beads.SingleSelectionDropIndicatorBead; public class List extends org.apache.flex.html.List { @@ -62,14 +62,14 @@ package org.apache.flex.express { super.addedToParent(); -// if (dragEnabled) { -// addBead(new SingleSelectionDragSourceBead()); -// addBead(new SingleSelectionDragImageBead()); -// } -// if (dropEnabled) { -// addBead(new SingleSelectionDropTargetBead()); -// addBead(new SingleSelectionDropIndicatorBead()); -// } + if (dragEnabled) { + addBead(new SingleSelectionDragSourceBead()); + addBead(new SingleSelectionDragImageBead()); + } + if (dropEnabled) { + addBead(new SingleSelectionDropTargetBead()); + addBead(new SingleSelectionDropIndicatorBead()); + } } override public function set dataProvider(value:Object):void
git commit: [flex-asjs] [refs/heads/develop] - ClippingViewport was deprecated
Repository: flex-asjs Updated Branches: refs/heads/develop 2609e6109 -> ac29804e4 ClippingViewport was deprecated Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ac29804e Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ac29804e Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ac29804e Branch: refs/heads/develop Commit: ac29804e43fd67abacf508b2b301be1313ad988f Parents: 2609e61 Author: Harbs <ha...@in-tools.com> Authored: Sun Sep 3 11:36:23 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Sun Sep 3 11:36:23 2017 +0300 -- frameworks/projects/Basic/src/main/resources/basic-manifest.xml | 2 +- frameworks/projects/Basic/src/main/resources/defaults.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ac29804e/frameworks/projects/Basic/src/main/resources/basic-manifest.xml -- diff --git a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml index 0ed5f4c..74fd071 100644 --- a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml +++ b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml @@ -120,7 +120,7 @@ --> - + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ac29804e/frameworks/projects/Basic/src/main/resources/defaults.css -- diff --git a/frameworks/projects/Basic/src/main/resources/defaults.css b/frameworks/projects/Basic/src/main/resources/defaults.css index ea7537e..ed556f3 100644 --- a/frameworks/projects/Basic/src/main/resources/defaults.css +++ b/frameworks/projects/Basic/src/main/resources/defaults.css @@ -370,7 +370,7 @@ Accordion IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.DataItemRendererFactoryForArrayData"); IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory"); IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.AccordionItemRenderer"); - IViewport: ClassReference("org.apache.flex.html.supportClasses.ClippingViewport"); + IViewport: ClassReference("org.apache.flex.html.supportClasses.Viewport"); IViewportModel: ClassReference("org.apache.flex.html.beads.models.ViewportModel"); IAccordionCollapseBead: ClassReference("org.apache.flex.html.beads.AccordionCollapseBead"); border-style: solid;
git commit: [flex-asjs] [refs/heads/develop] - Added isMobile()
Repository: flex-asjs Updated Branches: refs/heads/develop a2438456e -> 2609e6109 Added isMobile() Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/2609e610 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/2609e610 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/2609e610 Branch: refs/heads/develop Commit: 2609e61091d3b77d665752a57865278aa625f79d Parents: a243845 Author: Harbs <ha...@in-tools.com> Authored: Sun Sep 3 10:37:21 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Sun Sep 3 10:37:21 2017 +0300 -- .../Core/src/main/flex/org/apache/flex/utils/BrowserInfo.as| 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2609e610/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/BrowserInfo.as -- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/BrowserInfo.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/BrowserInfo.as index c902ac7..59f4052 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/BrowserInfo.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/BrowserInfo.as @@ -78,7 +78,7 @@ package org.apache.flex.utils private var _formFactor:String; /** - * The form factor of the device. Pne of: "Mobile", "Tablet", "TV", "iPhone", "iPad", "iPod" or "Desktop". + * The form factor of the device. One of: "Mobile", "Tablet", "TV", "iPhone", "iPad", "iPod" or "Desktop". */ public function get formFactor():String{ return _formFactor; @@ -87,6 +87,10 @@ package org.apache.flex.utils { return OSUtils.getOS(); } +public function isMobile():Boolean +{ +return formFactor != "Desktop" && formFactor != "TV"; +} private static var _current:BrowserInfo; public static function current():BrowserInfo {
git commit: [flex-asjs] [refs/heads/develop] - change metadata was only being attached to the SWF class
Repository: flex-asjs Updated Branches: refs/heads/develop 1b1697a0f -> a2438456e change metadata was only being attached to the SWF class Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a2438456 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a2438456 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a2438456 Branch: refs/heads/develop Commit: a2438456e7a0e31b3e1b00304067a68ad2e9fae7 Parents: 1b1697a Author: Harbs <ha...@in-tools.com> Authored: Sun Sep 3 10:36:52 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Sun Sep 3 10:36:52 2017 +0300 -- .../src/main/flex/org/apache/flex/html/CSSCheckBox.as | 10 ++ 1 file changed, 10 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a2438456/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/CSSCheckBox.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/CSSCheckBox.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/CSSCheckBox.as index 40c0b7a..bbcb387 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/CSSCheckBox.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/CSSCheckBox.as @@ -143,6 +143,16 @@ package org.apache.flex.html } +/** + * Dispatched when the user checks or un-checks the CSSCheckBox. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + [Event(name="change", type="org.apache.flex.events.Event")] + COMPILE::JS public class CSSCheckBox extends UIBase {
[1/2] git commit: [flex-asjs] [refs/heads/develop] - Allow chained assignment to non-existent children
Repository: flex-asjs Updated Branches: refs/heads/develop 885e32136 -> 641f74c04 Allow chained assignment to non-existent children Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/884826eb Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/884826eb Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/884826eb Branch: refs/heads/develop Commit: 884826ebfb9184574a17e6cb0a9f62331a4a31be Parents: 37dc600 Author: Harbs <ha...@in-tools.com> Authored: Mon Aug 28 12:54:52 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Mon Aug 28 12:54:52 2017 +0300 -- frameworks/projects/XML/src/main/flex/XML.as| 10 +++ .../projects/XML/src/main/flex/XMLList.as | 31 manualtests/XMLTest/src/MyInitialView.mxml | 5 3 files changed, 41 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/884826eb/frameworks/projects/XML/src/main/flex/XML.as -- diff --git a/frameworks/projects/XML/src/main/flex/XML.as b/frameworks/projects/XML/src/main/flex/XML.as index cf3d9ea..7e749fc 100644 --- a/frameworks/projects/XML/src/main/flex/XML.as +++ b/frameworks/projects/XML/src/main/flex/XML.as @@ -2131,6 +2131,16 @@ package { _value = value; } + + /** +* @private +* +* Allows XMLList to get the targetObject of its targetObject and not error when it gets the XML +*/ + public function get targetObject():* + { + return null; + } /** * Returns an XMLList object of all XML properties of the XML object that represent XML text nodes. http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/884826eb/frameworks/projects/XML/src/main/flex/XMLList.as -- diff --git a/frameworks/projects/XML/src/main/flex/XMLList.as b/frameworks/projects/XML/src/main/flex/XMLList.as index d90ee3d..6f8dcdd 100644 --- a/frameworks/projects/XML/src/main/flex/XMLList.as +++ b/frameworks/projects/XML/src/main/flex/XMLList.as @@ -230,6 +230,7 @@ package public function child(propertyName:Object):XMLList { var retVal:XMLList = new XMLList(); + retVal.targetProperty = propertyName.toString(); var propNum:Number = parseInt(propertyName,10); if(propNum.toString() == propertyName) { @@ -240,9 +241,12 @@ package } return retVal; } + if(isEmpty()) + { + retVal.targetObject = this; + } if(isSingle()) return _xmlArray[0].child(propertyName); - var len:int = _xmlArray.length; for (var i:int=0;i<len;i++) { @@ -783,12 +787,25 @@ package { return _targetProperty; } - - public function setAttribute(attr:*,value:String):void + private function xmlFromProperty():XML { + var xmlStr:String = "<"; + if(_targetProperty.prefix) + xmlStr += _targetProperty.prefix + "::"; + + xmlStr += _targetProperty.localName + "/>"; + return new XML(xmlStr); + } + public function setAttribute(attr:*,value:String):String + { + if(isEmpty() && targetObject)//walk up the tree and create nodes. + _xmlArray[0] = targetObject.setChild(_targetProperty,xmlFromProperty()); + var len:int = _xmlArray.length; for (var i:int=0;i<len;i++) _xmlArray[i].setAttribute(attr,value); + + return value; } public function hasAncestor(obj:*):Boolean @@ -840,11 +857,15 @@ package if(isSingle()) return _xmlArray[0].replace(propertyName,value); } - public function setChild(elementName:*, elements:Object):void +
[2/2] git commit: [flex-asjs] [refs/heads/develop] - Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into develop
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into develop * 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs: Add MDLDynamicTableExample to ilustrate how add/remove items to MDL Table - Currently only adding is working. The rest job will be done as part of FLEX-35354 Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/641f74c0 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/641f74c0 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/641f74c0 Branch: refs/heads/develop Commit: 641f74c044e44e229d5965a8a8cde27dd14c9b7e Parents: 884826e 885e321 Author: Harbs <ha...@in-tools.com> Authored: Mon Aug 28 12:55:10 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Mon Aug 28 12:55:10 2017 +0300 -- examples/flexjs/MDLDynamicTableExample/pom.xml | 74 .../src/MDLDynamicTableExample.mxml | 36 ++ .../MDLDynamicTableExample/src/MainView.mxml| 65 + .../CustomTableRowItemRenderer.mxml | 46 .../src/models/UserListModel.as | 37 ++ .../src/resources/mdl-js-index-template.html| 33 + .../src/resources/mdl-styles.css| 31 .../MDLDynamicTableExample/src/vo/UserVO.as | 40 +++ examples/flexjs/pom.xml | 1 + 9 files changed, 363 insertions(+) --
git commit: [flex-asjs] [refs/heads/develop] - Forgot header
Repository: flex-asjs Updated Branches: refs/heads/develop f19d96742 -> 37dc60031 Forgot header Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/37dc6003 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/37dc6003 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/37dc6003 Branch: refs/heads/develop Commit: 37dc60031f86d70159826770a9ea021046f65977 Parents: f19d967 Author: Harbs <ha...@in-tools.com> Authored: Sun Aug 27 12:40:02 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Sun Aug 27 12:40:02 2017 +0300 -- .../org/apache/flex/html/addElementToWrapper.as | 18 ++ 1 file changed, 18 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/37dc6003/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/addElementToWrapper.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/addElementToWrapper.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/addElementToWrapper.as index 0c4427c..f7638ba 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/addElementToWrapper.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/addElementToWrapper.as @@ -1,3 +1,21 @@ + +// +// 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.html { COMPILE::JS
git commit: [flex-asjs] [refs/heads/develop] - Returns parameter passed into setAttribute and setChild to enable chained assignment of values.
Repository: flex-asjs Updated Branches: refs/heads/develop f4276e0dd -> f19d96742 Returns parameter passed into setAttribute and setChild to enable chained assignment of values. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f19d9674 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f19d9674 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f19d9674 Branch: refs/heads/develop Commit: f19d96742f05669f48d9587de6afa2d96e795cc0 Parents: f4276e0 Author: Harbs <ha...@in-tools.com> Authored: Sun Aug 27 10:47:48 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Sun Aug 27 10:47:48 2017 +0300 -- frameworks/projects/XML/src/main/flex/XML.as | 14 -- 1 file changed, 8 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f19d9674/frameworks/projects/XML/src/main/flex/XML.as -- diff --git a/frameworks/projects/XML/src/main/flex/XML.as b/frameworks/projects/XML/src/main/flex/XML.as index 054682e..cf3d9ea 100644 --- a/frameworks/projects/XML/src/main/flex/XML.as +++ b/frameworks/projects/XML/src/main/flex/XML.as @@ -1808,7 +1808,7 @@ package return false; } - public function setAttribute(attr:*,value:String):void + public function setAttribute(attr:*,value:String):String { var i:int; if(!_attributes) @@ -1823,7 +1823,7 @@ package if(_attributes[i].name().equals(attr.name())) { _attributes[i].setValue(value); - return; + return value; } //addChild(_att) } @@ -1831,7 +1831,7 @@ package attr.setValue(value); addChild(attr); } - return; + return value; } if(attr.indexOf("xmlns") == 0) @@ -1857,13 +1857,13 @@ package if(_attributes[i].name().equals(attrXML.name())) { _attributes[i].setValue(value); - return; + return value; } //addChild(_att) } addChild(attrXML); } - + return value; } /** * Replaces the child properties of the XML object with the specified name with the specified XML or XMLList. @@ -1873,7 +1873,7 @@ package * @return * */ - public function setChild(elementName:*, elements:Object):void + public function setChild(elementName:*, elements:Object):Object { /* @@ -1943,6 +1943,7 @@ package var i:int; var len:int; var chld:XML; + var retVal:Object = elements; // I'm not wure that this a strict interpretation of the spec but I think this does the "right thing". var childType:String = typeof elements; @@ -1996,6 +1997,7 @@ package } //what to do if it's not XML or XMLList? Throw an error? Ignore? + return retVal; } /**
git commit: [flex-asjs] [refs/heads/develop] - Added missing pieces for TextBlock management Fixed bug in GroupElement.replaceElements()
Repository: flex-asjs Updated Branches: refs/heads/develop daca90f9e -> f4276e0dd Added missing pieces for TextBlock management Fixed bug in GroupElement.replaceElements() Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f4276e0d Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f4276e0d Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f4276e0d Branch: refs/heads/develop Commit: f4276e0dd628a0a3a22a33d1890ea3c1e1943b5a Parents: daca90f Author: Harbs <ha...@in-tools.com> Authored: Sun Aug 27 07:46:55 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Sun Aug 27 07:46:55 2017 +0300 -- .../apache/flex/text/engine/ContentElement.as | 25 .../org/apache/flex/text/engine/GroupElement.as | 21 ++-- .../org/apache/flex/text/engine/ITextBlock.as | 3 +++ .../flex/org/apache/flex/text/html/TextBlock.as | 4 4 files changed, 47 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f4276e0d/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ContentElement.as -- diff --git a/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ContentElement.as b/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ContentElement.as index 1b35305..e1358a4 100644 --- a/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ContentElement.as +++ b/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ContentElement.as @@ -44,10 +44,18 @@ package org.apache.flex.text.engine /** * The parent */ - public function get groupElement() : GroupElement + private var _groupElement:GroupElement; + public function get groupElement():GroupElement { + if(_groupElement) + return _groupElement.getElementIndex(this) < 0 ? null : _groupElement; return null; } + public function set groupElement(value:GroupElement):void + { + _groupElement = value; + } + public function get rawText() : String { return null; @@ -56,13 +64,22 @@ package org.apache.flex.text.engine { return null; } - public function get textBlock() : ITextBlock + + private var _textBlock:ITextBlock; + public function get textBlock():ITextBlock { - return null; + if(groupElement) + return groupElement.textBlock; + return _textBlock; } + public function set textBlock(value:ITextBlock):void + { + _textBlock = value; + } + public function get textBlockBeginIndex() : int { - return null; + return textBlock ? textBlock.getRelativeStart(this) : 0; } public var textRotation : String http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f4276e0d/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/GroupElement.as -- diff --git a/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/GroupElement.as b/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/GroupElement.as index a61c97f..7d5d928 100644 --- a/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/GroupElement.as +++ b/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/GroupElement.as @@ -20,6 +20,7 @@ package org.apache.flex.text.engine { import org.apache.flex.events.EventDispatcher; import org.apache.flex.text.engine.TextElement; + import org.apache.flex.text.engine.GroupElement; public class GroupElement extends ContentElement { @@ -27,7 +28,10 @@ package org.apache.flex.text.engine { super(elementFormat, eventMirror, textRotation); if(elements) + { _elements = elements; + setElementsGroup(this); + } else _elements = new Vector.(); } @@ -67,6 +71,7 @@ package org.apach
git commit: [flex-asjs] [refs/heads/develop] - Added helper function
Repository: flex-asjs Updated Branches: refs/heads/develop 5b8f1c589 -> daca90f9e Added helper function Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/daca90f9 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/daca90f9 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/daca90f9 Branch: refs/heads/develop Commit: daca90f9e688a3ac79edd569f759df2b5ba89b80 Parents: 5b8f1c5 Author: Harbs <ha...@in-tools.com> Authored: Sun Aug 27 07:43:25 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Sun Aug 27 07:43:25 2017 +0300 -- .../Basic/src/main/flex/BasicClasses.as | 4 .../org/apache/flex/html/addElementToWrapper.as | 20 2 files changed, 24 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daca90f9/frameworks/projects/Basic/src/main/flex/BasicClasses.as -- diff --git a/frameworks/projects/Basic/src/main/flex/BasicClasses.as b/frameworks/projects/Basic/src/main/flex/BasicClasses.as index 697efa8..bc62158 100644 --- a/frameworks/projects/Basic/src/main/flex/BasicClasses.as +++ b/frameworks/projects/Basic/src/main/flex/BasicClasses.as @@ -27,6 +27,10 @@ package */ internal class BasicClasses { + COMPILE::JS + { + import org.apache.flex.html.addElementToWrapper; addElementToWrapper; + } import org.apache.flex.html.ToolTip; ToolTip; import org.apache.flex.html.accessories.NumericOnlyTextInputBead; NumericOnlyTextInputBead; import org.apache.flex.html.beads.DispatchInputFinishedBead; DispatchInputFinishedBead; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/daca90f9/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/addElementToWrapper.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/addElementToWrapper.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/addElementToWrapper.as new file mode 100644 index 000..0c4427c --- /dev/null +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/addElementToWrapper.as @@ -0,0 +1,20 @@ +package org.apache.flex.html +{ +COMPILE::JS +{ +import org.apache.flex.core.UIBase; +import org.apache.flex.core.WrappedHTMLElement; +} + +/** + * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement + */ +COMPILE::JS +public function addElementToWrapper(wrapper:UIBase,type:String):WrappedHTMLElement +{ +var elem:WrappedHTMLElement = document.createElement(type) as WrappedHTMLElement; + wrapper.positioner = wrapper.element = elem; + elem.flexjs_wrapper = wrapper; +return elem; +} +} \ No newline at end of file
flex-asjs git commit: “Stringables” should be assignable to XML
Repository: flex-asjs Updated Branches: refs/heads/develop e17b287c1 -> 3bb0e7b12 âStringablesâ should be assignable to XML Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/3bb0e7b1 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/3bb0e7b1 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/3bb0e7b1 Branch: refs/heads/develop Commit: 3bb0e7b1205315edb379be3674e6a2be05165cee Parents: e17b287 Author: Harbs <ha...@in-tools.com> Authored: Wed Aug 23 23:51:24 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Wed Aug 23 23:51:24 2017 +0300 -- frameworks/projects/XML/src/main/flex/XML.as | 9 + 1 file changed, 9 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3bb0e7b1/frameworks/projects/XML/src/main/flex/XML.as -- diff --git a/frameworks/projects/XML/src/main/flex/XML.as b/frameworks/projects/XML/src/main/flex/XML.as index 7970df1..054682e 100644 --- a/frameworks/projects/XML/src/main/flex/XML.as +++ b/frameworks/projects/XML/src/main/flex/XML.as @@ -1943,6 +1943,15 @@ package var i:int; var len:int; var chld:XML; + + // I'm not wure that this a strict interpretation of the spec but I think this does the "right thing". + var childType:String = typeof elements; + if(childType != "object") + { + var stringable:XML = xmlFromStringable(elements); + elements = new XML("<" + elementName + "/>"); + elements.appendChild(stringable); + } if(elements is XML) {
git commit: [flex-asjs] [refs/heads/develop] - Partially fixed FormatExample
Repository: flex-asjs Updated Branches: refs/heads/develop f0ddbd345 -> e17b287c1 Partially fixed FormatExample Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/e17b287c Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/e17b287c Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/e17b287c Branch: refs/heads/develop Commit: e17b287c15d2bde12bf9cfe86050aa1fb8e5f499 Parents: f0ddbd3 Author: Harbs <ha...@in-tools.com> Authored: Tue Aug 22 11:12:29 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Tue Aug 22 11:12:29 2017 +0300 -- manualtests/FormatExample/src/MyFormView.mxml | 2 +- .../apache/flex/html/staticControls/accessories/NumberFormatter.as | 2 +- .../flex/html/staticControls/accessories/PhoneNumberFormatter.as | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e17b287c/manualtests/FormatExample/src/MyFormView.mxml -- diff --git a/manualtests/FormatExample/src/MyFormView.mxml b/manualtests/FormatExample/src/MyFormView.mxml index d513fcb..f31ca97 100644 --- a/manualtests/FormatExample/src/MyFormView.mxml +++ b/manualtests/FormatExample/src/MyFormView.mxml @@ -21,7 +21,7 @@ limitations under the License. xmlns:js="library://ns.apache.org/flexjs/basic" xmlns:local="*" xmlns:models="models.*" - xmlns:acc="org.apache.flex.html.accessories.*"> + xmlns:acc="org.apache.flex.html.staticControls.accessories.*"> .title { http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e17b287c/manualtests/FormatExample/src/org/apache/flex/html/staticControls/accessories/NumberFormatter.as -- diff --git a/manualtests/FormatExample/src/org/apache/flex/html/staticControls/accessories/NumberFormatter.as b/manualtests/FormatExample/src/org/apache/flex/html/staticControls/accessories/NumberFormatter.as index 0d1b613..58ffad1 100644 --- a/manualtests/FormatExample/src/org/apache/flex/html/staticControls/accessories/NumberFormatter.as +++ b/manualtests/FormatExample/src/org/apache/flex/html/staticControls/accessories/NumberFormatter.as @@ -16,7 +16,7 @@ // limitations under the License. // -package org.apache.flex.html.accessories +package org.apache.flex.html.staticControls.accessories { import org.apache.flex.core.IBeadModel; import org.apache.flex.core.IFormatBead; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e17b287c/manualtests/FormatExample/src/org/apache/flex/html/staticControls/accessories/PhoneNumberFormatter.as -- diff --git a/manualtests/FormatExample/src/org/apache/flex/html/staticControls/accessories/PhoneNumberFormatter.as b/manualtests/FormatExample/src/org/apache/flex/html/staticControls/accessories/PhoneNumberFormatter.as index 7523c96..4231bce 100644 --- a/manualtests/FormatExample/src/org/apache/flex/html/staticControls/accessories/PhoneNumberFormatter.as +++ b/manualtests/FormatExample/src/org/apache/flex/html/staticControls/accessories/PhoneNumberFormatter.as @@ -16,7 +16,7 @@ // limitations under the License. // -package org.apache.flex.html.accessories +package org.apache.flex.html.staticControls.accessories { import org.apache.flex.core.IBead; import org.apache.flex.core.IBeadModel;
git commit: [flex-asjs] [refs/heads/develop] - Fixed a few errors in DataGridXcompile
Repository: flex-asjs Updated Branches: refs/heads/develop ebc568a7e -> f0ddbd345 Fixed a few errors in DataGridXcompile Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f0ddbd34 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f0ddbd34 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f0ddbd34 Branch: refs/heads/develop Commit: f0ddbd345147baa20c661b4d1499d0ff7ef7c868 Parents: ebc568a Author: Harbs <ha...@in-tools.com> Authored: Tue Aug 22 11:01:33 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Tue Aug 22 11:01:33 2017 +0300 -- .../apache/flex/html/customControls/beads/DataGridView.as | 8 .../apache/flex/html/staticControls/beads/BoxGridView.as | 10 +- 2 files changed, 17 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f0ddbd34/manualtests/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataGridView.as -- diff --git a/manualtests/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataGridView.as b/manualtests/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataGridView.as index 15fe694..ba189d2 100644 --- a/manualtests/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataGridView.as +++ b/manualtests/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataGridView.as @@ -26,6 +26,7 @@ package org.apache.flex.html.customControls.beads import org.apache.flex.core.IDataGridModel; import org.apache.flex.core.IDataGridPresentationModel; import org.apache.flex.core.IStrand; + import org.apache.flex.core.IUIBase; import org.apache.flex.core.UIBase; import org.apache.flex.core.ValuesManager; import org.apache.flex.events.Event; @@ -145,5 +146,12 @@ package org.apache.flex.html.customControls.beads IEventDispatcher(_strand).dispatchEvent(new Event('change')); } + /** +* @flexjsignorecoercion org.apache.flex.core.IUIBase +*/ + public function get host():IUIBase + { + return _strand as IUIBase; + } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f0ddbd34/manualtests/DataGridXcompile/src/org/apache/flex/html/staticControls/beads/BoxGridView.as -- diff --git a/manualtests/DataGridXcompile/src/org/apache/flex/html/staticControls/beads/BoxGridView.as b/manualtests/DataGridXcompile/src/org/apache/flex/html/staticControls/beads/BoxGridView.as index a9d7b8f..7a75394 100644 --- a/manualtests/DataGridXcompile/src/org/apache/flex/html/staticControls/beads/BoxGridView.as +++ b/manualtests/DataGridXcompile/src/org/apache/flex/html/staticControls/beads/BoxGridView.as @@ -16,10 +16,11 @@ // limitations under the License. // -package org.apache.flex.html.beads +package org.apache.flex.html.staticControls.beads { import org.apache.flex.core.IBeadView; import org.apache.flex.core.IStrand; + import org.apache.flex.core.IUIBase; import org.apache.flex.core.UIBase; import org.apache.flex.html.Label; @@ -44,5 +45,12 @@ package org.apache.flex.html.beads label.height = 25; UIBase(_strand).addElement(label); } + /** +* @flexjsignorecoercion org.apache.flex.core.IUIBase +*/ + public function get host():IUIBase + { + return _strand as IUIBase; + } } }
git commit: [flex-asjs] [refs/heads/develop] - Fixed TLFEditTestFlexJS manual test
Repository: flex-asjs Updated Branches: refs/heads/develop 932f7cb4d -> ebc568a7e Fixed TLFEditTestFlexJS manual test Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ebc568a7 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ebc568a7 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ebc568a7 Branch: refs/heads/develop Commit: ebc568a7eb4494e4e9e689f184b7f6082a047ac2 Parents: 932f7cb Author: Harbs <ha...@in-tools.com> Authored: Tue Aug 22 10:36:39 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Tue Aug 22 10:36:39 2017 +0300 -- manualtests/TLFEditTestFlexJS/build.xml | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ebc568a7/manualtests/TLFEditTestFlexJS/build.xml -- diff --git a/manualtests/TLFEditTestFlexJS/build.xml b/manualtests/TLFEditTestFlexJS/build.xml index 24985be..f1abc29 100644 --- a/manualtests/TLFEditTestFlexJS/build.xml +++ b/manualtests/TLFEditTestFlexJS/build.xml @@ -29,6 +29,7 @@ +
git commit: [flex-asjs] [refs/heads/develop] - Fixed FlexJSStore
Repository: flex-asjs Updated Branches: refs/heads/develop d104a2edb -> 2ce4db356 Fixed FlexJSStore Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/2ce4db35 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/2ce4db35 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/2ce4db35 Branch: refs/heads/develop Commit: 2ce4db356053482fb618256ae50b3d6fd300571c Parents: d104a2e Author: Harbs <ha...@in-tools.com> Authored: Mon Aug 21 14:02:38 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Mon Aug 21 14:02:38 2017 +0300 -- .../html/beads/layouts/VerticalFlexLayout.as| 1 + .../html/supportClasses/PanelLayoutProxy.as | 27 2 files changed, 28 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2ce4db35/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/VerticalFlexLayout.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/VerticalFlexLayout.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/VerticalFlexLayout.as index d0b1c23..436423d 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/VerticalFlexLayout.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/VerticalFlexLayout.as @@ -246,6 +246,7 @@ package org.apache.flex.html.beads.layouts /** * * @flexjsignorecoercion org.apache.flex.core.ILayoutHost +* @flexjsignorecoercion org.apache.flex.core.UIBase * * @langversion 3.0 * @playerversion Flash 10.2 http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2ce4db35/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/PanelLayoutProxy.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/PanelLayoutProxy.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/PanelLayoutProxy.as index 4ebc174..8189029 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/PanelLayoutProxy.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/PanelLayoutProxy.as @@ -66,6 +66,7 @@ package org.apache.flex.html.supportClasses } /** +* @flexjsignorecoercion org.apache.flex.html.Panel * The width of the bounding box. * * @langversion 3.0 @@ -78,6 +79,7 @@ package org.apache.flex.html.supportClasses } /** +* @flexjsignorecoercion org.apache.flex.html.Panel * The height of the bounding box. * * @langversion 3.0 @@ -90,6 +92,7 @@ package org.apache.flex.html.supportClasses } /** +* @flexjsignorecoercion org.apache.flex.html.Panel * The number of elements in the parent. * * @langversion 3.0 @@ -103,6 +106,7 @@ package org.apache.flex.html.supportClasses } /** +* @flexjsignorecoercion org.apache.flex.html.Panel * Get a component from the parent. * * @param c The index of the subcomponent. @@ -117,16 +121,39 @@ package org.apache.flex.html.supportClasses return (host as Panel).$getElementAt(index); } + /** +* @flexjsignorecoercion org.apache.flex.html.Panel +*/ COMPILE::JS public function get somethingelse():WrappedHTMLElement { return (host as Panel).element; } + /** +* @flexjsignorecoercion org.apache.flex.html.Panel +*/ COMPILE::JS public function get element():WrappedHTMLElement { return (host as Panel).element; } + + /** +* @flexjsignorecoercion org.apache.flex.html.Panel +* The display style is used for both visible +* and layout so is managed as a special case. +* +* @langversion 3.0 +* @playerversion Flash 10.2 +* @playerversion AIR 2.6 +* @productversion FlexJS 0.0 +*/ +
git commit: [flex-asjs] [refs/heads/develop] - Simplified ToggleTextButton
Repository: flex-asjs Updated Branches: refs/heads/develop 8b1093013 -> d104a2edb Simplified ToggleTextButton Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d104a2ed Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d104a2ed Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d104a2ed Branch: refs/heads/develop Commit: d104a2edb2ef06e348ee65d9b56d44ccd071841c Parents: 8b10930 Author: Harbs <ha...@in-tools.com> Authored: Mon Aug 21 14:01:55 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Mon Aug 21 14:01:55 2017 +0300 -- .../org/apache/flex/html/ToggleTextButton.as| 25 1 file changed, 4 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d104a2ed/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ToggleTextButton.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ToggleTextButton.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ToggleTextButton.as index 6061898..8718a6f 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ToggleTextButton.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ToggleTextButton.as @@ -85,10 +85,6 @@ package org.apache.flex.html { addEventListener(MouseEvent.CLICK, internalMouseHandler); } -COMPILE::JS -{ -this.typeNames = 'toggleTextButton'; -} } private var _selected:Boolean = false; @@ -130,9 +126,7 @@ package org.apache.flex.html if (_selected != value) { _selected = value; - internalSelected(); - dispatchEvent(new Event("change")); } } @@ -177,26 +171,15 @@ package org.apache.flex.html COMPILE::JS { var isToggleTextButtonSelected:Boolean = element.classList.contains("toggleTextButton_Selected"); -if (!isToggleTextButtonSelected && _selected == true) -{ -element.classList.add("toggleTextButton_Selected"); -} -else if (isToggleTextButtonSelected && _selected == false) -{ +//sync the class with the state +if(isToggleTextButtonSelected != _selected) element.classList.toggle("toggleTextButton_Selected"); -} var isToggleTextButton:Boolean = element.classList.contains("toggleTextButton"); -if (!isToggleTextButton && _selected == false) -{ -element.classList.add("toggleTextButton"); -} -else if (isToggleTextButton && _selected == true) -{ +// Need to toggle if we have the class and it's selected or we don't and it's not selected. +if(isToggleTextButton == _selected) element.classList.toggle("toggleTextButton"); -} -typeNames = element.className; } }
git commit: [flex-asjs] [refs/heads/develop] - Added support for blink alpha and blink color for point cursor. HTML does not have the same transparency support as Flash and control over alternating co
Repository: flex-asjs Updated Branches: refs/heads/develop d526a4a81 -> bde25ebea Added support for blink alpha and blink color for point cursor. HTML does not have the same transparency support as Flash and control over alternating colors is important. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/bde25ebe Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/bde25ebe Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/bde25ebe Branch: refs/heads/develop Commit: bde25ebea5b88095865050324d8f01073588683f Parents: d526a4a Author: Harbs <ha...@in-tools.com> Authored: Sun Aug 20 21:39:17 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Sun Aug 20 21:39:17 2017 +0300 -- .../textLayout/container/ContainerController.as | 38 ++-- .../flex/textLayout/edit/SelectionFormat.as | 32 +++-- 2 files changed, 65 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bde25ebe/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/container/ContainerController.as -- diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/container/ContainerController.as b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/container/ContainerController.as index 8bf5d07..fc301e2 100644 --- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/container/ContainerController.as +++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/container/ContainerController.as @@ -83,6 +83,7 @@ package org.apache.flex.textLayout.container import org.apache.flex.utils.ObjectMap; import org.apache.flex.utils.PointUtils; import org.apache.flex.utils.Timer; + import org.apache.flex.graphics.IDrawable; @@ -2751,7 +2752,7 @@ package org.apache.flex.textLayout.container // TODO Want to evaluate whether there's a cleaner way to do this private var blinkTimer:Timer; - private var blinkObject:IUIBase; + private var blinkObject:IRect; /** * Starts a DisplayObject cursor blinking by changing its alpha value @@ -2760,7 +2761,8 @@ package org.apache.flex.textLayout.container * @param obj The DisplayObject to use as the cursor. * */ - private function startBlinkingCursor(obj:IUIBase, blinkInterval:int):void + private var blinkState:Boolean; + private function startBlinkingCursor(obj:IRect, blinkInterval:int):void { if (!blinkTimer) blinkTimer = new Timer(blinkInterval,0); @@ -2779,12 +2781,42 @@ package org.apache.flex.textLayout.container { if (blinkTimer) blinkTimer.stop(); + if(blinkObject) + { + var selFormat:SelectionFormat = interactionManager.currentSelectionFormat; + var fill:SolidColor = blinkObject.fill as SolidColor; + fill.alpha = selFormat.pointAlpha; + fill.color = selFormat.pointColor; + (blinkObject as IDrawable).draw(); + blinkObject.alpha = 1; + blinkState = false; + } blinkObject = null; } private function blinkTimerHandler(event:Event):void { - blinkObject.alpha = (blinkObject.alpha == 1.0) ? 0.0 : 1.0; + var selFormat:SelectionFormat = interactionManager.currentSelectionFormat; + if(selFormat) + { + var fill:SolidColor = blinkObject.fill as SolidColor; + if(blinkState) + { + fill.alpha = selFormat.pointBlinkAlpha; + fill.color = selFormat.pointBlinkColor; + } + else + { + fill.alpha = selFormat.pointAlpha; + fill.color = selFormat.pointColor; + } + (blinkObject as IDrawable).draw(); + blinkStat
git commit: [flex-asjs] [refs/heads/develop] - Forgot import
Repository: flex-asjs Updated Branches: refs/heads/develop 1d4211c4c -> ccc699f0b Forgot import Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ccc699f0 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ccc699f0 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ccc699f0 Branch: refs/heads/develop Commit: ccc699f0bef00d258280d00625af8b314fbf7895 Parents: 1d4211c Author: Harbs <ha...@in-tools.com> Authored: Fri Aug 18 17:02:34 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Fri Aug 18 17:02:34 2017 +0300 -- .../src/main/flex/org/apache/flex/mdl/CheckBox.as | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ccc699f0/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as index 25d6846..c3a405a 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as @@ -26,6 +26,7 @@ package org.apache.flex.mdl COMPILE::JS { import org.apache.flex.core.WrappedHTMLElement; +import org.apache.flex.events.Event; } /**
git commit: [flex-asjs] [refs/heads/develop] - Added change event on CheckBox Fixed RadioButton too
Repository: flex-asjs Updated Branches: refs/heads/develop 89145f188 -> 1d4211c4c Added change event on CheckBox Fixed RadioButton too Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/1d4211c4 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/1d4211c4 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/1d4211c4 Branch: refs/heads/develop Commit: 1d4211c4cb0200b2c8bae172adef6f9575ff553f Parents: 89145f1 Author: Harbs <ha...@in-tools.com> Authored: Fri Aug 18 15:46:25 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Fri Aug 18 15:46:25 2017 +0300 -- .../src/main/flex/org/apache/flex/mdl/CheckBox.as| 3 +++ .../src/main/flex/org/apache/flex/mdl/RadioButton.as | 15 +-- 2 files changed, 16 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d4211c4/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as index 58966f5..25d6846 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as @@ -245,6 +245,8 @@ package org.apache.flex.mdl COMPILE::JS { +if(input.checked == value) +return; var instance:Object = element['MaterialCheckbox']; if(instance) { @@ -255,6 +257,7 @@ package org.apache.flex.mdl } else input.checked = value; +dispatchEvent(new Event(Event.CHANGE)); } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d4211c4/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/RadioButton.as -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/RadioButton.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/RadioButton.as index f07a048..1b93392 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/RadioButton.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/RadioButton.as @@ -417,8 +417,19 @@ package org.apache.flex.mdl } public function set selected(value:Boolean):void { -icon.checked = value; -dispatchEvent(new Event(Event.CHANGE)) +if(icon.checked == value) +return; +var instance:Object = element['MaterialRadio']; +if(instance) +{ +if(value) +instance["check"](); +else +instance["uncheck"](); +} +else +icon.checked = value; +dispatchEvent(new Event(Event.CHANGE)); } public function get value():Object
git commit: [flex-asjs] [refs/heads/develop] - This should work better with MXML
Repository: flex-asjs Updated Branches: refs/heads/develop 8eaaeffb0 -> 89145f188 This should work better with MXML Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/89145f18 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/89145f18 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/89145f18 Branch: refs/heads/develop Commit: 89145f1889b7389ca8f241ee98b46e753b63036d Parents: 8eaaeff Author: Harbs <ha...@in-tools.com> Authored: Fri Aug 18 15:33:23 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Fri Aug 18 15:33:23 2017 +0300 -- .../src/main/flex/org/apache/flex/mdl/CheckBox.as | 12 +--- 1 file changed, 9 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/89145f18/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as index 217edf5..58966f5 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as @@ -245,10 +245,16 @@ package org.apache.flex.mdl COMPILE::JS { -if(value) -element['MaterialCheckbox'].check(); +var instance:Object = element['MaterialCheckbox']; +if(instance) +{ +if(value) +instance["check"](); +else +instance["uncheck"](); +} else -element['MaterialCheckbox'].uncheck(); +input.checked = value; } } }
git commit: [flex-asjs] [refs/heads/develop] - Forgot to remove this line.
Repository: flex-asjs Updated Branches: refs/heads/develop 467d4bfdb -> 8eaaeffb0 Forgot to remove this line. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8eaaeffb Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8eaaeffb Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8eaaeffb Branch: refs/heads/develop Commit: 8eaaeffb03fc2c38ad2e89ab044425b7e366678c Parents: 467d4bf Author: Harbs <ha...@in-tools.com> Authored: Fri Aug 18 15:26:24 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Fri Aug 18 15:26:24 2017 +0300 -- .../src/main/flex/org/apache/flex/mdl/CheckBox.as | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8eaaeffb/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as index 84afae8..217edf5 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as @@ -245,7 +245,6 @@ package org.apache.flex.mdl COMPILE::JS { -input.checked = value; if(value) element['MaterialCheckbox'].check(); else
git commit: [flex-asjs] [refs/heads/develop] - Setting checked state manually now works
Repository: flex-asjs Updated Branches: refs/heads/develop f208da8d9 -> 467d4bfdb Setting checked state manually now works Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/467d4bfd Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/467d4bfd Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/467d4bfd Branch: refs/heads/develop Commit: 467d4bfdba723eab442e5f8c12ddc816c7f8bb9f Parents: f208da8 Author: Harbs <ha...@in-tools.com> Authored: Fri Aug 18 15:01:23 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Fri Aug 18 15:01:23 2017 +0300 -- .../main/flex/org/apache/flex/mdl/CheckBox.as | 49 +--- .../src/main/resources/defaults.css | 10 ++-- 2 files changed, 47 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/467d4bfd/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as index aeafe00..84afae8 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as @@ -143,7 +143,14 @@ package org.apache.flex.mdl */ override public function get text():String { - return IToggleButtonModel(model).text; +COMPILE::SWF +{ + return IToggleButtonModel(model).text; +} +COMPILE::JS +{ +return textNode ? textNode.nodeValue : ""; +} } /** @@ -151,11 +158,14 @@ package org.apache.flex.mdl */ override public function set text(value:String):void { -IToggleButtonModel(model).text = value; +COMPILE::SWF +{ +IToggleButtonModel(model).text = value; +} COMPILE::JS { -if(textNode == null) +if(!textNode) { textNode = document.createTextNode('') as Text; checkbox.appendChild(textNode); @@ -175,11 +185,22 @@ package org.apache.flex.mdl */ public function get value():String { -return IToggleButtonModel(model).html; +COMPILE::SWF +{ +return IToggleButtonModel(model).html; +} + +COMPILE::JS +{ +return input.value; +} } public function set value(newValue:String):void { -IToggleButtonModel(model).html = newValue; +COMPILE::SWF +{ +IToggleButtonModel(model).html = newValue; +} COMPILE::JS { @@ -202,7 +223,14 @@ package org.apache.flex.mdl */ override public function get selected():Boolean { - return IToggleButtonModel(model).selected; +COMPILE::SWF +{ + return IToggleButtonModel(model).selected; +} +COMPILE::JS +{ +return input.checked; +} } /** @@ -210,11 +238,18 @@ package org.apache.flex.mdl */ override public function set selected(value:Boolean):void { -IToggleButtonModel(model).selected = value; +COMPILE::SWF +{ +IToggleButtonModel(model).selected = value; +} COMPILE::JS { input.checked = value; +if(value) +element['MaterialCheckbox'].check(); +else +element['MaterialCheckbox'].uncheck(); } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/467d4bfd/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css b/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css index 096f442..f8b3b05 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css +++ b/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css @@ -54,11 +54,6 @@ TextArea IBeadCo
git commit: [flex-asjs] [refs/heads/develop] - Cleaned up HTML components
Repository: flex-asjs Updated Branches: refs/heads/develop 6e55c55c7 -> 5277a0cbd Cleaned up HTML components Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/5277a0cb Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/5277a0cb Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/5277a0cb Branch: refs/heads/develop Commit: 5277a0cbd6a6e2abed71efc3d7da63997d7895c8 Parents: 6e55c55 Author: Harbs <ha...@in-tools.com> Authored: Sat Aug 12 22:01:10 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Sat Aug 12 22:01:10 2017 +0300 -- .../projects/HTML/src/main/flex/org/apache/flex/html/A.as | 6 ++ .../projects/HTML/src/main/flex/org/apache/flex/html/H1.as| 6 ++ .../projects/HTML/src/main/flex/org/apache/flex/html/H2.as| 6 ++ .../projects/HTML/src/main/flex/org/apache/flex/html/H3.as| 6 ++ .../projects/HTML/src/main/flex/org/apache/flex/html/H4.as| 6 ++ .../projects/HTML/src/main/flex/org/apache/flex/html/H5.as| 6 ++ .../projects/HTML/src/main/flex/org/apache/flex/html/H6.as| 6 ++ .../projects/HTML/src/main/flex/org/apache/flex/html/I.as | 6 ++ .../projects/HTML/src/main/flex/org/apache/flex/html/Li.as| 7 ++- .../HTML/src/main/flex/org/apache/flex/html/Select.as | 3 +-- .../projects/HTML/src/main/flex/org/apache/flex/html/Ul.as| 5 + 11 files changed, 20 insertions(+), 43 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5277a0cb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/A.as -- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/A.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/A.as index fdb39b3..23c0cde 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/A.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/A.as @@ -111,10 +111,8 @@ package org.apache.flex.html COMPILE::JS override protected function createElement():WrappedHTMLElement { - var a:HTMLElement = document.createElement('a') as HTMLElement; -a.setAttribute('href', href); - - element = a as WrappedHTMLElement; +element = document.createElement('a') as WrappedHTMLElement; +element.setAttribute('href', href); positioner = element; element.flexjs_wrapper = this; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5277a0cb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/H1.as -- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/H1.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/H1.as index 904b4dc..6a7d274 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/H1.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/H1.as @@ -94,12 +94,10 @@ package org.apache.flex.html COMPILE::JS override protected function createElement():WrappedHTMLElement { - var h1:HTMLElement = document.createElement('h1') as HTMLElement; +element = document.createElement('h1') as WrappedHTMLElement; textNode = document.createTextNode('') as Text; -h1.appendChild(textNode); - - element = h1 as WrappedHTMLElement; +element.appendChild(textNode); positioner = element; element.flexjs_wrapper = this; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5277a0cb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/H2.as -- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/H2.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/H2.as index e515fd5..7594984 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/H2.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/H2.as @@ -94,12 +94,10 @@ package org.apache.flex.html COMPILE::JS override protected function createElement():WrappedHTMLElement { - var h2:HTMLElement = document.createElement('h2') as HTMLElement; +element = document.createElement('h2') as WrappedHTMLElement; textNode = document.createTextNode('') as Text; -h2.appendChild(textNode); - - element = h2 as WrappedHTMLElement; +element.appen
git commit: [flex-asjs] [refs/heads/develop] - Fixed event handling
Repository: flex-asjs Updated Branches: refs/heads/develop e830366e4 -> dcd748c8c Fixed event handling Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/dcd748c8 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/dcd748c8 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/dcd748c8 Branch: refs/heads/develop Commit: dcd748c8c2d3732891419599438cf13ecc6ce27b Parents: e830366 Author: Harbs <ha...@in-tools.com> Authored: Wed Aug 9 19:45:30 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Wed Aug 9 19:45:30 2017 +0300 -- .../org/apache/flex/html/beads/DispatchInputFinishedBead.as | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/dcd748c8/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DispatchInputFinishedBead.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DispatchInputFinishedBead.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DispatchInputFinishedBead.as index 40cc900..7b932e2 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DispatchInputFinishedBead.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DispatchInputFinishedBead.as @@ -23,10 +23,12 @@ package org.apache.flex.html.beads import org.apache.flex.core.IStrand; import org.apache.flex.events.Event; import org.apache.flex.events.IEventDispatcher; + import org.apache.flex.events.utils.WhitespaceKeys; COMPILE::JS { import org.apache.flex.core.IRenderedObject; + import org.org.apache.flex.events.KeyboardEvent; import goog.events; } @@ -35,6 +37,7 @@ package org.apache.flex.html.beads import flash.events.FocusEvent; import flash.events.KeyboardEvent; import org.apache.flex.html.beads.ITextFieldView; + import org.apache.flex.events.utils.WhitespaceKeys; } /** @@ -118,9 +121,9 @@ package org.apache.flex.html.beads * @private */ COMPILE::JS - private function keydownHandler( event:Object ) : void + private function keydownHandler( event:KeyboardEvent ) : void { - if (event.keyCode == 13) //enter + if (event.key == WhitespaceKeys.ENTER) //enter { (_strand as IEventDispatcher).dispatchEvent(new Event(INPUT_FINISHED)); }
git commit: [flex-asjs] [refs/heads/develop] - Fixed SimpleDataProviderChangeNotifier and renamed it to EasyDataProviderChangeNotifier
Repository: flex-asjs Updated Branches: refs/heads/develop 2b2c10092 -> e830366e4 Fixed SimpleDataProviderChangeNotifier and renamed it to EasyDataProviderChangeNotifier Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/e830366e Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/e830366e Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/e830366e Branch: refs/heads/develop Commit: e830366e44f9643c30e62a2edcf998e8d36ac6cf Parents: 2b2c100 Author: Harbs <ha...@in-tools.com> Authored: Wed Aug 9 13:42:37 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Wed Aug 9 13:42:37 2017 +0300 -- .../beads/EasyDataProviderChangeNotifier.as | 108 +++ .../beads/SimpleDataProviderChangeNotifier.as | 90 .../Basic/src/main/resources/basic-manifest.xml | 2 +- 3 files changed, 109 insertions(+), 91 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e830366e/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/EasyDataProviderChangeNotifier.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/EasyDataProviderChangeNotifier.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/EasyDataProviderChangeNotifier.as new file mode 100644 index 000..0832581 --- /dev/null +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/EasyDataProviderChangeNotifier.as @@ -0,0 +1,108 @@ + +// +// 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.html.beads +{ + import org.apache.flex.collections.ArrayList; + import org.apache.flex.core.ISelectionModel; + import org.apache.flex.core.IStrand; + import org.apache.flex.events.Event; + import org.apache.flex.core.UIBase; + import org.apache.flex.events.IEventDispatcher; + +/** +* The EasyDataProviderChangeNotifier is similar to DataProviderChangeNotifier +* but allows the user to populate the data provider after it's been added. +* Also, no attributes are required. Just add . +* The dataProvider is assumed to be an ArrayList. +* +* @langversion 3.0 +* @playerversion Flash 10.2 +* @playerversion AIR 2.6 +* @productversion FlexJS 0.0 +*/ + public class EasyDataProviderChangeNotifier extends DataProviderChangeNotifier + { + /** +* constructor. +* +* @langversion 3.0 +* @playerversion Flash 10.2 +* @playerversion AIR 2.6 +* @productversion FlexJS 0.0 +*/ + public function EasyDataProviderChangeNotifier() + { + super(); + changeEventName = "dataProviderChanged"; + } + + override public function set strand(value:IStrand):void + { + _strand = value; + if(changeEventName) + selectionModel.addEventListener(changeEventName, destinationChangedHandler); + + destinationChangedHandler(null); + } + + override protected function destinationChangedHandler(event:Event):void + { + if (!dataProvider) + { + setDataProvider(); + if (!dataProvider && !changeEventName) + selectionModel.addEven
[03/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - Merge branch 'develop' into feature/browser-event
Merge branch 'develop' into feature/browser-event * develop: Make sure selected item doesn't mess with mdl styling Fixed selection of lines which are justified Setting the default TLFFactory is now required. No dependency on StandardTLFFactory (and HTML Text) unless used. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/840ac09f Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/840ac09f Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/840ac09f Branch: refs/heads/feature/strand-work Commit: 840ac09f959ed9ec45124dc03490dcbbbe66f8fb Parents: 8645a4f 8c2a6bc Author: Harbs <ha...@in-tools.com> Authored: Wed Jul 26 12:02:07 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Wed Jul 26 12:02:07 2017 +0300 -- .../flex/mdl/itemRenderers/MenuItemRenderer.as | 5 ++ .../conversion/BaseTextLayoutImporter.as| 6 +- .../textLayout/conversion/TextLayoutImporter.as | 6 +- .../flex/textLayout/edit/SelectionManager.as| 60 ++-- .../flex/textLayout/factory/TLFFactory.as | 9 ++- .../apache/flex/textLayout/utils/FactoryUtil.as | 14 - 6 files changed, 48 insertions(+), 52 deletions(-) --
[07/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - Added delta, deltaX and deltaY for mouse wheel events Needs tests
Added delta, deltaX and deltaY for mouse wheel events Needs tests Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/0d9fe0cc Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/0d9fe0cc Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/0d9fe0cc Branch: refs/heads/feature/strand-work Commit: 0d9fe0ccf79f14212d14f7ac59aa958894c45520 Parents: c166120 Author: Harbs <ha...@in-tools.com> Authored: Wed Jul 26 19:24:03 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Wed Jul 26 19:24:03 2017 +0300 -- .../org/apache/flex/events/KeyboardEvent.as | 9 +- .../flex/org/apache/flex/events/MouseEvent.as | 110 +-- 2 files changed, 111 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0d9fe0cc/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as -- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as index 71b4dd1..b3992d4 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as @@ -43,10 +43,17 @@ package org.apache.flex.events COMPILE::JS private var wrappedEvent:Object; + /** +* @type {KeyboardEvent} +*/ +COMPILE::JS + private var nativeEvent:Object; + COMPILE::JS public function wrapEvent(event:goog.events.BrowserEvent):void { wrappedEvent = event; +nativeEvent = event.getBrowserEvent(); } public function KeyboardEvent( @@ -194,7 +201,7 @@ package org.apache.flex.events if(wrappedEvent) { wrappedEvent.stopPropagation(); - wrappedEvent.getBrowserEvent().stopImmediatePropagation(); + nativeEvent.stopImmediatePropagation(); } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0d9fe0cc/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as -- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as index 14a3af7..d35ade7 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as @@ -151,7 +151,44 @@ package org.apache.flex.events { return cloneEvent() as flash.events.Event; } - + /** + * The horizontal scroll delta for wheel events +* In Flash this always returns 0. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.9 +*/ + public function get deltaX():int + { + return 0; + } + /** +* Horizontal wheel events are not supported in Flash +*/ + public function set deltaX(value:int):void + { + + } + + /** + * The vertical scroll delta for wheel events +* In Flash this just proxies to the delta + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.9 +*/ + public function get deltaY():int + { + return delta + } + public function set deltaY(value:int):void + { + delta = value; + } /** * Create a copy/clone of the Event object. * @@ -261,10 +298,16 @@ package org.apache.flex.events * @type {?goog.events.BrowserEvent} */ private var wrappedEvent:Object; + + /** +* @type {MouseEvent} +*/ + private var nativeEvent:Object; public function wrapEvent(event:goog.events.BrowserEvent):void { wrappedEvent = event; + nativeEvent = event.getBrowserEvent(); } public var relatedO
[10/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - Added SingleSelectionDropIndicatorBead and used it with the other single-selection drag and drop beads. Updated comments throughout.
Added SingleSelectionDropIndicatorBead and used it with the other single-selection drag and drop beads. Updated comments throughout. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/96ee5429 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/96ee5429 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/96ee5429 Branch: refs/heads/feature/strand-work Commit: 96ee5429f5e418658b0908689c692f2d47f128dc Parents: 01bc1dd Author: Peter EntAuthored: Thu Jul 27 11:37:12 2017 -0400 Committer: Peter Ent Committed: Thu Jul 27 11:37:12 2017 -0400 -- .../DragDrop/src/main/flex/DragDropClasses.as | 1 + .../html/beads/SingleSelectionDragImageBead.as | 22 ++-- .../html/beads/SingleSelectionDragSourceBead.as | 77 +--- .../beads/SingleSelectionDropIndicatorBead.as | 111 .../html/beads/SingleSelectionDropTargetBead.as | 125 --- .../beads/controllers/DragMouseController.as| 24 ++-- .../beads/controllers/DropMouseController.as| 16 +-- .../src/main/resources/basic-manifest.xml | 1 + 8 files changed, 315 insertions(+), 62 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/96ee5429/frameworks/projects/DragDrop/src/main/flex/DragDropClasses.as -- diff --git a/frameworks/projects/DragDrop/src/main/flex/DragDropClasses.as b/frameworks/projects/DragDrop/src/main/flex/DragDropClasses.as index 440b540..f2fd9c1 100644 --- a/frameworks/projects/DragDrop/src/main/flex/DragDropClasses.as +++ b/frameworks/projects/DragDrop/src/main/flex/DragDropClasses.as @@ -32,6 +32,7 @@ internal class DragDropClasses import org.apache.flex.html.beads.SingleSelectionDragImageBead; SingleSelectionDragImageBead; import org.apache.flex.html.beads.SingleSelectionDragSourceBead; SingleSelectionDragSourceBead; + import org.apache.flex.html.beads.SingleSelectionDropIndicatorBead; SingleSelectionDropIndicatorBead; import org.apache.flex.html.beads.SingleSelectionDropTargetBead; SingleSelectionDropTargetBead; } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/96ee5429/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 6fb10c9..d1ff17b 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 @@ -50,15 +50,23 @@ package org.apache.flex.html.beads * * The createDragImage() function can be overridden and a different component returned. * -* @see org.apache.flex.html.beads.SingleSelectionDropTargetBead. +* @see org.apache.flex.html.beads.SingleSelectionDragSourceBead. * * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 -* @productversion FlexJS 0.0 +* @productversion FlexJS 0.8 */ public class SingleSelectionDragImageBead extends EventDispatcher implements IBead { + /** +* Constructor. +* +* @langversion 3.0 +* @playerversion Flash 10.2 +* @playerversion AIR 2.6 +* @productversion FlexJS 0.8 +*/ public function SingleSelectionDragImageBead() { super(); @@ -66,6 +74,9 @@ package org.apache.flex.html.beads private var _strand:IStrand; + /** +* @private +*/ public function set strand(value:IStrand):void { _strand = value; @@ -73,11 +84,6 @@ package org.apache.flex.html.beads IEventDispatcher(_strand).addEventListener(DragEvent.DRAG_START, handleDragStart); } - public function get strand():IStrand - { - return _strand; - } - /** * Creates an example/temporary component to be dragged and returns it. * @@ -87,7 +93,7 @@ package org.apache.flex.html.beads * @langversion 3.0 *
[49/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - Merge branch 'develop' into feature/strand-work
Merge branch 'develop' into feature/strand-work * develop: (88 commits) Upgrade should wait for other beads (e.g. IDataProviderItemRendererMapper) to do their thing Condition not necessary Upgrade should wait for other beads (e.g. IDataProviderItemRendererMapper) to do their thing Condition not necessary Only layout if visible LayoutOnShow bead must be used to trigger layout when visible is set to true. LayoutOnShow added to Express Container Not used Made finding errorNS more efficient I think this fixed MS browsers Better XML errors Fix MDLExample FLEX-35347 - Add property "value" to CheckBox which will store additional information Update MDLExample with new feature Split COMPILE::SWF and COMPILE::JS into separate functions. Use setDisplayStyleForLayout() for compatibility with the visible property. - Switch FlexTeamPage_MDL example to compile JSFlex - Clean up native TeamPage try to not run SWF test if target is JS only Fix config of MDLExample used for Ant build Strikethru needs this too. Added special cursor for drag and drop operation. Removed extra IF statement. The Text Engine needs to specify base offset for adornments FontMetrics should not be scaled This doesnât compile correctly. Reverting. Make MDLExample compiled to JS only since MDL library do not have swf part ... Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/2df19a45 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/2df19a45 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/2df19a45 Branch: refs/heads/feature/strand-work Commit: 2df19a45bdbd2d0fb359ad1e4783f383be0c644e Parents: 41ac35e 42db766 Author: Harbs <ha...@in-tools.com> Authored: Mon Aug 7 19:01:43 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Mon Aug 7 19:01:43 2017 +0300 -- examples/build.xml | 3 + .../flexjs/examples/tests/ExampleBuildTest.java | 3 + .../ASDoc/src/main/flex/ASDocMainView.mxml | 12 +- .../src/main/flex/MyInitialView.mxml| 12 +- examples/flexjs/DragAndDropExample/build.xml| 66 examples/flexjs/DragAndDropExample/pom.xml | 77 + .../src/main/flex/DragAndDropExample.mxml | 36 ++ .../src/main/flex/MyInitialView.mxml| 95 ++ .../src/main/flex/models/ProductsModel.as | 54 +++ .../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 examples/flexjs/FlexTeamPage_MDL/pom.xml| 32 +- examples/flexjs/MDLExample/pom.xml | 17 +- .../src/main/config/compile-app-config.xml | 2 +- .../flexjs/MDLExample/src/main/flex/Menus.mxml | 12 +- .../MDLExample/src/main/flex/Toggles.mxml | 13 +- examples/flexjs/TeamPage/pom.xml| 15 - examples/flexjs/pom.xml | 3 + .../org/apache/flex/core/HTMLElementWrapper.as | 26 +- .../flex/org/apache/flex/core/LayoutBase.as | 2 + .../main/flex/org/apache/flex/core/UIBase.as| 47 ++- .../main/flex/org/apache/flex/css2/Cursors.as | 1 - .../main/flex/org/apache/flex/html/Container.as | 4 + .../flex/html/beads/AccordionCollapseBead.as| 6 +- .../html/beads/DataProviderChangeNotifier.as| 38 ++- .../DataProviderCollectionChangeNotifier.as | 12 +- .../beads/DataProviderItemsChangeNotifier.as| 12 +- .../flex/org/apache/flex/html/beads/ListView.as | 70 ++-- .../org/apache/flex/html/beads/PanelView.as | 7 + .../org/apache/flex/html/beads/ScrollBarView.as | 3 +- .../beads/SimpleDataProviderChangeNotifier.as | 3 +- .../apache/flex/html/beads/TitleBarView.mxml| 2 +- .../flex/html/beads/layouts/DataGridLayout.as | 10 +- .../beads/layouts/DataGridPercentageLayout.as | 12 +- .../html/beads/layouts/HorizontalFlexLayout.as | 298 .../layouts/OneFlexibleChildHorizontalLayout.as | 6 +- .../layouts/OneFlexibleChildVerticalLayout.as | 6 +- .../flex/html/beads/layouts/TileLayout.as | 4 +- .../html/beads/layouts/VerticalFlexLayout.as| 288 .../html/supportClasses/OverflowViewport.as | 129 +++ .../Basic/src/main/resources/basic-manifest.xml | 4 +- .../Basic/src/main/resources/defaults.css | 1 + ...
[01/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - Make sure selected item doesn't mess with mdl styling
Repository: flex-asjs Updated Branches: refs/heads/feature/strand-work 41ac35e83 -> 676dfc7bb Make sure selected item doesn't mess with mdl styling Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/1644608e Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/1644608e Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/1644608e Branch: refs/heads/feature/strand-work Commit: 1644608e3c1fce8e3155e0daf3902fecdf9d93ff Parents: a4a2bb3 Author: DESKTOP-RH4S838\YishayAuthored: Wed Jul 26 11:45:33 2017 +0300 Committer: DESKTOP-RH4S838\Yishay Committed: Wed Jul 26 11:45:33 2017 +0300 -- .../flex/org/apache/flex/mdl/itemRenderers/MenuItemRenderer.as | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1644608e/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/itemRenderers/MenuItemRenderer.as -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/itemRenderers/MenuItemRenderer.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/itemRenderers/MenuItemRenderer.as index f5c4fa3..7b4bc30 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/itemRenderers/MenuItemRenderer.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/itemRenderers/MenuItemRenderer.as @@ -165,6 +165,11 @@ package org.apache.flex.mdl.itemRenderers typeNames = element.className; } } + + override public function updateRenderer():void + { + // don't change background-color, let mdl library take care of that. + } protected var _ripple:Boolean = false; /**
[11/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - Fixed hasOwnProperty
Fixed hasOwnProperty Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/93c980dd Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/93c980dd Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/93c980dd Branch: refs/heads/feature/strand-work Commit: 93c980ddf90deb1805ea9b69bf46c0602db46ce1 Parents: 96ee542 Author: Harbs <ha...@in-tools.com> Authored: Sun Jul 30 22:58:32 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Sun Jul 30 22:58:32 2017 +0300 -- frameworks/projects/XML/src/main/flex/XML.as | 26 ++- manualtests/XMLTest/src/MyInitialView.mxml | 3 +++ 2 files changed, 19 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/93c980dd/frameworks/projects/XML/src/main/flex/XML.as -- diff --git a/frameworks/projects/XML/src/main/flex/XML.as b/frameworks/projects/XML/src/main/flex/XML.as index b075f2e..f09a018 100644 --- a/frameworks/projects/XML/src/main/flex/XML.as +++ b/frameworks/projects/XML/src/main/flex/XML.as @@ -1062,17 +1062,23 @@ package return p == "0"; var name:QName = toXMLName(p); var i:int; - for(i=0;i<_attributes.length;i++) + if(name.isAttribute) { - if(_attributes[i].name().matches(name)) - return true; + for(i=0;i<_attributes.length;i++) + { + if(_attributes[i].name().matches(name)) + return true; + } } - for(i=0;i<_children.length;i++) + else { - if(_children[i].nodeKind() != "element") - continue; - if(_children[i].name().matches(name)) - return true; + for(i=0;i<_children.length;i++) + { + if(_children[i].nodeKind() != "element") + continue; + if(_children[i].name().matches(name)) + return true; + } } return false; } @@ -2165,11 +2171,11 @@ package private function toAttributeName(name:*):QName { var qname:QName; - if(!name is QName) + if(!(name is QName)) { name = name.toString(); if(name.indexOf("@") > -1) - name = name.substring(name.indexOf("@")); + name = name.substring(name.indexOf("@") + 1); } qname = toXMLName(name); qname.isAttribute = true; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/93c980dd/manualtests/XMLTest/src/MyInitialView.mxml -- diff --git a/manualtests/XMLTest/src/MyInitialView.mxml b/manualtests/XMLTest/src/MyInitialView.mxml index efb4317..6b73d7f 100644 --- a/manualtests/XMLTest/src/MyInitialView.mxml +++ b/manualtests/XMLTest/src/MyInitialView.mxml @@ -97,6 +97,9 @@ limitations under the License. var list4:XMLList; var xml1:XML = ; trace(xml1.toXMLString()); +trace("should be true: " + xml1.hasOwnProperty("@baz")); +trace("should be false: " + xml1.hasOwnProperty("@foo")); +trace("should be false: " + xml1.hasOwnProperty("baz")); trace(xml1.toXMLString() == ''); var baz:XMLList = xml1.@baz; trace("baz: " + xml1.@baz.toString() + " //true");
[41/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - Not used
Not used Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/bc50901e Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/bc50901e Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/bc50901e Branch: refs/heads/feature/strand-work Commit: bc50901e97d6416a2983272c8f357e9c26592244 Parents: 10be5b8 Author: Harbs <ha...@in-tools.com> Authored: Sun Aug 6 07:54:29 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Sun Aug 6 07:54:29 2017 +0300 -- .../src/main/flex/org/apache/flex/text/engine/ITextLine.as | 1 - .../Text/src/main/flex/org/apache/flex/text/html/TextLine.as | 6 -- 2 files changed, 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bc50901e/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ITextLine.as -- diff --git a/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ITextLine.as b/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ITextLine.as index 60b6082..e5020ef 100644 --- a/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ITextLine.as +++ b/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ITextLine.as @@ -34,7 +34,6 @@ package org.apache.flex.text.engine function get doubleClickEnabled():Boolean; function get hasGraphicElement():Boolean; function get hasTabs():Boolean; - function get metaData():Object; function get nextLine():ITextLine; function get previousLine():ITextLine; function get rawTextLength():int; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bc50901e/frameworks/projects/Text/src/main/flex/org/apache/flex/text/html/TextLine.as -- diff --git a/frameworks/projects/Text/src/main/flex/org/apache/flex/text/html/TextLine.as b/frameworks/projects/Text/src/main/flex/org/apache/flex/text/html/TextLine.as index 33d4b22..440ae30 100644 --- a/frameworks/projects/Text/src/main/flex/org/apache/flex/text/html/TextLine.as +++ b/frameworks/projects/Text/src/main/flex/org/apache/flex/text/html/TextLine.as @@ -159,12 +159,6 @@ package org.apache.flex.text.html return false; } - COMPILE::JS - public function get metaData():Object - { - return null; - } - public function get nextLine():ITextLine { return null;
[20/50] flex-asjs git commit: Added OverflowViewport for containers which require visible overflow. Changed default ScrollingViewport to the standard Viewport. We might want to make it simply “Viewpor
Added OverflowViewport for containers which require visible overflow. Changed default ScrollingViewport to the standard Viewport. We might want to make it simply âViewportâ. Right now, both ScrollingViewport and Viewport point to the same thing. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/637cb437 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/637cb437 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/637cb437 Branch: refs/heads/feature/strand-work Commit: 637cb4376541f2c2e946769e49259507364e0529 Parents: 8ce67e2 Author: Harbs <ha...@in-tools.com> Authored: Wed Aug 2 00:24:44 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Wed Aug 2 00:24:44 2017 +0300 -- .../html/supportClasses/OverflowViewport.as | 129 +++ .../Basic/src/main/resources/basic-manifest.xml | 4 +- 2 files changed, 132 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/637cb437/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/OverflowViewport.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/OverflowViewport.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/OverflowViewport.as new file mode 100644 index 000..c123e96 --- /dev/null +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/OverflowViewport.as @@ -0,0 +1,129 @@ + +// +// 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.html.supportClasses +{ + import org.apache.flex.core.IBead; + import org.apache.flex.core.IContentView; + import org.apache.flex.core.IParentIUIBase; + import org.apache.flex.core.IStrand; + import org.apache.flex.core.IUIBase; + import org.apache.flex.core.IViewport; + import org.apache.flex.core.IViewportModel; + import org.apache.flex.core.UIBase; +import org.apache.flex.core.ValuesManager; + import org.apache.flex.events.Event; +import org.apache.flex.geom.Rectangle; +import org.apache.flex.geom.Size; + import org.apache.flex.html.beads.models.ScrollBarModel; +import org.apache.flex.utils.CSSContainerUtils; + COMPILE::SWF + { + import flash.geom.Rectangle; + } + +/** + * A OverflowViewport is the area of a Container set aside for displaying + * content. If the content exceeds the visible area of the viewport +* it will show. +* +* @langversion 3.0 +* @playerversion Flash 10.2 +* @playerversion AIR 2.6 +* @productversion FlexJS 0.0 + */ + public class OverflowViewport implements IBead, IViewport + { + /** +* Constructor +* +* @langversion 3.0 +* @playerversion Flash 10.2 +* @playerversion AIR 2.6 +* @productversion FlexJS 0.0 +*/ + public function OverflowViewport() + { + } + + /** +* Get the actual parent of the container's content. +* +* @langversion 3.0 +* @playerversion Flash 10.2 +* @playerversion AIR 2.6 +* @productversion FlexJS 0.0 +* @flexjsignorecoercion org.apache.flex.core.IUIBase +*/ +public function get contentView():IUIBase +{ +return _strand as IUIBase; +} + + protected var _strand:IStrand; + + /** +* @flexjsignorecoercion org.apache.flex.core.IUIBase +*/ + public functio
[46/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - Upgrade should wait for other beads (e.g. IDataProviderItemRendererMapper) to do their thing
Upgrade should wait for other beads (e.g. IDataProviderItemRendererMapper) to do their thing Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/89dc8f1b Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/89dc8f1b Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/89dc8f1b Branch: refs/heads/feature/strand-work Commit: 89dc8f1bb5973aa59c3712e749e468d9813d17dd Parents: ab9384c Author: DESKTOP-RH4S838\Yishay <yishayj...@hotmail.com> Authored: Mon Aug 7 13:48:39 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Mon Aug 7 14:34:53 2017 +0300 -- .../src/main/flex/org/apache/flex/mdl/Menu.as | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/89dc8f1b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Menu.as -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Menu.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Menu.as index bc69fc4..193addd 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Menu.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Menu.as @@ -18,6 +18,7 @@ package org.apache.flex.mdl { + import org.apache.flex.events.Event; import org.apache.flex.html.List; import org.apache.flex.mdl.beads.UpgradeElement; @@ -58,9 +59,14 @@ package org.apache.flex.mdl super(); className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user; -addBead(new UpgradeElement()); + addEventListener("beadsAdded", addUpgradeBead); } - + + protected function addUpgradeBead(event:Event):void + { + addBead(new UpgradeElement()); + } + /** * Default position for Menu in MDL is bottom/left (or no class selector specified) *
[22/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - - Fix failing Maven build of TLF module by adding CONFIG::debug and CONFIG:release to defines - Surround assert function by curly bra
- Fix failing Maven build of TLF module by adding CONFIG::debug and CONFIG:release to defines - Surround assert function by curly brackets in TLF debug package Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b52122d9 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b52122d9 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b52122d9 Branch: refs/heads/feature/strand-work Commit: b52122d95e925da051ad889e18681b830acbc802 Parents: 8ce67e2 Author: piotrzAuthored: Tue Aug 1 23:29:05 2017 +0200 Committer: piotrz Committed: Tue Aug 1 23:29:05 2017 +0200 -- frameworks/projects/TLF/pom.xml | 10 + .../org/apache/flex/textLayout/debug/assert.as | 43 ++-- 2 files changed, 32 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b52122d9/frameworks/projects/TLF/pom.xml -- diff --git a/frameworks/projects/TLF/pom.xml b/frameworks/projects/TLF/pom.xml index 1b7aac0..a052743 100644 --- a/frameworks/projects/TLF/pom.xml +++ b/frameworks/projects/TLF/pom.xml @@ -63,6 +63,16 @@ true true + + + CONFIG::debug + false + + + CONFIG::release + true + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b52122d9/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/debug/assert.as -- diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/debug/assert.as b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/debug/assert.as index 62ec778..09b6edf 100644 --- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/debug/assert.as +++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/debug/assert.as @@ -16,32 +16,33 @@ // limitations under the License. // -package org.apache.flex.textLayout.debug +package org.apache.flex.textLayout.debug { - - - - /** @private * Debug only function that prints a trace message if condition is false. * @return count of errors reported this assert: 1 or 0. * */ CONFIG::debug - public function assert(condition:Boolean, warning:String):int - { - if (!condition) - { - trace("ERROR: " + warning); - // throw if the bit is set - if (Debugging.throwOnAssert) - throw(new Error("TextLayoutAssert: " + warning)); - return 1; - } - return 0; - } +{ +public function assert(condition:Boolean, warning:String):int +{ +if (!condition) +{ +trace("ERROR: " + warning); +// throw if the bit is set +if (Debugging.throwOnAssert) +throw(new Error("TextLayoutAssert: " + warning)); +return 1; +} +return 0; +} +} + /** @private */ - CONFIG::release - public function assert(condition:Boolean, warning:String):void - { - } + CONFIG::release +{ +public function assert(condition:Boolean, warning:String):void +{ +} +} } // end package
[05/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - Fixed preventDefault()
Fixed preventDefault() Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/60f223a2 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/60f223a2 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/60f223a2 Branch: refs/heads/feature/strand-work Commit: 60f223a2d0e39b092cd392ab159aeca72174bedf Parents: 9767786 Author: Harbs <ha...@in-tools.com> Authored: Wed Jul 26 14:51:44 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Wed Jul 26 14:51:44 2017 +0300 -- .../org/apache/flex/events/KeyboardEvent.as | 35 .../flex/org/apache/flex/events/MouseEvent.as | 32 ++ 2 files changed, 67 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/60f223a2/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as -- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as index 29761f7..dda7e0a 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as @@ -210,7 +210,42 @@ package org.apache.flex.events if(wrappedEvent) wrappedEvent.stopPropagation(); } + /** +* Whether the default action has been prevented. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 +*/ +COMPILE::JS + override public function preventDefault():void + { + wrappedEvent ? wrappedEvent.preventDefault() : super.preventDefault(); + } + COMPILE::JS + private var _defaultPrevented:Boolean; + /** +* Whether the default action has been prevented. +* @type {boolean} + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 +*/ +COMPILE::JS + public function get defaultPrevented():Boolean + { + return wrappedEvent ? wrappedEvent.defaultPrevented : _defaultPrevented; + } +COMPILE::JS + public function set defaultPrevented(value:Boolean):void + { + _defaultPrevented = value; + } + /** * Create a copy/clone of the KeyboardEvent object. * http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/60f223a2/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as -- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as index cb52298..1b6fe7e 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as @@ -440,6 +440,38 @@ package org.apache.flex.events } /** +* Whether the default action has been prevented. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 +*/ + override public function preventDefault():void + { + wrappedEvent ? wrappedEvent.preventDefault() : super.preventDefault(); + } + + private var _defaultPrevented:Boolean; + /** +* Whether the default action has been prevented. +* @type {boolean} + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 +*/ + public function get defaultPrevented():Boolean + { + return wrappedEvent ? wrappedEvent.defaultPrevented : _defaultPrevented; + } + public function set defaultPrevented(value:Boolean):void + { + _defaultPrevented = value; + } + + /** * @private */ private static function installRollOverMixin():Boolean
[25/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - Add small adjustment to MDLExample Menus
Add small adjustment to MDLExample Menus Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/49a47f96 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/49a47f96 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/49a47f96 Branch: refs/heads/feature/strand-work Commit: 49a47f96f4fbf5c5af1f60e31abcd235003c35b3 Parents: 53ded5a Author: piotrzAuthored: Wed Aug 2 00:09:41 2017 +0200 Committer: piotrz Committed: Wed Aug 2 00:09:41 2017 +0200 -- .../flexjs/MDLExample/src/main/flex/Menus.mxml| 18 -- 1 file changed, 8 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/49a47f96/examples/flexjs/MDLExample/src/main/flex/Menus.mxml -- diff --git a/examples/flexjs/MDLExample/src/main/flex/Menus.mxml b/examples/flexjs/MDLExample/src/main/flex/Menus.mxml index d7bc721..b6e4ee7 100644 --- a/examples/flexjs/MDLExample/src/main/flex/Menus.mxml +++ b/examples/flexjs/MDLExample/src/main/flex/Menus.mxml @@ -24,15 +24,13 @@ limitations under the License. @@ -51,7 +49,7 @@ limitations under the License. - - + \ No newline at end of file
[33/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - Fix config of MDLExample used for Ant build
Fix config of MDLExample used for Ant build Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/25ae9b10 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/25ae9b10 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/25ae9b10 Branch: refs/heads/feature/strand-work Commit: 25ae9b101b8d5d56e48bcaf6cd1371168deefbfa Parents: de15fe6 Author: piotrzAuthored: Thu Aug 3 00:47:24 2017 +0200 Committer: piotrz Committed: Thu Aug 3 00:47:24 2017 +0200 -- examples/flexjs/MDLExample/src/main/config/compile-app-config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/25ae9b10/examples/flexjs/MDLExample/src/main/config/compile-app-config.xml -- diff --git a/examples/flexjs/MDLExample/src/main/config/compile-app-config.xml b/examples/flexjs/MDLExample/src/main/config/compile-app-config.xml index e306790..f612ccb 100644 --- a/examples/flexjs/MDLExample/src/main/config/compile-app-config.xml +++ b/examples/flexjs/MDLExample/src/main/config/compile-app-config.xml @@ -20,7 +20,7 @@ JSFlex -HTML.swc:defaults.css +Basic.swc:defaults.css ../resources/mdl-js-index-template.html
[28/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - FontMetrics should not be scaled
FontMetrics should not be scaled Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/adf157ac Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/adf157ac Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/adf157ac Branch: refs/heads/feature/strand-work Commit: adf157ac4d462095153739706d485f55b9926bd2 Parents: 253e73b Author: Harbs <ha...@in-tools.com> Authored: Wed Aug 2 13:04:16 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Wed Aug 2 13:04:16 2017 +0300 -- .../src/main/flex/org/apache/flex/text/engine/ElementFormat.as| 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/adf157ac/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ElementFormat.as -- diff --git a/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ElementFormat.as b/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ElementFormat.as index d5ab61c..b144b90 100644 --- a/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ElementFormat.as +++ b/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ElementFormat.as @@ -86,8 +86,7 @@ package org.apache.flex.text.engine public function getFontMetrics():FontMetrics { assert(fontDescription != null,"fontDescription not assigned!"); - var metrics:FontMetrics = fontDescription.fontLoader.getFont(fontDescription.fontName,fontDescription.fontStyle).fontMetrics; - return metrics.getScaledMetrics(fontSize); + return fontDescription.fontLoader.getFont(fontDescription.fontName,fontDescription.fontStyle).fontMetrics; } } } \ No newline at end of file
[23/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into develop
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/88c62cb3 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/88c62cb3 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/88c62cb3 Branch: refs/heads/feature/strand-work Commit: 88c62cb38372144f7131e1a6219b967778a526d7 Parents: b52122d 498d311 Author: piotrzAuthored: Tue Aug 1 23:32:16 2017 +0200 Committer: piotrz Committed: Tue Aug 1 23:32:16 2017 +0200 -- .../html/supportClasses/OverflowViewport.as | 129 +++ .../Basic/src/main/resources/basic-manifest.xml | 4 +- .../flex/textLayout/compose/TextLineRecycler.as | 2 +- 3 files changed, 133 insertions(+), 2 deletions(-) --
[35/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - try to not run SWF test if target is JS only
try to not run SWF test if target is JS only Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d360e9c1 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d360e9c1 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d360e9c1 Branch: refs/heads/feature/strand-work Commit: d360e9c11465d8647109e94674e0c910521ca574 Parents: 61bb998 Author: Alex HaruiAuthored: Wed Aug 2 17:11:44 2017 -0700 Committer: Alex Harui Committed: Wed Aug 2 17:11:49 2017 -0700 -- .../org/apache/flex/flexjs/examples/tests/ExampleBuildTest.java | 3 +++ examples/flexjs/pom.xml | 1 + 2 files changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d360e9c1/examples/examples-tests/src/main/java/org/apache/flex/flexjs/examples/tests/ExampleBuildTest.java -- diff --git a/examples/examples-tests/src/main/java/org/apache/flex/flexjs/examples/tests/ExampleBuildTest.java b/examples/examples-tests/src/main/java/org/apache/flex/flexjs/examples/tests/ExampleBuildTest.java index 9fcd1f7..19bb982 100644 --- a/examples/examples-tests/src/main/java/org/apache/flex/flexjs/examples/tests/ExampleBuildTest.java +++ b/examples/examples-tests/src/main/java/org/apache/flex/flexjs/examples/tests/ExampleBuildTest.java @@ -67,6 +67,9 @@ public class ExampleBuildTest { /// protected boolean isSwfProject() { +String targets = System.getProperty("targets", "SWF,JSFlex"); +if (!targets.contains("SWF")) +return false; String type = System.getProperty("type", "jar"); return "swf".equalsIgnoreCase(type); } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d360e9c1/examples/flexjs/pom.xml -- diff --git a/examples/flexjs/pom.xml b/examples/flexjs/pom.xml index 79ef510..14abd70 100644 --- a/examples/flexjs/pom.xml +++ b/examples/flexjs/pom.xml @@ -89,6 +89,7 @@ ${project.artifactId} ${project.version} ${project.packaging} + ${project.build.plugins.plugin.configuration.targets} ${project.build.directory}
[38/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - FLEX-35347 - Add property "value" to CheckBox which will store additional information Update MDLExample with new feature
FLEX-35347 - Add property "value" to CheckBox which will store additional information Update MDLExample with new feature Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/04045d39 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/04045d39 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/04045d39 Branch: refs/heads/feature/strand-work Commit: 04045d39edefa636babe52760abadd45c95ce8af Parents: 0bc728c Author: piotrzAuthored: Thu Aug 3 22:58:34 2017 +0200 Committer: piotrz Committed: Thu Aug 3 22:58:34 2017 +0200 -- .../MDLExample/src/main/flex/Toggles.mxml | 15 +-- .../main/flex/org/apache/flex/mdl/CheckBox.as | 26 ++-- 2 files changed, 32 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/04045d39/examples/flexjs/MDLExample/src/main/flex/Toggles.mxml -- diff --git a/examples/flexjs/MDLExample/src/main/flex/Toggles.mxml b/examples/flexjs/MDLExample/src/main/flex/Toggles.mxml index 784a7f6..7162c0a 100644 --- a/examples/flexjs/MDLExample/src/main/flex/Toggles.mxml +++ b/examples/flexjs/MDLExample/src/main/flex/Toggles.mxml @@ -24,8 +24,8 @@ limitations under the License. @@ -57,7 +58,7 @@ limitations under the License. - + @@ -82,13 +83,13 @@ limitations under the License. - + - - - + + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/04045d39/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as index 698be69..aeafe00 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as @@ -18,7 +18,7 @@ package org.apache.flex.mdl { -import org.apache.flex.html.CheckBox; +import org.apache.flex.html.CheckBox; import org.apache.flex.core.IToggleButtonModel; import org.apache.flex.mdl.beads.UpgradeChildren; import org.apache.flex.mdl.beads.UpgradeElement; @@ -103,7 +103,7 @@ package org.apache.flex.mdl element.flexjs_wrapper = this; return element; -}; +} protected var _ripple:Boolean = false; @@ -165,6 +165,28 @@ package org.apache.flex.mdl } } +/** + * The value associated with the CheckBox. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.9 + */ +public function get value():String +{ +return IToggleButtonModel(model).html; +} +public function set value(newValue:String):void +{ +IToggleButtonModel(model).html = newValue; + +COMPILE::JS +{ +input.value = newValue; +} +} + COMPILE::JS protected var textNode:Text;
[16/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - Made JS FlexibleLayouts consistent with swf ones.
Made JS FlexibleLayouts consistent with swf ones. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a631f066 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a631f066 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a631f066 Branch: refs/heads/feature/strand-work Commit: a631f066eb8ae3bb9b4e4cf17060a44152156062 Parents: 0ad0cdd Author: Harbs <ha...@in-tools.com> Authored: Mon Jul 31 12:15:57 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Mon Jul 31 12:15:57 2017 +0300 -- .../flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as | 3 ++- .../flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as | 3 ++- frameworks/projects/Basic/src/main/resources/defaults.css | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a631f066/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as index 2f81699..f0853fa 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as @@ -155,7 +155,8 @@ package org.apache.flex.html.beads.layouts // set the display on the contentView contentView.element.style["display"] = "flex"; contentView.element.style["flex-flow"] = "row"; - if (!contentView.element.style["align-items"]) + var align:String = ValuesManager.valuesImpl.getValue(host, "alignItems"); + if (align == "center") contentView.element.style["align-items"] = "center"; var n:int = contentView.numElements; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a631f066/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as index 53617fb..c4d70e1 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as @@ -156,7 +156,8 @@ package org.apache.flex.html.beads.layouts // set the display on the contentView contentView.element.style["display"] = "flex"; contentView.element.style["flex-flow"] = "column"; - if (!contentView.element.style["align-items"]) + var align:String = ValuesManager.valuesImpl.getValue(host, "alignItems"); + if (align == "center") contentView.element.style["align-items"] = "center"; var n:int = contentView.numElements; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a631f066/frameworks/projects/Basic/src/main/resources/defaults.css -- diff --git a/frameworks/projects/Basic/src/main/resources/defaults.css b/frameworks/projects/Basic/src/main/resources/defaults.css index 91d7932..7f7973b 100644 --- a/frameworks/projects/Basic/src/main/resources/defaults.css +++ b/frameworks/projects/Basic/src/main/resources/defaults.css @@ -58,6 +58,7 @@ Application { padding: 0px; margin: 0px; + align-content: flex-start; } Button
[48/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into develop
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into develop * 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs: Upgrade should wait for other beads (e.g. IDataProviderItemRendererMapper) to do their thing Condition not necessary Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/42db7661 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/42db7661 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/42db7661 Branch: refs/heads/feature/strand-work Commit: 42db76613c4c1ae889b694e1e49b79c7c8988165 Parents: 89dc8f1 dee2627 Author: Harbs <ha...@in-tools.com> Authored: Mon Aug 7 14:36:19 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Mon Aug 7 14:36:19 2017 +0300 -- --
[09/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - DragMouseController now dispatches events with itself as target; useful in MXML files.
DragMouseController now dispatches events with itself as target; useful in MXML files. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/01bc1dd0 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/01bc1dd0 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/01bc1dd0 Branch: refs/heads/feature/strand-work Commit: 01bc1dd0220b6244940efa05d632546370bf8f4d Parents: 28bf352 Author: Peter EntAuthored: Wed Jul 26 13:59:13 2017 -0400 Committer: Peter Ent Committed: Wed Jul 26 13:59:13 2017 -0400 -- .../projects/DragDrop/src/main/config/compile-swf-config.xml | 1 + .../src/main/flex/org/apache/flex/events/DragEvent.as | 7 ++- .../apache/flex/html/beads/controllers/DragMouseController.as | 5 + 3 files changed, 12 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/01bc1dd0/frameworks/projects/DragDrop/src/main/config/compile-swf-config.xml -- diff --git a/frameworks/projects/DragDrop/src/main/config/compile-swf-config.xml b/frameworks/projects/DragDrop/src/main/config/compile-swf-config.xml index 9fd8bab..a5adbcf 100644 --- a/frameworks/projects/DragDrop/src/main/config/compile-swf-config.xml +++ b/frameworks/projects/DragDrop/src/main/config/compile-swf-config.xml @@ -33,6 +33,7 @@ ../../../../../libs/Core.swc ../../../../../libs/Basic.swc ../../../../../libs/Collections.swc +../../../../../libs/Graphics.swc http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/01bc1dd0/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/events/DragEvent.as -- diff --git a/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/events/DragEvent.as b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/events/DragEvent.as index 0731c75..066ce74 100644 --- a/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/events/DragEvent.as +++ b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/events/DragEvent.as @@ -29,6 +29,10 @@ package org.apache.flex.events import window.MouseEvent; import org.apache.flex.events.utils.EventUtils; } + COMPILE::SWF + { + import flash.display.InteractiveObject; + } /** * Drag and Drop Events. @@ -360,7 +364,7 @@ package org.apache.flex.events de.shiftKey = event.shiftKey; de.buttonDown = event.buttonDown; de.delta = event.delta; -de.relatedObject = event.relatedObject; +de.relatedObject = event.target as InteractiveObject; var localPoint:Point = new Point(event.screenX, event.screenY); var clientPoint:Point = PointUtils.localToGlobal(localPoint, event.target); @@ -376,6 +380,7 @@ package org.apache.flex.events de.altKey = event.altKey; de.ctrlKey = event.ctrlKey; de.shiftKey = event.shiftKey; + de.relatedObject = event.target; var localPoint:Point = new Point(event.screenX, event.screenY); var clientPoint:Point = PointUtils.localToGlobal(localPoint, event.target); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/01bc1dd0/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/controllers/DragMouseController.as -- diff --git a/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/controllers/DragMouseController.as b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/controllers/DragMouseController.as index 38b1b1f..c7ac3ba 100644 --- a/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/controllers/DragMouseController.as +++ b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/controllers/DragMouseController.as @@ -218,6 +218,7 @@ package org.apache.flex.html.beads.controllers dragEvent.clientY = mouseDownY; trace("DRAG-MOUSE: sending dragStart via "+event.target.toString()); DragEvent.dispatchDragEvent(dragEvent, event.target); + dispatchEvent(dragEvent); if
[14/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - Fixing SimpleDataProviderChangeNotifier which was broken after recent changes to DataProviderChangeNotifier
Fixing SimpleDataProviderChangeNotifier which was broken after recent changes to DataProviderChangeNotifier Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/fd2ba63a Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/fd2ba63a Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/fd2ba63a Branch: refs/heads/feature/strand-work Commit: fd2ba63a27aa7bc67ab0cd29094a9ed2c90ec6c2 Parents: e32fc22 Author: DESKTOP-RH4S838\YishayAuthored: Mon Jul 31 11:06:16 2017 +0300 Committer: DESKTOP-RH4S838\Yishay Committed: Mon Jul 31 11:06:16 2017 +0300 -- .../html/beads/DataProviderChangeNotifier.as| 26 ++-- .../beads/SimpleDataProviderChangeNotifier.as | 3 ++- 2 files changed, 20 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd2ba63a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataProviderChangeNotifier.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataProviderChangeNotifier.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataProviderChangeNotifier.as index 22155cb..9b2315f 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataProviderChangeNotifier.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataProviderChangeNotifier.as @@ -54,16 +54,10 @@ package org.apache.flex.html.beads { if(object[propertyName] == dataProvider) return; -dataProvider.removeEventListener("itemAdded", handleDataProviderChanges); -dataProvider.removeEventListener("itemRemoved", handleDataProviderChanges); -dataProvider.removeEventListener("itemUpdated", handleDataProviderChanges); -dataProvider.removeEventListener("collectionChanged", handleDataProviderChanges); + detachEventListeners(); } dataProvider = object[propertyName] as ArrayList; -dataProvider.addEventListener("itemAdded", handleDataProviderChanges); -dataProvider.addEventListener("itemRemoved", handleDataProviderChanges); -dataProvider.addEventListener("itemUpdated", handleDataProviderChanges); -dataProvider.addEventListener("collectionChanged", handleDataProviderChanges); + attachEventListeners(); } private function handleDataProviderChanges(event:Event):void @@ -71,5 +65,21 @@ package org.apache.flex.html.beads var selectionModel:ISelectionModel = _strand.getBeadByType(ISelectionModel) as ISelectionModel; selectionModel.dispatchEvent(new Event("dataProviderChanged")); } + + protected function attachEventListeners():void + { + dataProvider.addEventListener("itemAdded", handleDataProviderChanges); + dataProvider.addEventListener("itemRemoved", handleDataProviderChanges); + dataProvider.addEventListener("itemUpdated", handleDataProviderChanges); + dataProvider.addEventListener("collectionChanged", handleDataProviderChanges); + } + + protected function detachEventListeners():void + { + dataProvider.removeEventListener("itemAdded", handleDataProviderChanges); + dataProvider.removeEventListener("itemRemoved", handleDataProviderChanges); + dataProvider.removeEventListener("itemUpdated", handleDataProviderChanges); + dataProvider.removeEventListener("collectionChanged", handleDataProviderChanges); + } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd2ba63a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/SimpleDataProviderChangeNotifier.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/SimpleDataProviderChangeNotifier.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/SimpleDataProviderChangeNotifier.as index 718f6bb..1d55c76 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/SimpleDataProviderChangeNotifier.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/SimpleDataProviderChangeNotifier.as @@ -64,7 +64,8 @@ package
[02/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into develop
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/8c2a6bc4 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8c2a6bc4 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8c2a6bc4 Branch: refs/heads/feature/strand-work Commit: 8c2a6bc4153208bb0141c61f3ab53def0b157b7d Parents: 1644608 c3b6d32 Author: DESKTOP-RH4S838\YishayAuthored: Wed Jul 26 11:46:16 2017 +0300 Committer: DESKTOP-RH4S838\Yishay Committed: Wed Jul 26 11:46:16 2017 +0300 -- .../flex/textLayout/edit/SelectionManager.as| 60 ++-- 1 file changed, 31 insertions(+), 29 deletions(-) --
[50/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - A bit more strand work Should fix CreateJS
A bit more strand work Should fix CreateJS Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/676dfc7b Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/676dfc7b Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/676dfc7b Branch: refs/heads/feature/strand-work Commit: 676dfc7bbc08a6ce77d8a89347e4a42319963896 Parents: 2df19a4 Author: Harbs <ha...@in-tools.com> Authored: Wed Aug 9 00:15:29 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Wed Aug 9 00:15:29 2017 +0300 -- .../flex/org/apache/flex/core/Application.as| 4 ++-- .../org/apache/flex/core/HTMLElementWrapper.as | 4 ++-- .../main/flex/org/apache/flex/core/UIBase.as| 4 ++-- .../flex/org/apache/flex/core/UIButtonBase.as | 4 ++-- .../flex/org/apache/flex/html/MXMLBeadView.as | 4 ++-- .../org/apache/flex/html/beads/TextAreaView.as | 4 ++-- .../supportClasses/TextFieldItemRenderer.as | 4 ++-- .../flex/org/apache/flex/core/ElementWrapper.as | 8 +++ .../main/flex/org/apache/flex/core/IStrand.as | 2 +- .../main/flex/org/apache/flex/core/Strand.as| 4 ++-- .../org/apache/flex/createjs/Application.as | 24 .../org/apache/flex/createjs/core/UIBase.as | 14 +--- 12 files changed, 26 insertions(+), 54 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/676dfc7b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as index 2bda2ad..178bc8a 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as @@ -404,9 +404,9 @@ package org.apache.flex.core * @productversion FlexJS 0.9 */ COMPILE::SWF -public function addBeads():void +public function addBeads(dispatch:Boolean=true):void { -addBeadsToStrand(this,beads); +addBeadsToStrand(this,beads,dispatch); } /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/676dfc7b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as index e594b7d..21de5f6 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as @@ -248,9 +248,9 @@ package org.apache.flex.core * @playerversion AIR 2.6 * @productversion FlexJS 0.9 */ -public function addBeads():void +public function addBeads(dispatch:Boolean=true):void { -addBeadsToStrand(this,beads); +addBeadsToStrand(this,beads,dispatch); } /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/676dfc7b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as index e83de17..41b05e5 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as @@ -1068,9 +1068,9 @@ package org.apache.flex.core * @productversion FlexJS 0.9 */ COMPILE::SWF -public function addBeads():void +public function addBeads(dispatch:Boolean=true):void { -addBeadsToStrand(this,beads); +addBeadsToStrand(this,beads,dispatch); } COMPILE::SWF http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/676dfc7b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIButtonBase.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIButtonBase.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIButtonBase.as index bc84800..e4b8420 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIButtonBase.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIButtonBase.as @@ -774,9 +774,9 @@ package org.apac
[12/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - Merge branch 'develop' into feature/browser-event
Merge branch 'develop' into feature/browser-event * develop: Fixed hasOwnProperty Added SingleSelectionDropIndicatorBead and used it with the other single-selection drag and drop beads. Updated comments throughout. DragMouseController now dispatches events with itself as target; useful in MXML files. PointUtils was missing. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/e32fc222 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/e32fc222 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/e32fc222 Branch: refs/heads/feature/strand-work Commit: e32fc222c011664faec082750f348bc715f682cd Parents: 0d9fe0c 93c980d Author: Harbs <ha...@in-tools.com> Authored: Sun Jul 30 23:49:50 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Sun Jul 30 23:49:50 2017 +0300 -- .../projects/Core/src/main/flex/CoreClasses.as | 1 + .../src/main/config/compile-swf-config.xml | 1 + .../DragDrop/src/main/flex/DragDropClasses.as | 1 + .../flex/org/apache/flex/events/DragEvent.as| 7 +- .../html/beads/SingleSelectionDragImageBead.as | 22 ++-- .../html/beads/SingleSelectionDragSourceBead.as | 77 +--- .../beads/SingleSelectionDropIndicatorBead.as | 111 .../html/beads/SingleSelectionDropTargetBead.as | 125 --- .../beads/controllers/DragMouseController.as| 29 +++-- .../beads/controllers/DropMouseController.as| 16 +-- .../src/main/resources/basic-manifest.xml | 1 + frameworks/projects/XML/src/main/flex/XML.as| 26 ++-- manualtests/XMLTest/src/MyInitialView.mxml | 3 + 13 files changed, 347 insertions(+), 73 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e32fc222/frameworks/projects/Core/src/main/flex/CoreClasses.as --
[42/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - Only layout if visible LayoutOnShow bead must be used to trigger layout when visible is set to true. LayoutOnShow added to Express Co
Only layout if visible LayoutOnShow bead must be used to trigger layout when visible is set to true. LayoutOnShow added to Express Container Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a9e7458c Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a9e7458c Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a9e7458c Branch: refs/heads/feature/strand-work Commit: a9e7458c505fdd1731068b3888a649035934c171 Parents: bc50901 Author: Harbs <ha...@in-tools.com> Authored: Mon Aug 7 00:12:12 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Mon Aug 7 00:12:12 2017 +0300 -- .../src/main/flex/org/apache/flex/core/LayoutBase.as| 2 ++ .../flex/org/apache/flex/html/beads/ScrollBarView.as| 3 ++- .../apache/flex/html/beads/layouts/DataGridLayout.as| 10 +- .../flex/html/beads/layouts/DataGridPercentageLayout.as | 12 ++-- .../src/main/flex/org/apache/flex/express/Container.as | 9 + 5 files changed, 28 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a9e7458c/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/LayoutBase.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/LayoutBase.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/LayoutBase.as index 7bc5ab0..6c4f2f2 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/LayoutBase.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/LayoutBase.as @@ -316,6 +316,8 @@ package org.apache.flex.core */ public function performLayout():void { + if(!host.visible) + return; // avoid running this layout instance recursively. if (isLayoutRunning) return; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a9e7458c/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/ScrollBarView.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/ScrollBarView.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/ScrollBarView.as index 41ef624..e290ba7 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/ScrollBarView.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/ScrollBarView.as @@ -116,7 +116,8 @@ package org.apache.flex.html.beads sbModel.addEventListener("stepSizeChange", changeHandler); sbModel.addEventListener("pageSizeChange", changeHandler); sbModel.addEventListener("valueChange", changeHandler); - +(value as IEventDispatcher).addEventListener("show", changeHandler); + if( _strand.getBeadByType(IBeadLayout) == null ) { layout = new (ValuesManager.valuesImpl.getValue(_strand, "iBeadLayout")) as IBeadLayout; _strand.addBead(layout); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a9e7458c/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/DataGridLayout.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/DataGridLayout.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/DataGridLayout.as index fe4ccab..e3c4624 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/DataGridLayout.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/DataGridLayout.as @@ -67,6 +67,7 @@ package org.apache.flex.html.beads.layouts * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion FlexJS 0.0 +* @flexjsignorecoercion org.apache.flex.core.UIBase */ public function set strand(value:IStrand):void { @@ -105,9 +106,12 @@ package org.apache.flex.html.beads.layouts { return _header; } + /** +* @flexjsignorecoercion org.apache.flex.core.UIBase +*/ public function set header(value:IUIBase):void { - _header = UIBase(value); + _header = (value as UIBase); } private var _columns:Array;
[39/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - Fix MDLExample
Fix MDLExample Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/19fa436d Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/19fa436d Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/19fa436d Branch: refs/heads/feature/strand-work Commit: 19fa436d6d02e4aeb54cd60c8ec3c3302c4f9de7 Parents: 04045d3 Author: piotrzAuthored: Thu Aug 3 23:09:06 2017 +0200 Committer: piotrz Committed: Thu Aug 3 23:09:06 2017 +0200 -- examples/flexjs/MDLExample/src/main/flex/Toggles.mxml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/19fa436d/examples/flexjs/MDLExample/src/main/flex/Toggles.mxml -- diff --git a/examples/flexjs/MDLExample/src/main/flex/Toggles.mxml b/examples/flexjs/MDLExample/src/main/flex/Toggles.mxml index 7162c0a..74927e8 100644 --- a/examples/flexjs/MDLExample/src/main/flex/Toggles.mxml +++ b/examples/flexjs/MDLExample/src/main/flex/Toggles.mxml @@ -83,7 +83,7 @@ limitations under the License. - +
[40/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - Made finding errorNS more efficient I think this fixed MS browsers Better XML errors
Made finding errorNS more efficient I think this fixed MS browsers Better XML errors Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/10be5b82 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/10be5b82 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/10be5b82 Branch: refs/heads/feature/strand-work Commit: 10be5b82ff91db9ec77966ba6d8c7c37defa6f81 Parents: 19fa436 Author: Harbs <ha...@in-tools.com> Authored: Fri Aug 4 15:15:40 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Fri Aug 4 15:15:40 2017 +0300 -- frameworks/projects/XML/src/main/flex/XML.as | 30 +-- 1 file changed, 23 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/10be5b82/frameworks/projects/XML/src/main/flex/XML.as -- diff --git a/frameworks/projects/XML/src/main/flex/XML.as b/frameworks/projects/XML/src/main/flex/XML.as index f09a018..7970df1 100644 --- a/frameworks/projects/XML/src/main/flex/XML.as +++ b/frameworks/projects/XML/src/main/flex/XML.as @@ -339,18 +339,34 @@ package ); } - + private static var errorNS:String; private function parseXMLStr(xml:String):void { var parser:DOMParser = new DOMParser(); - // get error namespace. It's different in different browsers. - var errorNS:String = parser.parseFromString('<', 'application/xml').getElementsByTagName("parsererror")[0].namespaceURI; - - var doc:Document = parser.parseFromString(xml, "application/xml"); + if(errorNS == null) + { + // get error namespace. It's different in different browsers. + try{ + errorNS = parser.parseFromString('<', 'application/xml').getElementsByTagName("parsererror")[0].namespaceURI; + } + catch(err:Error){ + // Some browsers (i.e. IE) just throw an error + errorNS = "na"; + } + } + try + { + var doc:Document = parser.parseFromString(xml, "application/xml"); + } + catch(err:Error) + { + throw err; + } //check for errors - if(doc.getElementsByTagNameNS(errorNS, 'parsererror').length > 0) - throw new Error('XML parse error'); + var errorNodes:NodeList = doc.getElementsByTagNameNS(errorNS, 'parsererror'); + if(errorNodes.length > 0) + throw new Error(errorNodes[0].innerHTML); for(var i:int=0;i<doc.childNodes.length;i++) { var node:Element = doc.childNodes[i];
[45/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into develop
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/dee26275 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/dee26275 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/dee26275 Branch: refs/heads/feature/strand-work Commit: dee26275eaea12a8a36a689906b6e0bac2a21897 Parents: 9dac303 8d6d7ca Author: DESKTOP-RH4S838\YishayAuthored: Mon Aug 7 14:27:56 2017 +0300 Committer: DESKTOP-RH4S838\Yishay Committed: Mon Aug 7 14:27:56 2017 +0300 -- .../flexjs/examples/tests/ExampleBuildTest.java | 3 + examples/flexjs/FlexTeamPage_MDL/pom.xml| 32 +- .../src/main/config/compile-app-config.xml | 2 +- .../MDLExample/src/main/flex/Toggles.mxml | 13 +- examples/flexjs/TeamPage/pom.xml| 15 - examples/flexjs/pom.xml | 1 + .../main/flex/org/apache/flex/css2/Cursors.as | 1 - .../html/beads/layouts/HorizontalFlexLayout.as | 298 ++- .../layouts/OneFlexibleChildHorizontalLayout.as | 3 +- .../layouts/OneFlexibleChildVerticalLayout.as | 3 +- .../html/beads/layouts/VerticalFlexLayout.as| 288 +- .../html/beads/SingleSelectionDragSourceBead.as | 2 + .../beads/controllers/DragMouseController.as| 1 - .../beads/controllers/DropMouseController.as| 9 +- .../main/flex/org/apache/flex/mdl/CheckBox.as | 26 +- .../textLayout/compose/utils/AdornmentUtils.as | 4 +- .../textLayout/elements/FlowGroupElement.as | 14 +- .../flex/textLayout/elements/FlowLeafElement.as | 14 +- .../apache/flex/text/engine/ElementFormat.as| 3 +- .../org/apache/flex/text/engine/FontMetrics.as | 20 ++ .../org/apache/flex/text/engine/ITextLine.as| 4 +- .../flex/org/apache/flex/text/html/TextLine.as | 11 +- frameworks/projects/XML/src/main/flex/XML.as| 30 +- 23 files changed, 423 insertions(+), 374 deletions(-) --
[15/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - Merge branch 'feature/browser-event' into develop
Merge branch 'feature/browser-event' into develop * feature/browser-event: Fixing SimpleDataProviderChangeNotifier which was broken after recent changes to DataProviderChangeNotifier Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/0ad0cdd5 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/0ad0cdd5 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/0ad0cdd5 Branch: refs/heads/feature/strand-work Commit: 0ad0cdd577de3973c91878cac6fe336b4b7e0a51 Parents: 235ce58 fd2ba63 Author: Harbs <ha...@in-tools.com> Authored: Mon Jul 31 11:45:18 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Mon Jul 31 11:45:18 2017 +0300 -- .../html/beads/DataProviderChangeNotifier.as| 26 ++-- .../beads/SimpleDataProviderChangeNotifier.as | 3 ++- 2 files changed, 20 insertions(+), 9 deletions(-) --
[24/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - FLEX-35344 - Fix by adding to Menu IBeadController (ListSingleSelectionMouseController) which handle "itemClick" on each renderer and
FLEX-35344 - Fix by adding to Menu IBeadController (ListSingleSelectionMouseController) which handle "itemClick" on each renderer and emits "change" event Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/53ded5a8 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/53ded5a8 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/53ded5a8 Branch: refs/heads/feature/strand-work Commit: 53ded5a89017e2441bc05ca117cb29db3a4fe153 Parents: 88c62cb Author: piotrzAuthored: Wed Aug 2 00:09:02 2017 +0200 Committer: piotrz Committed: Wed Aug 2 00:09:02 2017 +0200 -- .../projects/MaterialDesignLite/src/main/resources/defaults.css | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/53ded5a8/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css b/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css index 95d3b03..096f442 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css +++ b/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css @@ -116,6 +116,7 @@ Menu IBeadView: ClassReference("org.apache.flex.mdl.beads.views.ListView"); IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel"); IBeadLayout: ClassReference(null); /*"org.apache.flex.html.beads.layouts.VerticalLayout"*/ +IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController"); IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.DataItemRendererFactoryForArrayData"); IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory"); IItemRenderer: ClassReference("org.apache.flex.mdl.itemRenderers.MenuItemRenderer");
[06/50] flex-asjs git commit: I’m not positive, but without this, there is likely going to be problems with variable renaming in minified code.
Iâm not positive, but without this, there is likely going to be problems with variable renaming in minified code. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/c1661203 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/c1661203 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/c1661203 Branch: refs/heads/feature/strand-work Commit: c16612031792e5c8ace964bcabaf131c89ddfd9a Parents: 60f223a Author: Harbs <ha...@in-tools.com> Authored: Wed Jul 26 14:58:15 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Wed Jul 26 14:58:15 2017 +0300 -- .../src/main/flex/org/apache/flex/events/KeyboardEvent.as | 10 -- .../src/main/flex/org/apache/flex/events/MouseEvent.as| 8 +++- 2 files changed, 15 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1661203/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as -- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as index dda7e0a..71b4dd1 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as @@ -221,7 +221,13 @@ package org.apache.flex.events COMPILE::JS override public function preventDefault():void { - wrappedEvent ? wrappedEvent.preventDefault() : super.preventDefault(); + if(wrappedEvent) + wrappedEvent.preventDefault(); + else + { + super.preventDefault(); + _defaultPrevented = true; + } } COMPILE::JS @@ -245,7 +251,7 @@ package org.apache.flex.events { _defaultPrevented = value; } - + /** * Create a copy/clone of the KeyboardEvent object. * http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1661203/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as -- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as index 1b6fe7e..14a3af7 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as @@ -449,7 +449,13 @@ package org.apache.flex.events */ override public function preventDefault():void { - wrappedEvent ? wrappedEvent.preventDefault() : super.preventDefault(); + if(wrappedEvent) + wrappedEvent.preventDefault(); + else + { + super.preventDefault(); + _defaultPrevented = true; + } } private var _defaultPrevented:Boolean;
[26/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - Make MDLExample compiled to JS only since MDL library do not have swf part
Make MDLExample compiled to JS only since MDL library do not have swf part Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/4dab4229 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/4dab4229 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/4dab4229 Branch: refs/heads/feature/strand-work Commit: 4dab42290f200e51e4c66a5b86ae3329a6363109 Parents: 49a47f9 Author: piotrzAuthored: Wed Aug 2 00:11:07 2017 +0200 Committer: piotrz Committed: Wed Aug 2 00:11:07 2017 +0200 -- examples/flexjs/MDLExample/pom.xml | 17 + 1 file changed, 1 insertion(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4dab4229/examples/flexjs/MDLExample/pom.xml -- diff --git a/examples/flexjs/MDLExample/pom.xml b/examples/flexjs/MDLExample/pom.xml index fb88e3c..6d9db6e 100644 --- a/examples/flexjs/MDLExample/pom.xml +++ b/examples/flexjs/MDLExample/pom.xml @@ -53,6 +53,7 @@ true App.mxml + JSFlex ${basedir}/target/javascript/bin/js-debug/mdl-js-index-template.html -compiler.exclude-defaults-css-files=Basic-0.9.0-SNAPSHOT-js.swc:defaults.css @@ -66,24 +67,8 @@ MaterialDesignLite 0.9.0-SNAPSHOT swc - swf - - - org.apache.flex.flexjs.framework - MaterialDesignLite - 0.9.0-SNAPSHOT - swc js - - - - com.adobe.flash.framework - playerglobal - 20.0 - swc - provided -
[13/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - Changed to the normal flexible layouts
Changed to the normal flexible layouts Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/235ce586 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/235ce586 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/235ce586 Branch: refs/heads/feature/strand-work Commit: 235ce5860bafe7de1a5aa2ed92ea10ee1aa07674 Parents: e32fc22 Author: Harbs <ha...@in-tools.com> Authored: Mon Jul 31 10:56:25 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Mon Jul 31 10:56:25 2017 +0300 -- examples/flexjs/ASDoc/src/main/flex/ASDocMainView.mxml | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/235ce586/examples/flexjs/ASDoc/src/main/flex/ASDocMainView.mxml -- diff --git a/examples/flexjs/ASDoc/src/main/flex/ASDocMainView.mxml b/examples/flexjs/ASDoc/src/main/flex/ASDocMainView.mxml index d1b7158..4df58a6 100644 --- a/examples/flexjs/ASDoc/src/main/flex/ASDocMainView.mxml +++ b/examples/flexjs/ASDoc/src/main/flex/ASDocMainView.mxml @@ -59,19 +59,19 @@ limitations under the License. - + - + - + - + - + @@ -81,7 +81,7 @@ limitations under the License. - +
[19/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - Improvement, but probably still needs more work
Improvement, but probably still needs more work Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8ce67e22 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8ce67e22 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8ce67e22 Branch: refs/heads/feature/strand-work Commit: 8ce67e22618d74e2f5fef99a818fad78685786ad Parents: 6bd14d2 Author: Harbs <ha...@in-tools.com> Authored: Mon Jul 31 15:25:11 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Mon Jul 31 15:25:11 2017 +0300 -- .../textLayout/elements/utils/GeometricElementUtils.as| 7 +++ .../flex/org/apache/flex/text/engine/ElementFormat.as | 10 ++ 2 files changed, 13 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8ce67e22/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/utils/GeometricElementUtils.as -- diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/utils/GeometricElementUtils.as b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/utils/GeometricElementUtils.as index b31a6c0..225e15b 100644 --- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/utils/GeometricElementUtils.as +++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/utils/GeometricElementUtils.as @@ -37,6 +37,8 @@ package org.apache.flex.textLayout.elements.utils import org.apache.flex.textLayout.formats.TLFTypographicCase; import org.apache.flex.textLayout.formats.TextLayoutFormat; import org.apache.flex.textLayout.utils.LocaleUtil; + import org.apache.flex.textLayout.elements.ITextFlow; + import org.apache.flex.textLayout.factory.TLFFactory; public class GeometricElementUtils { /** @private */ @@ -183,6 +185,11 @@ package org.apache.flex.textLayout.elements.utils var fd:FontDescription = new FontDescription(); fd.fontStyle = computedFormat.fontStyle; fd.fontName = computedFormat.fontFamily; + var tf:ITextFlow = para.getTextFlow(); + if(tf) + fd.fontLoader = tf.tlfFactory.textFactory.getFontLoader(); + else + fd.fontLoader = TLFFactory.defaultTLFFactory.textFactory.getFontLoader(); // fd.renderingMode = computedFormat.renderingMode; // fd.cffHinting = computedFormat.cffHinting; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8ce67e22/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ElementFormat.as -- diff --git a/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ElementFormat.as b/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ElementFormat.as index 1ef20ed..d5ab61c 100644 --- a/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ElementFormat.as +++ b/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ElementFormat.as @@ -19,6 +19,9 @@ package org.apache.flex.text.engine { import org.apache.flex.geom.Rectangle; + import org.apache.flex.debugging.assert; + import org.apache.flex.text.engine.IFont; + import org.apache.flex.text.engine.FontMetrics; public class ElementFormat { @@ -82,10 +85,9 @@ package org.apache.flex.text.engine public function getFontMetrics():FontMetrics { - var fm:FontMetrics = new FontMetrics(); - // just a guess for now - fm.emBox = new Rectangle(0, 1.2 - fontSize, fontSize, 1.2); - return fm; + assert(fontDescription != null,"fontDescription not assigned!"); + var metrics:FontMetrics = fontDescription.fontLoader.getFont(fontDescription.fontName,fontDescription.fontStyle).fontMetrics; + return metrics.getScaledMetrics(fontSize); } } } \ No newline at end of file
[36/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - - Switch FlexTeamPage_MDL example to compile JSFlex - Clean up native TeamPage
- Switch FlexTeamPage_MDL example to compile JSFlex - Clean up native TeamPage Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ff5cf8e0 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ff5cf8e0 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ff5cf8e0 Branch: refs/heads/feature/strand-work Commit: ff5cf8e07173813732d31dfba8ef49c5b6c132d3 Parents: d360e9c Author: piotrzAuthored: Thu Aug 3 08:31:10 2017 +0200 Committer: piotrz Committed: Thu Aug 3 08:31:10 2017 +0200 -- examples/flexjs/FlexTeamPage_MDL/pom.xml | 32 +-- examples/flexjs/TeamPage/pom.xml | 15 - 2 files changed, 1 insertion(+), 46 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ff5cf8e0/examples/flexjs/FlexTeamPage_MDL/pom.xml -- diff --git a/examples/flexjs/FlexTeamPage_MDL/pom.xml b/examples/flexjs/FlexTeamPage_MDL/pom.xml index 3c73743..a99e301 100644 --- a/examples/flexjs/FlexTeamPage_MDL/pom.xml +++ b/examples/flexjs/FlexTeamPage_MDL/pom.xml @@ -53,6 +53,7 @@ true App.mxml + JSFlex ${basedir}/target/javascript/bin/js-debug/mdl-js-index-template.html -compiler.exclude-defaults-css-files=Basic-0.9.0-SNAPSHOT-js.swc:defaults.css @@ -66,13 +67,6 @@ MaterialDesignLite 0.9.0-SNAPSHOT swc - swf - - - org.apache.flex.flexjs.framework - MaterialDesignLite - 0.9.0-SNAPSHOT - swc js @@ -80,13 +74,6 @@ FontAwesome 0.9.0-SNAPSHOT swc - swf - - - org.apache.flex.flexjs.framework - FontAwesome - 0.9.0-SNAPSHOT - swc js @@ -94,24 +81,7 @@ Network 0.9.0-SNAPSHOT swc - swf - - - org.apache.flex.flexjs.framework - Network - 0.9.0-SNAPSHOT - swc js - - - - com.adobe.flash.framework - playerglobal - 20.0 - swc - provided - - http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ff5cf8e0/examples/flexjs/TeamPage/pom.xml -- diff --git a/examples/flexjs/TeamPage/pom.xml b/examples/flexjs/TeamPage/pom.xml index a41460f..e461a13 100644 --- a/examples/flexjs/TeamPage/pom.xml +++ b/examples/flexjs/TeamPage/pom.xml @@ -72,21 +72,6 @@ swc provided - - - -
[44/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - Upgrade should wait for other beads (e.g. IDataProviderItemRendererMapper) to do their thing
Upgrade should wait for other beads (e.g. IDataProviderItemRendererMapper) to do their thing Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/9dac303c Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/9dac303c Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/9dac303c Branch: refs/heads/feature/strand-work Commit: 9dac303cbf5c4bf7dd2a3f2f2a37e2d809fc281b Parents: 253e73b Author: DESKTOP-RH4S838\YishayAuthored: Mon Aug 7 13:48:39 2017 +0300 Committer: DESKTOP-RH4S838\Yishay Committed: Mon Aug 7 13:48:39 2017 +0300 -- .../src/main/flex/org/apache/flex/mdl/Menu.as | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9dac303c/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Menu.as -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Menu.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Menu.as index bc69fc4..193addd 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Menu.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Menu.as @@ -18,6 +18,7 @@ package org.apache.flex.mdl { + import org.apache.flex.events.Event; import org.apache.flex.html.List; import org.apache.flex.mdl.beads.UpgradeElement; @@ -58,9 +59,14 @@ package org.apache.flex.mdl super(); className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user; -addBead(new UpgradeElement()); + addEventListener("beadsAdded", addUpgradeBead); } - + + protected function addUpgradeBead(event:Event):void + { + addBead(new UpgradeElement()); + } + /** * Default position for Menu in MDL is bottom/left (or no class selector specified) *
[08/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - PointUtils was missing.
PointUtils was missing. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/28bf3528 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/28bf3528 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/28bf3528 Branch: refs/heads/feature/strand-work Commit: 28bf35280c724da53326f03843d372f33dd09cf6 Parents: 8c2a6bc Author: Peter EntAuthored: Wed Jul 26 13:58:13 2017 -0400 Committer: Peter Ent Committed: Wed Jul 26 13:58:13 2017 -0400 -- frameworks/projects/Core/src/main/flex/CoreClasses.as | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/28bf3528/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 e062a8b..2dd78cd 100644 --- a/frameworks/projects/Core/src/main/flex/CoreClasses.as +++ b/frameworks/projects/Core/src/main/flex/CoreClasses.as @@ -184,6 +184,7 @@ internal class CoreClasses import org.apache.flex.utils.StringUtil; StringUtil; import org.apache.flex.utils.ObjectMap; ObjectMap; import org.apache.flex.utils.ObjectUtil; ObjectUtil; + import org.apache.flex.utils.PointUtils; PointUtils; import org.apache.flex.utils.Timer; Timer; import org.apache.flex.utils.UIDUtil; UIDUtil; import org.apache.flex.utils.UIUtils; UIUtils;
[34/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - Fix config of MDLExample used for Ant build
Fix config of MDLExample used for Ant build Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/61bb9983 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/61bb9983 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/61bb9983 Branch: refs/heads/feature/strand-work Commit: 61bb99839e02cbb7d7dfea6a396b596db34d5970 Parents: 25ae9b1 66ac90c Author: piotrzAuthored: Thu Aug 3 00:48:24 2017 +0200 Committer: piotrz Committed: Thu Aug 3 00:48:24 2017 +0200 -- .../org/apache/flex/textLayout/compose/utils/AdornmentUtils.as | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --
[17/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - Wrong CSS
Wrong CSS Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/562a1302 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/562a1302 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/562a1302 Branch: refs/heads/feature/strand-work Commit: 562a1302e66a912053b7ea0195e5075cbcedf07f Parents: a631f06 Author: Harbs <ha...@in-tools.com> Authored: Mon Jul 31 12:33:03 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Mon Jul 31 12:33:03 2017 +0300 -- frameworks/projects/Basic/src/main/resources/defaults.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/562a1302/frameworks/projects/Basic/src/main/resources/defaults.css -- diff --git a/frameworks/projects/Basic/src/main/resources/defaults.css b/frameworks/projects/Basic/src/main/resources/defaults.css index 7f7973b..f267363 100644 --- a/frameworks/projects/Basic/src/main/resources/defaults.css +++ b/frameworks/projects/Basic/src/main/resources/defaults.css @@ -58,7 +58,6 @@ Application { padding: 0px; margin: 0px; - align-content: flex-start; } Button @@ -134,6 +133,7 @@ Container IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.BasicLayout"); IViewport: ClassReference("org.apache.flex.html.supportClasses.Viewport"); IViewportModel: ClassReference("org.apache.flex.html.beads.models.ViewportModel"); + align-items: flex-start; } ControlBar
[43/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - Condition not necessary
Condition not necessary Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8d6d7ca8 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8d6d7ca8 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8d6d7ca8 Branch: refs/heads/feature/strand-work Commit: 8d6d7ca847aa66316050d6b104816ab5382a7288 Parents: bc50901 Author: Harbs <ha...@in-tools.com> Authored: Mon Aug 7 00:13:33 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Mon Aug 7 00:13:33 2017 +0300 -- .../flex/textLayout/elements/FlowGroupElement.as | 14 +- 1 file changed, 1 insertion(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8d6d7ca8/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowGroupElement.as -- diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowGroupElement.as b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowGroupElement.as index 8664a29..e869c75 100644 --- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowGroupElement.as +++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowGroupElement.as @@ -968,19 +968,7 @@ package org.apache.flex.textLayout.elements if (curFlowElement.parentRelativeStart != relativePosition) { - if (curFlowElement.className == "FlowGroupElement") - { - FlowGroupElement(curFlowElement).splitAtPosition(relativePosition - curFlowElement.parentRelativeStart); - } - else - { - // I would imagine that it has to be a span. That's the only non-FlowGroupElement - // type that can take up more than a textLength of 1. - CONFIG::debug - { - assert(curFlowElement.className == "SpanElement", "SpanElements are the only leaf elements that can currently have > 1 textLength");} - ISpanElement(curFlowElement).splitAtPosition(relativePosition - curFlowElement.parentRelativeStart); - } + curFlowElement.splitAtPosition(relativePosition - curFlowElement.parentRelativeStart); // increase by one. It's the new element that we want to move over. curElementIdx++; }
[21/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - unnecessary import
unnecessary import Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/498d3113 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/498d3113 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/498d3113 Branch: refs/heads/feature/strand-work Commit: 498d3113f6f90d2ec5914c11ab42db06f780d4ac Parents: 637cb43 Author: Harbs <ha...@in-tools.com> Authored: Wed Aug 2 00:25:09 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Wed Aug 2 00:25:09 2017 +0300 -- .../flex/org/apache/flex/textLayout/compose/TextLineRecycler.as| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/498d3113/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/compose/TextLineRecycler.as -- diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/compose/TextLineRecycler.as b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/compose/TextLineRecycler.as index 1be1f57..51ebc2f 100644 --- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/compose/TextLineRecycler.as +++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/compose/TextLineRecycler.as @@ -21,7 +21,7 @@ package org.apache.flex.textLayout.compose import org.apache.flex.text.engine.ITextLine; import org.apache.flex.utils.ObjectMap; - CONFIG::debug { import org.apache.flex.textLayout.debug.assert; } + // CONFIG::debug { import org.apache.flex.textLayout.debug.assert; }
[04/50] flex-asjs git commit: alpha should work…
alpha should work⦠Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/9767786d Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/9767786d Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/9767786d Branch: refs/heads/feature/strand-work Commit: 9767786df78b37308e22a27dc8598c81f7cb1880 Parents: 840ac09 Author: Harbs <ha...@in-tools.com> Authored: Wed Jul 26 12:55:11 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Wed Jul 26 12:55:11 2017 +0300 -- .../org/apache/flex/textLayout/container/ContainerController.as| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9767786d/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/container/ContainerController.as -- diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/container/ContainerController.as b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/container/ContainerController.as index 1bf69cb..8bf5d07 100644 --- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/container/ContainerController.as +++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/container/ContainerController.as @@ -3009,7 +3009,7 @@ package org.apache.flex.textLayout.container var curAlpha:Number = (interactionManager.activePosition == interactionManager.anchorPosition) ? selFormat.pointAlpha : selFormat.rangeAlpha; if (selectionSprite.alpha != curAlpha) - selectionSprite.alpha = 1;//curAlpha; testing remove this + selectionSprite.alpha = curAlpha; if (selectionSprite.numElements == 0) addSelectionContainer(selectionSprite);
[27/50] flex-asjs git commit: This doesn’t compile correctly. Reverting.
This doesnât compile correctly. Reverting. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/253e73b5 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/253e73b5 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/253e73b5 Branch: refs/heads/feature/strand-work Commit: 253e73b5c1e5d97a4d24c8505f5b0c2b45cf4b51 Parents: 4dab422 Author: Harbs <ha...@in-tools.com> Authored: Wed Aug 2 11:45:05 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Wed Aug 2 11:45:05 2017 +0300 -- .../org/apache/flex/textLayout/debug/assert.as | 43 ++-- 1 file changed, 21 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/253e73b5/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/debug/assert.as -- diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/debug/assert.as b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/debug/assert.as index 09b6edf..62ec778 100644 --- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/debug/assert.as +++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/debug/assert.as @@ -16,33 +16,32 @@ // limitations under the License. // -package org.apache.flex.textLayout.debug +package org.apache.flex.textLayout.debug { + + + + /** @private * Debug only function that prints a trace message if condition is false. * @return count of errors reported this assert: 1 or 0. * */ CONFIG::debug -{ -public function assert(condition:Boolean, warning:String):int -{ -if (!condition) -{ -trace("ERROR: " + warning); -// throw if the bit is set -if (Debugging.throwOnAssert) -throw(new Error("TextLayoutAssert: " + warning)); -return 1; -} -return 0; -} -} - + public function assert(condition:Boolean, warning:String):int + { + if (!condition) + { + trace("ERROR: " + warning); + // throw if the bit is set + if (Debugging.throwOnAssert) + throw(new Error("TextLayoutAssert: " + warning)); + return 1; + } + return 0; + } /** @private */ - CONFIG::release -{ -public function assert(condition:Boolean, warning:String):void -{ -} -} + CONFIG::release + public function assert(condition:Boolean, warning:String):void + { + } } // end package
[29/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - The Text Engine needs to specify base offset for adornments
The Text Engine needs to specify base offset for adornments Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/6066f252 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/6066f252 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/6066f252 Branch: refs/heads/feature/strand-work Commit: 6066f2528ddcbbf4f2060c7e31125b68674cd910 Parents: adf157a Author: Harbs <ha...@in-tools.com> Authored: Wed Aug 2 17:31:44 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Wed Aug 2 17:31:44 2017 +0300 -- .../textLayout/compose/utils/AdornmentUtils.as | 2 +- .../flex/textLayout/elements/FlowLeafElement.as | 14 +- .../apache/flex/text/engine/ElementFormat.as| 2 +- .../org/apache/flex/text/engine/FontMetrics.as | 20 .../org/apache/flex/text/engine/ITextLine.as| 3 ++- .../flex/org/apache/flex/text/html/TextLine.as | 5 + 6 files changed, 42 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6066f252/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/compose/utils/AdornmentUtils.as -- diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/compose/utils/AdornmentUtils.as b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/compose/utils/AdornmentUtils.as index abaa81e..9fa970e 100644 --- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/compose/utils/AdornmentUtils.as +++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/compose/utils/AdornmentUtils.as @@ -210,7 +210,6 @@ package org.apache.flex.textLayout.compose.utils var metrics:FontMetrics = element.getComputedFontMetrics(); - var backgroundOnly:Boolean = !(element.computedFormat.textDecoration == TextDecoration.UNDERLINE || element.computedFormat.lineThrough); if (!backgroundOnly) @@ -223,6 +222,7 @@ package org.apache.flex.textLayout.compose.utils var stOffset:Number = calculateStrikeThrough(element,tLine, blockProgression, metrics); var ulOffset:Number = calculateUnderlineOffset(element, stOffset, blockProgression, metrics, tLine); + ulOffset += tLine.getAdornmentOffsetBase(); } if (blockProgression != BlockProgression.RL) http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6066f252/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowLeafElement.as -- diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowLeafElement.as b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowLeafElement.as index cee6fac..8f78fa3 100644 --- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowLeafElement.as +++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowLeafElement.as @@ -329,7 +329,19 @@ package org.apache.flex.textLayout.elements var tf:ITextFlow = getTextFlow(); if (tf && tf.flowComposer && tf.flowComposer.swfContext) return tf.flowComposer.swfContext.callInContext(ef.getFontMetrics, ef, null, true); - return ef.getFontMetrics(); + COMPILE::SWF + { + return ef.getFontMetrics(); + } + COMPILE::JS + { + var metrics:FontMetrics = ef.getFontMetrics(); + metrics.underlineOffset *= ef.fontSize; + metrics.underlineThickness *= ef.fontSize; + metrics.strikethroughOffset *= ef.fontSize; + metrics.strikethroughThickness *= ef.fontSize; + return metrics; + } } /** @private */ http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6066f252/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ElementFormat.as -- diff --git a/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ElementFormat.as b/frameworks/projects/Text/src/main/flex
[31/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - Added special cursor for drag and drop operation.
Added special cursor for drag and drop operation. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/de15fe6b Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/de15fe6b Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/de15fe6b Branch: refs/heads/feature/strand-work Commit: de15fe6b031e47378d768524dcb059f1b146bccb Parents: e6dc3e1 Author: Peter EntAuthored: Wed Aug 2 11:08:36 2017 -0400 Committer: Peter Ent Committed: Wed Aug 2 11:08:36 2017 -0400 -- .../apache/flex/html/beads/SingleSelectionDragSourceBead.as | 2 ++ .../flex/html/beads/controllers/DragMouseController.as | 1 - .../flex/html/beads/controllers/DropMouseController.as | 9 - 3 files changed, 10 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/de15fe6b/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 6ed7b62..aaab245 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 @@ -120,6 +120,8 @@ package org.apache.flex.html.beads trace("SingleSelectionDragSourceBead received the DragStart"); DragEvent.dragInitiator = this; + DragMouseController.dragImageOffsetX = -5; + DragMouseController.dragImageOffsetY = -5; var startHere:Object = event.target; while( !(startHere is DataItemRenderer) && startHere != null) { http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/de15fe6b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/controllers/DragMouseController.as -- diff --git a/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/controllers/DragMouseController.as b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/controllers/DragMouseController.as index 96965b3..fc6b07a 100644 --- a/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/controllers/DragMouseController.as +++ b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/controllers/DragMouseController.as @@ -236,7 +236,6 @@ package org.apache.flex.html.beads.controllers COMPILE::JS { dragImage.element.style['pointer-events'] = 'none'; dragImage.element.style['position'] = 'absolute'; - dragImage.element.style['cursor'] = 'pointer'; } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/de15fe6b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/controllers/DropMouseController.as -- diff --git a/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/controllers/DropMouseController.as b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/controllers/DropMouseController.as index f9eee77..cc2c7ac 100644 --- a/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/controllers/DropMouseController.as +++ b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/controllers/DropMouseController.as @@ -28,6 +28,7 @@ package org.apache.flex.html.beads.controllers import org.apache.flex.events.MouseEvent; import org.apache.flex.geom.Point; import org.apache.flex.utils.PointUtils; + import org.apache.flex.css2.Cursors; COMPILE::SWF { import flash.display.InteractiveObject; @@ -153,6 +154,8 @@ package org.apache.flex.html.beads.controllers inside = true; IUIBase(_strand).addEventListener(DragEvent.DRAG_END, dragEndHandler); IUIBase(_strand).addEventListener(MouseEvent.ROLL_OUT, rollOutHandler); + + Cursors.setCursor(_strand as IUIBase, Cursors.MOVE); }
[18/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - Added typename to Container
Added typename to Container Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/6bd14d2f Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/6bd14d2f Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/6bd14d2f Branch: refs/heads/feature/strand-work Commit: 6bd14d2f14da59b3278aa66719391eeb706bfec5 Parents: 562a130 Author: Harbs <ha...@in-tools.com> Authored: Mon Jul 31 13:04:47 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Mon Jul 31 13:04:47 2017 +0300 -- .../Basic/src/main/flex/org/apache/flex/html/Container.as| 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6bd14d2f/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/Container.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/Container.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/Container.as index cbcf526..b21ec83 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/Container.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/Container.as @@ -79,6 +79,10 @@ package org.apache.flex.html */ public function Container() { + COMPILE::JS + { + typeNames = 'Container'; + } super(); }
git commit: [flex-asjs] [refs/heads/develop] - Use protocol-relative links
Repository: flex-asjs Updated Branches: refs/heads/develop c874c8e1e -> 574faa160 Use protocol-relative links Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/574faa16 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/574faa16 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/574faa16 Branch: refs/heads/develop Commit: 574faa160b5de2ef0537a1b160029f73bcb1c9ee Parents: c874c8e Author: Harbs <ha...@in-tools.com> Authored: Tue Aug 8 13:31:20 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Tue Aug 8 13:31:20 2017 +0300 -- .../src/main/flex/org/apache/flex/mdl/Dialog.as | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/574faa16/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Dialog.as -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Dialog.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Dialog.as index 8ba2019..0b2c60a 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Dialog.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Dialog.as @@ -49,8 +49,8 @@ package org.apache.flex.mdl * constructor. * * - * https://cdnjs.cloudflare.com/ajax/libs/dialog-polyfill/0.4.5/dialog-polyfill.min.css;> - * https://cdnjs.cloudflare.com/ajax/libs/dialog-polyfill/0.4.5/dialog-polyfill.min.js"</a>;> + * + * * * * @langversion 3.0
git commit: [flex-asjs] [refs/heads/develop] - Revert "Only layout if visible"
Repository: flex-asjs Updated Branches: refs/heads/develop 42db76613 -> c874c8e1e Revert "Only layout if visible" This reverts commit a9e7458c505fdd1731068b3888a649035934c171. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/c874c8e1 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/c874c8e1 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/c874c8e1 Branch: refs/heads/develop Commit: c874c8e1ed1e6a3786e04b9629b387f84d4ba250 Parents: 42db766 Author: Harbs <ha...@in-tools.com> Authored: Tue Aug 8 00:09:45 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Tue Aug 8 00:09:45 2017 +0300 -- .../src/main/flex/org/apache/flex/core/LayoutBase.as| 2 -- .../flex/org/apache/flex/html/beads/ScrollBarView.as| 3 +-- .../apache/flex/html/beads/layouts/DataGridLayout.as| 10 +- .../flex/html/beads/layouts/DataGridPercentageLayout.as | 12 ++-- .../src/main/flex/org/apache/flex/express/Container.as | 9 - 5 files changed, 8 insertions(+), 28 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c874c8e1/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/LayoutBase.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/LayoutBase.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/LayoutBase.as index 6c4f2f2..7bc5ab0 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/LayoutBase.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/LayoutBase.as @@ -316,8 +316,6 @@ package org.apache.flex.core */ public function performLayout():void { - if(!host.visible) - return; // avoid running this layout instance recursively. if (isLayoutRunning) return; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c874c8e1/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/ScrollBarView.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/ScrollBarView.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/ScrollBarView.as index e290ba7..41ef624 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/ScrollBarView.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/ScrollBarView.as @@ -116,8 +116,7 @@ package org.apache.flex.html.beads sbModel.addEventListener("stepSizeChange", changeHandler); sbModel.addEventListener("pageSizeChange", changeHandler); sbModel.addEventListener("valueChange", changeHandler); -(value as IEventDispatcher).addEventListener("show", changeHandler); - + if( _strand.getBeadByType(IBeadLayout) == null ) { layout = new (ValuesManager.valuesImpl.getValue(_strand, "iBeadLayout")) as IBeadLayout; _strand.addBead(layout); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c874c8e1/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/DataGridLayout.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/DataGridLayout.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/DataGridLayout.as index e3c4624..fe4ccab 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/DataGridLayout.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/DataGridLayout.as @@ -67,7 +67,6 @@ package org.apache.flex.html.beads.layouts * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion FlexJS 0.0 -* @flexjsignorecoercion org.apache.flex.core.UIBase */ public function set strand(value:IStrand):void { @@ -106,12 +105,9 @@ package org.apache.flex.html.beads.layouts { return _header; } - /** -* @flexjsignorecoercion org.apache.flex.core.UIBase -*/ public function set header(value:IUIBase):void { - _header = (value as UIBase); + _header = UIBase(value); } private var _co
[3/4] git commit: [flex-asjs] [refs/heads/develop] - Upgrade should wait for other beads (e.g. IDataProviderItemRendererMapper) to do their thing
Upgrade should wait for other beads (e.g. IDataProviderItemRendererMapper) to do their thing Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/89dc8f1b Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/89dc8f1b Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/89dc8f1b Branch: refs/heads/develop Commit: 89dc8f1bb5973aa59c3712e749e468d9813d17dd Parents: ab9384c Author: DESKTOP-RH4S838\Yishay <yishayj...@hotmail.com> Authored: Mon Aug 7 13:48:39 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Mon Aug 7 14:34:53 2017 +0300 -- .../src/main/flex/org/apache/flex/mdl/Menu.as | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/89dc8f1b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Menu.as -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Menu.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Menu.as index bc69fc4..193addd 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Menu.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Menu.as @@ -18,6 +18,7 @@ package org.apache.flex.mdl { + import org.apache.flex.events.Event; import org.apache.flex.html.List; import org.apache.flex.mdl.beads.UpgradeElement; @@ -58,9 +59,14 @@ package org.apache.flex.mdl super(); className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user; -addBead(new UpgradeElement()); + addEventListener("beadsAdded", addUpgradeBead); } - + + protected function addUpgradeBead(event:Event):void + { + addBead(new UpgradeElement()); + } + /** * Default position for Menu in MDL is bottom/left (or no class selector specified) *
[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
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into develop * 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs: Upgrade should wait for other beads (e.g. IDataProviderItemRendererMapper) to do their thing Condition not necessary Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/42db7661 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/42db7661 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/42db7661 Branch: refs/heads/develop Commit: 42db76613c4c1ae889b694e1e49b79c7c8988165 Parents: 89dc8f1 dee2627 Author: Harbs <ha...@in-tools.com> Authored: Mon Aug 7 14:36:19 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Mon Aug 7 14:36:19 2017 +0300 -- --