git commit: [flex-asjs] [refs/heads/develop] - Created specialized bead for DataGrid drag and drop operations so that column re-order can work with DataGrids that also want to do drag and drop. Added
Repository: flex-asjs Updated Branches: refs/heads/develop fd4ffd905 -> 49831cb0c Created specialized bead for DataGrid drag and drop operations so that column re-order can work with DataGrids that also want to do drag and drop. Added events to the SingleSelection drag and drop beads. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/49831cb0 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/49831cb0 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/49831cb0 Branch: refs/heads/develop Commit: 49831cb0ca178fa3f5e10044ddc5c93f1fde3948 Parents: fd4ffd9 Author: Peter EntAuthored: Wed Sep 27 10:56:52 2017 -0400 Committer: Peter Ent Committed: Wed Sep 27 10:56:52 2017 -0400 -- .../org/apache/flex/html/beads/DataGridView.as | 2 + .../flex/org/apache/flex/utils/PointUtils.as| 24 +- .../DragDrop/src/main/flex/DragDropClasses.as | 2 + .../flex/html/beads/ButtonBarReorderBead.as | 7 +- .../flex/html/beads/DataGridDragDropBead.as | 243 +++ .../html/beads/SingleSelectionDragImageBead.as | 6 +- .../html/beads/SingleSelectionDragSourceBead.as | 77 +- .../html/beads/SingleSelectionDropTargetBead.as | 90 +++ .../beads/controllers/DragMouseController.as| 118 + .../beads/controllers/DropMouseController.as| 74 +++--- .../src/main/resources/basic-manifest.xml | 2 + 11 files changed, 533 insertions(+), 112 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/49831cb0/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataGridView.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataGridView.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataGridView.as index 5f58cf5..6497e4d 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataGridView.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataGridView.as @@ -200,6 +200,8 @@ package org.apache.flex.html.beads host.addEventListener("widthChanged", handleSizeChanges); host.addEventListener("heightChanged", handleSizeChanges); + + host.dispatchEvent(new Event("dataGridViewCreated")); } /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/49831cb0/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/PointUtils.as -- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/PointUtils.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/PointUtils.as index a3bf905..c8dbfa7 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/PointUtils.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/PointUtils.as @@ -24,14 +24,14 @@ package org.apache.flex.utils import flash.geom.Point; import flash.display.Stage; } - + import org.apache.flex.core.IUIBase; import org.apache.flex.geom.Point; /** * The PointUtils class is a collection of static functions that convert * Points between coordinate spaces. -* +* * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 @@ -46,13 +46,13 @@ package org.apache.flex.utils { throw new Error("PointUtils should not be instantiated."); } - + /** * Converts a point from global coordinates to local coordinates -* +* * @param point The point being converted. * @param local The component used as reference for the conversion. -* +* * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 @@ -71,13 +71,13 @@ package org.apache.flex.utils var x:Number = pt.x; var y:Number = pt.y; var element:HTMLElement = local.element as HTMLElement; - + do { x -= element.offsetLeft; y -= element.offsetTop; if (local['parent'] !== undefined) { local = local.parent; -element = local.element as HTMLElement; +element = local ? local.element as HTMLElement : null;
git commit: [flex-asjs] [refs/heads/develop] - Checked these files in by accident. Do not need them.
Repository: flex-asjs Updated Branches: refs/heads/develop 41d3a14e2 -> 49585ec76 Checked these files in by accident. Do not need them. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/49585ec7 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/49585ec7 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/49585ec7 Branch: refs/heads/develop Commit: 49585ec7654858c7b33d63a2192bdfc9ac65210d Parents: 41d3a14 Author: Peter EntAuthored: Thu Sep 21 09:37:56 2017 -0400 Committer: Peter Ent Committed: Thu Sep 21 09:37:56 2017 -0400 -- .../src/main/flex/models/MyDataGridModel.as | 36 .../src/main/flex/models/MyPresentationModel.as | 30 .../src/main/flex/models/MyTextModel.as | 36 3 files changed, 102 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/49585ec7/examples/express/DataGridExample/src/main/flex/models/MyDataGridModel.as -- diff --git a/examples/express/DataGridExample/src/main/flex/models/MyDataGridModel.as b/examples/express/DataGridExample/src/main/flex/models/MyDataGridModel.as deleted file mode 100644 index f8f22ac..000 --- a/examples/express/DataGridExample/src/main/flex/models/MyDataGridModel.as +++ /dev/null @@ -1,36 +0,0 @@ - -// -// 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 models -{ - import org.apache.flex.html.beads.models.DataGridModel; - - public class MyDataGridModel extends DataGridModel - { - public function MyDataGridModel() - { - super(); - trace("This is my DataGrid model"); - } - - override public function set columns(value:Array):void - { - super.columns = value; - } - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/49585ec7/examples/express/DataGridExample/src/main/flex/models/MyPresentationModel.as -- diff --git a/examples/express/DataGridExample/src/main/flex/models/MyPresentationModel.as b/examples/express/DataGridExample/src/main/flex/models/MyPresentationModel.as deleted file mode 100644 index d93d3f7..000 --- a/examples/express/DataGridExample/src/main/flex/models/MyPresentationModel.as +++ /dev/null @@ -1,30 +0,0 @@ - -// -// 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 models -{ - import org.apache.flex.html.beads.models.DataGridPresentationModel; - - public class MyPresentationModel extends DataGridPresentationModel - { - public function MyPresentationModel() - { - super(); - } -
git commit: [flex-asjs] [refs/heads/develop] - Added an example of the Express DataGrid to the Express example set.
Repository: flex-asjs Updated Branches: refs/heads/develop d311cf99c -> 4742928e2 Added an example of the Express DataGrid to the Express example set. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/4742928e Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/4742928e Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/4742928e Branch: refs/heads/develop Commit: 4742928e2278f977f6f41c1a5a79131fa0947f9b Parents: d311cf9 Author: Peter EntAuthored: Wed Sep 20 16:37:49 2017 -0400 Committer: Peter Ent Committed: Wed Sep 20 16:37:49 2017 -0400 -- 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/MyDataGridModel.as | 18 + .../src/main/flex/models/MyPresentationModel.as | 12 .../src/main/flex/models/MyTextModel.as | 18 + .../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 19 files changed, 473 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4742928e/examples/build.xml -- diff --git a/examples/build.xml b/examples/build.xml index 9d7e3cd..a6aaf53 100644 --- a/examples/build.xml +++ b/examples/build.xml @@ -75,6 +75,7 @@ + @@ -121,6 +122,7 @@ + @@ -157,6 +159,7 @@ + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4742928e/examples/express/DataGridExample/README.txt -- diff --git a/examples/express/DataGridExample/README.txt b/examples/express/DataGridExample/README.txt new file mode 100644 index 000..5799a7b --- /dev/null +++ b/examples/express/DataGridExample/README.txt @@ -0,0 +1,30 @@ + +// +// 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. +// + + +DESCRIPTION + +The DataGridExample in the Express project demonstrates the FlexJS DataGrid with +the addition of beads that provide drag-and-drop support. + +This Flex application may be run as a Flash SWF or cross-compiled (using Falcon JX) +into JavaScript and HTML and run without Flash. + +The data for the DataGrid is found in the application's model and is connected +using a ConstantBinding bead which ties a property of a model to a property +in a component, in this case, the DataGrid's dataProvider property. http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4742928e/examples/express/DataGridExample/build.xml -- diff --git a/examples/express/DataGridExample/build.xml b/examples/express/DataGridExample/build.xml new file mode 100644 index 000..a268315 --- /dev/null +++
git commit: [flex-asjs] [refs/heads/develop] - Added DataGrid to the Express project; includes all drag and drop beads by default.
Repository: flex-asjs Updated Branches: refs/heads/develop 8432afc9c -> d311cf99c Added DataGrid to the Express project; includes all drag and drop beads by default. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d311cf99 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d311cf99 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d311cf99 Branch: refs/heads/develop Commit: d311cf99c7aa5e0e4c1b3fcee291e284e41a7d96 Parents: 8432afc Author: Peter EntAuthored: Wed Sep 20 16:34:50 2017 -0400 Committer: Peter Ent Committed: Wed Sep 20 16:34:50 2017 -0400 -- .../beads/DataGridWithDrawingLayerLayout.as | 38 +++ .../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 ++- 5 files changed, 78 insertions(+), 20 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d311cf99/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/DataGridWithDrawingLayerLayout.as -- diff --git a/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/DataGridWithDrawingLayerLayout.as b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/DataGridWithDrawingLayerLayout.as index 31c7c30..e29c1d9 100644 --- a/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/DataGridWithDrawingLayerLayout.as +++ b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/DataGridWithDrawingLayerLayout.as @@ -17,22 +17,22 @@ // package org.apache.flex.html.beads -{ +{ import org.apache.flex.core.IStrand; import org.apache.flex.core.IUIBase; import org.apache.flex.core.UIBase; import org.apache.flex.html.beads.IDataGridView; import org.apache.flex.html.beads.layouts.VerticalFlexLayout; - + COMPILE::SWF { import org.apache.flex.html.supportClasses.ScrollingViewport; import org.apache.flex.html.supportClasses.ScrollBar; } - + /** * DataGridWithDrawingLayerLayout is a class that extends VerticalFlexLayout * and positions the drawing layer created by a DataGridDrawingLayerBead. -* +* * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 @@ -42,7 +42,7 @@ package org.apache.flex.html.beads { /** * constructor -* +* * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 @@ -52,12 +52,12 @@ package org.apache.flex.html.beads { super(); } - + private var _strand:IStrand; - + /** * @copy org.apache.flex.core.IBead#strand -* +* * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 @@ -68,7 +68,7 @@ package org.apache.flex.html.beads super.strand = value; _strand = value; } - + /** * @private */ @@ -77,25 +77,25 @@ package org.apache.flex.html.beads // If there is a drawing layer, remove it so the super.layout function // will not include it. var layerBead:IDrawingLayerBead = _strand.getBeadByType(IDrawingLayerBead) as IDrawingLayerBead; - if (layerBead) { + if (layerBead != null && layerBead.layer != null) { UIBase(_strand).removeElement(layerBead.layer); } - + // Run the actual layout var result:Boolean = super.layout(); - + // Put the drawing layer back, sizing it to fit over the listArea. - if (layerBead) { + if (layerBead != null && layerBead.layer != null) { UIBase(_strand).addElement(layerBead.layer); - + var layerX:Number = 0; var layerY:Number = 0;
git commit: [flex-asjs] [refs/heads/develop] - Updated DragDropExample to include DataGrid column re-ordering.
Repository: flex-asjs Updated Branches: refs/heads/develop 88cd277a2 -> 8432afc9c Updated DragDropExample to include DataGrid column re-ordering. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8432afc9 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8432afc9 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8432afc9 Branch: refs/heads/develop Commit: 8432afc9cf1b55021034aa1ba0c1a306f98b4cb7 Parents: 88cd277 Author: Peter EntAuthored: Wed Sep 20 11:36:01 2017 -0400 Committer: Peter Ent Committed: Wed Sep 20 11:36:01 2017 -0400 -- .../src/main/flex/MyInitialView.mxml| 36 +--- 1 file changed, 31 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8432afc9/examples/flexjs/DragAndDropExample/src/main/flex/MyInitialView.mxml -- diff --git a/examples/flexjs/DragAndDropExample/src/main/flex/MyInitialView.mxml b/examples/flexjs/DragAndDropExample/src/main/flex/MyInitialView.mxml index 33347f7..0d727bc 100644 --- a/examples/flexjs/DragAndDropExample/src/main/flex/MyInitialView.mxml +++ b/examples/flexjs/DragAndDropExample/src/main/flex/MyInitialView.mxml @@ -21,10 +21,12 @@ limitations under the License. xmlns:js="library://ns.apache.org/flexjs/basic" xmlns:gen="simple.*" className="MainView"> + @namespace gen "simple.*"; @namespace js "library://ns.apache.org/flexjs/basic"; + .MainView { backgroundColor: #FF; } @@ -44,6 +46,26 @@ limitations under the License. backgroundColor: #DD; opacity: 0.80; } + + .DragDropList + { + IBeadView: ClassReference("org.apache.flex.html.beads.DragDropListView"); + IContentView: ClassReference("org.apache.flex.html.supportClasses.DataGroup"); + border: solid 1px black; + } + + /* +* These style selectors allow the DataGrid's ButtonBar header to be re-organized +* and change the order of the columns. +*/ + + js|DataGridButtonBar { + IBeadView: ClassReference("org.apache.flex.html.beads.DataGridButtonBarViewForMovableColumns"); + } + + js|DataGrid { + IBeadView: ClassReference("org.apache.flex.html.beads.DataGridColumnReorderView"); + } @@ -58,7 +80,6 @@ limitations under the License. --> - - - - + + + @@ -79,14 +100,19 @@ limitations under the License. Use SingleSelectionDropTargetBead with DataGrid or List to indicate that the component can be the recipient of a drag operation. The dropped item will be incorporated into the data model of the list or grid. + + Use SingleSelectionDropIndicatorBead with the component that is a drop target to + draw an indication of where the drop will be accepted. You can create your own drop + indicator by subclassing this bead. --> - + +
git commit: [flex-asjs] [refs/heads/develop] - Changes for drag and drop support in the DataGrid, especially to provide movable columns.
Repository: flex-asjs Updated Branches: refs/heads/develop 008ff2872 -> 88cd277a2 Changes for drag and drop support in the DataGrid, especially to provide movable columns. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/88cd277a Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/88cd277a Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/88cd277a Branch: refs/heads/develop Commit: 88cd277a2e6c4038ec4c1359a747e0d5243d4d6a Parents: 008ff28 Author: Peter EntAuthored: Tue Sep 19 15:24:56 2017 -0400 Committer: Peter Ent Committed: Tue Sep 19 15:24:56 2017 -0400 -- .../org/apache/flex/html/beads/DataGridView.as | 131 +++ .../TextItemRendererFactoryForArrayData.as | 62 ++-- .../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 + .../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 + 15 files changed, 921 insertions(+), 304 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/88cd277a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataGridView.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataGridView.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataGridView.as index 58ee8c7..5f58cf5 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataGridView.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataGridView.as @@ -37,11 +37,11 @@ package org.apache.flex.html.beads import org.apache.flex.html.supportClasses.DataGridColumn; import org.apache.flex.html.supportClasses.DataGridColumnList; import org.apache.flex.html.supportClasses.Viewport; - + COMPILE::SWF { import org.apache.flex.core.SimpleCSSStylesWithFlex; } - + /** * The DataGridView class is the visual bead for the org.apache.flex.html.DataGrid. * This class constructs the items that make the DataGrid: Lists for each column and a @@ -67,13 +67,13 @@ package org.apache.flex.html.beads { super(); } - + private var _strand:IStrand; private var _header:DataGridButtonBar; private var _listArea:Container; - + private var _lists:Array; - + /** * An array of List objects the comprise the columns of the DataGrid. */ @@ -81,7 +81,7 @@ package org.apache.flex.html.beads { return _lists; } - + /** * The area used to hold the columns * @@ -90,7 +90,7 @@ package org.apache.flex.html.beads { return _listArea; } - + /** * Returns the component used as the header for the DataGrid. */ @@ -98,7 +98,7 @@ package org.apache.flex.html.beads { return _header; } - + /** * @copy org.apache.flex.core.IBead#strand * @@ -111,21 +111,43 @@ package org.apache.flex.html.beads { super.strand = value; _strand = value; - - var host:DataGrid = value as DataGrid; - + + IEventDispatcher(_strand).addEventListener("beadsAdded", finishSetup); +
git commit: [flex-asjs] [refs/heads/develop] - Temporarily removed references to DragDrop classes while investigating build problem.
Repository: flex-asjs Updated Branches: refs/heads/develop ac29804e4 -> fc3b4840b Temporarily removed references to DragDrop classes while investigating build problem. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/fc3b4840 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/fc3b4840 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/fc3b4840 Branch: refs/heads/develop Commit: fc3b4840b62f020c8fc3b37abc57bb821bb30ca2 Parents: ac29804 Author: Peter EntAuthored: Sun Sep 3 07:57:21 2017 -0400 Committer: Peter Ent Committed: Sun Sep 3 07:57:21 2017 -0400 -- .../main/flex/org/apache/flex/express/List.as | 24 ++-- 1 file changed, 12 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fc3b4840/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 530d27a..c454641 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
[3/4] git commit: [flex-asjs] [refs/heads/develop] - Added drawing layer beads to enable the drop indicator to have a place outside of the itemRenderer space.
Added drawing layer beads to enable the drop indicator to have a place outside of the itemRenderer space. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/06213a0c Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/06213a0c Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/06213a0c Branch: refs/heads/develop Commit: 06213a0c167513327e0a80bd154d33674cd9783d Parents: 2443273 Author: Peter EntAuthored: Wed Aug 30 16:27:17 2017 -0400 Committer: Peter Ent Committed: Wed Aug 30 16:27:17 2017 -0400 -- .../Basic/src/main/flex/BasicClasses.as | 1 + .../flex/html/beads/DataGridPercentageView.as | 3 +- .../org/apache/flex/html/beads/DataGridView.as | 3 +- .../org/apache/flex/html/beads/IDataGridView.as | 6 +- .../Basic/src/main/resources/defaults.css | 2 +- .../flex/org/apache/flex/utils/PointUtils.as| 2 +- .../DragDrop/src/main/flex/DragDropClasses.as | 8 +- .../flex/html/beads/DataGridDrawingLayerBead.as | 103 ++ .../beads/DataGridWithDrawingLayerLayout.as | 117 .../apache/flex/html/beads/DragDropListView.as | 134 +++ .../apache/flex/html/beads/IDrawingLayerBead.as | 45 +++ .../flex/html/beads/ListDrawingLayerBead.as | 97 ++ .../SingleSelectionDataGridDropTargetBead.as| 112 .../html/beads/SingleSelectionDropTargetBead.as | 118 +--- .../src/main/resources/basic-manifest.xml | 9 +- 15 files changed, 594 insertions(+), 166 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/06213a0c/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 0aaa08b..e58f2cf 100644 --- a/frameworks/projects/Basic/src/main/flex/BasicClasses.as +++ b/frameworks/projects/Basic/src/main/flex/BasicClasses.as @@ -169,6 +169,7 @@ internal class BasicClasses import org.apache.flex.html.DataGridButtonBar; DataGridButtonBar; import org.apache.flex.html.beads.DataGridColumnView; DataGridColumnView; import org.apache.flex.html.beads.DataGridView; DataGridView; + import org.apache.flex.html.beads.IDataGridView; IDataGridView; import org.apache.flex.html.beads.DataGridPercentageView; DataGridPercentageView; import org.apache.flex.html.beads.DateChooserView; DateChooserView; import org.apache.flex.html.beads.DateFieldView; DateFieldView; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/06213a0c/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataGridPercentageView.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataGridPercentageView.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataGridPercentageView.as index 74bd364..be2260f 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataGridPercentageView.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataGridPercentageView.as @@ -31,6 +31,7 @@ package org.apache.flex.html.beads import org.apache.flex.html.DataGrid; import org.apache.flex.html.DataGridButtonBar; import org.apache.flex.html.Container; + import org.apache.flex.html.beads.IDataGridView; import org.apache.flex.html.beads.layouts.ButtonBarLayout; import org.apache.flex.html.beads.models.ButtonBarModel; import org.apache.flex.html.supportClasses.DataGridColumn; @@ -53,7 +54,7 @@ package org.apache.flex.html.beads * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - public class DataGridPercentageView extends GroupView implements IBeadView + public class DataGridPercentageView extends GroupView implements IBeadView, IDataGridView { /** * constructor. http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/06213a0c/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataGridView.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataGridView.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataGridView.as index 10e317f..58ee8c7 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataGridView.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataGridView.as @@ -31,6 +31,7 @@ package
[1/4] git commit: [flex-asjs] [refs/heads/develop] - Drag and drop work thus far. Not complete.
Repository: flex-asjs Updated Branches: refs/heads/develop 641f74c04 -> 1b1697a0f Drag and drop work thus far. Not complete. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/bdc62464 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/bdc62464 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/bdc62464 Branch: refs/heads/develop Commit: bdc62464429130da6049d4da4530eed4c4be1e6c Parents: 574faa1 Author: Peter EntAuthored: Tue Aug 8 08:41:51 2017 -0400 Committer: Peter Ent Committed: Tue Aug 8 08:41:51 2017 -0400 -- .../Basic/src/main/flex/BasicClasses.as | 2 + .../main/flex/org/apache/flex/css2/DragMove.fxg | 48 .../flex/org/apache/flex/css2/DragReject.fxg| 73 .../DragDrop/src/main/flex/DragDropClasses.as | 1 + .../SingleSelectionDataGridDropTargetBead.as| 112 +++ .../html/beads/SingleSelectionDragSourceBead.as | 4 +- .../html/beads/SingleSelectionDropTargetBead.as | 51 - .../beads/controllers/DragMouseController.as| 5 +- .../src/main/resources/basic-manifest.xml | 2 + frameworks/projects/Express/pom.xml | 14 +++ .../src/main/config/compile-swf-config.xml | 1 + .../main/flex/org/apache/flex/express/List.as | 38 +++ 12 files changed, 322 insertions(+), 29 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bdc62464/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 539beaa..0aaa08b 100644 --- a/frameworks/projects/Basic/src/main/flex/BasicClasses.as +++ b/frameworks/projects/Basic/src/main/flex/BasicClasses.as @@ -238,6 +238,8 @@ internal class BasicClasses COMPILE::SWF { import org.apache.flex.css2.Copy; Copy; + import org.apache.flex.css2.DragMove; DragMove; + import org.apache.flex.css2.DragReject; DragReject; } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bdc62464/frameworks/projects/Basic/src/main/flex/org/apache/flex/css2/DragMove.fxg -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/css2/DragMove.fxg b/frameworks/projects/Basic/src/main/flex/org/apache/flex/css2/DragMove.fxg new file mode 100644 index 000..212ef6c --- /dev/null +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/css2/DragMove.fxg @@ -0,0 +1,48 @@ + + +http://ns.adobe.com/fxg/2008; xmlns:ATE="http://ns.adobe.com/ate/2009; xmlns:d="http://ns.adobe.com/fxg/2008/dt; + xmlns:flm="http://ns.adobe.com/flame/2008; + xmlns:afx="http://ns.apache.org/flex/2012; afx:className="org.apache.flex.css2.DragMove" afx:baseClassName="flash.display.Sprite" > + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bdc62464/frameworks/projects/Basic/src/main/flex/org/apache/flex/css2/DragReject.fxg -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/css2/DragReject.fxg b/frameworks/projects/Basic/src/main/flex/org/apache/flex/css2/DragReject.fxg new file mode 100644 index 000..d85703a --- /dev/null +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/css2/DragReject.fxg @@ -0,0 +1,73 @@ + + +http://ns.adobe.com/fxg/2008; xmlns:ATE="http://ns.adobe.com/ate/2009; xmlns:d="http://ns.adobe.com/fxg/2008/dt; + xmlns:flm="http://ns.adobe.com/flame/2008; + xmlns:afx="http://ns.apache.org/flex/2012; afx:className="org.apache.flex.css2.DragReject" afx:baseClassName="flash.display.Sprite" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bdc62464/frameworks/projects/DragDrop/src/main/flex/DragDropClasses.as
[4/4] git commit: [flex-asjs] [refs/heads/develop] - Merge branch 'develop' into feature/dragAndDrop
Merge branch 'develop' into feature/dragAndDrop * develop: (24 commits) Allow chained assignment to non-existent children 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 Forgot header Returns parameter passed into setAttribute and setChild to enable chained assignment of values. Added missing pieces for TextBlock management Fixed bug in GroupElement.replaceElements() Added helper function FLEX-35354 - Rename TabsItemRendererFactoryForArrayListData to TabsDynamicItemsRendererFactoryForArrayListData - Update TabsDynamicItemsRendererFactoryForArrayListData with new implementation of DynamicItemsRendererFactoryForArrayListData - Update example MDLDynamicTabsExample FLEX-35354 - Add DynamicItemsRendererFactoryForArrayListData to allow add items dynamically to MDL Table - Bead can be used in other components - Update TabsItemRendererFactoryForArrayListData with new DynamicItemsRendererFactoryForArrayListData Switch MDLDynamicTabsExample to JSFlex only build in Maven âStringablesâ should be assignable to XML Partially fixed FormatExample Fixed a few errors in DataGridXcompile Fixed TLFEditTestFlexJS manual test Added maven build for UnitTests -refactored ant builds of manual tests to be closer to examples, and support for 'maven_compat' from test level ant scripts. -renamed GenericTests to UnitTests and fixed some display issues due to layout changes etc Quick fix for FormExample (avoid 0 width, 0 height clipping) Quick fix for ListsTest Quick fix for ImageTest FLEX-35350 - THead and TBody need to be created a bit early cause MDL complaining with NPE when dataProvider is null quick fix to get compiling and something displaying ... Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/1b1697a0 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/1b1697a0 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/1b1697a0 Branch: refs/heads/develop Commit: 1b1697a0f65c0fccea58726bf9c6cb23121da849 Parents: 06213a0 641f74c Author: Peter EntAuthored: Wed Aug 30 16:27:51 2017 -0400 Committer: Peter Ent Committed: Wed Aug 30 16:27:51 2017 -0400 -- 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/MDLDynamicTabsExample/pom.xml | 18 +- .../src/main/flex/views/InitialView.mxml| 24 +- .../src/main/resources/mdl-styles.css | 2 +- examples/flexjs/pom.xml | 1 + .../Basic/src/main/flex/BasicClasses.as | 5 + .../org/apache/flex/html/ToggleTextButton.as| 25 +- .../org/apache/flex/html/addElementToWrapper.as | 38 ++ ...namicItemsRendererFactoryForArrayListData.as | 200 +++ .../html/beads/layouts/VerticalFlexLayout.as| 1 + .../html/supportClasses/PanelLayoutProxy.as | 27 + .../Basic/src/main/resources/basic-manifest.xml | 1 + .../src/main/flex/MDLClasses.as | 2 +- .../src/main/flex/org/apache/flex/mdl/Dialog.as | 9 +- .../src/main/flex/org/apache/flex/mdl/Table.as | 26 +- ...namicItemsRendererFactoryForArrayListData.as | 108 .../TabsItemRendererFactoryForArrayListData.as | 206 --- .../org/apache/flex/mdl/beads/views/TabsView.as | 6 +- .../src/main/resources/defaults.css | 4 +- .../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 + frameworks/projects/XML/src/main/flex/XML.as| 33 +- .../projects/XML/src/main/flex/XMLList.as | 31 +- manualtests/BubbleTest/build.xml| 44 +- manualtests/ContainerTest/build.xml | 40 +- manualtests/CursorTest/build.xml| 44 +- manualtests/DataBindingTestbed/build.xml| 41 +- manualtests/DataGridXcompile/build.xml | 39 +- .../html/customControls/beads/DataGridView.as | 8 + .../html/staticControls/beads/BoxGridView.as| 10 +- manualtests/DateChooserExample/build.xml| 38 +- manualtests/EffectsExample/build.xml| 43 +- .../EffectsExample/src/MyInitialView.mxml | 10 +- manualtests/FlexJSTest_HTML5/build.xml | 36 +- manualtests/FlexJSTest_Panel/build.xml | 35 +-
[2/4] git commit: [flex-asjs] [refs/heads/develop] - Merge branch 'develop' into feature/dragAndDrop
Merge branch 'develop' into feature/dragAndDrop * develop: (26 commits) Update MDL Example - MDL Grid should have at least one MDL GridCell 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. revert this because it isn't needed now that we require the same IValuesImpl in the module as is in the main app. switch to using IModule to trigger module output Forgot import Added change event on CheckBox Fixed RadioButton too This should work better with MXML Forgot to remove this line. Setting checked state manually now works maven build for ModuleExample. Module artifacts are not copied into the MainApp (yet) initial module example initialize modules UIModule and UIModuleLoader FLEX-35350 - Add missing overrides of methods related to item renderers - Use in all places element instead positioner Fix typo in import of KeyboardEvent FLEX-35350 - Make HTML element "table" as main element of MDL Table component which allows to add bead to it instead of "tbody" - TableCell and TableColumnt now extends existing classes in Basic module - accordingly TableCell and TableHeader Fix typo in comments of MDL CardInner Cleaned up HTML components try this price if we can't get other price data fx:Style blocks in MXML weren't working. How did they ever 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/2443273b Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/2443273b Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/2443273b Branch: refs/heads/develop Commit: 2443273b691c62df76f29dd05d68da88f7f7e88e Parents: bdc6246 8b10930 Author: Peter EntAuthored: Mon Aug 21 10:41:46 2017 +0200 Committer: Peter Ent Committed: Mon Aug 21 10:41:46 2017 +0200 -- examples/build.xml | 3 + .../src/main/flex/models/MyModel.as | 2 + .../flexjs/MDLExample/src/main/flex/Badges.mxml | 53 +++-- .../MDLExample/src/main/flex/Buttons.mxml | 176 +++--- .../flexjs/MDLExample/src/main/flex/Chips.mxml | 19 +- .../MDLExample/src/main/flex/Dialogs.mxml | 14 +- .../MDLExample/src/main/flex/DropDownList.mxml | 5 +- .../MDLExample/src/main/flex/Footers.mxml | 10 +- .../flexjs/MDLExample/src/main/flex/Grids.mxml | 5 - .../flexjs/MDLExample/src/main/flex/Icons.mxml | 58 ++--- .../flexjs/MDLExample/src/main/flex/Lists.mxml | 171 +- .../flexjs/MDLExample/src/main/flex/Menus.mxml | 37 +-- .../MDLExample/src/main/flex/Sliders.mxml | 11 +- .../MDLExample/src/main/flex/Snackbar.mxml | 13 +- .../flexjs/MDLExample/src/main/flex/Tables.mxml | 123 +- .../flexjs/MDLExample/src/main/flex/Tabs.mxml | 4 +- .../MDLExample/src/main/flex/TextFields.mxml| 116 - .../MDLExample/src/main/flex/Toggles.mxml | 90 +++ examples/flexjs/ModuleExample/MainApp/build.xml | 55 + examples/flexjs/ModuleExample/MainApp/pom.xml | 60 + .../src/main/config/compile-app-config.xml | 24 ++ .../MainApp/src/main/flex/MainApp.mxml | 34 +++ examples/flexjs/ModuleExample/Module/build.xml | 76 ++ examples/flexjs/ModuleExample/Module/pom.xml| 60 + .../src/main/config/compile-app-config.xml | 26 +++ .../Module/src/main/flex/Module.mxml| 30 +++ examples/flexjs/ModuleExample/build.xml | 95 examples/flexjs/ModuleExample/pom.xml | 162 + examples/flexjs/pom.xml | 1 + .../main/flex/org/apache/flex/html/UIModule.as | 140 +++ .../flex/org/apache/flex/html/UIModuleLoader.as | 233 +++ .../html/beads/DispatchInputFinishedBead.as | 7 +- .../beads/EasyDataProviderChangeNotifier.as | 108 + .../beads/SimpleDataProviderChangeNotifier.as | 90 --- .../Basic/src/main/resources/basic-manifest.xml | 5 +- .../projects/Core/src/main/flex/CoreClasses.as | 1 + .../main/flex/org/apache/flex/core/IModule.as | 34 +++ .../org/apache/flex/core/SimpleCSSValuesImpl.as | 5 +- .../src/main/flex/org/apache/flex/html/A.as | 6 +- .../src/main/flex/org/apache/flex/html/H1.as| 6 +- .../src/main/flex/org/apache/flex/html/H2.as| 6 +- .../src/main/flex/org/apache/flex/html/H3.as| 6 +- .../src/main/flex/org/apache/flex/html/H4.as| 6 +- .../src/main/flex/org/apache/flex/html/H5.as| 6 +- .../src/main/flex/org/apache/flex/html/H6.as| 6 +- .../src/main/flex/org/apache/flex/html/I.as | 6 +- .../src/main/flex/org/apache/flex/html/Li.as| 7 +- .../main/flex/org/apache/flex/html/Select.as| 3 +- .../src/main/flex/org/apache/flex/html/Ul.as| 5
[14/32] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - -refactored ant builds of manual tests to be closer to examples, and support for 'maven_compat' from test level ant scripts. -renamed
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/523eac21/manualtests/GenericTests/src/flexUnitTests/core/BinaryDataTesterTest.as -- diff --git a/manualtests/GenericTests/src/flexUnitTests/core/BinaryDataTesterTest.as b/manualtests/GenericTests/src/flexUnitTests/core/BinaryDataTesterTest.as deleted file mode 100644 index b10d18c..000 --- a/manualtests/GenericTests/src/flexUnitTests/core/BinaryDataTesterTest.as +++ /dev/null @@ -1,567 +0,0 @@ - -// -// 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 flexUnitTests.core -{ - - -import org.apache.flex.utils.Endian; -import flexunit.framework.Assert; -import org.apache.flex.utils.BinaryData - - -public class BinaryDataTesterTest - { - - [Before] - public function setUp():void { - } - - [After] - public function tearDown():void { - } - - [BeforeClass] - public static function setUpBeforeClass():void { - } - - [AfterClass] - public static function tearDownAfterClass():void { - } - - - //util check functions - private static function bytesMatchExpectedData(bd:BinaryData,expected:Array,offset:int=0):Boolean{ - var len:uint = expected.length; - var end:uint=offset+len; - for (var i:int=offset;i
[29/32] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - Add MDLDynamicTableExample to ilustrate how add/remove items to MDL Table - Currently only adding is working. The rest job will be do
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/885e3213 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/885e3213 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/885e3213 Branch: refs/heads/feature/dragAndDrop Commit: 885e3213653ce7188d8365a1a8f2a2e2018d351d Parents: 37dc600 Author: piotrzAuthored: Sun Aug 27 23:16:17 2017 +0200 Committer: piotrz Committed: Sun Aug 27 23:16:17 2017 +0200 -- 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(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/885e3213/examples/flexjs/MDLDynamicTableExample/pom.xml -- diff --git a/examples/flexjs/MDLDynamicTableExample/pom.xml b/examples/flexjs/MDLDynamicTableExample/pom.xml new file mode 100644 index 000..c1603a0 --- /dev/null +++ b/examples/flexjs/MDLDynamicTableExample/pom.xml @@ -0,0 +1,74 @@ + + +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> + 4.0.0 + + +org.apache.flex.flexjs.examples +examples-flexjs +0.9.0-SNAPSHOT + + + MDLDynamicTableExample + 0.9.0-SNAPSHOT + swf + + Apache Flex - FlexJS: Examples: FlexJS: MDLDynamicTableExample + + + +indigo +pink + + + +src + + +src/resources +true + + + + +org.apache.flex.flexjs.compiler +flexjs-maven-plugin +true + + MDLDynamicTableExample.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 + + + + + + + + org.apache.flex.flexjs.framework + MaterialDesignLite + 0.9.0-SNAPSHOT + swc + js + + + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/885e3213/examples/flexjs/MDLDynamicTableExample/src/MDLDynamicTableExample.mxml -- diff --git a/examples/flexjs/MDLDynamicTableExample/src/MDLDynamicTableExample.mxml b/examples/flexjs/MDLDynamicTableExample/src/MDLDynamicTableExample.mxml new file mode 100644 index 000..4e2a329 --- /dev/null +++ b/examples/flexjs/MDLDynamicTableExample/src/MDLDynamicTableExample.mxml @@ -0,0 +1,36 @@ + + +http://ns.adobe.com/mxml/2009; + xmlns:js="library://ns.apache.org/flexjs/basic" + xmlns:local="*"> + + + + + + + + + + + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/885e3213/examples/flexjs/MDLDynamicTableExample/src/MainView.mxml -- diff --git a/examples/flexjs/MDLDynamicTableExample/src/MainView.mxml b/examples/flexjs/MDLDynamicTableExample/src/MainView.mxml new file mode 100644 index 000..95691fb --- /dev/null +++ b/examples/flexjs/MDLDynamicTableExample/src/MainView.mxml @@ -0,0 +1,65 @@ + + +http://ns.adobe.com/mxml/2009; +xmlns:js="library://ns.apache.org/flexjs/basic" +xmlns:mdl="library://ns.apache.org/flexjs/mdl" xmlns:models="models.*"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
[12/32] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - -refactored ant builds of manual tests to be closer to examples, and support for 'maven_compat' from test level ant scripts. -renamed
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/523eac21/manualtests/UnitTests/src/main/flex/flexUnitTests/core/StrandTesterTest.as -- diff --git a/manualtests/UnitTests/src/main/flex/flexUnitTests/core/StrandTesterTest.as b/manualtests/UnitTests/src/main/flex/flexUnitTests/core/StrandTesterTest.as new file mode 100644 index 000..f6715bb --- /dev/null +++ b/manualtests/UnitTests/src/main/flex/flexUnitTests/core/StrandTesterTest.as @@ -0,0 +1,55 @@ + +// +// 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 flexUnitTests.core +{ +import flexunit.framework.Assert; + +import org.apache.flex.core.Strand; + +public class StrandTesterTest +{ +[Before] +public function setUp():void +{ +} + +[After] +public function tearDown():void +{ +} + +[BeforeClass] +public static function setUpBeforeClass():void +{ +} + +[AfterClass] +public static function tearDownAfterClass():void +{ +} + +[Test] +public function testIdProperty():void +{ +var strand:Strand = new Strand(); +strand.id = "foo"; +Assert.assertEquals("Error testing Srand.id", "foo",strand.id); +} +} +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/523eac21/manualtests/UnitTests/src/main/flex/flexUnitTests/jira/JiraTesterTest.as -- diff --git a/manualtests/UnitTests/src/main/flex/flexUnitTests/jira/JiraTesterTest.as b/manualtests/UnitTests/src/main/flex/flexUnitTests/jira/JiraTesterTest.as new file mode 100644 index 000..c361f39 --- /dev/null +++ b/manualtests/UnitTests/src/main/flex/flexUnitTests/jira/JiraTesterTest.as @@ -0,0 +1,73 @@ + +// +// 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 flexUnitTests.jira +{ +import flexunit.framework.Assert; + + +public class JiraTesterTest +{ + public static var isJS:Boolean; +[BeforeClass] +public static function setUpBeforeClass():void +{ +var js:Boolean = false; +try { +var check:* = getDefinitionByName("flash.system.Capabilities"); +} catch (e:Error) { +js = true; +} +//if this next reference to 'check' is not included, then the above try/catch code +// appears to be optimized away in js-release mode +//todo: this is inconsistent with swf, need to create simple test case for jx compiler/gcc +if (check == null) { +js = true; +} +isJS = js; +} + + [AfterClass] +public static function tearDownAfterClass():void +{ +} + + +[Before] +public function setUp():void +{ +} + +[After] +
[22/32] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - Switch MDLDynamicTabsExample to JSFlex only build in Maven
Switch MDLDynamicTabsExample to JSFlex only build in Maven Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/29bef6b1 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/29bef6b1 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/29bef6b1 Branch: refs/heads/feature/dragAndDrop Commit: 29bef6b10fbb5d48ecc2c9cb27d35ecc72e1a464 Parents: 3bb0e7b Author: piotrzAuthored: Wed Aug 23 23:09:38 2017 +0200 Committer: piotrz Committed: Wed Aug 23 23:09:38 2017 +0200 -- examples/flexjs/MDLDynamicTabsExample/pom.xml | 18 +- 1 file changed, 1 insertion(+), 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/29bef6b1/examples/flexjs/MDLDynamicTabsExample/pom.xml -- diff --git a/examples/flexjs/MDLDynamicTabsExample/pom.xml b/examples/flexjs/MDLDynamicTabsExample/pom.xml index db429a1..f21bcf0 100644 --- a/examples/flexjs/MDLDynamicTabsExample/pom.xml +++ b/examples/flexjs/MDLDynamicTabsExample/pom.xml @@ -47,6 +47,7 @@ true TabsExample.mxml + JSFlex true ${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 @@ -56,22 +57,6 @@ - - - com.adobe.flash.framework - playerglobal - 20.0 - swc - provided - - - - org.apache.flex.flexjs.framework - MaterialDesignLite - 0.9.0-SNAPSHOT - swc - swf - org.apache.flex.flexjs.framework MaterialDesignLite @@ -79,7 +64,6 @@ swc js -
[18/32] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - Fixed TLFEditTestFlexJS manual test
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/feature/dragAndDrop Commit: ebc568a7eb4494e4e9e689f184b7f6082a047ac2 Parents: 932f7cb Author: HarbsAuthored: Tue Aug 22 10:36:39 2017 +0300 Committer: Harbs 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 @@ +
[32/32] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - Merge branch 'develop' into feature/dragAndDrop
Merge branch 'develop' into feature/dragAndDrop * develop: (24 commits) Allow chained assignment to non-existent children 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 Forgot header Returns parameter passed into setAttribute and setChild to enable chained assignment of values. Added missing pieces for TextBlock management Fixed bug in GroupElement.replaceElements() Added helper function FLEX-35354 - Rename TabsItemRendererFactoryForArrayListData to TabsDynamicItemsRendererFactoryForArrayListData - Update TabsDynamicItemsRendererFactoryForArrayListData with new implementation of DynamicItemsRendererFactoryForArrayListData - Update example MDLDynamicTabsExample FLEX-35354 - Add DynamicItemsRendererFactoryForArrayListData to allow add items dynamically to MDL Table - Bead can be used in other components - Update TabsItemRendererFactoryForArrayListData with new DynamicItemsRendererFactoryForArrayListData Switch MDLDynamicTabsExample to JSFlex only build in Maven âStringablesâ should be assignable to XML Partially fixed FormatExample Fixed a few errors in DataGridXcompile Fixed TLFEditTestFlexJS manual test Added maven build for UnitTests -refactored ant builds of manual tests to be closer to examples, and support for 'maven_compat' from test level ant scripts. -renamed GenericTests to UnitTests and fixed some display issues due to layout changes etc Quick fix for FormExample (avoid 0 width, 0 height clipping) Quick fix for ListsTest Quick fix for ImageTest FLEX-35350 - THead and TBody need to be created a bit early cause MDL complaining with NPE when dataProvider is null quick fix to get compiling and something displaying ... Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/1b1697a0 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/1b1697a0 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/1b1697a0 Branch: refs/heads/feature/dragAndDrop Commit: 1b1697a0f65c0fccea58726bf9c6cb23121da849 Parents: 06213a0 641f74c Author: Peter EntAuthored: Wed Aug 30 16:27:51 2017 -0400 Committer: Peter Ent Committed: Wed Aug 30 16:27:51 2017 -0400 -- 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/MDLDynamicTabsExample/pom.xml | 18 +- .../src/main/flex/views/InitialView.mxml| 24 +- .../src/main/resources/mdl-styles.css | 2 +- examples/flexjs/pom.xml | 1 + .../Basic/src/main/flex/BasicClasses.as | 5 + .../org/apache/flex/html/ToggleTextButton.as| 25 +- .../org/apache/flex/html/addElementToWrapper.as | 38 ++ ...namicItemsRendererFactoryForArrayListData.as | 200 +++ .../html/beads/layouts/VerticalFlexLayout.as| 1 + .../html/supportClasses/PanelLayoutProxy.as | 27 + .../Basic/src/main/resources/basic-manifest.xml | 1 + .../src/main/flex/MDLClasses.as | 2 +- .../src/main/flex/org/apache/flex/mdl/Dialog.as | 9 +- .../src/main/flex/org/apache/flex/mdl/Table.as | 26 +- ...namicItemsRendererFactoryForArrayListData.as | 108 .../TabsItemRendererFactoryForArrayListData.as | 206 --- .../org/apache/flex/mdl/beads/views/TabsView.as | 6 +- .../src/main/resources/defaults.css | 4 +- .../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 + frameworks/projects/XML/src/main/flex/XML.as| 33 +- .../projects/XML/src/main/flex/XMLList.as | 31 +- manualtests/BubbleTest/build.xml| 44 +- manualtests/ContainerTest/build.xml | 40 +- manualtests/CursorTest/build.xml| 44 +- manualtests/DataBindingTestbed/build.xml| 41 +- manualtests/DataGridXcompile/build.xml | 39 +- .../html/customControls/beads/DataGridView.as | 8 + .../html/staticControls/beads/BoxGridView.as| 10 +- manualtests/DateChooserExample/build.xml| 38 +- manualtests/EffectsExample/build.xml| 43 +- .../EffectsExample/src/MyInitialView.mxml | 10 +- manualtests/FlexJSTest_HTML5/build.xml | 36 +- manualtests/FlexJSTest_Panel/build.xml | 35
[25/32] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - Added helper function
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/feature/dragAndDrop Commit: daca90f9e688a3ac79edd569f759df2b5ba89b80 Parents: 5b8f1c5 Author: HarbsAuthored: Sun Aug 27 07:43:25 2017 +0300 Committer: Harbs 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
[06/32] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - quick fix to get compiling and something displaying
quick fix to get compiling and something displaying Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a1f60d16 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a1f60d16 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a1f60d16 Branch: refs/heads/feature/dragAndDrop Commit: a1f60d1603d87419a04bd388dca4d2a542b41462 Parents: 629949e Author: greg-doveAuthored: Tue Aug 22 08:19:18 2017 +1200 Committer: greg-dove Committed: Tue Aug 22 08:19:18 2017 +1200 -- manualtests/FlexJSTest_SVG/src/SkinsView.mxml | 57 -- 1 file changed, 30 insertions(+), 27 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a1f60d16/manualtests/FlexJSTest_SVG/src/SkinsView.mxml -- diff --git a/manualtests/FlexJSTest_SVG/src/SkinsView.mxml b/manualtests/FlexJSTest_SVG/src/SkinsView.mxml index e1a95d3..e0a6f65 100644 --- a/manualtests/FlexJSTest_SVG/src/SkinsView.mxml +++ b/manualtests/FlexJSTest_SVG/src/SkinsView.mxml @@ -18,7 +18,10 @@ limitations under the License. --> http://ns.adobe.com/mxml/2009; - xmlns:js="library://ns.apache.org/flexjs/basic" xmlns:skins="skins.*" xmlns:mx="library://ns.adobe.com/flex/mx" + xmlns:js="library://ns.apache.org/flexjs/basic" + xmlns:svg="org.apache.flex.svg.*" + xmlns:graphics="org.apache.flex.graphics.*" + xmlns:skins="skins.*" xmlns:mx="library://ns.adobe.com/flex/mx" initComplete="viewbase1_initCompleteHandler(event)">
[11/32] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - -refactored ant builds of manual tests to be closer to examples, and support for 'maven_compat' from test level ant scripts. -renamed
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/523eac21/manualtests/build.xml -- diff --git a/manualtests/build.xml b/manualtests/build.xml index fc658f3..99f9b76 100644 --- a/manualtests/build.xml +++ b/manualtests/build.xml @@ -74,7 +74,9 @@ + + @@ -87,8 +89,11 @@ + + - + + @@ -103,9 +108,10 @@ + - - + + @@ -114,12 +120,14 @@ - + + - + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/523eac21/manualtests/build_example.xml -- diff --git a/manualtests/build_example.xml b/manualtests/build_example.xml index 62d98b6..586ac49 100644 --- a/manualtests/build_example.xml +++ b/manualtests/build_example.xml @@ -20,82 +20,243 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - + + + - - + - - - - - + + + + + + + - + + + + + + + + + + + + + + +file="${srcDir}/${example}.mxml" +output="${destDir}/${example}.swf"> - + @@ -108,13 +269,13 @@ - - + + - - + + @@ -123,14 +284,23 @@ - + + + + + + +
[30/32] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - Allow chained assignment to non-existent children
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/feature/dragAndDrop Commit: 884826ebfb9184574a17e6cb0a9f62331a4a31be Parents: 37dc600 Author: HarbsAuthored: Mon Aug 28 12:54:52 2017 +0300 Committer: Harbs 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 "; + 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
[20/32] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - Partially fixed FormatExample
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/feature/dragAndDrop Commit: e17b287c15d2bde12bf9cfe86050aa1fb8e5f499 Parents: f0ddbd3 Author: HarbsAuthored: Tue Aug 22 11:12:29 2017 +0300 Committer: Harbs 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;
[04/32] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - 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/629949ec Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/629949ec Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/629949ec Branch: refs/heads/feature/dragAndDrop Commit: 629949ec033368ed535cbf7d6a31898623ec71b0 Parents: 7cd3093 2ce4db3 Author: greg-doveAuthored: Tue Aug 22 07:30:30 2017 +1200 Committer: greg-dove Committed: Tue Aug 22 07:30:30 2017 +1200 -- .../flexjs/MDLExample/src/main/flex/Badges.mxml | 53 +++--- .../MDLExample/src/main/flex/Buttons.mxml | 176 ++- .../flexjs/MDLExample/src/main/flex/Chips.mxml | 19 +- .../MDLExample/src/main/flex/Dialogs.mxml | 14 +- .../MDLExample/src/main/flex/DropDownList.mxml | 5 +- .../MDLExample/src/main/flex/Footers.mxml | 10 +- .../flexjs/MDLExample/src/main/flex/Grids.mxml | 5 - .../flexjs/MDLExample/src/main/flex/Icons.mxml | 58 +++--- .../flexjs/MDLExample/src/main/flex/Lists.mxml | 171 +++--- .../flexjs/MDLExample/src/main/flex/Menus.mxml | 37 ++-- .../MDLExample/src/main/flex/Sliders.mxml | 11 +- .../MDLExample/src/main/flex/Snackbar.mxml | 13 +- .../flexjs/MDLExample/src/main/flex/Tables.mxml | 123 ++--- .../flexjs/MDLExample/src/main/flex/Tabs.mxml | 4 +- .../MDLExample/src/main/flex/TextFields.mxml| 116 ++-- .../MDLExample/src/main/flex/Toggles.mxml | 90 +- .../org/apache/flex/html/ToggleTextButton.as| 25 +-- .../html/beads/layouts/VerticalFlexLayout.as| 1 + .../html/supportClasses/PanelLayoutProxy.as | 27 +++ 19 files changed, 475 insertions(+), 483 deletions(-) --
[28/32] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - Forgot header
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/feature/dragAndDrop Commit: 37dc60031f86d70159826770a9ea021046f65977 Parents: f19d967 Author: HarbsAuthored: Sun Aug 27 12:40:02 2017 +0300 Committer: Harbs 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
[31/32] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - 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/feature/dragAndDrop Commit: 641f74c044e44e229d5965a8a8cde27dd14c9b7e Parents: 884826e 885e321 Author: HarbsAuthored: Mon Aug 28 12:55:10 2017 +0300 Committer: Harbs 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(+) --
[19/32] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - Fixed a few errors in DataGridXcompile
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/feature/dragAndDrop Commit: f0ddbd345147baa20c661b4d1499d0ff7ef7c868 Parents: ebc568a Author: HarbsAuthored: Tue Aug 22 11:01:33 2017 +0300 Committer: Harbs 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; + } } }
[24/32] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - FLEX-35354 - Rename TabsItemRendererFactoryForArrayListData to TabsDynamicItemsRendererFactoryForArrayListData - Update TabsDynamicIt
FLEX-35354 - Rename TabsItemRendererFactoryForArrayListData to TabsDynamicItemsRendererFactoryForArrayListData - Update TabsDynamicItemsRendererFactoryForArrayListData with new implementation of DynamicItemsRendererFactoryForArrayListData - Update example MDLDynamicTabsExample Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/5b8f1c58 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/5b8f1c58 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/5b8f1c58 Branch: refs/heads/feature/dragAndDrop Commit: 5b8f1c5898c776eb7470e855073833e68e794a6d Parents: 56e467a Author: piotrzAuthored: Wed Aug 23 23:53:09 2017 +0200 Committer: piotrz Committed: Wed Aug 23 23:53:09 2017 +0200 -- .../src/main/flex/views/InitialView.mxml| 24 ++- .../src/main/resources/mdl-styles.css | 2 +- .../src/main/flex/MDLClasses.as | 2 +- ...namicItemsRendererFactoryForArrayListData.as | 108 ++ .../TabsItemRendererFactoryForArrayListData.as | 206 --- .../org/apache/flex/mdl/beads/views/TabsView.as | 6 +- .../src/main/resources/defaults.css | 4 +- 7 files changed, 129 insertions(+), 223 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5b8f1c58/examples/flexjs/MDLDynamicTabsExample/src/main/flex/views/InitialView.mxml -- diff --git a/examples/flexjs/MDLDynamicTabsExample/src/main/flex/views/InitialView.mxml b/examples/flexjs/MDLDynamicTabsExample/src/main/flex/views/InitialView.mxml index 5523b6f..1482982 100644 --- a/examples/flexjs/MDLDynamicTabsExample/src/main/flex/views/InitialView.mxml +++ b/examples/flexjs/MDLDynamicTabsExample/src/main/flex/views/InitialView.mxml @@ -39,14 +39,18 @@ limitations under the License. - - - - - - - + + + + + + + + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5b8f1c58/examples/flexjs/MDLDynamicTabsExample/src/main/resources/mdl-styles.css -- diff --git a/examples/flexjs/MDLDynamicTabsExample/src/main/resources/mdl-styles.css b/examples/flexjs/MDLDynamicTabsExample/src/main/resources/mdl-styles.css index 8d52a54..e713389 100644 --- a/examples/flexjs/MDLDynamicTabsExample/src/main/resources/mdl-styles.css +++ b/examples/flexjs/MDLDynamicTabsExample/src/main/resources/mdl-styles.css @@ -27,5 +27,5 @@ { IItemRenderer: ClassReference("itemRenderers.CustomTabBarPanelItemRenderer"); IBeadModel: ClassReference("org.apache.flex.mdl.beads.models.TabArrayListModel"); - IDataProviderItemRendererMapper: ClassReference("org.apache.flex.mdl.beads.TabsItemRendererFactoryForArrayListData"); + IDataProviderItemRendererMapper: ClassReference("org.apache.flex.mdl.beads.TabsDynamicItemsRendererFactoryForArrayListData"); } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5b8f1c58/frameworks/projects/MaterialDesignLite/src/main/flex/MDLClasses.as -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/MDLClasses.as b/frameworks/projects/MaterialDesignLite/src/main/flex/MDLClasses.as index d9ac1ac..00ffe9d 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/MDLClasses.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/MDLClasses.as @@ -28,7 +28,7 @@ package internal class MDLClasses { import org.apache.flex.mdl.beads.TabsItemRendererFactoryForArrayData; TabsItemRendererFactoryForArrayData; - import org.apache.flex.mdl.beads.TabsItemRendererFactoryForArrayListData; TabsItemRendererFactoryForArrayListData; + import org.apache.flex.mdl.beads.TabsDynamicItemsRendererFactoryForArrayListData; TabsDynamicItemsRendererFactoryForArrayListData; import org.apache.flex.mdl.beads.models.TabArrayModel; TabArrayModel; import org.apache.flex.mdl.beads.models.TabArrayListModel; TabArrayListModel; import org.apache.flex.mdl.beads.models.ToastModel; ToastModel; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5b8f1c58/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/TabsDynamicItemsRendererFactoryForArrayListData.as
[03/32] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - Fixed FlexJSStore
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/feature/dragAndDrop Commit: 2ce4db356053482fb618256ae50b3d6fd300571c Parents: d104a2e Author: HarbsAuthored: Mon Aug 21 14:02:38 2017 +0300 Committer: Harbs 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 +*/ + COMPILE::JS + public function
[16/32] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - Added maven build for UnitTests
Added maven build for UnitTests Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f51fcadc Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f51fcadc Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f51fcadc Branch: refs/heads/feature/dragAndDrop Commit: f51fcadc60c681f2abb94a3b3d17cedd25b04a81 Parents: 523eac2 Author: greg-doveAuthored: Tue Aug 22 11:34:37 2017 +1200 Committer: greg-dove Committed: Tue Aug 22 11:34:37 2017 +1200 -- manualtests/UnitTests/pom.xml | 172 + manualtests/pom.xml | 170 2 files changed, 342 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f51fcadc/manualtests/UnitTests/pom.xml -- diff --git a/manualtests/UnitTests/pom.xml b/manualtests/UnitTests/pom.xml new file mode 100644 index 000..315291b --- /dev/null +++ b/manualtests/UnitTests/pom.xml @@ -0,0 +1,172 @@ + + +http://maven.apache.org/POM/4.0.0; +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; +xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + 4.0.0 + + + org.apache.flex.flexjs.manualtests + manualtests + 0.9.0-SNAPSHOT + + UnitTests + 0.9.0-SNAPSHOT + swf + Apache Flex - FlexJS: ManualTests: UnitTests + + + ${project.artifactId} + #ff + -- + 11 + 1 + 0 + expressInstall.swf + ${project.artifactId} + ${project.artifactId} + 100% + 100% + + + + compile + + + org.apache.flex.flexjs.compiler + flexjs-maven-plugin + true + + SWF + ${project.artifactId}.mxml + true + -keep-as3-metadata+=Test,BeforeClass,AfterClass,Before,After,TestVariance,Event,Bindable,TestMeta -keep-code-with-metadata=Test,BeforeClass,AfterClass,Before,After,TestVariance,TestMeta + ${basedir}/target/bin-debug + ${project.artifactId}.swf + + + + compile-js + process-sources + + compile-app + + + JSFlex + ${project.artifactId}.mxml + false + -keep-as3-metadata+=Test,BeforeClass,AfterClass,Before,After,TestVariance,Event,Bindable,TestMeta -keep-code-with-metadata=Test,BeforeClass,AfterClass,Before,After,TestVariance,TestMeta + ${basedir}/target + + + + + + maven-resources-plugin + 3.0.2 + + + copy-template-swf + compile + + copy-resources + + + ${basedir}/target/bin-debug + true + + + ${FLEXJS_HOME}/templates/swfobject + true
[07/32] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - FLEX-35350 - THead and TBody need to be created a bit early cause MDL complaining with NPE when dataProvider is null
FLEX-35350 - THead and TBody need to be created a bit early cause MDL complaining with NPE when dataProvider is 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/d52d531b Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d52d531b Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d52d531b Branch: refs/heads/feature/dragAndDrop Commit: d52d531b04895d7ecc38167c96a08d9ca9e75594 Parents: 10163b7 Author: piotrzAuthored: Tue Aug 22 00:23:26 2017 +0200 Committer: piotrz Committed: Tue Aug 22 00:23:26 2017 +0200 -- .../src/main/flex/org/apache/flex/mdl/Table.as | 26 1 file changed, 10 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d52d531b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Table.as -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Table.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Table.as index 2513548..d4a7514 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Table.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Table.as @@ -102,9 +102,6 @@ package org.apache.flex.mdl { COMPILE::JS { - addTHeadToParent(); - addTBodyToParent(); - if (_isTheadAddedToParent && _isTbodyAddedToParent) { tbody.addElement(c); @@ -172,12 +169,12 @@ package org.apache.flex.mdl element = document.createElement('table') as WrappedHTMLElement; -thead = new THead(); - tbody = new TBody(); - positioner = element; element.flexjs_wrapper = this; +addTHeadToParent(); +addTBodyToParent(); + return element; } @@ -242,11 +239,10 @@ package org.apache.flex.mdl { if (_isTheadAddedToParent) return; -if (thead) -{ -super.addElement(thead); - _isTheadAddedToParent = true; -} + thead = new THead(); + super.addElement(thead); + + _isTheadAddedToParent = true; } COMPILE::JS @@ -254,11 +250,9 @@ package org.apache.flex.mdl { if (_isTbodyAddedToParent) return; - if (tbody) -{ -super.addElement(tbody); - _isTbodyAddedToParent = true; -} +tbody = new TBody(); +super.addElement(tbody); + _isTbodyAddedToParent = true; } } }
[13/32] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - -refactored ant builds of manual tests to be closer to examples, and support for 'maven_compat' from test level ant scripts. -renamed
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/523eac21/manualtests/GenericTests/src/testshim/FlexJSUnitTestRunner.as -- diff --git a/manualtests/GenericTests/src/testshim/FlexJSUnitTestRunner.as b/manualtests/GenericTests/src/testshim/FlexJSUnitTestRunner.as deleted file mode 100644 index 7494963..000 --- a/manualtests/GenericTests/src/testshim/FlexJSUnitTestRunner.as +++ /dev/null @@ -1,186 +0,0 @@ - -// -// 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 testshim { - -import org.apache.flex.reflection.MetaDataArgDefinition; -import org.apache.flex.reflection.MetaDataDefinition; -import org.apache.flex.reflection.MethodDefinition; -import org.apache.flex.reflection.TypeDefinition; -import org.apache.flex.reflection.describeType; - -import flexunit.framework.Assert; -public class FlexJSUnitTestRunner { - - -public function FlexJSUnitTestRunner(testerClass:Class, notificationReceiver:Function) { -this.testerClass = testerClass; -this.callback = notificationReceiver; -prepare(); -} - -private var testerClass:Class; -private var callback:Function; - -private var _testingName:String; -public function get testingName():String{ -return _testingName; -} -private var _successCount:uint=0; -public function get successCount():uint { -return _successCount; -} - -private var _failCount:uint=0; -public function get failCount():uint { -return _failCount; -} - -private var _successfulAssertions:uint=0; -public function get successfulAssertions():uint { -return _successfulAssertions; -} - -private var beforeClassFunc:Function; -private var afterClassFunc:Function; -private var setupFunc:MethodDefinition; -private var tearDownFunc:MethodDefinition; - -private var testMethods:Array=[]; - -private function prepare():void{ -var typeDef:TypeDefinition = describeType(testerClass); -_testingName = typeDef.name; -var staticMethods:Array = typeDef.staticMethods; -for each (var methodDef:MethodDefinition in staticMethods) { -var beforeClass:Array = methodDef.retrieveMetaDataByName("BeforeClass"); -var afterClass:Array = methodDef.retrieveMetaDataByName("AfterClass"); -if ( beforeClass.length ) { -if (beforeClassFunc!=null) throw new Error("BeforeClass used more than once in "+typeDef.qualifiedName); -beforeClassFunc = testerClass[methodDef.name]; -} -if ( afterClass.length ) { -if (afterClassFunc!=null) throw new Error("AfterClass used more than once in "+typeDef.qualifiedName); -afterClassFunc = testerClass[methodDef.name]; -} -} -var methods:Array = typeDef.methods; -for each (methodDef in methods) { -var beforeTests:Array = methodDef.retrieveMetaDataByName("Before"); -var afterTests:Array = methodDef.retrieveMetaDataByName("After"); -if ( beforeTests.length ) { -if (setupFunc!=null) throw new Error("Before used more than once in "+typeDef.qualifiedName); -setupFunc = methodDef; -} -if ( afterTests.length ) { -if (tearDownFunc!=null) throw new Error("After used more than once in "+typeDef.qualifiedName); -tearDownFunc = methodDef; -} -var test:Array = methodDef.retrieveMetaDataByName("Test"); -if (test.length) { -testMethods.push(methodDef); -} -testMethods.sortOn("name"); -} - -if (testMethods.length == 0) { -throw new Error("Zero test methods detected in "+typeDef.qualifiedName+", check to make sure -keep-as3-metadata is configured"); -} -} - -private function begin():void { -if (beforeClassFunc!=null) beforeClassFunc(); -} - -
[27/32] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - Returns parameter passed into setAttribute and setChild to enable chained assignment of values.
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/feature/dragAndDrop Commit: f19d96742f05669f48d9587de6afa2d96e795cc0 Parents: f4276e0 Author: HarbsAuthored: Sun Aug 27 10:47:48 2017 +0300 Committer: Harbs 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; } /**
[26/32] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - Added missing pieces for TextBlock management Fixed bug in GroupElement.replaceElements()
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/feature/dragAndDrop Commit: f4276e0dd628a0a3a22a33d1890ea3c1e1943b5a Parents: daca90f Author: HarbsAuthored: Sun Aug 27 07:46:55 2017 +0300 Committer: Harbs 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.apache.flex.text.engine } public function replaceElements(beginIndex:int,
[15/32] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - -refactored ant builds of manual tests to be closer to examples, and support for 'maven_compat' from test level ant scripts. -renamed
-refactored ant builds of manual tests to be closer to examples, and support for 'maven_compat' from test level ant scripts. -renamed GenericTests to UnitTests and fixed some display issues due to layout changes etc Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/523eac21 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/523eac21 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/523eac21 Branch: refs/heads/feature/dragAndDrop Commit: 523eac21fa4dff0ac0199cf0a8b0e11506e5859f Parents: af7f5cd Author: greg-doveAuthored: Tue Aug 22 11:33:40 2017 +1200 Committer: greg-dove Committed: Tue Aug 22 11:33:40 2017 +1200 -- manualtests/BubbleTest/build.xml| 44 +- manualtests/ContainerTest/build.xml | 40 +- manualtests/CursorTest/build.xml| 44 +- manualtests/DataBindingTestbed/build.xml| 41 +- manualtests/DataGridXcompile/build.xml | 39 +- manualtests/DateChooserExample/build.xml| 38 +- manualtests/EffectsExample/build.xml| 43 +- manualtests/FlexJSTest_HTML5/build.xml | 36 +- manualtests/FlexJSTest_Panel/build.xml | 35 +- manualtests/FlexJSTest_SVG/build.xml| 37 +- manualtests/FlexJSTest_basic/build.xml | 36 +- manualtests/FlexJSTest_createjs/build.xml | 41 +- manualtests/FlexJSTest_jquery/build.xml | 38 +- manualtests/FormExample/build.xml | 45 +- manualtests/FormatExample/build.xml | 43 +- manualtests/GenericTests/build.xml | 76 --- manualtests/GenericTests/src/GenericTests.mxml | 39 -- manualtests/GenericTests/src/MyInitialView.mxml | 193 --- manualtests/GenericTests/src/README.txt | 61 -- manualtests/GenericTests/src/TestClasses.as | 37 -- .../src/flexUnitTests/CoreTester.as | 43 -- .../src/flexUnitTests/JiraIssuesTester.as | 29 - .../src/flexUnitTests/ObservedBugsTester.as | 33 -- .../src/flexUnitTests/ReflectionTester.as | 38 -- .../flexUnitTests/core/BinaryDataTesterTest.as | 567 --- .../src/flexUnitTests/core/StrandTesterTest.as | 55 -- .../src/flexUnitTests/jira/JiraTesterTest.as| 73 --- .../observedbugs/ObservedBugTests.as| 101 .../reflection/ReflectionTesterTest.as | 373 .../reflection/ReflectionTesterTestAlias.as | 90 --- .../reflection/ReflectionTesterTestUseCache.as | 93 --- .../reflection/support/ITestInterface.as| 27 - .../reflection/support/ITestInterface2.as | 29 - .../reflection/support/ITestInterface3.as | 27 - .../reflection/support/ITestInterface4.as | 29 - .../reflection/support/TestClass1.as| 91 --- .../reflection/support/TestClass2.as| 103 .../reflection/support/TestClass3.as| 39 -- .../reflection/support/TestClass4.as| 95 .../src/flexunit/framework/Assert.as| 305 -- .../flexunit/framework/AssertionFailedError.as | 39 -- .../src/testshim/FlexJSUnitTestRunner.as| 186 -- .../GenericTests/src/testshim/TestResult.as | 56 -- .../GenericTests/testsview/image/Flex.png | Bin 3526 -> 0 bytes manualtests/GenericTests/testsview/index.html | 128 - manualtests/ImageTest/build.xml | 37 +- manualtests/LanguageTests/build.xml | 37 +- manualtests/ListsTest/build.xml | 35 +- manualtests/ProxyTest/build.xml | 38 +- manualtests/ReflectionTest/build.xml| 38 +- manualtests/RollEventsTest/build.xml| 37 +- manualtests/TLFEditTestFlexJS/build.xml | 36 +- manualtests/UnitTests/README.txt| 61 ++ manualtests/UnitTests/build.xml | 58 ++ manualtests/UnitTests/src/README.txt| 61 ++ .../src/main/config/compile-app-config.xml | 25 + .../UnitTests/src/main/flex/MyInitialView.mxml | 190 +++ manualtests/UnitTests/src/main/flex/README.txt | 61 ++ .../UnitTests/src/main/flex/TestClasses.as | 37 ++ .../UnitTests/src/main/flex/UnitTests.mxml | 39 ++ .../src/main/flex/flexUnitTests/CoreTester.as | 43 ++ .../main/flex/flexUnitTests/JiraIssuesTester.as | 29 + .../flex/flexUnitTests/ObservedBugsTester.as| 33 ++ .../main/flex/flexUnitTests/ReflectionTester.as | 38 ++ .../flexUnitTests/core/BinaryDataTesterTest.as | 567 +++ .../flex/flexUnitTests/core/StrandTesterTest.as | 55 ++ .../flex/flexUnitTests/jira/JiraTesterTest.as | 73 +++ .../observedbugs/ObservedBugTests.as| 91 +++ .../reflection/ReflectionTesterTest.as | 373 .../reflection/ReflectionTesterTestAlias.as | 90 +++
[17/32] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - 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/932f7cb4 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/932f7cb4 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/932f7cb4 Branch: refs/heads/feature/dragAndDrop Commit: 932f7cb4de15b4ff45d8dd71d76bd08110242f19 Parents: f51fcad d52d531 Author: greg-doveAuthored: Tue Aug 22 11:35:04 2017 +1200 Committer: greg-dove Committed: Tue Aug 22 11:35:04 2017 +1200 -- .../src/main/flex/org/apache/flex/mdl/Dialog.as | 9 --- .../src/main/flex/org/apache/flex/mdl/Table.as | 26 2 files changed, 15 insertions(+), 20 deletions(-) --
[21/32] flex-asjs git commit: “Stringables” should be assignable to XML
â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/feature/dragAndDrop Commit: 3bb0e7b1205315edb379be3674e6a2be05165cee Parents: e17b287 Author: HarbsAuthored: Wed Aug 23 23:51:24 2017 +0300 Committer: Harbs 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) {
[10/32] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - Quick fix for FormExample (avoid 0 width, 0 height clipping)
Quick fix for FormExample (avoid 0 width, 0 height clipping) Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/af7f5cd1 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/af7f5cd1 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/af7f5cd1 Branch: refs/heads/feature/dragAndDrop Commit: af7f5cd1cd55ff90f1c62c4e309c0b52e9756bbd Parents: 1fe4d2c Author: greg-doveAuthored: Tue Aug 22 11:30:43 2017 +1200 Committer: greg-dove Committed: Tue Aug 22 11:30:43 2017 +1200 -- manualtests/FormExample/src/MyFormView.mxml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/af7f5cd1/manualtests/FormExample/src/MyFormView.mxml -- diff --git a/manualtests/FormExample/src/MyFormView.mxml b/manualtests/FormExample/src/MyFormView.mxml index 190fbe5..6e85f22 100644 --- a/manualtests/FormExample/src/MyFormView.mxml +++ b/manualtests/FormExample/src/MyFormView.mxml @@ -47,7 +47,7 @@ limitations under the License. - +
[23/32] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - FLEX-35354 - Add DynamicItemsRendererFactoryForArrayListData to allow add items dynamically to MDL Table - Bead can be used in other
FLEX-35354 - Add DynamicItemsRendererFactoryForArrayListData to allow add items dynamically to MDL Table - Bead can be used in other components - Update TabsItemRendererFactoryForArrayListData with new DynamicItemsRendererFactoryForArrayListData Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/56e467a1 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/56e467a1 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/56e467a1 Branch: refs/heads/feature/dragAndDrop Commit: 56e467a1db22e644c4917b9b012291b94e1f3054 Parents: 29bef6b Author: piotrzAuthored: Wed Aug 23 23:43:48 2017 +0200 Committer: piotrz Committed: Wed Aug 23 23:43:48 2017 +0200 -- .../Basic/src/main/flex/BasicClasses.as | 1 + ...namicItemsRendererFactoryForArrayListData.as | 200 +++ .../Basic/src/main/resources/basic-manifest.xml | 1 + 3 files changed, 202 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/56e467a1/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 539beaa..697efa8 100644 --- a/frameworks/projects/Basic/src/main/flex/BasicClasses.as +++ b/frameworks/projects/Basic/src/main/flex/BasicClasses.as @@ -158,6 +158,7 @@ internal class BasicClasses import org.apache.flex.html.beads.layouts.TileLayout; TileLayout; import org.apache.flex.html.beads.TextItemRendererFactoryForArrayData; TextItemRendererFactoryForArrayData; import org.apache.flex.html.beads.DataItemRendererFactoryForArrayData; DataItemRendererFactoryForArrayData; +import org.apache.flex.html.beads.DynamicItemsRendererFactoryForArrayListData; DynamicItemsRendererFactoryForArrayListData; import org.apache.flex.html.beads.DataItemRendererFactoryForArrayList; DataItemRendererFactoryForArrayList; import org.apache.flex.html.beads.DataItemRendererFactoryForHierarchicalData; DataItemRendererFactoryForHierarchicalData; import org.apache.flex.html.supportClasses.DataGroup; DataGroup; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/56e467a1/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DynamicItemsRendererFactoryForArrayListData.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DynamicItemsRendererFactoryForArrayListData.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DynamicItemsRendererFactoryForArrayListData.as new file mode 100644 index 000..6ccd952 --- /dev/null +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DynamicItemsRendererFactoryForArrayListData.as @@ -0,0 +1,200 @@ + +// +// 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.IArrayList; +import org.apache.flex.core.IBead; +import org.apache.flex.core.IDataProviderItemRendererMapper; +import org.apache.flex.core.IItemRendererClassFactory; +import org.apache.flex.core.IItemRendererParent; +import org.apache.flex.core.IListPresentationModel; +import org.apache.flex.core.IStrand; +import org.apache.flex.core.SimpleCSSStyles; +import org.apache.flex.core.UIBase; +import org.apache.flex.core.ValuesManager; +import org.apache.flex.events.CollectionEvent; + +import org.apache.flex.events.EventDispatcher; +import org.apache.flex.events.IEventDispatcher; +import org.apache.flex.html.beads.IListView; +import org.apache.flex.events.Event; +import org.apache.flex.core.ISelectableItemRenderer; +import
[09/32] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - Quick fix for ListsTest
Quick fix for ListsTest Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/1fe4d2c9 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/1fe4d2c9 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/1fe4d2c9 Branch: refs/heads/feature/dragAndDrop Commit: 1fe4d2c97e41a8d2f2eb4d958f7c8e7e70dd803e Parents: a5f14d7 Author: greg-doveAuthored: Tue Aug 22 11:29:05 2017 +1200 Committer: greg-dove Committed: Tue Aug 22 11:29:05 2017 +1200 -- manualtests/ListsTest/src/products/ProductItemRenderer.as | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1fe4d2c9/manualtests/ListsTest/src/products/ProductItemRenderer.as -- diff --git a/manualtests/ListsTest/src/products/ProductItemRenderer.as b/manualtests/ListsTest/src/products/ProductItemRenderer.as index 2983149..6e3d74a 100644 --- a/manualtests/ListsTest/src/products/ProductItemRenderer.as +++ b/manualtests/ListsTest/src/products/ProductItemRenderer.as @@ -57,7 +57,7 @@ package products { super.data = value; - image.url = data.image; + image.src = data.image; title.text = data.title; detail.text = data.detail; }
[01/32] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - Fix EffectsTimer test
Repository: flex-asjs Updated Branches: refs/heads/feature/dragAndDrop 06213a0c1 -> 1b1697a0f Fix EffectsTimer 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/7cd30933 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/7cd30933 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/7cd30933 Branch: refs/heads/feature/dragAndDrop Commit: 7cd3093332caf3d03c5c9eca7a424c9d4f16f953 Parents: bde25eb Author: greg-doveAuthored: Mon Aug 21 17:01:44 2017 +1200 Committer: greg-dove Committed: Mon Aug 21 17:01:44 2017 +1200 -- manualtests/EffectsExample/src/MyInitialView.mxml | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7cd30933/manualtests/EffectsExample/src/MyInitialView.mxml -- diff --git a/manualtests/EffectsExample/src/MyInitialView.mxml b/manualtests/EffectsExample/src/MyInitialView.mxml index 74cfafb..19fefe8 100644 --- a/manualtests/EffectsExample/src/MyInitialView.mxml +++ b/manualtests/EffectsExample/src/MyInitialView.mxml @@ -28,6 +28,10 @@ limitations under the License. font-size: 14pt; font-weight: bold; } + + global { + IEffectTimer: ClassReference("org.apache.flex.utils.EffectTimer"); + } @@ -78,10 +82,10 @@ limitations under the License. - - + + - +
[08/32] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - Quick fix for ImageTest
Quick fix for ImageTest Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a5f14d73 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a5f14d73 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a5f14d73 Branch: refs/heads/feature/dragAndDrop Commit: a5f14d73961a9aefbee0c16b7a0a03e5fd77b3e9 Parents: a1f60d1 Author: greg-doveAuthored: Tue Aug 22 11:28:02 2017 +1200 Committer: greg-dove Committed: Tue Aug 22 11:28:02 2017 +1200 -- manualtests/ImageTest/src/MyInitialView.mxml | 8 1 file changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a5f14d73/manualtests/ImageTest/src/MyInitialView.mxml -- diff --git a/manualtests/ImageTest/src/MyInitialView.mxml b/manualtests/ImageTest/src/MyInitialView.mxml index 8037448..0ed949a 100644 --- a/manualtests/ImageTest/src/MyInitialView.mxml +++ b/manualtests/ImageTest/src/MyInitialView.mxml @@ -35,10 +35,10 @@ limitations under the License. - - - - + + + +
[02/32] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - Simplified ToggleTextButton
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/feature/dragAndDrop Commit: d104a2edb2ef06e348ee65d9b56d44ccd071841c Parents: 8b10930 Author: HarbsAuthored: Mon Aug 21 14:01:55 2017 +0300 Committer: Harbs 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; } }
[05/32] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - Update doc for MDL Dialog
Update doc for MDL Dialog Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/10163b76 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/10163b76 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/10163b76 Branch: refs/heads/feature/dragAndDrop Commit: 10163b7662f63e58c804c261a48c367222049bc9 Parents: 2ce4db3 Author: piotrzAuthored: Mon Aug 21 21:59:44 2017 +0200 Committer: piotrz Committed: Mon Aug 21 21:59:44 2017 +0200 -- .../src/main/flex/org/apache/flex/mdl/Dialog.as | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/10163b76/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 0b2c60a..1f08069 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 @@ -122,7 +122,7 @@ package org.apache.flex.mdl } /** -* show modal dialog +* Displays the dialog element and makes it the top-most modal dialog. * * @langversion 3.0 * @playerversion Flash 10.2 @@ -140,9 +140,10 @@ package org.apache.flex.mdl } /** -* show dialog. +* Displays the dialog element. +* * Note: It seems MDL does not support non modal dialogs, since there's no examples -* and dialogs are always added to "document.body" We could study change this. +* and dialogs are always added to "document.body". * * @langversion 3.0 * @playerversion Flash 10.2 @@ -160,7 +161,7 @@ package org.apache.flex.mdl } /** -* close dialog +* Closes the dialog element. * * @langversion 3.0 * @playerversion Flash 10.2
git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - Added drawing layer beads to enable the drop indicator to have a place outside of the itemRenderer space.
Repository: flex-asjs Updated Branches: refs/heads/feature/dragAndDrop 2443273b6 -> 06213a0c1 Added drawing layer beads to enable the drop indicator to have a place outside of the itemRenderer space. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/06213a0c Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/06213a0c Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/06213a0c Branch: refs/heads/feature/dragAndDrop Commit: 06213a0c167513327e0a80bd154d33674cd9783d Parents: 2443273 Author: Peter EntAuthored: Wed Aug 30 16:27:17 2017 -0400 Committer: Peter Ent Committed: Wed Aug 30 16:27:17 2017 -0400 -- .../Basic/src/main/flex/BasicClasses.as | 1 + .../flex/html/beads/DataGridPercentageView.as | 3 +- .../org/apache/flex/html/beads/DataGridView.as | 3 +- .../org/apache/flex/html/beads/IDataGridView.as | 6 +- .../Basic/src/main/resources/defaults.css | 2 +- .../flex/org/apache/flex/utils/PointUtils.as| 2 +- .../DragDrop/src/main/flex/DragDropClasses.as | 8 +- .../flex/html/beads/DataGridDrawingLayerBead.as | 103 ++ .../beads/DataGridWithDrawingLayerLayout.as | 117 .../apache/flex/html/beads/DragDropListView.as | 134 +++ .../apache/flex/html/beads/IDrawingLayerBead.as | 45 +++ .../flex/html/beads/ListDrawingLayerBead.as | 97 ++ .../SingleSelectionDataGridDropTargetBead.as| 112 .../html/beads/SingleSelectionDropTargetBead.as | 118 +--- .../src/main/resources/basic-manifest.xml | 9 +- 15 files changed, 594 insertions(+), 166 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/06213a0c/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 0aaa08b..e58f2cf 100644 --- a/frameworks/projects/Basic/src/main/flex/BasicClasses.as +++ b/frameworks/projects/Basic/src/main/flex/BasicClasses.as @@ -169,6 +169,7 @@ internal class BasicClasses import org.apache.flex.html.DataGridButtonBar; DataGridButtonBar; import org.apache.flex.html.beads.DataGridColumnView; DataGridColumnView; import org.apache.flex.html.beads.DataGridView; DataGridView; + import org.apache.flex.html.beads.IDataGridView; IDataGridView; import org.apache.flex.html.beads.DataGridPercentageView; DataGridPercentageView; import org.apache.flex.html.beads.DateChooserView; DateChooserView; import org.apache.flex.html.beads.DateFieldView; DateFieldView; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/06213a0c/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataGridPercentageView.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataGridPercentageView.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataGridPercentageView.as index 74bd364..be2260f 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataGridPercentageView.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataGridPercentageView.as @@ -31,6 +31,7 @@ package org.apache.flex.html.beads import org.apache.flex.html.DataGrid; import org.apache.flex.html.DataGridButtonBar; import org.apache.flex.html.Container; + import org.apache.flex.html.beads.IDataGridView; import org.apache.flex.html.beads.layouts.ButtonBarLayout; import org.apache.flex.html.beads.models.ButtonBarModel; import org.apache.flex.html.supportClasses.DataGridColumn; @@ -53,7 +54,7 @@ package org.apache.flex.html.beads * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - public class DataGridPercentageView extends GroupView implements IBeadView + public class DataGridPercentageView extends GroupView implements IBeadView, IDataGridView { /** * constructor. http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/06213a0c/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataGridView.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataGridView.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataGridView.as index 10e317f..58ee8c7 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataGridView.as +++
[02/28] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - change coordinate space to something expected but different from the way Flash textLine works
change coordinate space to something expected but different from the way Flash textLine 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/367f8b97 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/367f8b97 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/367f8b97 Branch: refs/heads/feature/dragAndDrop Commit: 367f8b9793641cbc43d88c4bb8184d136b5a3d09 Parents: 3bb3f41 Author: Alex HaruiAuthored: Tue Aug 8 10:00:20 2017 -0700 Committer: Alex Harui Committed: Tue Aug 8 10:01:16 2017 -0700 -- .../Text/src/main/flex/org/apache/flex/text/html/TextLine.as | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/367f8b97/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 440ae30..c260c0c 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 @@ -356,7 +356,7 @@ package org.apache.flex.text.html if (atomIndex == element.firstChild.textContent.length - 1) { w = (element.firstChild as HTMLElement).getClientRects()[0].width; - return new Rectangle(w, 1.2 - _textBlock.content.elementFormat.fontSize, 3, 1.2); + return new Rectangle(w, 1.2, 3, 1.2 + _textBlock.content.elementFormat.fontSize); } else { @@ -372,7 +372,7 @@ package org.apache.flex.text.html span.innerHTML = s.substring(0, atomIndex + 1); w = span.getClientRects()[0].width; element.removeChild(span); - return new Rectangle(w1, 1.2 - _textBlock.content.elementFormat.fontSize, w - w1, 1.2); + return new Rectangle(w1, 1.2, w - w1, 1.2 + _textBlock.content.elementFormat.fontSize); } } }
[06/28] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - Fixed event handling
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/feature/dragAndDrop Commit: dcd748c8c2d3732891419599438cf13ecc6ce27b Parents: e830366 Author: HarbsAuthored: Wed Aug 9 19:45:30 2017 +0300 Committer: Harbs 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)); }
[10/28] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - Fix typo in comments of MDL CardInner
Fix typo in comments of MDL CardInner Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/003ccc46 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/003ccc46 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/003ccc46 Branch: refs/heads/feature/dragAndDrop Commit: 003ccc46bcf07029d6302021b55db26612dfb49a Parents: 5277a0c Author: piotrzAuthored: Mon Aug 14 00:02:36 2017 +0200 Committer: piotrz Committed: Mon Aug 14 00:02:36 2017 +0200 -- .../src/main/flex/org/apache/flex/mdl/supportClasses/CardInner.as | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/003ccc46/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/supportClasses/CardInner.as -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/supportClasses/CardInner.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/supportClasses/CardInner.as index 281d5bf..4a0b449 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/supportClasses/CardInner.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/supportClasses/CardInner.as @@ -26,7 +26,7 @@ package org.apache.flex.mdl.supportClasses } /** -* The CardInner class is a base class por all Card inner containers. +* The CardInner class is a base class for all Card inner containers. * * @langversion 3.0 * @playerversion Flash 10.2
[05/28] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - Fixed SimpleDataProviderChangeNotifier and renamed it to EasyDataProviderChangeNotifier
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/feature/dragAndDrop Commit: e830366e44f9643c30e62a2edcf998e8d36ac6cf Parents: 2b2c100 Author: HarbsAuthored: Wed Aug 9 13:42:37 2017 +0300 Committer: Harbs 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.addEventListener("dataProviderChanged", setFirstDataProvider); + + } else + { +
[04/28] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - guess at a size if no fontloader
guess at a size if no fontloader Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/3bb3f41a Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/3bb3f41a Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/3bb3f41a Branch: refs/heads/feature/dragAndDrop Commit: 3bb3f41a1f05e68c7caad86204a3b10c02dc6678 Parents: 9decbb6 Author: Alex HaruiAuthored: Tue Aug 8 09:59:38 2017 -0700 Committer: Alex Harui Committed: Tue Aug 8 10:01:16 2017 -0700 -- .../flex/org/apache/flex/text/engine/ElementFormat.as | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3bb3f41a/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 00a5c82..47e9bb2 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,7 +86,15 @@ package org.apache.flex.text.engine public function getFontMetrics():FontMetrics { assert(fontDescription != null,"fontDescription not assigned!"); - return fontDescription.fontLoader.getFont(fontDescription.fontName,fontDescription.fontStyle).fontMetrics.clone(); +if (fontDescription.fontLoader) + return fontDescription.fontLoader.getFont(fontDescription.fontName,fontDescription.fontStyle).fontMetrics.clone(); +else +{ +var fm:FontMetrics = new FontMetrics(); +// just a guess for now +fm.emBox = new Rectangle(0, 1.2 - fontSize, fontSize, 1.2); +return fm; +} } } } \ No newline at end of file
[19/28] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - Forgot to remove this line.
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/feature/dragAndDrop Commit: 8eaaeffb03fc2c38ad2e89ab044425b7e366678c Parents: 467d4bf Author: HarbsAuthored: Fri Aug 18 15:26:24 2017 +0300 Committer: Harbs 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
[25/28] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - Added support for blink alpha and blink color for point cursor. HTML does not have the same transparency support as Flash and control
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/feature/dragAndDrop Commit: bde25ebea5b88095865050324d8f01073588683f Parents: d526a4a Author: HarbsAuthored: Sun Aug 20 21:39:17 2017 +0300 Committer: Harbs 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(); + blinkState = !blinkState; + } + else +
[07/28] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - try this price if we can't get other price data
try this price if we can't get other price data Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/6e55c55c Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/6e55c55c Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/6e55c55c Branch: refs/heads/feature/dragAndDrop Commit: 6e55c55c716a79d09b62e63d58110b39037d5fcf Parents: bf706bc Author: Alex HaruiAuthored: Wed Aug 9 10:18:58 2017 -0700 Committer: Alex Harui Committed: Wed Aug 9 10:19:13 2017 -0700 -- examples/flexjs/DataBindingExample/src/main/flex/models/MyModel.as | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6e55c55c/examples/flexjs/DataBindingExample/src/main/flex/models/MyModel.as -- diff --git a/examples/flexjs/DataBindingExample/src/main/flex/models/MyModel.as b/examples/flexjs/DataBindingExample/src/main/flex/models/MyModel.as index 5a16d02..0c05d63 100644 --- a/examples/flexjs/DataBindingExample/src/main/flex/models/MyModel.as +++ b/examples/flexjs/DataBindingExample/src/main/flex/models/MyModel.as @@ -58,6 +58,8 @@ package models { if (_requestedField == "Ask") s = _responseData["Bid"]; +if (s == null) +s = _responseData["LastTradePriceOnly"]; } return s; }
[14/28] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - UIModule and UIModuleLoader
UIModule and UIModuleLoader Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/020c1cb9 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/020c1cb9 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/020c1cb9 Branch: refs/heads/feature/dragAndDrop Commit: 020c1cb9e4a825f228ced241728dd80e4cab8432 Parents: 683db92 Author: Alex HaruiAuthored: Tue Aug 15 13:15:50 2017 -0700 Committer: Alex Harui Committed: Tue Aug 15 13:19:34 2017 -0700 -- .../main/flex/org/apache/flex/html/UIModule.as | 139 +++ .../flex/org/apache/flex/html/UIModuleLoader.as | 233 +++ .../Basic/src/main/resources/basic-manifest.xml | 3 + 3 files changed, 375 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/020c1cb9/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/UIModule.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/UIModule.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/UIModule.as new file mode 100644 index 000..4c7784f --- /dev/null +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/UIModule.as @@ -0,0 +1,139 @@ + +// +// 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::SWF +{ +import flash.system.ApplicationDomain; +import flash.utils.getQualifiedClassName; +} +import org.apache.flex.core.IFlexInfo; +import org.apache.flex.core.IValuesImpl; + import org.apache.flex.core.ValuesManager; + import org.apache.flex.events.Event; + import org.apache.flex.events.ValueChangeEvent; + +/** + * Indicates that the state change has completed. All properties + * that need to change have been changed, and all transitinos + * that need to run have completed. However, any deferred work + * may not be completed, and the screen may not be updated until + * code stops executing. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ +[Event(name="stateChangeComplete", type="org.apache.flex.events.Event")] + +/** + * Indicates that the initialization of the container is complete. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ +[Event(name="initComplete", type="org.apache.flex.events.Event")] + +/** + * Indicates that the children of the container is have been added. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ +[Event(name="childrenAdded", type="org.apache.flex.events.Event")] + +/** + * The UIModule class is the base class for modules of user + * interface controls in FlexJS. It is usable as the root tag of MXML + * documents and UI controls and containers are added to it. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public class UIModule extends Group implements IFlexInfo + { +/** + * Constructor. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public function UIModule() + { + super(); + } + +private var _info:Object; + +/** + * An Object containing information generated + * by the compiler that is
[21/28] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - Added change event on CheckBox Fixed RadioButton too
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/feature/dragAndDrop Commit: 1d4211c4cb0200b2c8bae172adef6f9575ff553f Parents: 89145f1 Author: HarbsAuthored: Fri Aug 18 15:46:25 2017 +0300 Committer: Harbs 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
[28/28] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - Merge branch 'develop' into feature/dragAndDrop
Merge branch 'develop' into feature/dragAndDrop * develop: (26 commits) Update MDL Example - MDL Grid should have at least one MDL GridCell 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. revert this because it isn't needed now that we require the same IValuesImpl in the module as is in the main app. switch to using IModule to trigger module output Forgot import Added change event on CheckBox Fixed RadioButton too This should work better with MXML Forgot to remove this line. Setting checked state manually now works maven build for ModuleExample. Module artifacts are not copied into the MainApp (yet) initial module example initialize modules UIModule and UIModuleLoader FLEX-35350 - Add missing overrides of methods related to item renderers - Use in all places element instead positioner Fix typo in import of KeyboardEvent FLEX-35350 - Make HTML element "table" as main element of MDL Table component which allows to add bead to it instead of "tbody" - TableCell and TableColumnt now extends existing classes in Basic module - accordingly TableCell and TableHeader Fix typo in comments of MDL CardInner Cleaned up HTML components try this price if we can't get other price data fx:Style blocks in MXML weren't working. How did they ever 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/2443273b Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/2443273b Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/2443273b Branch: refs/heads/feature/dragAndDrop Commit: 2443273b691c62df76f29dd05d68da88f7f7e88e Parents: bdc6246 8b10930 Author: Peter EntAuthored: Mon Aug 21 10:41:46 2017 +0200 Committer: Peter Ent Committed: Mon Aug 21 10:41:46 2017 +0200 -- examples/build.xml | 3 + .../src/main/flex/models/MyModel.as | 2 + .../flexjs/MDLExample/src/main/flex/Badges.mxml | 53 +++-- .../MDLExample/src/main/flex/Buttons.mxml | 176 +++--- .../flexjs/MDLExample/src/main/flex/Chips.mxml | 19 +- .../MDLExample/src/main/flex/Dialogs.mxml | 14 +- .../MDLExample/src/main/flex/DropDownList.mxml | 5 +- .../MDLExample/src/main/flex/Footers.mxml | 10 +- .../flexjs/MDLExample/src/main/flex/Grids.mxml | 5 - .../flexjs/MDLExample/src/main/flex/Icons.mxml | 58 ++--- .../flexjs/MDLExample/src/main/flex/Lists.mxml | 171 +- .../flexjs/MDLExample/src/main/flex/Menus.mxml | 37 +-- .../MDLExample/src/main/flex/Sliders.mxml | 11 +- .../MDLExample/src/main/flex/Snackbar.mxml | 13 +- .../flexjs/MDLExample/src/main/flex/Tables.mxml | 123 +- .../flexjs/MDLExample/src/main/flex/Tabs.mxml | 4 +- .../MDLExample/src/main/flex/TextFields.mxml| 116 - .../MDLExample/src/main/flex/Toggles.mxml | 90 +++ examples/flexjs/ModuleExample/MainApp/build.xml | 55 + examples/flexjs/ModuleExample/MainApp/pom.xml | 60 + .../src/main/config/compile-app-config.xml | 24 ++ .../MainApp/src/main/flex/MainApp.mxml | 34 +++ examples/flexjs/ModuleExample/Module/build.xml | 76 ++ examples/flexjs/ModuleExample/Module/pom.xml| 60 + .../src/main/config/compile-app-config.xml | 26 +++ .../Module/src/main/flex/Module.mxml| 30 +++ examples/flexjs/ModuleExample/build.xml | 95 examples/flexjs/ModuleExample/pom.xml | 162 + examples/flexjs/pom.xml | 1 + .../main/flex/org/apache/flex/html/UIModule.as | 140 +++ .../flex/org/apache/flex/html/UIModuleLoader.as | 233 +++ .../html/beads/DispatchInputFinishedBead.as | 7 +- .../beads/EasyDataProviderChangeNotifier.as | 108 + .../beads/SimpleDataProviderChangeNotifier.as | 90 --- .../Basic/src/main/resources/basic-manifest.xml | 5 +- .../projects/Core/src/main/flex/CoreClasses.as | 1 + .../main/flex/org/apache/flex/core/IModule.as | 34 +++ .../org/apache/flex/core/SimpleCSSValuesImpl.as | 5 +- .../src/main/flex/org/apache/flex/html/A.as | 6 +- .../src/main/flex/org/apache/flex/html/H1.as| 6 +- .../src/main/flex/org/apache/flex/html/H2.as| 6 +- .../src/main/flex/org/apache/flex/html/H3.as| 6 +- .../src/main/flex/org/apache/flex/html/H4.as| 6 +- .../src/main/flex/org/apache/flex/html/H5.as| 6 +- .../src/main/flex/org/apache/flex/html/H6.as| 6 +- .../src/main/flex/org/apache/flex/html/I.as | 6 +- .../src/main/flex/org/apache/flex/html/Li.as| 7 +- .../main/flex/org/apache/flex/html/Select.as| 3 +-
[13/28] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - FLEX-35350 - Add missing overrides of methods related to item renderers - Use in all places element instead positioner
FLEX-35350 - Add missing overrides of methods related to item renderers - Use in all places element instead positioner Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/683db92f Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/683db92f Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/683db92f Branch: refs/heads/feature/dragAndDrop Commit: 683db92f43d324bc786f6d8f99b5fab3b95aa842 Parents: 2950a79 Author: piotrzAuthored: Tue Aug 15 14:48:11 2017 +0200 Committer: piotrz Committed: Tue Aug 15 14:48:11 2017 +0200 -- .../src/main/flex/org/apache/flex/mdl/Table.as | 68 +++- 1 file changed, 53 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/683db92f/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Table.as -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Table.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Table.as index 22dbfe5..2513548 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Table.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Table.as @@ -19,6 +19,7 @@ package org.apache.flex.mdl { import org.apache.flex.core.IChild; +import org.apache.flex.core.IItemRenderer; COMPILE::JS { @@ -87,7 +88,8 @@ package org.apache.flex.mdl } } - /** + +/** * @copy org.apache.flex.core.IParent#addElement() * * @langversion 3.0 @@ -109,8 +111,50 @@ package org.apache.flex.mdl } } } - - COMPILE::JS + +override public function removeElement(c:IChild, dispatchEvent:Boolean = true):void +{ + COMPILE::JS +{ +if (_isTbodyAddedToParent) +{ +tbody.removeElement(c); +} +} +} + +override public function removeAllItemRenderers():void +{ + if (!_isTbodyAddedToParent) return; + + COMPILE::JS +{ +while (tbody.numElements) +{ +var child:IChild = tbody.getElementAt(0); +removeElement(child); +} +} +} + +override public function getItemRendererForIndex(index:int):IItemRenderer +{ + if (!_isTbodyAddedToParent) return null; + +COMPILE::JS +{ +if (index < 0 || index >= tbody.numElements) + { + return null; +} + +return tbody.getElementAt(index) as IItemRenderer; +} + + return null; +} + +COMPILE::JS private var thead:THead; private var _isTheadAddedToParent:Boolean = false; @@ -136,13 +180,7 @@ package org.apache.flex.mdl return element; } - - COMPILE::JS - override protected function setClassName(value:String):void - { - positioner.className = value; - } - + protected var _shadow:Number = 0; /** * A boolean flag to activate "mdl-shadow--Xdp" effect selector. @@ -161,14 +199,14 @@ package org.apache.flex.mdl { COMPILE::JS { - positioner.classList.remove("mdl-shadow--" + _shadow + "dp"); + element.classList.remove("mdl-shadow--" + _shadow + "dp"); if(value == 2 || value == 3 || value == 4 || value == 6 || value == 8 || value == 16) { _shadow = value; - positioner.classList.add("mdl-shadow--" + _shadow + "dp"); - typeNames = positioner.className; +element.classList.add("mdl-shadow--" + _shadow + "dp"); + typeNames = element.className; } } } @@ -194,8 +232,8 @@ package org.apache.flex.mdl COMPILE::JS { -
[20/28] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - This should work better with MXML
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/feature/dragAndDrop Commit: 89145f1889b7389ca8f241ee98b46e753b63036d Parents: 8eaaeff Author: HarbsAuthored: Fri Aug 18 15:33:23 2017 +0300 Committer: Harbs 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; } } }
[24/28] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - revert this because it isn't needed now that we require the same IValuesImpl in the module as is in the main app.
revert this because it isn't needed now that we require the same IValuesImpl in the module as is in the main app. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d526a4a8 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d526a4a8 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d526a4a8 Branch: refs/heads/feature/dragAndDrop Commit: d526a4a81df20449b8ab6b55ff870028cfe31563 Parents: bbbd0f2 Author: Alex HaruiAuthored: Fri Aug 18 22:50:34 2017 -0700 Committer: Alex Harui Committed: Fri Aug 18 22:50:34 2017 -0700 -- .../flex/org/apache/flex/core/SimpleCSSValuesImpl.as | 11 +-- 1 file changed, 1 insertion(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d526a4a8/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as -- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as index 003ca12..d96558b 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as @@ -81,26 +81,17 @@ package org.apache.flex.core public function init(main:Object):void { var styleClassName:String; -var mainClassName:String; var c:Class; if (!values) { values = {}; mainClass = main; -mainClassName = getQualifiedClassName(mainClass); +var mainClassName:String = getQualifiedClassName(mainClass); styleClassName = "_" + mainClassName + "_Styles"; c = ApplicationDomain.currentDomain.getDefinition(styleClassName) as Class; generateCSSStyleDeclarations(c["factoryFunctions"], c["data"]); } -else if (main is IFlexInfo) -{ -mainClass = main; -mainClassName = getQualifiedClassName(mainClass); -styleClassName = "_" + mainClassName + "_Styles"; -c = ApplicationDomain.currentDomain.getDefinition(styleClassName) as Class; -generateCSSStyleDeclarations(c["factoryFunctions"], c["data"]); -} c = main.constructor as Class; generateCSSStyleDeclarations(c["factoryFunctions"], c["data"]); if (hasEventListener("init"))
[15/28] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - initialize modules
initialize modules Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8e7c6532 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8e7c6532 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8e7c6532 Branch: refs/heads/feature/dragAndDrop Commit: 8e7c65320d79cc0f66c9949c4362ac68ac5266bc Parents: 020c1cb Author: Alex HaruiAuthored: Tue Aug 15 13:17:00 2017 -0700 Committer: Alex Harui Committed: Tue Aug 15 13:19:34 2017 -0700 -- .../flex/org/apache/flex/core/SimpleCSSValuesImpl.as| 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8e7c6532/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as -- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as index 3c3f955..003ca12 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as @@ -81,16 +81,26 @@ package org.apache.flex.core public function init(main:Object):void { var styleClassName:String; +var mainClassName:String; + var c:Class; if (!values) { values = {}; mainClass = main; - var mainClassName:String = getQualifiedClassName(mainClass); +mainClassName = getQualifiedClassName(mainClass); styleClassName = "_" + mainClassName + "_Styles"; c = ApplicationDomain.currentDomain.getDefinition(styleClassName) as Class; generateCSSStyleDeclarations(c["factoryFunctions"], c["data"]); } +else if (main is IFlexInfo) +{ +mainClass = main; +mainClassName = getQualifiedClassName(mainClass); +styleClassName = "_" + mainClassName + "_Styles"; +c = ApplicationDomain.currentDomain.getDefinition(styleClassName) as Class; +generateCSSStyleDeclarations(c["factoryFunctions"], c["data"]); +} c = main.constructor as Class; generateCSSStyleDeclarations(c["factoryFunctions"], c["data"]); if (hasEventListener("init"))
[22/28] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - Forgot import
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/feature/dragAndDrop Commit: ccc699f0bef00d258280d00625af8b314fbf7895 Parents: 1d4211c Author: HarbsAuthored: Fri Aug 18 17:02:34 2017 +0300 Committer: Harbs 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; } /**
[03/28] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - TLFEditor needs StandardTLFFactory
TLFEditor needs StandardTLFFactory Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/9decbb65 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/9decbb65 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/9decbb65 Branch: refs/heads/feature/dragAndDrop Commit: 9decbb65f7fcb4ab3425700ab6e8d311b05948c6 Parents: 574faa1 Author: Alex HaruiAuthored: Tue Aug 8 09:59:13 2017 -0700 Committer: Alex Harui Committed: Tue Aug 8 10:01:16 2017 -0700 -- frameworks/projects/TLF/src/main/flex/TLFClasses.as | 1 + manualtests/TLFEditTestFlexJS/src/TLFEditor.as | 4 2 files changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9decbb65/frameworks/projects/TLF/src/main/flex/TLFClasses.as -- diff --git a/frameworks/projects/TLF/src/main/flex/TLFClasses.as b/frameworks/projects/TLF/src/main/flex/TLFClasses.as index 29f9d14..6321c18 100644 --- a/frameworks/projects/TLF/src/main/flex/TLFClasses.as +++ b/frameworks/projects/TLF/src/main/flex/TLFClasses.as @@ -111,6 +111,7 @@ package import org.apache.flex.textLayout.events.TextLayoutEvent; TextLayoutEvent; import org.apache.flex.textLayout.factory.TextLineFactoryBase; TextLineFactoryBase; +import org.apache.flex.textLayout.factory.StandardTLFFactory; StandardTLFFactory; import org.apache.flex.textLayout.factory.StringTextLineFactory; StringTextLineFactory; import org.apache.flex.textLayout.factory.TextFlowTextLineFactory; TextFlowTextLineFactory; import org.apache.flex.textLayout.factory.TruncationOptions; TruncationOptions; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9decbb65/manualtests/TLFEditTestFlexJS/src/TLFEditor.as -- diff --git a/manualtests/TLFEditTestFlexJS/src/TLFEditor.as b/manualtests/TLFEditTestFlexJS/src/TLFEditor.as index fc6ad76..8052a58 100644 --- a/manualtests/TLFEditTestFlexJS/src/TLFEditor.as +++ b/manualtests/TLFEditTestFlexJS/src/TLFEditor.as @@ -30,6 +30,8 @@ import flash.utils.setTimeout; import org.apache.flex.textLayout.beads.DispatchTLFKeyboardEventBead; import org.apache.flex.textLayout.container.TextContainerManager; +import org.apache.flex.textLayout.factory.TLFFactory; +import org.apache.flex.textLayout.factory.StandardTLFFactory; import org.apache.flex.textLayout.edit.EditingMode; import org.apache.flex.textLayout.edit.ISelectionManager; import org.apache.flex.textLayout.edit.SelectionFormat; @@ -57,6 +59,8 @@ public class TLFEditor extends UIBase public function TLFEditor() { +TLFFactory.defaultTLFFactory = new StandardTLFFactory(); + // Create the TLF TextContainerManager, using this component // as the DisplayObjectContainer for its TextLines. // This TextContainerManager instance persists for the lifetime
[23/28] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - switch to using IModule to trigger module output
switch to using IModule to trigger module output Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/bbbd0f20 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/bbbd0f20 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/bbbd0f20 Branch: refs/heads/feature/dragAndDrop Commit: bbbd0f2024f16632a44575e77f24af63c85023dd Parents: ccc699f Author: Alex HaruiAuthored: Fri Aug 18 22:08:37 2017 -0700 Committer: Alex Harui Committed: Fri Aug 18 22:09:29 2017 -0700 -- .../main/flex/org/apache/flex/html/UIModule.as | 3 +- .../projects/Core/src/main/flex/CoreClasses.as | 1 + .../main/flex/org/apache/flex/core/IModule.as | 34 3 files changed, 37 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bbbd0f20/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/UIModule.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/UIModule.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/UIModule.as index 4c7784f..f81b9e9 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/UIModule.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/UIModule.as @@ -24,6 +24,7 @@ package org.apache.flex.html import flash.utils.getQualifiedClassName; } import org.apache.flex.core.IFlexInfo; +import org.apache.flex.core.IModule; import org.apache.flex.core.IValuesImpl; import org.apache.flex.core.ValuesManager; import org.apache.flex.events.Event; @@ -73,7 +74,7 @@ package org.apache.flex.html * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - public class UIModule extends Group implements IFlexInfo + public class UIModule extends Group implements IFlexInfo, IModule { /** * Constructor. http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bbbd0f20/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 f1c3101..e616bb1 100644 --- a/frameworks/projects/Core/src/main/flex/CoreClasses.as +++ b/frameworks/projects/Core/src/main/flex/CoreClasses.as @@ -82,6 +82,7 @@ internal class CoreClasses import org.apache.flex.core.ILayoutParent; ILayoutParent; import org.apache.flex.core.IListPresentationModel; IListPresentationModel; import org.apache.flex.core.IMeasurementBead; IMeasurementBead; +import org.apache.flex.core.IModule; IModule; import org.apache.flex.core.IPanelModel; IPanelModel; import org.apache.flex.core.IParent; IParent; import org.apache.flex.core.IParentIUIBase; IParentIUIBase; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bbbd0f20/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IModule.as -- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IModule.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IModule.as new file mode 100644 index 000..844619a --- /dev/null +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IModule.as @@ -0,0 +1,34 @@ + +// +// 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.core +{ +/** + * The compiler checks the main class to see if it implements the + * IModule interface and generates bootstrapping code for a module + * instead of an application. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + *
[16/28] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - initial module example
initial module example Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ba3140be Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ba3140be Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ba3140be Branch: refs/heads/feature/dragAndDrop Commit: ba3140beeeb9b66cd8175dae4253821daefc47f6 Parents: 8e7c653 Author: Alex HaruiAuthored: Tue Aug 15 13:19:00 2017 -0700 Committer: Alex Harui Committed: Tue Aug 15 13:19:34 2017 -0700 -- examples/build.xml | 3 + examples/flexjs/ModuleExample/MainApp/build.xml | 55 .../src/main/config/compile-app-config.xml | 24 + .../MainApp/src/main/flex/MainApp.mxml | 34 +++ examples/flexjs/ModuleExample/Module/build.xml | 76 .../src/main/config/compile-app-config.xml | 26 ++ .../Module/src/main/flex/Module.mxml| 30 +++ examples/flexjs/ModuleExample/build.xml | 95 8 files changed, 343 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba3140be/examples/build.xml -- diff --git a/examples/build.xml b/examples/build.xml index 5913b78..9d7e3cd 100644 --- a/examples/build.xml +++ b/examples/build.xml @@ -97,6 +97,7 @@ + @@ -142,6 +143,7 @@ + @@ -177,6 +179,7 @@ + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba3140be/examples/flexjs/ModuleExample/MainApp/build.xml -- diff --git a/examples/flexjs/ModuleExample/MainApp/build.xml b/examples/flexjs/ModuleExample/MainApp/build.xml new file mode 100644 index 000..a69e99f --- /dev/null +++ b/examples/flexjs/ModuleExample/MainApp/build.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba3140be/examples/flexjs/ModuleExample/MainApp/src/main/config/compile-app-config.xml -- diff --git a/examples/flexjs/ModuleExample/MainApp/src/main/config/compile-app-config.xml b/examples/flexjs/ModuleExample/MainApp/src/main/config/compile-app-config.xml new file mode 100644 index 000..cb6846f --- /dev/null +++ b/examples/flexjs/ModuleExample/MainApp/src/main/config/compile-app-config.xml @@ -0,0 +1,24 @@ + + + +--variable_map_output_file gccvars.txt +--property_map_output_file gccprops.txt + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba3140be/examples/flexjs/ModuleExample/MainApp/src/main/flex/MainApp.mxml -- diff --git a/examples/flexjs/ModuleExample/MainApp/src/main/flex/MainApp.mxml b/examples/flexjs/ModuleExample/MainApp/src/main/flex/MainApp.mxml new file mode 100644 index 000..9e101bb --- /dev/null +++ b/examples/flexjs/ModuleExample/MainApp/src/main/flex/MainApp.mxml @@ -0,0 +1,34 @@ + + +http://ns.adobe.com/mxml/2009; + xmlns:js="library://ns.apache.org/flexjs/basic" > + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba3140be/examples/flexjs/ModuleExample/Module/build.xml -- diff --git a/examples/flexjs/ModuleExample/Module/build.xml b/examples/flexjs/ModuleExample/Module/build.xml new file mode 100644 index 000..b9e5a18 --- /dev/null +++ b/examples/flexjs/ModuleExample/Module/build.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba3140be/examples/flexjs/ModuleExample/Module/src/main/config/compile-app-config.xml --
[17/28] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - maven build for ModuleExample. Module artifacts are not copied into the MainApp (yet)
maven build for ModuleExample. Module artifacts are not copied into the MainApp (yet) Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f208da8d Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f208da8d Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f208da8d Branch: refs/heads/feature/dragAndDrop Commit: f208da8d9a7836a6100b8426faf0ca08c9fed71e Parents: ba3140b Author: Alex HaruiAuthored: Wed Aug 16 10:08:26 2017 -0700 Committer: Alex Harui Committed: Wed Aug 16 10:08:26 2017 -0700 -- examples/flexjs/ModuleExample/MainApp/pom.xml | 60 examples/flexjs/ModuleExample/Module/pom.xml | 60 examples/flexjs/ModuleExample/pom.xml | 162 + examples/flexjs/pom.xml | 1 + 4 files changed, 283 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f208da8d/examples/flexjs/ModuleExample/MainApp/pom.xml -- diff --git a/examples/flexjs/ModuleExample/MainApp/pom.xml b/examples/flexjs/ModuleExample/MainApp/pom.xml new file mode 100644 index 000..8fc88e2 --- /dev/null +++ b/examples/flexjs/ModuleExample/MainApp/pom.xml @@ -0,0 +1,60 @@ + + +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + 4.0.0 + + +org.apache.flex.flexjs.examples +examples-flexjs-ModuleExample +0.9.0-SNAPSHOT + + + MainApp + 0.9.0-SNAPSHOT + swf + + Apache Flex - FlexJS: Examples: FlexJS: ModuleExample: MainApp + + + + +org.apache.flex.flexjs.compiler +flexjs-maven-plugin +true + + MainApp.mxml + false + -js-compiler-option=--variable_map_output_file gccvars.txt;-js-compiler-option+=--property_map_output_file gccprops.txt + + + + + + + + com.adobe.flash.framework + playerglobal + ${flash.version} + swc + provided + + + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f208da8d/examples/flexjs/ModuleExample/Module/pom.xml -- diff --git a/examples/flexjs/ModuleExample/Module/pom.xml b/examples/flexjs/ModuleExample/Module/pom.xml new file mode 100644 index 000..2001b0a --- /dev/null +++ b/examples/flexjs/ModuleExample/Module/pom.xml @@ -0,0 +1,60 @@ + + +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + 4.0.0 + + +org.apache.flex.flexjs.examples +examples-flexjs-ModuleExample +0.9.0-SNAPSHOT + + + Module + 0.9.0-SNAPSHOT + swf + + Apache Flex - FlexJS: Examples: FlexJS: ModuleExample: Module + + + + +org.apache.flex.flexjs.compiler +flexjs-maven-plugin +true + + Module.mxml + false + -js-compiler-option=--variable_map_input_file ../../../../../MainApp/target/javascript/bin/js-release/gccvars.txt;-js-compiler-option+=--property_map_input_file ../../../../../MainApp/target/javascript/bin/js-release/gccprops.txt + + + + + + + + com.adobe.flash.framework + playerglobal + ${flash.version} + swc + provided + + + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f208da8d/examples/flexjs/ModuleExample/pom.xml -- diff --git a/examples/flexjs/ModuleExample/pom.xml b/examples/flexjs/ModuleExample/pom.xml new file mode 100644 index 000..3e48e85 --- /dev/null +++ b/examples/flexjs/ModuleExample/pom.xml @@ -0,0 +1,162 @@ + + +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + 4.0.0 + + +org.apache.flex.flexjs.examples +examples-flexjs +0.9.0-SNAPSHOT + + + examples-flexjs-ModuleExample + 0.9.0-SNAPSHOT + pom + + Apache Flex - FlexJS: Examples: FlexJS: ModuleExample + + +MainApp +Module + + + + + + + + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f208da8d/examples/flexjs/pom.xml -- diff --git a/examples/flexjs/pom.xml b/examples/flexjs/pom.xml index 14abd70..2de6a5a 100644 --- a/examples/flexjs/pom.xml +++ b/examples/flexjs/pom.xml @@ -53,6 +53,7 @@ MDLDynamicTabsExample MDLExample +ModuleExample MobileMap
[27/28] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - 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/8b109301 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8b109301 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8b109301 Branch: refs/heads/feature/dragAndDrop Commit: 8b1093013ec3323af9ecc79be6d926a1a8f6f6d1 Parents: 65b7eb9 bde25eb Author: piotrzAuthored: Sun Aug 20 23:49:20 2017 +0200 Committer: piotrz Committed: Sun Aug 20 23:49:20 2017 +0200 -- .../textLayout/container/ContainerController.as | 38 ++-- .../flex/textLayout/edit/SelectionFormat.as | 32 +++-- 2 files changed, 65 insertions(+), 5 deletions(-) --
[18/28] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - Setting checked state manually now works
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/feature/dragAndDrop Commit: 467d4bfdba723eab442e5f8c12ddc816c7f8bb9f Parents: f208da8 Author: HarbsAuthored: Fri Aug 18 15:01:23 2017 +0300 Committer: Harbs 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 IBeadController:
[26/28] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - Update MDL Example - MDL Grid should have at least one MDL GridCell
Update MDL Example - MDL Grid should have at least one MDL GridCell Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/65b7eb99 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/65b7eb99 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/65b7eb99 Branch: refs/heads/feature/dragAndDrop Commit: 65b7eb99497532dadd8bd91f9932e3904ef6987b Parents: d526a4a Author: piotrzAuthored: Sun Aug 20 23:47:21 2017 +0200 Committer: piotrz Committed: Sun Aug 20 23:47:21 2017 +0200 -- .../flexjs/MDLExample/src/main/flex/Badges.mxml | 53 +++--- .../MDLExample/src/main/flex/Buttons.mxml | 176 ++- .../flexjs/MDLExample/src/main/flex/Chips.mxml | 19 +- .../MDLExample/src/main/flex/Dialogs.mxml | 14 +- .../MDLExample/src/main/flex/DropDownList.mxml | 5 +- .../MDLExample/src/main/flex/Footers.mxml | 10 +- .../flexjs/MDLExample/src/main/flex/Grids.mxml | 5 - .../flexjs/MDLExample/src/main/flex/Icons.mxml | 58 +++--- .../flexjs/MDLExample/src/main/flex/Lists.mxml | 171 +++--- .../flexjs/MDLExample/src/main/flex/Menus.mxml | 37 ++-- .../MDLExample/src/main/flex/Sliders.mxml | 11 +- .../MDLExample/src/main/flex/Snackbar.mxml | 13 +- .../flexjs/MDLExample/src/main/flex/Tables.mxml | 123 ++--- .../flexjs/MDLExample/src/main/flex/Tabs.mxml | 4 +- .../MDLExample/src/main/flex/TextFields.mxml| 116 ++-- .../MDLExample/src/main/flex/Toggles.mxml | 90 +- 16 files changed, 443 insertions(+), 462 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/65b7eb99/examples/flexjs/MDLExample/src/main/flex/Badges.mxml -- diff --git a/examples/flexjs/MDLExample/src/main/flex/Badges.mxml b/examples/flexjs/MDLExample/src/main/flex/Badges.mxml index 11ee536..581f41b 100644 --- a/examples/flexjs/MDLExample/src/main/flex/Badges.mxml +++ b/examples/flexjs/MDLExample/src/main/flex/Badges.mxml @@ -32,30 +32,35 @@ limitations under the License. - - - - - - - - - - - - - -http://flex.apache.org;> - - - - - -http://flex.apache.org;> - - - - + + + + + + + + + + + + + + + + + +http://flex.apache.org;> + + + + + +http://flex.apache.org;> + + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/65b7eb99/examples/flexjs/MDLExample/src/main/flex/Buttons.mxml -- diff --git a/examples/flexjs/MDLExample/src/main/flex/Buttons.mxml b/examples/flexjs/MDLExample/src/main/flex/Buttons.mxml index 1f99688..9131d53 100644 --- a/examples/flexjs/MDLExample/src/main/flex/Buttons.mxml +++ b/examples/flexjs/MDLExample/src/main/flex/Buttons.mxml @@ -33,92 +33,96 @@ limitations under the License. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + +
[08/28] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - fx:Style blocks in MXML weren't working. How did they ever work?
fx:Style blocks in MXML weren't working. How did they ever 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/bf706bc8 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/bf706bc8 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/bf706bc8 Branch: refs/heads/feature/dragAndDrop Commit: bf706bc8022d735f70a739e73e34ef50c542f0d0 Parents: dcd748c Author: Alex HaruiAuthored: Wed Aug 9 10:18:29 2017 -0700 Committer: Alex Harui Committed: Wed Aug 9 10:19:13 2017 -0700 -- .../Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bf706bc8/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as -- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as index 36198f6..3c3f955 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as @@ -91,7 +91,7 @@ package org.apache.flex.core c = ApplicationDomain.currentDomain.getDefinition(styleClassName) as Class; generateCSSStyleDeclarations(c["factoryFunctions"], c["data"]); } - c = mainClass.constructor as Class; + c = main.constructor as Class; generateCSSStyleDeclarations(c["factoryFunctions"], c["data"]); if (hasEventListener("init")) dispatchEvent(new ValueEvent("init", false, false, c["fontFaces"]));
[12/28] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - Fix typo in import of KeyboardEvent
Fix typo in import of KeyboardEvent Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/2950a794 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/2950a794 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/2950a794 Branch: refs/heads/feature/dragAndDrop Commit: 2950a794ee83d0c5436f99861ed317d1e390dc2c Parents: 1d4eb63 Author: piotrzAuthored: Tue Aug 15 13:18:14 2017 +0200 Committer: piotrz Committed: Tue Aug 15 13:18:14 2017 +0200 -- .../flex/org/apache/flex/html/beads/DispatchInputFinishedBead.as | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2950a794/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 7b932e2..f83ed16 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 @@ -28,7 +28,7 @@ package org.apache.flex.html.beads COMPILE::JS { import org.apache.flex.core.IRenderedObject; - import org.org.apache.flex.events.KeyboardEvent; + import org.apache.flex.events.KeyboardEvent; import goog.events; }
[01/28] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - fix keyboard events for TLFEditTestFlexJS
Repository: flex-asjs Updated Branches: refs/heads/feature/dragAndDrop bdc624644 -> 2443273b6 fix keyboard events for TLFEditTestFlexJS Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/2b2c1009 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/2b2c1009 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/2b2c1009 Branch: refs/heads/feature/dragAndDrop Commit: 2b2c10092ab0cac0c6f8cee2dac231f789f8e13f Parents: 367f8b9 Author: Alex HaruiAuthored: Tue Aug 8 10:01:04 2017 -0700 Committer: Alex Harui Committed: Tue Aug 8 10:01:16 2017 -0700 -- .../textLayout/beads/DispatchTLFKeyboardEventBead.as | 13 +++-- 1 file changed, 11 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2b2c1009/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/beads/DispatchTLFKeyboardEventBead.as -- diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/beads/DispatchTLFKeyboardEventBead.as b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/beads/DispatchTLFKeyboardEventBead.as index c308f9d..a671239 100644 --- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/beads/DispatchTLFKeyboardEventBead.as +++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/beads/DispatchTLFKeyboardEventBead.as @@ -25,7 +25,8 @@ package org.apache.flex.textLayout.beads import org.apache.flex.events.Event; import org.apache.flex.events.IEventDispatcher; import org.apache.flex.events.KeyboardEvent; - import org.apache.flex.events.utils.KeyboardEventConverter; + import org.apache.flex.events.utils.EditingKeys; +import org.apache.flex.events.utils.KeyboardEventConverter; import org.apache.flex.text.events.TextEvent; import org.apache.flex.textLayout.events.FocusEvent; @@ -202,12 +203,16 @@ package org.apache.flex.textLayout.beads } } +private var inKeyEventHandler:Boolean; + /** * @private */ COMPILE::JS protected function keyEventHandler(event:KeyboardEvent):void { +if (inKeyEventHandler) return; +inKeyEventHandler = true; event.stopImmediatePropagation(); var newEvent:org.apache.flex.events.KeyboardEvent = KeyboardEventConverter.convert(event); (_strand as IEventDispatcher).dispatchEvent(newEvent); @@ -217,6 +222,10 @@ package org.apache.flex.textLayout.beads } if (event.type == "keypress") { +// don't send along a TextInput event for "Backspace". It should get handled +// in keyDownHandler +if (event.key == EditingKeys.BACKSPACE) +return; var textEvent:org.apache.flex.text.events.TextEvent = new org.apache.flex.text.events.TextEvent(TextEvent.TEXT_INPUT); if (event.key != null) textEvent.text = event.key; @@ -226,7 +235,7 @@ package org.apache.flex.textLayout.beads textEvent.text = String.fromCharCode(event['keyCode']); (_strand as IEventDispatcher).dispatchEvent(textEvent); } - +inKeyEventHandler = false; } /**
[09/28] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - Cleaned up HTML components
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/feature/dragAndDrop Commit: 5277a0cbd6a6e2abed71efc3d7da63997d7895c8 Parents: 6e55c55 Author: HarbsAuthored: Sat Aug 12 22:01:10 2017 +0300 Committer: Harbs 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.appendChild(textNode); positioner = element;
[11/28] git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - FLEX-35350 - Make HTML element "table" as main element of MDL Table component which allows to add bead to it instead of "tbody" - Tab
FLEX-35350 - Make HTML element "table" as main element of MDL Table component which allows to add bead to it instead of "tbody" - TableCell and TableColumnt now extends existing classes in Basic module - accordingly TableCell and TableHeader Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/1d4eb637 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/1d4eb637 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/1d4eb637 Branch: refs/heads/feature/dragAndDrop Commit: 1d4eb6373c2e84594feea4a5b4247e752153a616 Parents: 003ccc4 Author: piotrzAuthored: Tue Aug 15 11:46:37 2017 +0200 Committer: piotrz Committed: Tue Aug 15 11:46:37 2017 +0200 -- .../src/main/flex/org/apache/flex/mdl/TBody.as | 67 + .../src/main/flex/org/apache/flex/mdl/Table.as | 78 +++- .../main/flex/org/apache/flex/mdl/TableCell.as | 14 ++-- .../flex/org/apache/flex/mdl/TableColumn.as | 14 ++-- 4 files changed, 125 insertions(+), 48 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d4eb637/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TBody.as -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TBody.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TBody.as new file mode 100644 index 000..8452c48 --- /dev/null +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TBody.as @@ -0,0 +1,67 @@ + +// +// 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.mdl +{ + import org.apache.flex.html.Group; + +COMPILE::JS +{ +import org.apache.flex.core.WrappedHTMLElement; +} + + /** +* The TBody class is a Container component capable of presenting content of MDL Table +* +* @langversion 3.0 +* @playerversion Flash 10.2 +* @playerversion AIR 2.6 +* @productversion FlexJS 0.8 +*/ + public class TBody extends Group + { + /** +* constructor. +* +* @langversion 3.0 +* @playerversion Flash 10.2 +* @playerversion AIR 2.6 +* @productversion FlexJS 0.8 +*/ + public function TBody() + { + super(); + + //className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user; + } + +/** + * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement + */ +COMPILE::JS +override protected function createElement():WrappedHTMLElement +{ +element = document.createElement('tbody') as WrappedHTMLElement; + + positioner = element; +element.flexjs_wrapper = this; + +return element; +} + } +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1d4eb637/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Table.as -- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Table.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Table.as index e08465b..22dbfe5 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Table.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Table.as @@ -19,8 +19,7 @@ package org.apache.flex.mdl { import org.apache.flex.core.IChild; - import org.apache.flex.core.IUIBase; - +
git commit: [flex-asjs] [refs/heads/feature/dragAndDrop] - Drag and drop work thus far. Not complete.
Repository: flex-asjs Updated Branches: refs/heads/feature/dragAndDrop [created] bdc624644 Drag and drop work thus far. Not complete. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/bdc62464 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/bdc62464 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/bdc62464 Branch: refs/heads/feature/dragAndDrop Commit: bdc62464429130da6049d4da4530eed4c4be1e6c Parents: 574faa1 Author: Peter EntAuthored: Tue Aug 8 08:41:51 2017 -0400 Committer: Peter Ent Committed: Tue Aug 8 08:41:51 2017 -0400 -- .../Basic/src/main/flex/BasicClasses.as | 2 + .../main/flex/org/apache/flex/css2/DragMove.fxg | 48 .../flex/org/apache/flex/css2/DragReject.fxg| 73 .../DragDrop/src/main/flex/DragDropClasses.as | 1 + .../SingleSelectionDataGridDropTargetBead.as| 112 +++ .../html/beads/SingleSelectionDragSourceBead.as | 4 +- .../html/beads/SingleSelectionDropTargetBead.as | 51 - .../beads/controllers/DragMouseController.as| 5 +- .../src/main/resources/basic-manifest.xml | 2 + frameworks/projects/Express/pom.xml | 14 +++ .../src/main/config/compile-swf-config.xml | 1 + .../main/flex/org/apache/flex/express/List.as | 38 +++ 12 files changed, 322 insertions(+), 29 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bdc62464/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 539beaa..0aaa08b 100644 --- a/frameworks/projects/Basic/src/main/flex/BasicClasses.as +++ b/frameworks/projects/Basic/src/main/flex/BasicClasses.as @@ -238,6 +238,8 @@ internal class BasicClasses COMPILE::SWF { import org.apache.flex.css2.Copy; Copy; + import org.apache.flex.css2.DragMove; DragMove; + import org.apache.flex.css2.DragReject; DragReject; } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bdc62464/frameworks/projects/Basic/src/main/flex/org/apache/flex/css2/DragMove.fxg -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/css2/DragMove.fxg b/frameworks/projects/Basic/src/main/flex/org/apache/flex/css2/DragMove.fxg new file mode 100644 index 000..212ef6c --- /dev/null +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/css2/DragMove.fxg @@ -0,0 +1,48 @@ + + +http://ns.adobe.com/fxg/2008; xmlns:ATE="http://ns.adobe.com/ate/2009; xmlns:d="http://ns.adobe.com/fxg/2008/dt; + xmlns:flm="http://ns.adobe.com/flame/2008; + xmlns:afx="http://ns.apache.org/flex/2012; afx:className="org.apache.flex.css2.DragMove" afx:baseClassName="flash.display.Sprite" > + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bdc62464/frameworks/projects/Basic/src/main/flex/org/apache/flex/css2/DragReject.fxg -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/css2/DragReject.fxg b/frameworks/projects/Basic/src/main/flex/org/apache/flex/css2/DragReject.fxg new file mode 100644 index 000..d85703a --- /dev/null +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/css2/DragReject.fxg @@ -0,0 +1,73 @@ + + +http://ns.adobe.com/fxg/2008; xmlns:ATE="http://ns.adobe.com/ate/2009; xmlns:d="http://ns.adobe.com/fxg/2008/dt; + xmlns:flm="http://ns.adobe.com/flame/2008; + xmlns:afx="http://ns.apache.org/flex/2012; afx:className="org.apache.flex.css2.DragReject" afx:baseClassName="flash.display.Sprite" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file
git commit: [flex-asjs] [refs/heads/develop] - Added special cursor for drag and drop operation.
Repository: flex-asjs Updated Branches: refs/heads/develop e6dc3e159 -> de15fe6b0 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/develop 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); + +
git commit: [flex-asjs] [refs/heads/develop] - Removed extra IF statement.
Repository: flex-asjs Updated Branches: refs/heads/develop 6066f2528 -> e6dc3e159 Removed extra IF statement. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/e6dc3e15 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/e6dc3e15 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/e6dc3e15 Branch: refs/heads/develop Commit: e6dc3e159f6ac1b82501e2c459f35f95c8c7cb4f Parents: 6066f25 Author: Peter EntAuthored: Wed Aug 2 11:05:38 2017 -0400 Committer: Peter Ent Committed: Wed Aug 2 11:05:38 2017 -0400 -- .../projects/Basic/src/main/flex/org/apache/flex/css2/Cursors.as| 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e6dc3e15/frameworks/projects/Basic/src/main/flex/org/apache/flex/css2/Cursors.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/css2/Cursors.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/css2/Cursors.as index 96ef8f4..cde3a0f 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/css2/Cursors.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/css2/Cursors.as @@ -194,7 +194,6 @@ package org.apache.flex.css2 if (!iui && s.parent) iui = s.parent.parent as IUIBase; if (iui) -if (iui) { var cursor:String = getCursor(iui); if (cursor)
git commit: [flex-asjs] [refs/heads/develop] - Added SingleSelectionDropIndicatorBead and used it with the other single-selection drag and drop beads. Updated comments throughout.
Repository: flex-asjs Updated Branches: refs/heads/develop 01bc1dd02 -> 96ee5429f 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/develop 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
[1/2] git commit: [flex-asjs] [refs/heads/develop] - PointUtils was missing.
Repository: flex-asjs Updated Branches: refs/heads/develop 8c2a6bc41 -> 01bc1dd02 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/develop 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;
[2/2] git commit: [flex-asjs] [refs/heads/develop] - 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/develop 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 (DragEvent.dragSource
git commit: [flex-asjs] [refs/heads/develop] - Fix for bug where the "close" event on a Panel was not being dispatched on HTML platform. This was because the "close" event from the TitleBar was set to
Repository: flex-asjs Updated Branches: refs/heads/develop dae3a3c77 -> f012cfad6 Fix for bug where the "close" event on a Panel was not being dispatched on HTML platform. This was because the "close" event from the TitleBar was set to bubble and events do not bubble (easily anyway) on the HTML platform. PanelView now intercepts the event and dispatches its own. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f012cfad Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f012cfad Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f012cfad Branch: refs/heads/develop Commit: f012cfad6e81b1d3e73c27c7ec99dc8ea735791e Parents: dae3a3c Author: Peter EntAuthored: Thu Jul 20 14:03:02 2017 -0400 Committer: Peter Ent Committed: Thu Jul 20 14:03:02 2017 -0400 -- .../src/main/flex/org/apache/flex/html/beads/PanelView.as | 7 +++ .../main/flex/org/apache/flex/html/beads/TitleBarView.mxml| 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f012cfad/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/PanelView.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/PanelView.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/PanelView.as index c2bb227..d9b3757 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/PanelView.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/PanelView.as @@ -153,6 +153,8 @@ package org.apache.flex.html.beads _titleBar.element.style["flex-grow"] = "0"; _titleBar.element.style["order"] = "1"; } + + _titleBar.addEventListener("close", handleClose); // replace the TitleBar's model with the Panel's model (it implements ITitleBarModel) so that // any changes to values in the Panel's model that correspond values in the TitleBar will @@ -265,5 +267,10 @@ package org.apache.flex.html.beads performLayout(event); } + private function handleClose(event:Event):void + { + IEventDispatcher(_strand).dispatchEvent(new Event("close")); + } + } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f012cfad/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/TitleBarView.mxml -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/TitleBarView.mxml b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/TitleBarView.mxml index 0f27523..a5ff08d 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/TitleBarView.mxml +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/TitleBarView.mxml @@ -37,7 +37,7 @@ limitations under the License. private function clickHandler():void { -var newEvent:org.apache.flex.events.Event = new org.apache.flex.events.Event('close',true); +var newEvent:org.apache.flex.events.Event = new org.apache.flex.events.Event('close'); UIBase(_strand).dispatchEvent(newEvent) } ]]>
git commit: [flex-asjs] [refs/heads/develop] - Adding DragAndDropExample.
Repository: flex-asjs Updated Branches: refs/heads/develop e440ae9f2 -> 64790cc90 Adding DragAndDropExample. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/64790cc9 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/64790cc9 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/64790cc9 Branch: refs/heads/develop Commit: 64790cc90d781af78bc0ee8365595e48daa89269 Parents: e440ae9 Author: Peter EntAuthored: Wed Jul 19 14:44:25 2017 -0400 Committer: Peter Ent Committed: Wed Jul 19 14:44:25 2017 -0400 -- examples/build.xml | 3 + examples/flexjs/DragAndDropExample/build.xml| 66 + examples/flexjs/DragAndDropExample/pom.xml | 85 + .../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 15 files changed, 448 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/64790cc9/examples/build.xml -- diff --git a/examples/build.xml b/examples/build.xml index 601993a..5913b78 100644 --- a/examples/build.xml +++ b/examples/build.xml @@ -85,6 +85,7 @@ + @@ -129,6 +130,7 @@ + @@ -163,6 +165,7 @@ + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/64790cc9/examples/flexjs/DragAndDropExample/build.xml -- diff --git a/examples/flexjs/DragAndDropExample/build.xml b/examples/flexjs/DragAndDropExample/build.xml new file mode 100644 index 000..8be8d37 --- /dev/null +++ b/examples/flexjs/DragAndDropExample/build.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/64790cc9/examples/flexjs/DragAndDropExample/pom.xml -- diff --git a/examples/flexjs/DragAndDropExample/pom.xml b/examples/flexjs/DragAndDropExample/pom.xml new file mode 100644 index 000..8e5afc9 --- /dev/null +++ b/examples/flexjs/DragAndDropExample/pom.xml @@ -0,0 +1,85 @@ + + +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + 4.0.0 + + + + +org.apache.flex.flexjs.examples +examples-flexjs +0.9.0-SNAPSHOT + + + DragAndDropExample + 0.9.0-SNAPSHOT + swf + + Apache Flex - FlexJS: Examples: FlexJS: DragAndDropExample + + + + +org.apache.flex.flexjs.compiler +flexjs-maven-plugin +true + + DragAndDropExample.mxml + + + + + + + + + + + org.apache.flex.flexjs.framework + 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/64790cc9/examples/flexjs/DragAndDropExample/src/main/flex/DragAndDropExample.mxml -- diff --git a/examples/flexjs/DragAndDropExample/src/main/flex/DragAndDropExample.mxml b/examples/flexjs/DragAndDropExample/src/main/flex/DragAndDropExample.mxml new file mode 100644 index 000..41989f8 ---
git commit: [flex-asjs] [refs/heads/develop] - Need to create a chain of parent event targets.
Repository: flex-asjs Updated Branches: refs/heads/develop 36cea4fcf -> e440ae9f2 Need to create a chain of parent event targets. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/e440ae9f Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/e440ae9f Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/e440ae9f Branch: refs/heads/develop Commit: e440ae9f2b9b0524de42e90da66f6c69bd7cd5ce Parents: 36cea4f Author: Peter EntAuthored: Wed Jul 19 14:43:17 2017 -0400 Committer: Peter Ent Committed: Wed Jul 19 14:43:17 2017 -0400 -- .../src/main/flex/org/apache/flex/events/DragEvent.as| 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e440ae9f/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 cb161c0..0731c75 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 @@ -409,13 +409,17 @@ package org.apache.flex.events } COMPILE::JS { + // build an event target chain of ancestors so that bubbling + // will work for drag events on JS platform. var pet:Object = target.getParentEventTarget(); if (!pet) { var p:Object = target.parent; - while (p != null && !(p is IStrand)) { + var t:Object = target; + while (p != null && (p is IStrand)) { + t.setParentEventTarget(p); + t = p; p = p.parent; } - target.setParentEventTarget(p); } (target as IEventDispatcher).dispatchEvent(event);
git commit: [flex-asjs] [refs/heads/develop] - Updates to DragDrop that makes it work for SWF and JS platforms.
Repository: flex-asjs Updated Branches: refs/heads/develop 887d7c447 -> d19b4f4ab Updates to DragDrop that makes it work for SWF and JS platforms. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d19b4f4a Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d19b4f4a Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d19b4f4a Branch: refs/heads/develop Commit: d19b4f4ab0d0c73d170cd6b78441df4b07320aaa Parents: 887d7c4 Author: Peter EntAuthored: Tue Jul 18 15:17:50 2017 -0400 Committer: Peter Ent Committed: Tue Jul 18 15:17:50 2017 -0400 -- .../DragDrop/src/main/flex/DragDropClasses.as | 1 + .../flex/org/apache/flex/events/DragEvent.as| 96 +- .../org/apache/flex/events/DragEventBase.as | 1 + .../html/beads/SingleSelectionDragImageBead.as | 131 +++ .../html/beads/SingleSelectionDragSourceBead.as | 41 +++--- .../html/beads/SingleSelectionDropTargetBead.as | 14 +- .../beads/controllers/DragMouseController.as| 29 ++-- .../beads/controllers/DropMouseController.as| 43 +++--- .../src/main/resources/basic-manifest.xml | 1 + 9 files changed, 251 insertions(+), 106 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d19b4f4a/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 866c39e..440b540 100644 --- a/frameworks/projects/DragDrop/src/main/flex/DragDropClasses.as +++ b/frameworks/projects/DragDrop/src/main/flex/DragDropClasses.as @@ -30,6 +30,7 @@ internal class DragDropClasses import org.apache.flex.core.DropType; DropType; import org.apache.flex.events.DragEvent; DragEvent; + import org.apache.flex.html.beads.SingleSelectionDragImageBead; SingleSelectionDragImageBead; import org.apache.flex.html.beads.SingleSelectionDragSourceBead; SingleSelectionDragSourceBead; import org.apache.flex.html.beads.SingleSelectionDropTargetBead; SingleSelectionDropTargetBead; } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d19b4f4a/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 9ed81df..cb161c0 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 @@ -24,6 +24,7 @@ package org.apache.flex.events COMPILE::JS { import org.apache.flex.core.IUIBase; + import org.apache.flex.core.IStrand; import window.Event; import window.MouseEvent; import org.apache.flex.events.utils.EventUtils; @@ -261,27 +262,50 @@ package org.apache.flex.events public static var dragSource:Object; COMPILE::SWF { - private var _clientX:Number; - override public function set clientX(value:Number):void - { - super.clientX = value; - _clientX = value; - } - override public function get clientX():Number - { - return _clientX; - } - - private var _clientY:Number; - override public function set clientY(value:Number):void - { - super.clientY = value; - _clientY = value; - } - override public function get clientY():Number - { - return _clientY; + private var _clientX:Number; + + /** +* @private +*/ + override public function set clientX(value:Number):void + { + super.clientX = value; + _clientX = value; + } + override public function get clientX():Number + { + return _clientX; + } + + private var _clientY:Number; + + /** +* @private +*/ +
git commit: [flex-asjs] [refs/heads/develop] - Disabled mouse events for the drag image. Set the default cursor for StringItemRenderer to be pointer.
Repository: flex-asjs Updated Branches: refs/heads/develop 52300dae3 -> 4010a04c2 Disabled mouse events for the drag image. Set the default cursor for StringItemRenderer to be pointer. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/4010a04c Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/4010a04c Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/4010a04c Branch: refs/heads/develop Commit: 4010a04c279af361a1f44e822e31410ebbae6bff Parents: 52300da Author: Peter EntAuthored: Wed Jul 12 17:00:40 2017 -0400 Committer: Peter Ent Committed: Wed Jul 12 17:00:40 2017 -0400 -- .../projects/Basic/src/main/resources/defaults.css | 1 + .../flex/html/beads/controllers/DragMouseController.as | 13 - 2 files changed, 9 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4010a04c/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 531180f..91d7932 100644 --- a/frameworks/projects/Basic/src/main/resources/defaults.css +++ b/frameworks/projects/Basic/src/main/resources/defaults.css @@ -496,6 +496,7 @@ StringItemRenderer height: 24; flex-shrink: 0; flex-grow: 1; + cursor: pointer; } AccordionItemRenderer http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4010a04c/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 6d560a1..2963d86 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 @@ -243,16 +243,19 @@ package org.apache.flex.html.beads.controllers (dragImage as InteractiveObject).mouseEnabled = false; (dragImage as DisplayObjectContainer).mouseChildren = false; } + COMPILE::JS { + dragImage.element.style['pointer-events'] = 'none'; + } } } } else { -trace("DRAG-MOUSE: sending dragMove " + event.target.toString()); +//trace("DRAG-MOUSE: sending dragMove " + event.target.toString()); dragEvent = DragEvent.createDragEvent("dragMove", event); -trace("client: " + event.clientX.toString() + " " + event.clientY.toString() + " " + event.target.toString()); +//trace("client: " + event.clientX.toString() + " " + event.clientY.toString() + " " + event.target.toString()); pt = PointUtils.globalToLocal(new Point(event.clientX, event.clientY), host); -trace("host: " + pt.x.toString() + " " + pt.y.toString()); +//trace("host: " + pt.x.toString() + " " + pt.y.toString()); dragImage.x = pt.x + dragImageOffsetX; dragImage.y = pt.y + dragImageOffsetY; DragEvent.dispatchDragEvent(dragEvent, event.target); @@ -261,12 +264,12 @@ package org.apache.flex.html.beads.controllers private function dragMouseUpHandler(event:MouseEvent):void { -trace("DRAG-MOUSE: dragMouseUp"); +//trace("DRAG-MOUSE: dragMouseUp"); var dragEvent:DragEvent; if (dragging) { -trace("DRAG-MOUSE: sending dragEnd"); +//trace("DRAG-MOUSE: sending dragEnd"); var screenPoint:Point = new Point(event.screenX, event.screenY); var newPoint:Point = PointUtils.globalToLocal(screenPoint, event.target);
git commit: [flex-asjs] [refs/heads/develop] - Change dragImage HTML style to position property and use a pointer cursor.
Repository: flex-asjs Updated Branches: refs/heads/develop da16efbee -> 52300dae3 Change dragImage HTML style to position property and use a pointer cursor. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/52300dae Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/52300dae Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/52300dae Branch: refs/heads/develop Commit: 52300dae3cbb5ed87ed8be391d5866aa30c4aa85 Parents: da16efb Author: Peter EntAuthored: Wed Jul 12 14:28:14 2017 -0400 Committer: Peter Ent Committed: Wed Jul 12 14:28:14 2017 -0400 -- .../org/apache/flex/html/beads/SingleSelectionDragSourceBead.as | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/52300dae/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 0af7043..6701d80 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,10 @@ package org.apache.flex.html.beads dragImage.height = (ir as UIBase).height; var label:Label = new Label(); label.text = ir.data.toString(); + COMPILE::JS { + dragImage.element.style.position = 'absolute'; + dragImage.element.style.cursor = 'pointer'; + } dragImage.addElement(label); DragEvent.dragSource = ir.data;
[1/2] git commit: [flex-asjs] [refs/heads/tlf] - Copy bubbles property from source event to result event.
Repository: flex-asjs Updated Branches: refs/heads/tlf fcf36f6b9 -> fad521450 Copy bubbles property from source event to result 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/83e5a687 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/83e5a687 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/83e5a687 Branch: refs/heads/tlf Commit: 83e5a68783b10e400a9e1223d56b65e47d47d386 Parents: fcf36f6 Author: Peter EntAuthored: Fri Jun 30 17:19:45 2017 -0400 Committer: Peter Ent Committed: Fri Jun 30 17:19:45 2017 -0400 -- .../src/main/flex/org/apache/flex/core/HTMLElementWrapper.as | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/83e5a687/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 30a67bb..f104b83 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 @@ -253,7 +253,7 @@ package org.apache.flex.core eventType = e as String; if (e === org.apache.flex.events.Event.CHANGE) { -e = EventUtils.createEvent(eventType); +e = EventUtils.createEvent(eventType, e.bubbles); } } else @@ -261,7 +261,7 @@ package org.apache.flex.core eventType = e.type; if (ElementEvents.elementEvents[eventType]) { -e = EventUtils.createEvent(eventType); +e = EventUtils.createEvent(eventType, e.bubbles); } } var source:Object = this.getActualDispatcher_(eventType);
[2/2] git commit: [flex-asjs] [refs/heads/tlf] - Some changes to get DragAndDrop to work with new List-oriented DnD beads.
Some changes to get DragAndDrop to work with new List-oriented DnD beads. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/fad52145 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/fad52145 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/fad52145 Branch: refs/heads/tlf Commit: fad5214500960e48be9da87dda88530ae31cc235 Parents: 83e5a68 Author: Peter EntAuthored: Fri Jun 30 17:25:35 2017 -0400 Committer: Peter Ent Committed: Fri Jun 30 17:25:35 2017 -0400 -- frameworks/projects/Core/src/main/flex/CoreClasses.as | 1 + .../DragDrop/src/main/flex/org/apache/flex/events/DragEvent.as| 3 ++- .../org/apache/flex/html/beads/SingleSelectionDragSourceBead.as | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fad52145/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 0aaa985..fcd30eb 100644 --- a/frameworks/projects/Core/src/main/flex/CoreClasses.as +++ b/frameworks/projects/Core/src/main/flex/CoreClasses.as @@ -71,6 +71,7 @@ internal class CoreClasses import org.apache.flex.core.IDataProviderItemRendererMapper; IDataProviderItemRendererMapper; import org.apache.flex.core.IBinaryImageModel; IBinaryImageModel; import org.apache.flex.core.IDocument; IDocument; + import org.apache.flex.core.IDragInitiator; IDragInitiator; import org.apache.flex.core.IFormatBead; IFormatBead; import org.apache.flex.core.IImage; IImage; import org.apache.flex.core.IImageModel; IImageModel; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fad52145/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 392da45..9ed81df 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 @@ -380,7 +380,8 @@ package org.apache.flex.events } COMPILE::JS { -((target as IUIBase).element as IEventDispatcher).dispatchEvent(event as window.Event); + // ((target as IUIBase).element as IEventDispatcher).dispatchEvent(event as window.Event); + (target as IEventDispatcher).dispatchEvent(event as window.Event); } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fad52145/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 c911651..0af7043 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 @@ -22,6 +22,7 @@ package org.apache.flex.html.beads import org.apache.flex.core.IBead; import org.apache.flex.core.IDragInitiator; import org.apache.flex.core.IDataProviderModel; + import org.apache.flex.core.IDocument; import org.apache.flex.core.IItemRenderer; import org.apache.flex.core.IItemRendererParent; import org.apache.flex.core.IParent; @@ -43,7 +44,6 @@ package org.apache.flex.html.beads * By adding this bead, a user can drag a row of the List to a new location within the list. This bead * should be used in conjunction with SingleSelectionDropTargetBead. * - * @flexjsignoreimport org.apache.flex.core.IDragInitiator * @see org.apache.flex.html.beads.SingleSelectionDropTargetBead. * * @langversion 3.0
git commit: [flex-asjs] [refs/heads/develop] - Added missing projects.
Repository: flex-asjs Updated Branches: refs/heads/develop 0636f5755 -> 262bca151 Added missing projects. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/262bca15 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/262bca15 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/262bca15 Branch: refs/heads/develop Commit: 262bca15108044f76e85bb3d1bd281bfc6b696f5 Parents: 0636f57 Author: Peter EntAuthored: Fri Jun 30 14:10:51 2017 -0400 Committer: Peter Ent Committed: Fri Jun 30 14:10:51 2017 -0400 -- examples/flexjs/ASDoc/src/main/config/asdoc-config.xml | 9 + 1 file changed, 9 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/262bca15/examples/flexjs/ASDoc/src/main/config/asdoc-config.xml -- diff --git a/examples/flexjs/ASDoc/src/main/config/asdoc-config.xml b/examples/flexjs/ASDoc/src/main/config/asdoc-config.xml index fe29e1c..30ed037 100644 --- a/examples/flexjs/ASDoc/src/main/config/asdoc-config.xml +++ b/examples/flexjs/ASDoc/src/main/config/asdoc-config.xml @@ -52,6 +52,7 @@ --> + ${frameworks_dir}/projects/Basic/src/main/flex ${frameworks_dir}/projects/Binding/src/main/flex ${frameworks_dir}/projects/Charts/src/main/flex ${frameworks_dir}/projects/Collections/src/main/flex @@ -59,6 +60,9 @@ ${frameworks_dir}/projects/CreateJS/src/main/flex ${frameworks_dir}/projects/DragDrop/src/main/flex ${frameworks_dir}/projects/Effects/src/main/flex + ${frameworks_dir}/projects/Express/src/main/flex + ${frameworks_dir}/projects/Flat/src/main/flex + ${frameworks_dir}/projects/FontAwesome/src/main/flex ${frameworks_dir}/projects/Formatters/src/main/flex ${frameworks_dir}/projects/GoogleMaps/src/main/flex ${frameworks_dir}/projects/Graphics/src/main/flex @@ -67,9 +71,14 @@ ${frameworks_dir}/projects/HTML5/src/main/flex ${frameworks_dir}/projects/JQuery/src/main/flex ${frameworks_dir}/projects/Language/src/main/flex + ${frameworks_dir}/projects/MaterialDesignLite/src/main/flex ${frameworks_dir}/projects/Mobile/src/main/flex ${frameworks_dir}/projects/Network/src/main/flex ${frameworks_dir}/projects/Reflection/src/main/flex + ${frameworks_dir}/projects/Storage/src/main/flex + ${frameworks_dir}/projects/TLF/src/main/flex + ${frameworks_dir}/projects/Text/src/main/flex + ${frameworks_dir}/projects/XML/src/main/flex
git commit: [flex-asjs] [refs/heads/tlf] - Made the SingleSelectionDragSourceBead and SingleSelectionDropTargetBead a bit more generic to work with DataGrid as well as List. Added dragStartObject to D
Repository: flex-asjs Updated Branches: refs/heads/tlf c89b3a11e -> 38d7d38a5 Made the SingleSelectionDragSourceBead and SingleSelectionDropTargetBead a bit more generic to work with DataGrid as well as List. Added dragStartObject to DragMouseController and dropTargetObject to DropMouseController. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/38d7d38a Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/38d7d38a Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/38d7d38a Branch: refs/heads/tlf Commit: 38d7d38a5087b90179d6807ae05ce805820904e1 Parents: c89b3a1 Author: Peter EntAuthored: Thu Jun 29 11:20:31 2017 -0400 Committer: Peter Ent Committed: Thu Jun 29 11:20:31 2017 -0400 -- .../html/beads/SingleSelectionDragSourceBead.as | 97 +++ .../html/beads/SingleSelectionDropTargetBead.as | 119 +-- .../beads/controllers/DragMouseController.as| 12 ++ .../beads/controllers/DropMouseController.as| 13 ++ 4 files changed, 125 insertions(+), 116 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/38d7d38a/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 72b0a00..c911651 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 @@ -101,39 +101,30 @@ package org.apache.flex.html.beads { trace("SingleSelectionDragSourceBead received the DragStart"); - var downPoint:Point = new Point(event.clientX, event.clientY);//PointUtils.localToGlobal(new Point(event.clientX, event.clientY), _strand); - //trace("Dragging from this point: "+downPoint.x+", "+downPoint.y); - //trace("-- find the itemRenderer this object is over"); + if (DragMouseController.dragStartObject == null) return; // not interested in empty things - if (itemRendererParent != null) { - var n:Number = itemRendererParent.numElements; - for (var i:int=0; i < n; i++) { - var child:UIBase = itemRendererParent.getElementAt(i) as UIBase; - if (child != null) { - var childPoint:Point = PointUtils.localToGlobal(new Point(child.x,child.y), itemRendererParent); - //trace("-- child "+i+": "+childPoint.x+" - "+(childPoint.x+child.width)+" x "+childPoint.y+" - "+(childPoint.y+child.height)); - var rect:Rectangle = new Rectangle(childPoint.x, childPoint.y, child.width, child.height); - if (rect.containsPoint(downPoint)) { - var ir:IItemRenderer = child as IItemRenderer; - - //trace("-- dragging this child, " + i + ", at "+childPoint.x+", "+childPoint.y); - indexOfDragSource = i; - - var dragImage:UIBase = new Group(); - dragImage.className = "DragImage"; - dragImage.width = child.width; - dragImage.height = child.height; - var label:Label = new Label(); - label.text = ir.data.toString(); - dragImage.addElement(label); - - DragEvent.dragSource = ir.data; - DragEvent.dragInitiator = this; -
git commit: [flex-asjs] [refs/heads/tlf] - Modified drag and drop beads to accommodate dragging between, as well as within, Lists. Added simple copy/move dragging property.
Repository: flex-asjs Updated Branches: refs/heads/tlf ab82aab1a -> c6e721f93 Modified drag and drop beads to accommodate dragging between, as well as within, Lists. Added simple copy/move dragging property. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/c6e721f9 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/c6e721f9 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/c6e721f9 Branch: refs/heads/tlf Commit: c6e721f93d0951f1fc3e3913523f308c8335ac54 Parents: ab82aab Author: Peter EntAuthored: Wed Jun 28 09:23:59 2017 -0400 Committer: Peter Ent Committed: Wed Jun 28 09:23:59 2017 -0400 -- .../html/beads/SingleSelectionDragSourceBead.as | 56 +--- .../html/beads/SingleSelectionDropTargetBead.as | 41 +++--- 2 files changed, 66 insertions(+), 31 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c6e721f9/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 71f5394..72b0a00 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 @@ -18,8 +18,10 @@ package org.apache.flex.html.beads { + import org.apache.flex.collections.ArrayList; import org.apache.flex.core.IBead; import org.apache.flex.core.IDragInitiator; + import org.apache.flex.core.IDataProviderModel; import org.apache.flex.core.IItemRenderer; import org.apache.flex.core.IItemRendererParent; import org.apache.flex.core.IParent; @@ -68,6 +70,16 @@ package org.apache.flex.html.beads return _itemRendererParent; } + private var _dragType:String = "move"; + public function get dragType():String + { + return _dragType; + } + public function set dragType(value:String):void + { + _dragType = value; + } + public function set strand(value:IStrand):void { _strand = value; @@ -83,13 +95,15 @@ package org.apache.flex.html.beads return _strand; } + private var indexOfDragSource:int = -1; + private function handleDragStart(event:DragEvent):void { trace("SingleSelectionDragSourceBead received the DragStart"); var downPoint:Point = new Point(event.clientX, event.clientY);//PointUtils.localToGlobal(new Point(event.clientX, event.clientY), _strand); - trace("Dragging from this point: "+downPoint.x+", "+downPoint.y); - trace("-- find the itemRenderer this object is over"); + //trace("Dragging from this point: "+downPoint.x+", "+downPoint.y); + //trace("-- find the itemRenderer this object is over"); if (itemRendererParent != null) { var n:Number = itemRendererParent.numElements; @@ -97,15 +111,14 @@ package org.apache.flex.html.beads var child:UIBase = itemRendererParent.getElementAt(i) as UIBase; if (child != null) { var childPoint:Point = PointUtils.localToGlobal(new Point(child.x,child.y), itemRendererParent); - trace("-- child "+i+": "+childPoint.x+" - "+(childPoint.x+child.width)+" x "+childPoint.y+" - "+(childPoint.y+child.height)); + //trace("-- child "+i+": "+childPoint.x+" - "+(childPoint.x+child.width)+" x "+childPoint.y+" - "+(childPoint.y+child.height)); var rect:Rectangle = new Rectangle(childPoint.x, childPoint.y, child.width, child.height); if (rect.containsPoint(downPoint)) {
git commit: [flex-asjs] [refs/heads/tlf] - New beads to support drag and drop with lists. Preliminary version.
Repository: flex-asjs Updated Branches: refs/heads/tlf c2f7a2d8f -> 88e31ab94 New beads to support drag and drop with lists. Preliminary version. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/88e31ab9 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/88e31ab9 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/88e31ab9 Branch: refs/heads/tlf Commit: 88e31ab94d5648b482982523f1f00177a8b7fd01 Parents: c2f7a2d Author: Peter EntAuthored: Tue Jun 27 16:03:10 2017 -0400 Committer: Peter Ent Committed: Tue Jun 27 16:03:10 2017 -0400 -- .../controllers/ItemRendererMouseController.as | 4 +- .../src/main/config/compile-swf-config.xml | 1 + .../DragDrop/src/main/flex/DragDropClasses.as | 3 + .../flex/org/apache/flex/events/DragEvent.as| 31 +++ .../html/beads/SingleSelectionDragSourceBead.as | 142 ++ .../html/beads/SingleSelectionDropTargetBead.as | 189 +++ .../beads/controllers/DragMouseController.as| 45 +++-- .../beads/controllers/DropMouseController.as| 17 +- .../src/main/resources/basic-manifest.xml | 2 + 9 files changed, 413 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/88e31ab9/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/controllers/ItemRendererMouseController.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/controllers/ItemRendererMouseController.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/controllers/ItemRendererMouseController.as index 33c6aa2..bc9bc11 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/controllers/ItemRendererMouseController.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/controllers/ItemRendererMouseController.as @@ -174,9 +174,7 @@ COMPILE::JS { { var target:ISelectableItemRenderer = event.currentTarget as ISelectableItemRenderer; if (target) - { - event.stopImmediatePropagation(); - + { var newEvent:ItemClickedEvent = new ItemClickedEvent("itemClicked"); newEvent.data = target.data; newEvent.multipleSelection = event.shiftKey; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/88e31ab9/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 a557a61..9fd8bab 100644 --- a/frameworks/projects/DragDrop/src/main/config/compile-swf-config.xml +++ b/frameworks/projects/DragDrop/src/main/config/compile-swf-config.xml @@ -32,6 +32,7 @@ ${env.AIR_HOME}/frameworks/libs/air/airglobal.swc ../../../../../libs/Core.swc ../../../../../libs/Basic.swc +../../../../../libs/Collections.swc http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/88e31ab9/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 14d0b54..866c39e 100644 --- a/frameworks/projects/DragDrop/src/main/flex/DragDropClasses.as +++ b/frameworks/projects/DragDrop/src/main/flex/DragDropClasses.as @@ -29,6 +29,9 @@ internal class DragDropClasses { import org.apache.flex.core.DropType; DropType; import org.apache.flex.events.DragEvent; DragEvent; + + import org.apache.flex.html.beads.SingleSelectionDragSourceBead; SingleSelectionDragSourceBead; + import org.apache.flex.html.beads.SingleSelectionDropTargetBead; SingleSelectionDropTargetBead; } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/88e31ab9/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 8acef67..392da45 100644 --- a/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/events/DragEvent.as +++
git commit: [flex-asjs] [refs/heads/release0.8.0] - Partial solution to the NumericStepper issue.
Repository: flex-asjs Updated Branches: refs/heads/release0.8.0 04a63b6c2 -> 8dc27279a Partial solution to the NumericStepper issue. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8dc27279 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8dc27279 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8dc27279 Branch: refs/heads/release0.8.0 Commit: 8dc27279a01e37674bd39b606aae4d63dd5f6477 Parents: 04a63b6 Author: Peter EntAuthored: Wed Jun 7 17:17:25 2017 -0400 Committer: Peter Ent Committed: Wed Jun 7 17:17:25 2017 -0400 -- .../flex/html/beads/NumericStepperView.as | 34 .../org/apache/flex/html/beads/SpinnerView.as | 17 ++ .../Basic/src/main/resources/defaults.css | 4 ++- 3 files changed, 48 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8dc27279/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/NumericStepperView.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/NumericStepperView.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/NumericStepperView.as index 807eef0..4c7e6ba 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/NumericStepperView.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/NumericStepperView.as @@ -82,6 +82,8 @@ package org.apache.flex.html.beads input = new TextInput(); input.className = "NumericStepperInput"; input.typeNames = "NumericStepperInput"; + input.width = 100; + input.height = 22; IParent(value).addElement(input); COMPILE::JS { @@ -93,6 +95,7 @@ package org.apache.flex.html.beads spinner.addBead( UIBase(value).model as IBead ); IParent(value).addElement(spinner); spinner.height = input.height; + spinner.width = input.height/2; COMPILE::JS { spinner.positioner.style.display = 'inline-block'; @@ -120,10 +123,22 @@ package org.apache.flex.html.beads input.text = String(spinner.value); -var host:ILayoutChild = ILayoutChild(value); -if ((!host.isWidthSizedToContent() && !isNaN(host.explicitWidth)) || -(!host.isHeightSizedToContent() && !isNaN(host.explicitHeight))) -sizeChangeHandler(null); + COMPILE::SWF + { + var host:ILayoutChild = ILayoutChild(value); + + // Complete the setup if the height is sized to content or has been explicitly set + // and the width is sized to content or has been explicitly set + if ((host.isHeightSizedToContent() || !isNaN(host.explicitHeight)) && + (host.isWidthSizedToContent() || !isNaN(host.explicitWidth))) + sizeChangeHandler(null); + } + COMPILE::JS + { + // always run size change since there are no size change events + sizeChangeHandler(null); + } + } /** @@ -131,13 +146,20 @@ package org.apache.flex.html.beads */ private function sizeChangeHandler(event:Event) : void { + COMPILE::JS + { + spinner.height = input.height; + spinner.width = input.height/2; + } + input.x = 0; input.y = 0; input.width = UIBase(_strand).width-spinner.width-2; + COMPILE::SWF { - spinner.x = input.width; - spinner.y = 0; + spinner.x = input.width; + spinner.y = 0; } }
git commit: [flex-asjs] [refs/heads/release0.8.0] - Removed the border and background on the NumericStepper.
Repository: flex-asjs Updated Branches: refs/heads/release0.8.0 a2c5fb663 -> 2282ab70b Removed the border and background on the NumericStepper. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/2282ab70 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/2282ab70 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/2282ab70 Branch: refs/heads/release0.8.0 Commit: 2282ab70b722a52bcaf71c21c918d07cd3d8d3fe Parents: a2c5fb6 Author: Peter EntAuthored: Tue Jun 6 11:59:45 2017 -0400 Committer: Peter Ent Committed: Tue Jun 6 11:59:45 2017 -0400 -- frameworks/projects/Basic/src/main/resources/defaults.css | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2282ab70/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 7e839d1..880d161 100644 --- a/frameworks/projects/Basic/src/main/resources/defaults.css +++ b/frameworks/projects/Basic/src/main/resources/defaults.css @@ -415,10 +415,7 @@ NumericStepper IBeadView: ClassReference("org.apache.flex.html.beads.NumericStepperView"); padding: 0px; - border-style: solid; - border-color: #00; - border-width: 1px; - background-color: #FF; + border-style: none; } Panel
git commit: [flex-asjs] [refs/heads/release0.8.0] - Fix for FLEX-35322: NumericStepper layout.
Repository: flex-asjs Updated Branches: refs/heads/release0.8.0 a9321c529 -> a2c5fb663 Fix for FLEX-35322: NumericStepper layout. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a2c5fb66 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a2c5fb66 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a2c5fb66 Branch: refs/heads/release0.8.0 Commit: a2c5fb6635f8892e80d7af57dcbbf2cd37ab7ceb Parents: a9321c5 Author: Peter EntAuthored: Tue Jun 6 11:44:07 2017 -0400 Committer: Peter Ent Committed: Tue Jun 6 11:44:07 2017 -0400 -- .../flex/org/apache/flex/html/beads/NumericStepperView.as | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a2c5fb66/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/NumericStepperView.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/NumericStepperView.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/NumericStepperView.as index 032e46e..15e2321 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/NumericStepperView.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/NumericStepperView.as @@ -120,8 +120,8 @@ package org.apache.flex.html.beads input.text = String(spinner.value); var host:ILayoutChild = ILayoutChild(value); -if ((host.isWidthSizedToContent() || isNaN(host.explicitWidth)) && -(host.isHeightSizedToContent() || isNaN(host.explicitHeight))) +if ((!host.isWidthSizedToContent() && !isNaN(host.explicitWidth)) || +(!host.isHeightSizedToContent() && !isNaN(host.explicitHeight))) sizeChangeHandler(null); } @@ -130,12 +130,12 @@ package org.apache.flex.html.beads */ private function sizeChangeHandler(event:Event) : void { - input.x = 2; - input.y = (UIBase(_strand).height - input.height)/2; + input.x = 0; + input.y = 0; input.width = UIBase(_strand).width-spinner.width-2; COMPILE::SWF { - spinner.x = input.width+2; + spinner.x = input.width; spinner.y = 0; } }
git commit: [flex-asjs] [refs/heads/release0.8.0] - Cordova Application now extends AirApplication. Changed storage directory to more common "dataDirectory" which is available on more platforms.
Repository: flex-asjs Updated Branches: refs/heads/release0.8.0 f021c8f75 -> f72cf762d Cordova Application now extends AirApplication. Changed storage directory to more common "dataDirectory" which is available on more platforms. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f72cf762 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f72cf762 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f72cf762 Branch: refs/heads/release0.8.0 Commit: f72cf762dd3b2e44615aed803f507fbd23820656 Parents: f021c8f Author: Peter EntAuthored: Fri Jun 2 11:43:30 2017 -0400 Committer: Peter Ent Committed: Fri Jun 2 11:43:30 2017 -0400 -- .../src/main/flex/org/apache/flex/cordova/Application.as | 4 ++-- .../flex/storage/providers/AndroidExternalStorageProvider.as | 8 2 files changed, 6 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f72cf762/frameworks/projects/Mobile/src/main/flex/org/apache/flex/cordova/Application.as -- diff --git a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/cordova/Application.as b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/cordova/Application.as index 52de8d6..b2f21a9 100644 --- a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/cordova/Application.as +++ b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/cordova/Application.as @@ -19,7 +19,7 @@ package org.apache.flex.cordova { import org.apache.flex.events.Event; - import org.apache.flex.core.Application; + import org.apache.flex.core.AirApplication; import org.apache.flex.core.IFlexInfo; /** @@ -30,7 +30,7 @@ package org.apache.flex.cordova * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - public class Application extends org.apache.flex.core.Application implements IFlexInfo + public class Application extends org.apache.flex.core.AirApplication implements IFlexInfo { /** * FalconJX will inject html into the index.html file. Surround with http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f72cf762/frameworks/projects/Storage/src/main/flex/org/apache/flex/storage/providers/AndroidExternalStorageProvider.as -- diff --git a/frameworks/projects/Storage/src/main/flex/org/apache/flex/storage/providers/AndroidExternalStorageProvider.as b/frameworks/projects/Storage/src/main/flex/org/apache/flex/storage/providers/AndroidExternalStorageProvider.as index 99234de..ff3be38 100644 --- a/frameworks/projects/Storage/src/main/flex/org/apache/flex/storage/providers/AndroidExternalStorageProvider.as +++ b/frameworks/projects/Storage/src/main/flex/org/apache/flex/storage/providers/AndroidExternalStorageProvider.as @@ -96,7 +96,7 @@ package org.apache.flex.storage.providers public function readTextFromDataFile( fileName:String ) : void { COMPILE::JS { - var fullPath:String = String(cordova["file"]["externalDataDirectory"]) + fileName; + var fullPath:String = String(cordova["file"]["dataDirectory"]) + fileName; window.resolveLocalFileSystemURL(fullPath, function (fileEntry):void { fileEntry.file(function (file):void { @@ -140,7 +140,7 @@ package org.apache.flex.storage.providers public function openInputDataStream( fileName:String ) : void { COMPILE::JS { - var fullPath:String = String(cordova["file"]["externalDataDirectory"]) + fileName; + var fullPath:String = String(cordova["file"]["dataDirectory"]) + fileName; window.resolveLocalFileSystemURL(fullPath, function (fileEntry):void { fileEntry.file(function (file):void { @@ -180,7 +180,7 @@ package org.apache.flex.storage.providers public function writeTextToDataFile( fileName:String, text:String ) : void { COMPILE::JS { - var fullPath:String = String(cordova["file"]["externalDataDirectory"]) + fileName; + var fullPath:String = String(cordova["file"]["dataDirectory"]) + fileName; window.resolveLocalFileSystemURL(fullPath, function (fileEntry):void {
git commit: [flex-asjs] [refs/heads/release0.8.0] - Intermediate changes for Accordion.
Repository: flex-asjs Updated Branches: refs/heads/release0.8.0 7a030dbc1 -> d6cb59b17 Intermediate changes for Accordion. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d6cb59b1 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d6cb59b1 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d6cb59b1 Branch: refs/heads/release0.8.0 Commit: d6cb59b1769902d5e5bb61ce9d09680b79b21a68 Parents: 7a030db Author: Peter EntAuthored: Thu Jun 1 15:32:11 2017 -0400 Committer: Peter Ent Committed: Thu Jun 1 15:32:11 2017 -0400 -- .../flex/html/beads/AccordionCollapseBead.as| 5 +- .../html/beads/AccordionItemRendererView.as | 6 +- .../org/apache/flex/html/beads/AccordionView.as | 62 ++-- .../layouts/OneFlexibleChildHorizontalLayout.as | 4 ++ ...eFlexibleChildHorizontalLayoutForOverflow.as | 4 ++ .../layouts/OneFlexibleChildVerticalLayout.as | 4 ++ ...OneFlexibleChildVerticalLayoutForOverflow.as | 4 ++ .../Basic/src/main/resources/defaults.css | 2 +- 8 files changed, 67 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d6cb59b1/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/AccordionCollapseBead.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/AccordionCollapseBead.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/AccordionCollapseBead.as index 2dde93f..163c276 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/AccordionCollapseBead.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/AccordionCollapseBead.as @@ -22,6 +22,7 @@ package org.apache.flex.html.beads import org.apache.flex.core.IStrand; import org.apache.flex.core.UIBase; import org.apache.flex.events.Event; + import org.apache.flex.events.IEventDispatcher; import org.apache.flex.html.Accordion; import org.apache.flex.html.beads.layouts.IOneFlexibleChildLayout; import org.apache.flex.html.supportClasses.ICollapsible; @@ -74,8 +75,8 @@ package org.apache.flex.html.beads lastElement.collapse(); } lastSelectedIndex = host.selectedIndex; - layout.flexibleChild = newChild.id; - layout.layout(); + layout.flexibleChild = String(host.selectedIndex); + IEventDispatcher(_strand).dispatchEvent(new Event("layoutNeeded")); } protected function get layout():IOneFlexibleChildLayout http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d6cb59b1/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/AccordionItemRendererView.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/AccordionItemRendererView.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/AccordionItemRendererView.as index 85e2b79..9c59377 100644 --- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/AccordionItemRendererView.as +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/AccordionItemRendererView.as @@ -19,6 +19,7 @@ package org.apache.flex.html.beads { import org.apache.flex.events.Event; + import org.apache.flex.events.IEventDispatcher; import org.apache.flex.html.supportClasses.ICollapsible; /** @@ -53,12 +54,13 @@ package org.apache.flex.html.beads var collapsibleStrand:ICollapsible = _strand as ICollapsible; if (!collapsibleStrand.collapsed) { - super.performLayout(event); + IEventDispatcher(_strand).dispatchEvent(new Event("layoutNeeded")); +// super.performLayout(event); } else // skip layout for viewport children { COMPILE::SWF { // no longer needed layoutViewBeforeContentLayout(); - afterLayout(); + //afterLayout(); } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d6cb59b1/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/AccordionView.as
git commit: [flex-asjs] [refs/heads/release0.8.0] - Clean up Camera code.
Repository: flex-asjs Updated Branches: refs/heads/release0.8.0 71d7d8b5b -> 7a030dbc1 Clean up Camera 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/7a030dbc Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/7a030dbc Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/7a030dbc Branch: refs/heads/release0.8.0 Commit: 7a030dbc1d174e9bd022eb0b1a524c4495745bb5 Parents: 71d7d8b Author: Peter EntAuthored: Thu Jun 1 08:26:50 2017 -0400 Committer: Peter Ent Committed: Thu Jun 1 08:26:50 2017 -0400 -- .../src/main/flex/org/apache/flex/cordova/Camera.as| 13 - 1 file changed, 4 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7a030dbc/frameworks/projects/Mobile/src/main/flex/org/apache/flex/cordova/Camera.as -- diff --git a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/cordova/Camera.as b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/cordova/Camera.as index 8333fb2..ace3c01 100644 --- a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/cordova/Camera.as +++ b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/cordova/Camera.as @@ -54,28 +54,23 @@ package org.apache.flex.cordova */ COMPILE::JS public class Camera - { - private var pictureSource:*; // picture source - private var destinationType:*; // sets the format of returned value - + { public function Camera() { - pictureSource=navigator['camera'].PictureSourceType; - destinationType=navigator['camera'].DestinationType; } public function capturePhoto(onPhotoDataSuccess:Function, onFail:Function):void { - // Take picture using device camera and retrieve image as base64-encoded string + // Take picture using device camera and retrieve image as URI navigator['camera'].getPicture(onPhotoDataSuccess, onFail, { quality: 50, - destinationType: destinationType.FILE_URI }); //DATA_URL + destinationType: navigator['camera'].DestinationType.FILE_URI }); } public function getPhotoFromLibrary(onPhotoURISuccess:Function, onFail:Function):void { // Retrieve image file location from specified source navigator['camera'].getPicture(onPhotoURISuccess, onFail, { quality: 50, - destinationType: destinationType.FILE_URI, + destinationType: navigator['camera'].DestinationType.FILE_URI, sourceType: navigator['camera'].PictureSourceType.PHOTOLIBRARY }); }
git commit: [flex-asjs] [refs/heads/release0.8.0] - Updated CordovaCameraExample
Repository: flex-asjs Updated Branches: refs/heads/release0.8.0 4c2928367 -> 73ea16860 Updated CordovaCameraExample Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/73ea1686 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/73ea1686 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/73ea1686 Branch: refs/heads/release0.8.0 Commit: 73ea1686036094c5ba6f39ddbf593fa7084c9005 Parents: 4c29283 Author: Peter EntAuthored: Tue May 30 14:51:37 2017 -0400 Committer: Peter Ent Committed: Tue May 30 14:51:37 2017 -0400 -- .../CordovaCameraExample-app.xml| 2 +- examples/flexjs/CordovaCameraExample/README.txt | 25 +- examples/flexjs/CordovaCameraExample/build.xml | 51 .../src/main/flex/CordovaCameraExample.mxml | 11 ++--- .../src/main/flex/MyInitialView.mxml| 29 --- 5 files changed, 49 insertions(+), 69 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/73ea1686/examples/flexjs/CordovaCameraExample/CordovaCameraExample-app.xml -- diff --git a/examples/flexjs/CordovaCameraExample/CordovaCameraExample-app.xml b/examples/flexjs/CordovaCameraExample/CordovaCameraExample-app.xml index 2e94c41..716ed13 100644 --- a/examples/flexjs/CordovaCameraExample/CordovaCameraExample-app.xml +++ b/examples/flexjs/CordovaCameraExample/CordovaCameraExample-app.xml @@ -17,7 +17,7 @@ limitations under the License. --> -http://ns.adobe.com/air/application/4.0;> +http://ns.adobe.com/air/application/16.0;> - - - + + + + + - - - + + + - - - + + + - - - + + - - - - - - - + + + + - - - - - - - - - - + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/73ea1686/examples/flexjs/CordovaCameraExample/src/main/flex/CordovaCameraExample.mxml -- diff --git a/examples/flexjs/CordovaCameraExample/src/main/flex/CordovaCameraExample.mxml b/examples/flexjs/CordovaCameraExample/src/main/flex/CordovaCameraExample.mxml index a745202..7c2d5db 100644 --- a/examples/flexjs/CordovaCameraExample/src/main/flex/CordovaCameraExample.mxml +++ b/examples/flexjs/CordovaCameraExample/src/main/flex/CordovaCameraExample.mxml @@ -19,12 +19,11 @@ --> http://ns.adobe.com/mxml/2009; - xmlns:local="*" - xmlns:models="models.*" - xmlns:js="library://ns.apache.org/flexjs/basic" - xmlns:cordova="library://ns.apache.org/flexjs/cordova" - isDeviceReady="MyInitialView(initialView).ready = true" - > + xmlns:js="library://ns.apache.org/flexjs/basic" + xmlns:cordova="library://ns.apache.org/flexjs/cordova" + xmlns:google="library://ns.apache.org/flexjs/google" + xmlns:local="*" + applicationComplete="MyInitialView(initialView).ready = true"> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/73ea1686/examples/flexjs/CordovaCameraExample/src/main/flex/MyInitialView.mxml -- diff --git a/examples/flexjs/CordovaCameraExample/src/main/flex/MyInitialView.mxml b/examples/flexjs/CordovaCameraExample/src/main/flex/MyInitialView.mxml index 0b291b2..dcdd742 100644 --- a/examples/flexjs/CordovaCameraExample/src/main/flex/MyInitialView.mxml +++ b/examples/flexjs/CordovaCameraExample/src/main/flex/MyInitialView.mxml @@ -23,9 +23,9 @@ limitations under the License. - - - - + -
git commit: [flex-asjs] [refs/heads/release0.8.0] - Update mobile Cordova Camera package so that it works again on Android and Air. Note that PhotoLibrary (for Cordova) is not available in this releas
ile mode 100644 index 97e99eb..000 --- a/frameworks/projects/Mobile/src/main/flex/org/apache/cordova/geolocation/Geolocation.as +++ /dev/null @@ -1,61 +0,0 @@ - -// -// 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.cordova.geolocation -{ - /** -* Geolocation provides the interface to the Cordova Geolocation plugin. -*/ - - [Mixin] - /** -* The Geolocation class implements Cordova geolocation plugin -* -* @langversion 3.0 -* @playerversion Flash 10.2 -* @playerversion AIR 2.6 -* @productversion FlexJS 0.0 -* @flexjscordovaplugin cordova-plugin-geolocation -* @flexjsignorecoercion FileEntry -* @flexjsignorecoercion FileWriter -* @flexjsignorecoercion window - * @flexjsignorecoercion Blob -*/ - public class Geolocation - { - /** -* Constructor -*/ - public function Geolocation() - { - } - - /** -* Gets the device current location. If successful, the onSuccess function is -* called with position parameter (see Cordova documentation). If failure, the -* onError function is called with an error parameter (.code and .message members). -*/ - public function getCurrentPosition(onSuccess:Function, onError:Function):void - { - COMPILE::JS { - // TODO: (pent) Cordova externs - navigator["geolocation"].getCurrentPosition(onSuccess, onError); - } - } - } -} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c292836/frameworks/projects/Mobile/src/main/flex/org/apache/flex/cordova/Application.as -- diff --git a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/cordova/Application.as b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/cordova/Application.as new file mode 100644 index 000..52de8d6 --- /dev/null +++ b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/cordova/Application.as @@ -0,0 +1,86 @@ + +// +// 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.cordova +{ + import org.apache.flex.events.Event; + import org.apache.flex.core.Application; + import org.apache.flex.core.IFlexInfo; + + /** +* A customized Application that dispatches the Cordova deviceReady event +* +* @langversion 3.0 +* @playerversion Flash 10.2 +* @playerversion AIR 2.6 +* @productversion FlexJS 0.0 +*/ + public class Application extends org.apache.flex.core.Application implements IFlexInfo + { + /** +* FalconJX will inject html into the index.html file. Surround with +* "inject_html" tag as f
git commit: [flex-asjs] [refs/heads/release0.8.0] - Updated examples that run in Air to use new AirApplication class.
Repository: flex-asjs Updated Branches: refs/heads/release0.8.0 6ccc02585 -> fef387458 Updated examples that run in Air to use new AirApplication 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/fef38745 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/fef38745 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/fef38745 Branch: refs/heads/release0.8.0 Commit: fef3874581e8309457c87e3436f5b23257866133 Parents: 6ccc025 Author: Peter EntAuthored: Tue May 23 14:27:53 2017 -0400 Committer: Peter Ent Committed: Tue May 23 14:27:53 2017 -0400 -- examples/flexjs/DesktopMap/build.xml| 3 ++- examples/flexjs/DesktopMap/src/main/flex/DesktopMap.mxml| 6 +++--- examples/flexjs/DesktopMap/src/main/flex/MyInitialView.mxml | 4 +--- examples/flexjs/MapSearch/MapSearch-app.xml | 2 +- examples/flexjs/MapSearch/src/main/flex/MapSearch.mxml | 9 - examples/flexjs/MapSearch/src/main/flex/MyInitialView.mxml | 1 - examples/flexjs/MobileStocks/build.xml | 3 ++- examples/flexjs/StorageExample/build.xml| 5 +++-- .../flexjs/StorageExample/src/main/flex/StorageExample.mxml | 4 ++-- 9 files changed, 18 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fef38745/examples/flexjs/DesktopMap/build.xml -- diff --git a/examples/flexjs/DesktopMap/build.xml b/examples/flexjs/DesktopMap/build.xml index ea73725..eb915ca 100644 --- a/examples/flexjs/DesktopMap/build.xml +++ b/examples/flexjs/DesktopMap/build.xml @@ -73,7 +73,8 @@ - + + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fef38745/examples/flexjs/DesktopMap/src/main/flex/DesktopMap.mxml -- diff --git a/examples/flexjs/DesktopMap/src/main/flex/DesktopMap.mxml b/examples/flexjs/DesktopMap/src/main/flex/DesktopMap.mxml index 4f938b6..d5c357b 100644 --- a/examples/flexjs/DesktopMap/src/main/flex/DesktopMap.mxml +++ b/examples/flexjs/DesktopMap/src/main/flex/DesktopMap.mxml @@ -18,7 +18,7 @@ // --> -http://ns.adobe.com/mxml/2009; +http://ns.adobe.com/mxml/2009; xmlns:local="*" xmlns:models="models.*" xmlns:js="library://ns.apache.org/flexjs/basic" @@ -34,7 +34,7 @@ - + @@ -43,4 +43,4 @@ - + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fef38745/examples/flexjs/DesktopMap/src/main/flex/MyInitialView.mxml -- diff --git a/examples/flexjs/DesktopMap/src/main/flex/MyInitialView.mxml b/examples/flexjs/DesktopMap/src/main/flex/MyInitialView.mxml index df08437..3e45ddb 100644 --- a/examples/flexjs/DesktopMap/src/main/flex/MyInitialView.mxml +++ b/examples/flexjs/DesktopMap/src/main/flex/MyInitialView.mxml @@ -98,7 +98,6 @@ limitations under the License. .MapPanel { border: 1px solid #55; backgroundColor: darkgray; - margin-top: 20px; margin-left: auto; margin-right: auto; } @@ -132,10 +131,9 @@ limitations under the License. - - + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fef38745/examples/flexjs/MapSearch/MapSearch-app.xml -- diff --git a/examples/flexjs/MapSearch/MapSearch-app.xml b/examples/flexjs/MapSearch/MapSearch-app.xml index b93fefb..55dcbef 100644 --- a/examples/flexjs/MapSearch/MapSearch-app.xml +++ b/examples/flexjs/MapSearch/MapSearch-app.xml @@ -88,7 +88,7 @@ - 500 + 480 640 http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fef38745/examples/flexjs/MapSearch/src/main/flex/MapSearch.mxml -- diff --git a/examples/flexjs/MapSearch/src/main/flex/MapSearch.mxml b/examples/flexjs/MapSearch/src/main/flex/MapSearch.mxml index 5613b81..be37386 100644 --- a/examples/flexjs/MapSearch/src/main/flex/MapSearch.mxml +++
git commit: [flex-asjs] [refs/heads/release0.8.0] - Created AirApplication the adds a single frame delay so Air applications will get the correct stage size.
Repository: flex-asjs Updated Branches: refs/heads/release0.8.0 1e450bb75 -> 6ccc02585 Created AirApplication the adds a single frame delay so Air applications will get the correct stage size. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/6ccc0258 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/6ccc0258 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/6ccc0258 Branch: refs/heads/release0.8.0 Commit: 6ccc02585b1adcba5cf0053531f907b216ba3ddb Parents: 1e450bb Author: Peter EntAuthored: Tue May 23 14:25:39 2017 -0400 Committer: Peter Ent Committed: Tue May 23 14:25:39 2017 -0400 -- .../flex/org/apache/flex/core/AirApplication.as | 115 +++ .../Basic/src/main/resources/basic-manifest.xml | 1 + 2 files changed, 116 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6ccc0258/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/AirApplication.as -- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/AirApplication.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/AirApplication.as new file mode 100644 index 000..51058b2 --- /dev/null +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/AirApplication.as @@ -0,0 +1,115 @@ + +// +// 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.core +{ +import org.apache.flex.events.Event; +import org.apache.flex.events.IEventDispatcher; + +//-- +// Events +//-- + +/** + * Dispatched at startup. Attributes and sub-instances of + * the MXML document have been created and assigned. + * The component lifecycle is different + * than the Flex SDK. There is no creationComplete event. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ +[Event(name="initialize", type="org.apache.flex.events.Event")] + +/** + * Dispatched at startup before the instances get created. + * Beads can call preventDefault and defer initialization. + * This event will be dispatched on every frame until no + * listeners call preventDefault(), then the initialize() + * method will be called. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ +[Event(name="preinitialize", type="org.apache.flex.events.Event")] + +/** + * Dispatched at startup after the initial view has been + * put on the display list. This event is sent before + * applicationComplete is dispatched. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ +[Event(name="viewChanged", type="org.apache.flex.events.Event")] + +/** + * Dispatched at startup after the initial view has been + * put on the display list. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ +[Event(name="applicationComplete", type="org.apache.flex.events.Event")] + +/** + * The AirApplication class should be used by Air applications as their +* main entry point. + * + * @see Application + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.8 + */ +public class AirApplication extends Application +{ +/** + * Constructor. + * + * @langversion 3.0 + * @playerversion