You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ha...@apache.org on 2017/08/08 21:15:37 UTC
[01/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
Make sure selected item doesn't mess with mdl styling
Repository: flex-asjs
Updated Branches:
refs/heads/feature/strand-work 41ac35e83 -> 676dfc7bb
Make sure selected item doesn't mess with mdl styling
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/1644608e
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/1644608e
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/1644608e
Branch: refs/heads/feature/strand-work
Commit: 1644608e3c1fce8e3155e0daf3902fecdf9d93ff
Parents: a4a2bb3
Author: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
Authored: Wed Jul 26 11:45:33 2017 +0300
Committer: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
Committed: Wed Jul 26 11:45:33 2017 +0300
----------------------------------------------------------------------
.../flex/org/apache/flex/mdl/itemRenderers/MenuItemRenderer.as | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1644608e/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/itemRenderers/MenuItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/itemRenderers/MenuItemRenderer.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/itemRenderers/MenuItemRenderer.as
index f5c4fa3..7b4bc30 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/itemRenderers/MenuItemRenderer.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/itemRenderers/MenuItemRenderer.as
@@ -165,6 +165,11 @@ package org.apache.flex.mdl.itemRenderers
typeNames = element.className;
}
}
+
+ override public function updateRenderer():void
+ {
+ // don't change background-color, let mdl library take care of that.
+ }
protected var _ripple:Boolean = false;
/**
[08/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
PointUtils was missing.
Posted by ha...@apache.org.
PointUtils was missing.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/28bf3528
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/28bf3528
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/28bf3528
Branch: refs/heads/feature/strand-work
Commit: 28bf35280c724da53326f03843d372f33dd09cf6
Parents: 8c2a6bc
Author: Peter Ent <pe...@apache.org>
Authored: Wed Jul 26 13:58:13 2017 -0400
Committer: Peter Ent <pe...@apache.org>
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;
[17/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
Wrong CSS
Posted by ha...@apache.org.
Wrong CSS
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/562a1302
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/562a1302
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/562a1302
Branch: refs/heads/feature/strand-work
Commit: 562a1302e66a912053b7ea0195e5075cbcedf07f
Parents: a631f06
Author: Harbs <ha...@in-tools.com>
Authored: Mon Jul 31 12:33:03 2017 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Mon Jul 31 12:33:03 2017 +0300
----------------------------------------------------------------------
frameworks/projects/Basic/src/main/resources/defaults.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/562a1302/frameworks/projects/Basic/src/main/resources/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/resources/defaults.css b/frameworks/projects/Basic/src/main/resources/defaults.css
index 7f7973b..f267363 100644
--- a/frameworks/projects/Basic/src/main/resources/defaults.css
+++ b/frameworks/projects/Basic/src/main/resources/defaults.css
@@ -58,7 +58,6 @@ Application
{
padding: 0px;
margin: 0px;
- align-content: flex-start;
}
Button
@@ -134,6 +133,7 @@ Container
IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.BasicLayout");
IViewport: ClassReference("org.apache.flex.html.supportClasses.Viewport");
IViewportModel: ClassReference("org.apache.flex.html.beads.models.ViewportModel");
+ align-items: flex-start;
}
ControlBar
[40/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
Made finding errorNS more efficient I think this fixed MS browsers Better XML
errors
Posted by ha...@apache.org.
Made finding errorNS more efficient
I think this fixed MS browsers
Better XML errors
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/10be5b82
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/10be5b82
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/10be5b82
Branch: refs/heads/feature/strand-work
Commit: 10be5b82ff91db9ec77966ba6d8c7c37defa6f81
Parents: 19fa436
Author: Harbs <ha...@in-tools.com>
Authored: Fri Aug 4 15:15:40 2017 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Fri Aug 4 15:15:40 2017 +0300
----------------------------------------------------------------------
frameworks/projects/XML/src/main/flex/XML.as | 30 +++++++++++++++++------
1 file changed, 23 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/10be5b82/frameworks/projects/XML/src/main/flex/XML.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/flex/XML.as b/frameworks/projects/XML/src/main/flex/XML.as
index f09a018..7970df1 100644
--- a/frameworks/projects/XML/src/main/flex/XML.as
+++ b/frameworks/projects/XML/src/main/flex/XML.as
@@ -339,18 +339,34 @@ package
);
}
-
+ private static var errorNS:String;
private function parseXMLStr(xml:String):void
{
var parser:DOMParser = new DOMParser();
- // get error namespace. It's different in different browsers.
- var errorNS:String = parser.parseFromString('<', 'application/xml').getElementsByTagName("parsererror")[0].namespaceURI;
-
- var doc:Document = parser.parseFromString(xml, "application/xml");
+ if(errorNS == null)
+ {
+ // get error namespace. It's different in different browsers.
+ try{
+ errorNS = parser.parseFromString('<', 'application/xml').getElementsByTagName("parsererror")[0].namespaceURI;
+ }
+ catch(err:Error){
+ // Some browsers (i.e. IE) just throw an error
+ errorNS = "na";
+ }
+ }
+ try
+ {
+ var doc:Document = parser.parseFromString(xml, "application/xml");
+ }
+ catch(err:Error)
+ {
+ throw err;
+ }
//check for errors
- if(doc.getElementsByTagNameNS(errorNS, 'parsererror').length > 0)
- throw new Error('XML parse error');
+ var errorNodes:NodeList = doc.getElementsByTagNameNS(errorNS, 'parsererror');
+ if(errorNodes.length > 0)
+ throw new Error(errorNodes[0].innerHTML);
for(var i:int=0;i<doc.childNodes.length;i++)
{
var node:Element = doc.childNodes[i];
[50/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - A
bit more strand work Should fix CreateJS
Posted by ha...@apache.org.
A bit more strand work
Should fix CreateJS
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/676dfc7b
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/676dfc7b
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/676dfc7b
Branch: refs/heads/feature/strand-work
Commit: 676dfc7bbc08a6ce77d8a89347e4a42319963896
Parents: 2df19a4
Author: Harbs <ha...@in-tools.com>
Authored: Wed Aug 9 00:15:29 2017 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Wed Aug 9 00:15:29 2017 +0300
----------------------------------------------------------------------
.../flex/org/apache/flex/core/Application.as | 4 ++--
.../org/apache/flex/core/HTMLElementWrapper.as | 4 ++--
.../main/flex/org/apache/flex/core/UIBase.as | 4 ++--
.../flex/org/apache/flex/core/UIButtonBase.as | 4 ++--
.../flex/org/apache/flex/html/MXMLBeadView.as | 4 ++--
.../org/apache/flex/html/beads/TextAreaView.as | 4 ++--
.../supportClasses/TextFieldItemRenderer.as | 4 ++--
.../flex/org/apache/flex/core/ElementWrapper.as | 8 +++----
.../main/flex/org/apache/flex/core/IStrand.as | 2 +-
.../main/flex/org/apache/flex/core/Strand.as | 4 ++--
.../org/apache/flex/createjs/Application.as | 24 ++++----------------
.../org/apache/flex/createjs/core/UIBase.as | 14 +-----------
12 files changed, 26 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/676dfc7b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as
index 2bda2ad..178bc8a 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as
@@ -404,9 +404,9 @@ package org.apache.flex.core
* @productversion FlexJS 0.9
*/
COMPILE::SWF
- public function addBeads():void
+ public function addBeads(dispatch:Boolean=true):void
{
- addBeadsToStrand(this,beads);
+ addBeadsToStrand(this,beads,dispatch);
}
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/676dfc7b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as
index e594b7d..21de5f6 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as
@@ -248,9 +248,9 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.9
*/
- public function addBeads():void
+ public function addBeads(dispatch:Boolean=true):void
{
- addBeadsToStrand(this,beads);
+ addBeadsToStrand(this,beads,dispatch);
}
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/676dfc7b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as
index e83de17..41b05e5 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as
@@ -1068,9 +1068,9 @@ package org.apache.flex.core
* @productversion FlexJS 0.9
*/
COMPILE::SWF
- public function addBeads():void
+ public function addBeads(dispatch:Boolean=true):void
{
- addBeadsToStrand(this,beads);
+ addBeadsToStrand(this,beads,dispatch);
}
COMPILE::SWF
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/676dfc7b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIButtonBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIButtonBase.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIButtonBase.as
index bc84800..e4b8420 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIButtonBase.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIButtonBase.as
@@ -774,9 +774,9 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.9
*/
- public function addBeads():void
+ public function addBeads(dispatch:Boolean=true):void
{
- addBeadsToStrand(this,beads);
+ addBeadsToStrand(this,beads,dispatch);
}
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/676dfc7b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/MXMLBeadView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/MXMLBeadView.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/MXMLBeadView.as
index f436e19..a49cd6a 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/MXMLBeadView.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/MXMLBeadView.as
@@ -293,9 +293,9 @@ package org.apache.flex.html
* @playerversion AIR 2.6
* @productversion FlexJS 0.9
*/
- public function addBeads():void
+ public function addBeads(dispatch:Boolean=true):void
{
- addBeadsToStrand(this,beads);
+ addBeadsToStrand(this,beads,dispatch);
}
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/676dfc7b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/TextAreaView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/TextAreaView.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/TextAreaView.as
index e41e446..cad85c6 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/TextAreaView.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/TextAreaView.as
@@ -243,9 +243,9 @@ package org.apache.flex.html.beads
* @playerversion AIR 2.6
* @productversion FlexJS 0.9
*/
- public function addBeads():void
+ public function addBeads(dispatch:Boolean=true):void
{
- addBeadsToStrand(this,beads);
+ addBeadsToStrand(this,beads,dispatch);
}
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/676dfc7b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/TextFieldItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/TextFieldItemRenderer.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/TextFieldItemRenderer.as
index 1599e20..b8cc0f2 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/TextFieldItemRenderer.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/TextFieldItemRenderer.as
@@ -518,9 +518,9 @@ package org.apache.flex.html.supportClasses
* @playerversion AIR 2.6
* @productversion FlexJS 0.9
*/
- public function addBeads():void
+ public function addBeads(dispatch:Boolean=true):void
{
- addBeadsToStrand(this,beads);
+ addBeadsToStrand(this,beads,dispatch);
}
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/676dfc7b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ElementWrapper.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ElementWrapper.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ElementWrapper.as
index be01864..d8d5ada 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ElementWrapper.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ElementWrapper.as
@@ -107,9 +107,9 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.9
*/
- public function addBeads():void
+ public function addBeads(dispatch:Boolean=true):void
{
- addBeadsToStrand(this,beads);
+ addBeadsToStrand(this,beads,dispatch);
}
/**
@@ -306,9 +306,9 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.9
*/
- public function addBeads():void
+ public function addBeads(dispatch:Boolean=true):void
{
- addBeadsToStrand(this,beads);
+ addBeadsToStrand(this,beads,dispatch);
}
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/676dfc7b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IStrand.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IStrand.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IStrand.as
index a60e340..3cdbf73 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IStrand.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IStrand.as
@@ -70,7 +70,7 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.9
*/
- function addBeads():void;
+ function addBeads(dispatch:Boolean=true):void;
/**
* Find a bead on the strand.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/676dfc7b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/Strand.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/Strand.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/Strand.as
index f4953fa..5c1673a 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/Strand.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/Strand.as
@@ -161,9 +161,9 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.9
*/
- public function addBeads():void
+ public function addBeads(dispatch:Boolean=true):void
{
- addBeadsToStrand(this,beads);
+ addBeadsToStrand(this,beads,dispatch);
}
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/676dfc7b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Application.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Application.as b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Application.as
index d778020..cd2e575 100644
--- a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Application.as
+++ b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Application.as
@@ -175,8 +175,8 @@ package org.apache.flex.createjs
* "inject_html" tag as follows:
*
* <inject_html>
- * <script src="https://code.createjs.com/easeljs-0.8.1.min.js"></script>
- * <script src="https://code.createjs.com/tweenjs-0.6.2.min.js"></script>
+ * <script src="//code.createjs.com/easeljs-0.8.1.min.js"></script>
+ * <script src="//code.createjs.com/tweenjs-0.6.2.min.js"></script>
* </inject_html>
*/
public function Application()
@@ -217,11 +217,7 @@ package org.apache.flex.createjs
dispatchEvent('initialize');
- for (var index:int in beads) {
- addBead(beads[index]);
- }
-
- dispatchEvent(new org.apache.flex.events.Event("beadsAdded"));
+ addBeads();
initialView.applicationModel = this.model;
addElement(initialView);
@@ -350,19 +346,7 @@ package org.apache.flex.createjs
{
MXMLDataInterpreter.generateMXMLProperties(this, data);
}
-
- /**
- * The array property that is used to add additional
- * beads to an MXML tag. From ActionScript, just
- * call addBead directly.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public var beads:Array;
-
+
/**
* @copy org.apache.flex.core.IParent#addElement()
*
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/676dfc7b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/core/UIBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/core/UIBase.as b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/core/UIBase.as
index d29fa51..5bb420b 100644
--- a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/core/UIBase.as
+++ b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/core/UIBase.as
@@ -211,16 +211,6 @@ package org.apache.flex.createjs.core
}
/**
- * @copy org.apache.flex.core.Application#beads
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public var beads:Array;
-
- /**
* The method called when added to a parent. This is a good
* time to set up beads.
*
@@ -281,9 +271,7 @@ package org.apache.flex.createjs.core
_height = _explicitHeight = value as Number;
}
}
-
- for each (var bead:IBead in beads)
- addBead(bead);
+ addBeads(false);
if (getBeadByType(IBeadModel) == null)
{
[30/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
Removed extra IF statement.
Posted by ha...@apache.org.
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/feature/strand-work
Commit: e6dc3e159f6ac1b82501e2c459f35f95c8c7cb4f
Parents: 6066f25
Author: Peter Ent <pe...@apache.org>
Authored: Wed Aug 2 11:05:38 2017 -0400
Committer: Peter Ent <pe...@apache.org>
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)
[47/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
Condition not necessary
Posted by ha...@apache.org.
Condition not necessary
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ab9384c4
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ab9384c4
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ab9384c4
Branch: refs/heads/feature/strand-work
Commit: ab9384c4a2d2420cc4197fc713d24f954b20edcd
Parents: a9e7458
Author: Harbs <ha...@in-tools.com>
Authored: Mon Aug 7 00:13:33 2017 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Mon Aug 7 14:34:53 2017 +0300
----------------------------------------------------------------------
.../flex/textLayout/elements/FlowGroupElement.as | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ab9384c4/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowGroupElement.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowGroupElement.as b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowGroupElement.as
index 8664a29..e869c75 100644
--- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowGroupElement.as
+++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowGroupElement.as
@@ -968,19 +968,7 @@ package org.apache.flex.textLayout.elements
if (curFlowElement.parentRelativeStart != relativePosition)
{
- if (curFlowElement.className == "FlowGroupElement")
- {
- FlowGroupElement(curFlowElement).splitAtPosition(relativePosition - curFlowElement.parentRelativeStart);
- }
- else
- {
- // I would imagine that it has to be a span. That's the only non-FlowGroupElement
- // type that can take up more than a textLength of 1.
- CONFIG::debug
- {
- assert(curFlowElement.className == "SpanElement", "SpanElements are the only leaf elements that can currently have > 1 textLength"); }
- ISpanElement(curFlowElement).splitAtPosition(relativePosition - curFlowElement.parentRelativeStart);
- }
+ curFlowElement.splitAtPosition(relativePosition - curFlowElement.parentRelativeStart);
// increase by one. It's the new element that we want to move over.
curElementIdx++;
}
[42/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
Only layout if visible LayoutOnShow bead must be used to trigger layout when
visible is set to true. LayoutOnShow added to Express Container
Posted by ha...@apache.org.
Only layout if visible
LayoutOnShow bead must be used to trigger layout when visible is set to true.
LayoutOnShow added to Express Container
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a9e7458c
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a9e7458c
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a9e7458c
Branch: refs/heads/feature/strand-work
Commit: a9e7458c505fdd1731068b3888a649035934c171
Parents: bc50901
Author: Harbs <ha...@in-tools.com>
Authored: Mon Aug 7 00:12:12 2017 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Mon Aug 7 00:12:12 2017 +0300
----------------------------------------------------------------------
.../src/main/flex/org/apache/flex/core/LayoutBase.as | 2 ++
.../flex/org/apache/flex/html/beads/ScrollBarView.as | 3 ++-
.../apache/flex/html/beads/layouts/DataGridLayout.as | 10 +++++++++-
.../flex/html/beads/layouts/DataGridPercentageLayout.as | 12 ++++++++++--
.../src/main/flex/org/apache/flex/express/Container.as | 9 +++++----
5 files changed, 28 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a9e7458c/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/LayoutBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/LayoutBase.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/LayoutBase.as
index 7bc5ab0..6c4f2f2 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/LayoutBase.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/LayoutBase.as
@@ -316,6 +316,8 @@ package org.apache.flex.core
*/
public function performLayout():void
{
+ if(!host.visible)
+ return;
// avoid running this layout instance recursively.
if (isLayoutRunning) return;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a9e7458c/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/ScrollBarView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/ScrollBarView.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/ScrollBarView.as
index 41ef624..e290ba7 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/ScrollBarView.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/ScrollBarView.as
@@ -116,7 +116,8 @@ package org.apache.flex.html.beads
sbModel.addEventListener("stepSizeChange", changeHandler);
sbModel.addEventListener("pageSizeChange", changeHandler);
sbModel.addEventListener("valueChange", changeHandler);
-
+ (value as IEventDispatcher).addEventListener("show", changeHandler);
+
if( _strand.getBeadByType(IBeadLayout) == null ) {
layout = new (ValuesManager.valuesImpl.getValue(_strand, "iBeadLayout")) as IBeadLayout;
_strand.addBead(layout);
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a9e7458c/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/DataGridLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/DataGridLayout.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/DataGridLayout.as
index fe4ccab..e3c4624 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/DataGridLayout.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/DataGridLayout.as
@@ -67,6 +67,7 @@ package org.apache.flex.html.beads.layouts
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
+ * @flexjsignorecoercion org.apache.flex.core.UIBase
*/
public function set strand(value:IStrand):void
{
@@ -105,9 +106,12 @@ package org.apache.flex.html.beads.layouts
{
return _header;
}
+ /**
+ * @flexjsignorecoercion org.apache.flex.core.UIBase
+ */
public function set header(value:IUIBase):void
{
- _header = UIBase(value);
+ _header = (value as UIBase);
}
private var _columns:Array;
@@ -142,6 +146,7 @@ package org.apache.flex.html.beads.layouts
/**
* @copy org.apache.flex.core.IBeadLayout#layout
+ * @flexjsignorecoercion org.apache.flex.core.UIBase
*/
public function layout():Boolean
{
@@ -202,9 +207,12 @@ package org.apache.flex.html.beads.layouts
/**
* @private
+ * @flexjsignorecoercion org.apache.flex.core.UIBase
*/
private function handleSizeChanges(event:Event):void
{
+ if(!(_strand as UIBase).visible)
+ return;
var view:DataGridView = UIBase(_strand).view as DataGridView;
if (view == null) return;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a9e7458c/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/DataGridPercentageLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/DataGridPercentageLayout.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/DataGridPercentageLayout.as
index 7459a24..a8195d5 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/DataGridPercentageLayout.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/DataGridPercentageLayout.as
@@ -66,6 +66,7 @@ package org.apache.flex.html.beads.layouts
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
+ * @flexjsignorecoercion org.apache.flex.core.UIBase
*/
public function set strand(value:IStrand):void
{
@@ -104,9 +105,12 @@ package org.apache.flex.html.beads.layouts
{
return _header;
}
+ /**
+ * @flexjsignorecoercion org.apache.flex.core.UIBase
+ */
public function set header(value:IUIBase):void
{
- _header = UIBase(value);
+ _header = value as UIBase;
}
private var _columns:Array;
@@ -141,6 +145,7 @@ package org.apache.flex.html.beads.layouts
/**
* @copy org.apache.flex.core.IBeadLayout#layout
+ * @flexjsignorecoercion org.apache.flex.core.UIBase
*/
public function layout():Boolean
{
@@ -210,10 +215,13 @@ package org.apache.flex.html.beads.layouts
/**
* @private
+ * @flexjsignorecoercion org.apache.flex.core.UIBase
*/
private function handleSizeChanges(event:Event):void
{
- var view:DataGridView = UIBase(_strand).view as DataGridView;
+ if(!(_strand as UIBase).visible)
+ return;
+ var view:DataGridView = (_strand as UIBase).view as DataGridView;
if (view == null) return;
columns = view.columnLists;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a9e7458c/frameworks/projects/Express/src/main/flex/org/apache/flex/express/Container.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Express/src/main/flex/org/apache/flex/express/Container.as b/frameworks/projects/Express/src/main/flex/org/apache/flex/express/Container.as
index 27e2b08..5316c8c 100644
--- a/frameworks/projects/Express/src/main/flex/org/apache/flex/express/Container.as
+++ b/frameworks/projects/Express/src/main/flex/org/apache/flex/express/Container.as
@@ -19,15 +19,15 @@
package org.apache.flex.express
{
import org.apache.flex.binding.ContainerDataBinding;
- import org.apache.flex.html.Container;
- import org.apache.flex.html.supportClasses.ScrollingViewport;
-
import org.apache.flex.core.BindableCSSStyles;
import org.apache.flex.core.StyleChangeNotifier;
+ import org.apache.flex.html.Container;
+ import org.apache.flex.html.beads.layouts.LayoutOnShow;
+ import org.apache.flex.html.supportClasses.ScrollingViewport;
COMPILE::SWF {
- import org.apache.flex.html.beads.SolidBackgroundWithChangeListenerBead;
import org.apache.flex.html.beads.SingleLineBorderWithChangeListenerBead;
+ import org.apache.flex.html.beads.SolidBackgroundWithChangeListenerBead;
}
/**
@@ -48,6 +48,7 @@ package org.apache.flex.express
addBead(new ContainerDataBinding());
addBead(new ScrollingViewport());
addBead(new StyleChangeNotifier());
+ addBead(new LayoutOnShow());
COMPILE::SWF {
addBead(new SolidBackgroundWithChangeListenerBead());
[23/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs
into develop
Posted by ha...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/88c62cb3
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/88c62cb3
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/88c62cb3
Branch: refs/heads/feature/strand-work
Commit: 88c62cb38372144f7131e1a6219b967778a526d7
Parents: b52122d 498d311
Author: piotrz <pi...@apache.org>
Authored: Tue Aug 1 23:32:16 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Tue Aug 1 23:32:16 2017 +0200
----------------------------------------------------------------------
.../html/supportClasses/OverflowViewport.as | 129 +++++++++++++++++++
.../Basic/src/main/resources/basic-manifest.xml | 4 +-
.../flex/textLayout/compose/TextLineRecycler.as | 2 +-
3 files changed, 133 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[35/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
try to not run SWF test if target is JS only
Posted by ha...@apache.org.
try to not run SWF test if target is JS only
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d360e9c1
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d360e9c1
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d360e9c1
Branch: refs/heads/feature/strand-work
Commit: d360e9c11465d8647109e94674e0c910521ca574
Parents: 61bb998
Author: Alex Harui <ah...@apache.org>
Authored: Wed Aug 2 17:11:44 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Aug 2 17:11:49 2017 -0700
----------------------------------------------------------------------
.../org/apache/flex/flexjs/examples/tests/ExampleBuildTest.java | 3 +++
examples/flexjs/pom.xml | 1 +
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d360e9c1/examples/examples-tests/src/main/java/org/apache/flex/flexjs/examples/tests/ExampleBuildTest.java
----------------------------------------------------------------------
diff --git a/examples/examples-tests/src/main/java/org/apache/flex/flexjs/examples/tests/ExampleBuildTest.java b/examples/examples-tests/src/main/java/org/apache/flex/flexjs/examples/tests/ExampleBuildTest.java
index 9fcd1f7..19bb982 100644
--- a/examples/examples-tests/src/main/java/org/apache/flex/flexjs/examples/tests/ExampleBuildTest.java
+++ b/examples/examples-tests/src/main/java/org/apache/flex/flexjs/examples/tests/ExampleBuildTest.java
@@ -67,6 +67,9 @@ public class ExampleBuildTest {
///////////////////////////////////////////////////////////////////
protected boolean isSwfProject() {
+ String targets = System.getProperty("targets", "SWF,JSFlex");
+ if (!targets.contains("SWF"))
+ return false;
String type = System.getProperty("type", "jar");
return "swf".equalsIgnoreCase(type);
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d360e9c1/examples/flexjs/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/pom.xml b/examples/flexjs/pom.xml
index 79ef510..14abd70 100644
--- a/examples/flexjs/pom.xml
+++ b/examples/flexjs/pom.xml
@@ -89,6 +89,7 @@
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<type>${project.packaging}</type>
+ <targets>${project.build.plugins.plugin.configuration.targets}</targets>
<buildDirectory>${project.build.directory}</buildDirectory>
</systemPropertyVariables>
</configuration>
[12/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
Merge branch 'develop' into feature/browser-event
Posted by ha...@apache.org.
Merge branch 'develop' into feature/browser-event
* develop:
Fixed hasOwnProperty
Added SingleSelectionDropIndicatorBead and used it with the other single-selection drag and drop beads. Updated comments throughout.
DragMouseController now dispatches events with itself as target; useful in MXML files.
PointUtils was missing.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/e32fc222
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/e32fc222
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/e32fc222
Branch: refs/heads/feature/strand-work
Commit: e32fc222c011664faec082750f348bc715f682cd
Parents: 0d9fe0c 93c980d
Author: Harbs <ha...@in-tools.com>
Authored: Sun Jul 30 23:49:50 2017 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Sun Jul 30 23:49:50 2017 +0300
----------------------------------------------------------------------
.../projects/Core/src/main/flex/CoreClasses.as | 1 +
.../src/main/config/compile-swf-config.xml | 1 +
.../DragDrop/src/main/flex/DragDropClasses.as | 1 +
.../flex/org/apache/flex/events/DragEvent.as | 7 +-
.../html/beads/SingleSelectionDragImageBead.as | 22 ++--
.../html/beads/SingleSelectionDragSourceBead.as | 77 +++++++++---
.../beads/SingleSelectionDropIndicatorBead.as | 111 ++++++++++++++++
.../html/beads/SingleSelectionDropTargetBead.as | 125 ++++++++++++++++---
.../beads/controllers/DragMouseController.as | 29 +++--
.../beads/controllers/DropMouseController.as | 16 +--
.../src/main/resources/basic-manifest.xml | 1 +
frameworks/projects/XML/src/main/flex/XML.as | 26 ++--
manualtests/XMLTest/src/MyInitialView.mxml | 3 +
13 files changed, 347 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e32fc222/frameworks/projects/Core/src/main/flex/CoreClasses.as
----------------------------------------------------------------------
[11/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
Fixed hasOwnProperty
Posted by ha...@apache.org.
Fixed hasOwnProperty
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/93c980dd
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/93c980dd
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/93c980dd
Branch: refs/heads/feature/strand-work
Commit: 93c980ddf90deb1805ea9b69bf46c0602db46ce1
Parents: 96ee542
Author: Harbs <ha...@in-tools.com>
Authored: Sun Jul 30 22:58:32 2017 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Sun Jul 30 22:58:32 2017 +0300
----------------------------------------------------------------------
frameworks/projects/XML/src/main/flex/XML.as | 26 ++++++++++++++---------
manualtests/XMLTest/src/MyInitialView.mxml | 3 +++
2 files changed, 19 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/93c980dd/frameworks/projects/XML/src/main/flex/XML.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/flex/XML.as b/frameworks/projects/XML/src/main/flex/XML.as
index b075f2e..f09a018 100644
--- a/frameworks/projects/XML/src/main/flex/XML.as
+++ b/frameworks/projects/XML/src/main/flex/XML.as
@@ -1062,17 +1062,23 @@ package
return p == "0";
var name:QName = toXMLName(p);
var i:int;
- for(i=0;i<_attributes.length;i++)
+ if(name.isAttribute)
{
- if(_attributes[i].name().matches(name))
- return true;
+ for(i=0;i<_attributes.length;i++)
+ {
+ if(_attributes[i].name().matches(name))
+ return true;
+ }
}
- for(i=0;i<_children.length;i++)
+ else
{
- if(_children[i].nodeKind() != "element")
- continue;
- if(_children[i].name().matches(name))
- return true;
+ for(i=0;i<_children.length;i++)
+ {
+ if(_children[i].nodeKind() != "element")
+ continue;
+ if(_children[i].name().matches(name))
+ return true;
+ }
}
return false;
}
@@ -2165,11 +2171,11 @@ package
private function toAttributeName(name:*):QName
{
var qname:QName;
- if(!name is QName)
+ if(!(name is QName))
{
name = name.toString();
if(name.indexOf("@") > -1)
- name = name.substring(name.indexOf("@"));
+ name = name.substring(name.indexOf("@") + 1);
}
qname = toXMLName(name);
qname.isAttribute = true;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/93c980dd/manualtests/XMLTest/src/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/manualtests/XMLTest/src/MyInitialView.mxml b/manualtests/XMLTest/src/MyInitialView.mxml
index efb4317..6b73d7f 100644
--- a/manualtests/XMLTest/src/MyInitialView.mxml
+++ b/manualtests/XMLTest/src/MyInitialView.mxml
@@ -97,6 +97,9 @@ limitations under the License.
var list4:XMLList;
var xml1:XML = <foo baz="true"/>;
trace(xml1.toXMLString());
+ trace("should be true: " + xml1.hasOwnProperty("@baz"));
+ trace("should be false: " + xml1.hasOwnProperty("@foo"));
+ trace("should be false: " + xml1.hasOwnProperty("baz"));
trace(xml1.toXMLString() == '<foo baz="true"/>');
var baz:XMLList = xml1.@baz;
trace("baz: " + xml1.@baz.toString() + " //true");
[19/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
Improvement, but probably still needs more work
Posted by ha...@apache.org.
Improvement, but probably still needs more work
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8ce67e22
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8ce67e22
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8ce67e22
Branch: refs/heads/feature/strand-work
Commit: 8ce67e22618d74e2f5fef99a818fad78685786ad
Parents: 6bd14d2
Author: Harbs <ha...@in-tools.com>
Authored: Mon Jul 31 15:25:11 2017 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Mon Jul 31 15:25:11 2017 +0300
----------------------------------------------------------------------
.../textLayout/elements/utils/GeometricElementUtils.as | 7 +++++++
.../flex/org/apache/flex/text/engine/ElementFormat.as | 10 ++++++----
2 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8ce67e22/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/utils/GeometricElementUtils.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/utils/GeometricElementUtils.as b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/utils/GeometricElementUtils.as
index b31a6c0..225e15b 100644
--- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/utils/GeometricElementUtils.as
+++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/utils/GeometricElementUtils.as
@@ -37,6 +37,8 @@ package org.apache.flex.textLayout.elements.utils
import org.apache.flex.textLayout.formats.TLFTypographicCase;
import org.apache.flex.textLayout.formats.TextLayoutFormat;
import org.apache.flex.textLayout.utils.LocaleUtil;
+ import org.apache.flex.textLayout.elements.ITextFlow;
+ import org.apache.flex.textLayout.factory.TLFFactory;
public class GeometricElementUtils
{
/** @private */
@@ -183,6 +185,11 @@ package org.apache.flex.textLayout.elements.utils
var fd:FontDescription = new FontDescription();
fd.fontStyle = computedFormat.fontStyle;
fd.fontName = computedFormat.fontFamily;
+ var tf:ITextFlow = para.getTextFlow();
+ if(tf)
+ fd.fontLoader = tf.tlfFactory.textFactory.getFontLoader();
+ else
+ fd.fontLoader = TLFFactory.defaultTLFFactory.textFactory.getFontLoader();
// fd.renderingMode = computedFormat.renderingMode;
// fd.cffHinting = computedFormat.cffHinting;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8ce67e22/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ElementFormat.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ElementFormat.as b/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ElementFormat.as
index 1ef20ed..d5ab61c 100644
--- a/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ElementFormat.as
+++ b/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ElementFormat.as
@@ -19,6 +19,9 @@
package org.apache.flex.text.engine
{
import org.apache.flex.geom.Rectangle;
+ import org.apache.flex.debugging.assert;
+ import org.apache.flex.text.engine.IFont;
+ import org.apache.flex.text.engine.FontMetrics;
public class ElementFormat
{
@@ -82,10 +85,9 @@ package org.apache.flex.text.engine
public function getFontMetrics():FontMetrics
{
- var fm:FontMetrics = new FontMetrics();
- // just a guess for now
- fm.emBox = new Rectangle(0, 1.2 - fontSize, fontSize, 1.2);
- return fm;
+ assert(fontDescription != null,"fontDescription not assigned!");
+ var metrics:FontMetrics = fontDescription.fontLoader.getFont(fontDescription.fontName,fontDescription.fontStyle).fontMetrics;
+ return metrics.getScaledMetrics(fontSize);
}
}
}
\ No newline at end of file
[34/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
Fix config of MDLExample used for Ant build
Posted by ha...@apache.org.
Fix config of MDLExample used for Ant build
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/61bb9983
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/61bb9983
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/61bb9983
Branch: refs/heads/feature/strand-work
Commit: 61bb99839e02cbb7d7dfea6a396b596db34d5970
Parents: 25ae9b1 66ac90c
Author: piotrz <pi...@apache.org>
Authored: Thu Aug 3 00:48:24 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Thu Aug 3 00:48:24 2017 +0200
----------------------------------------------------------------------
.../org/apache/flex/textLayout/compose/utils/AdornmentUtils.as | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[49/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
Merge branch 'develop' into feature/strand-work
Posted by ha...@apache.org.
Merge branch 'develop' into feature/strand-work
* develop: (88 commits)
Upgrade should wait for other beads (e.g. IDataProviderItemRendererMapper) to do their thing
Condition not necessary
Upgrade should wait for other beads (e.g. IDataProviderItemRendererMapper) to do their thing
Condition not necessary
Only layout if visible LayoutOnShow bead must be used to trigger layout when visible is set to true. LayoutOnShow added to Express Container
Not used
Made finding errorNS more efficient I think this fixed MS browsers Better XML errors
Fix MDLExample
FLEX-35347 - Add property "value" to CheckBox which will store additional information Update MDLExample with new feature
Split COMPILE::SWF and COMPILE::JS into separate functions. Use setDisplayStyleForLayout() for compatibility with the visible property.
- Switch FlexTeamPage_MDL example to compile JSFlex - Clean up native TeamPage
try to not run SWF test if target is JS only
Fix config of MDLExample used for Ant build
Strikethru needs this too.
Added special cursor for drag and drop operation.
Removed extra IF statement.
The Text Engine needs to specify base offset for adornments
FontMetrics should not be scaled
This doesn’t compile correctly. Reverting.
Make MDLExample compiled to JS only since MDL library do not have swf part
...
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/2df19a45
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/2df19a45
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/2df19a45
Branch: refs/heads/feature/strand-work
Commit: 2df19a45bdbd2d0fb359ad1e4783f383be0c644e
Parents: 41ac35e 42db766
Author: Harbs <ha...@in-tools.com>
Authored: Mon Aug 7 19:01:43 2017 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Mon Aug 7 19:01:43 2017 +0300
----------------------------------------------------------------------
examples/build.xml | 3 +
.../flexjs/examples/tests/ExampleBuildTest.java | 3 +
.../ASDoc/src/main/flex/ASDocMainView.mxml | 12 +-
.../src/main/flex/MyInitialView.mxml | 12 +-
examples/flexjs/DragAndDropExample/build.xml | 66 ++++
examples/flexjs/DragAndDropExample/pom.xml | 77 +++++
.../src/main/flex/DragAndDropExample.mxml | 36 ++
.../src/main/flex/MyInitialView.mxml | 95 ++++++
.../src/main/flex/models/ProductsModel.as | 54 +++
.../src/main/flex/products/Product.as | 43 +++
.../main/flex/products/ProductItemRenderer.as | 66 ++++
.../src/main/resources/assets/smallbluerect.jpg | Bin 0 -> 13500 bytes
.../main/resources/assets/smallgreenrect.jpg | Bin 0 -> 13542 bytes
.../main/resources/assets/smallorangerect.gif | Bin 0 -> 821 bytes
.../main/resources/assets/smallorangerect.jpg | Bin 0 -> 13571 bytes
.../main/resources/assets/smallpurplerect.jpg | Bin 0 -> 13517 bytes
.../src/main/resources/assets/smallredrect.jpg | Bin 0 -> 13477 bytes
.../main/resources/assets/smallyellowrect.jpg | Bin 0 -> 13598 bytes
examples/flexjs/FlexTeamPage_MDL/pom.xml | 32 +-
examples/flexjs/MDLExample/pom.xml | 17 +-
.../src/main/config/compile-app-config.xml | 2 +-
.../flexjs/MDLExample/src/main/flex/Menus.mxml | 12 +-
.../MDLExample/src/main/flex/Toggles.mxml | 13 +-
examples/flexjs/TeamPage/pom.xml | 15 -
examples/flexjs/pom.xml | 3 +
.../org/apache/flex/core/HTMLElementWrapper.as | 26 +-
.../flex/org/apache/flex/core/LayoutBase.as | 2 +
.../main/flex/org/apache/flex/core/UIBase.as | 47 ++-
.../main/flex/org/apache/flex/css2/Cursors.as | 1 -
.../main/flex/org/apache/flex/html/Container.as | 4 +
.../flex/html/beads/AccordionCollapseBead.as | 6 +-
.../html/beads/DataProviderChangeNotifier.as | 38 ++-
.../DataProviderCollectionChangeNotifier.as | 12 +-
.../beads/DataProviderItemsChangeNotifier.as | 12 +-
.../flex/org/apache/flex/html/beads/ListView.as | 70 ++--
.../org/apache/flex/html/beads/PanelView.as | 7 +
.../org/apache/flex/html/beads/ScrollBarView.as | 3 +-
.../beads/SimpleDataProviderChangeNotifier.as | 3 +-
.../apache/flex/html/beads/TitleBarView.mxml | 2 +-
.../flex/html/beads/layouts/DataGridLayout.as | 10 +-
.../beads/layouts/DataGridPercentageLayout.as | 12 +-
.../html/beads/layouts/HorizontalFlexLayout.as | 298 ++++++++--------
.../layouts/OneFlexibleChildHorizontalLayout.as | 6 +-
.../layouts/OneFlexibleChildVerticalLayout.as | 6 +-
.../flex/html/beads/layouts/TileLayout.as | 4 +-
.../html/beads/layouts/VerticalFlexLayout.as | 288 ++++++++--------
.../html/supportClasses/OverflowViewport.as | 129 +++++++
.../Basic/src/main/resources/basic-manifest.xml | 4 +-
.../Basic/src/main/resources/defaults.css | 1 +
.../projects/Core/src/main/flex/CoreClasses.as | 5 +-
.../flex/org/apache/flex/core/ElementWrapper.as | 7 +-
.../org/apache/flex/debugging/throwError.as | 43 +++
.../flex/org/apache/flex/events/BrowserEvent.as | 47 +--
.../org/apache/flex/events/ElementEvents.as | 6 +-
.../org/apache/flex/events/IBrowserEvent.as | 35 ++
.../org/apache/flex/events/KeyboardEvent.as | 139 +++++++-
.../flex/org/apache/flex/events/MouseEvent.as | 337 +++++++++++++++++--
.../org/apache/flex/events/getTargetWrapper.as | 32 ++
.../flex/events/utils/KeyboardEventConverter.as | 22 +-
.../flex/events/utils/MouseEventConverter.as | 28 +-
.../src/main/config/compile-swf-config.xml | 1 +
.../DragDrop/src/main/flex/DragDropClasses.as | 2 +
.../flex/org/apache/flex/events/DragEvent.as | 107 ++++--
.../org/apache/flex/events/DragEventBase.as | 1 +
.../html/beads/SingleSelectionDragImageBead.as | 137 ++++++++
.../html/beads/SingleSelectionDragSourceBead.as | 116 ++++---
.../beads/SingleSelectionDropIndicatorBead.as | 111 ++++++
.../html/beads/SingleSelectionDropTargetBead.as | 131 +++++--
.../beads/controllers/DragMouseController.as | 57 ++--
.../beads/controllers/DropMouseController.as | 68 ++--
.../src/main/resources/basic-manifest.xml | 2 +
.../flex/org/apache/flex/express/Container.as | 9 +-
.../Language/src/main/flex/LanguageClasses.as | 3 +
.../org/apache/flex/language/string/match.as | 33 ++
.../org/apache/flex/language/string/search.as | 33 ++
.../main/flex/org/apache/flex/utils/Language.as | 2 +-
.../main/flex/org/apache/flex/mdl/CheckBox.as | 26 +-
.../src/main/flex/org/apache/flex/mdl/Menu.as | 16 +-
.../flex/mdl/itemRenderers/MenuItemRenderer.as | 5 +
.../src/main/resources/defaults.css | 6 +
frameworks/projects/TLF/pom.xml | 10 +
.../flex/textLayout/compose/TextLineRecycler.as | 2 +-
.../textLayout/compose/utils/AdornmentUtils.as | 4 +-
.../textLayout/container/ContainerController.as | 2 +-
.../container/TextContainerManager.as | 8 -
.../conversion/BaseTextLayoutImporter.as | 6 +-
.../textLayout/conversion/TextLayoutImporter.as | 6 +-
.../flex/textLayout/edit/SelectionManager.as | 63 ++--
.../textLayout/elements/FlowGroupElement.as | 14 +-
.../flex/textLayout/elements/FlowLeafElement.as | 14 +-
.../textLayout/elements/ParagraphElement.as | 2 +-
.../flex/textLayout/elements/SpanElement.as | 4 +-
.../flex/textLayout/elements/TableElement.as | 8 +
.../elements/utils/GeometricElementUtils.as | 7 +
.../flex/textLayout/factory/TLFFactory.as | 9 +-
.../apache/flex/textLayout/utils/FactoryUtil.as | 14 -
.../apache/flex/text/engine/ElementFormat.as | 9 +-
.../org/apache/flex/text/engine/FontMetrics.as | 20 ++
.../org/apache/flex/text/engine/ITextLine.as | 4 +-
.../flex/org/apache/flex/text/html/TextLine.as | 11 +-
frameworks/projects/XML/src/main/flex/XML.as | 250 +++++++++-----
.../projects/XML/src/main/flex/XMLClasses.as | 2 +
.../projects/XML/src/main/flex/XMLList.as | 70 +++-
.../main/flex/org/apache/flex/language/toXML.as | 51 +++
.../flex/org/apache/flex/language/toXMLList.as | 51 +++
manualtests/BubbleTest/build.xml | 73 ++++
manualtests/BubbleTest/src/BubbleTest.mxml | 135 ++++++++
manualtests/ContainerTest/build.xml | 3 +-
.../src/products/ProductItemRenderer.as | 2 +-
manualtests/DataBindingTestbed/build.xml | 5 +-
manualtests/XMLTest/build.xml | 1 +
manualtests/XMLTest/src/MyInitialView.mxml | 3 +
112 files changed, 3064 insertions(+), 918 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2df19a45/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/HTMLElementWrapper.as
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2df19a45/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2df19a45/frameworks/projects/Core/src/main/flex/CoreClasses.as
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2df19a45/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ElementWrapper.as
----------------------------------------------------------------------
[48/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs
into develop
Posted by ha...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into develop
* 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs:
Upgrade should wait for other beads (e.g. IDataProviderItemRendererMapper) to do their thing
Condition not necessary
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/42db7661
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/42db7661
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/42db7661
Branch: refs/heads/feature/strand-work
Commit: 42db76613c4c1ae889b694e1e49b79c7c8988165
Parents: 89dc8f1 dee2627
Author: Harbs <ha...@in-tools.com>
Authored: Mon Aug 7 14:36:19 2017 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Mon Aug 7 14:36:19 2017 +0300
----------------------------------------------------------------------
----------------------------------------------------------------------
[41/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
Not used
Posted by ha...@apache.org.
Not used
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/bc50901e
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/bc50901e
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/bc50901e
Branch: refs/heads/feature/strand-work
Commit: bc50901e97d6416a2983272c8f357e9c26592244
Parents: 10be5b8
Author: Harbs <ha...@in-tools.com>
Authored: Sun Aug 6 07:54:29 2017 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Sun Aug 6 07:54:29 2017 +0300
----------------------------------------------------------------------
.../src/main/flex/org/apache/flex/text/engine/ITextLine.as | 1 -
.../Text/src/main/flex/org/apache/flex/text/html/TextLine.as | 6 ------
2 files changed, 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bc50901e/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ITextLine.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ITextLine.as b/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ITextLine.as
index 60b6082..e5020ef 100644
--- a/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ITextLine.as
+++ b/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ITextLine.as
@@ -34,7 +34,6 @@ package org.apache.flex.text.engine
function get doubleClickEnabled():Boolean;
function get hasGraphicElement():Boolean;
function get hasTabs():Boolean;
- function get metaData():Object;
function get nextLine():ITextLine;
function get previousLine():ITextLine;
function get rawTextLength():int;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bc50901e/frameworks/projects/Text/src/main/flex/org/apache/flex/text/html/TextLine.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Text/src/main/flex/org/apache/flex/text/html/TextLine.as b/frameworks/projects/Text/src/main/flex/org/apache/flex/text/html/TextLine.as
index 33d4b22..440ae30 100644
--- a/frameworks/projects/Text/src/main/flex/org/apache/flex/text/html/TextLine.as
+++ b/frameworks/projects/Text/src/main/flex/org/apache/flex/text/html/TextLine.as
@@ -159,12 +159,6 @@ package org.apache.flex.text.html
return false;
}
- COMPILE::JS
- public function get metaData():Object
- {
- return null;
- }
-
public function get nextLine():ITextLine
{
return null;
[37/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
Split COMPILE::SWF and COMPILE::JS into separate functions. Use
setDisplayStyleForLayout() for compatibility with the visible property.
Posted by ha...@apache.org.
Split COMPILE::SWF and COMPILE::JS into separate functions.
Use setDisplayStyleForLayout() for compatibility with the visible 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/0bc728cf
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/0bc728cf
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/0bc728cf
Branch: refs/heads/feature/strand-work
Commit: 0bc728cf5f37793f01c2645fdeaa143e37d82ca2
Parents: ff5cf8e
Author: Harbs <ha...@in-tools.com>
Authored: Thu Aug 3 18:56:45 2017 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Thu Aug 3 18:56:45 2017 +0300
----------------------------------------------------------------------
.../html/beads/layouts/HorizontalFlexLayout.as | 298 ++++++++++---------
.../layouts/OneFlexibleChildHorizontalLayout.as | 3 +-
.../layouts/OneFlexibleChildVerticalLayout.as | 3 +-
.../html/beads/layouts/VerticalFlexLayout.as | 288 +++++++++---------
4 files changed, 308 insertions(+), 284 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0bc728cf/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalFlexLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalFlexLayout.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalFlexLayout.as
index d6d2449..52550ed 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalFlexLayout.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalFlexLayout.as
@@ -95,178 +95,190 @@ package org.apache.flex.html.beads.layouts
/**
* @copy org.apache.flex.core.IBeadLayout#layout
- * @flexjsignorecoercion org.apache.flex.core.ILayoutHost
*
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion FlexJS 0.8
*/
+ COMPILE::SWF
override public function layout():Boolean
{
- COMPILE::SWF {
- var contentView:ILayoutView = layoutView;
-
- var n:Number = contentView.numElements;
- if (n == 0) return false;
-
- var spacing:String = "none";
-
- var maxWidth:Number = 0;
- var maxHeight:Number = 0;
- var growCount:Number = 0;
- var childData:Array = [];
- var hostWidthSizedToContent:Boolean = host.isWidthSizedToContent();
- var hostHeightSizedToContent:Boolean = host.isHeightSizedToContent();
- var hostWidth:Number = host.width;
- var hostHeight:Number = host.height;
-
- var ilc:ILayoutChild;
- var data:Object;
- var canAdjust:Boolean = false;
-
- var paddingMetrics:Rectangle = CSSContainerUtils.getPaddingMetrics(host);
- var borderMetrics:Rectangle = CSSContainerUtils.getBorderMetrics(host);
-
- // adjust the host's usable size by the metrics. If hostSizedToContent, then the
- // resulting adjusted value may be less than zero.
- hostWidth -= paddingMetrics.left + paddingMetrics.right + borderMetrics.left + borderMetrics.right;
- hostHeight -= paddingMetrics.top + paddingMetrics.bottom + borderMetrics.top + borderMetrics.bottom;
-
- if ((hostWidth <= 0 && !hostWidthSizedToContent) || (hostHeight <= 0 && !hostHeightSizedToContent)) return false;
-
- var remainingWidth:Number = hostWidth;
+
+ var contentView:ILayoutView = layoutView;
+
+ var n:Number = contentView.numElements;
+ if (n == 0) return false;
+
+ var spacing:String = "none";
+
+ var maxWidth:Number = 0;
+ var maxHeight:Number = 0;
+ var growCount:Number = 0;
+ var childData:Array = [];
+ var hostWidthSizedToContent:Boolean = host.isWidthSizedToContent();
+ var hostHeightSizedToContent:Boolean = host.isHeightSizedToContent();
+ var hostWidth:Number = host.width;
+ var hostHeight:Number = host.height;
+
+ var ilc:ILayoutChild;
+ var data:Object;
+ var canAdjust:Boolean = false;
+
+ var paddingMetrics:Rectangle = CSSContainerUtils.getPaddingMetrics(host);
+ var borderMetrics:Rectangle = CSSContainerUtils.getBorderMetrics(host);
+
+ // adjust the host's usable size by the metrics. If hostSizedToContent, then the
+ // resulting adjusted value may be less than zero.
+ hostWidth -= paddingMetrics.left + paddingMetrics.right + borderMetrics.left + borderMetrics.right;
+ hostHeight -= paddingMetrics.top + paddingMetrics.bottom + borderMetrics.top + borderMetrics.bottom;
+
+ if ((hostWidth <= 0 && !hostWidthSizedToContent) || (hostHeight <= 0 && !hostHeightSizedToContent)) return false;
+
+ var remainingWidth:Number = hostWidth;
+
+ //trace("HorizontalFlexLayout for "+UIBase(host).id+" with remainingWidth: "+remainingWidth);
+
+ // First pass determines the data about the child.
+ for(var i:int=0; i < n; i++)
+ {
+ var child:IUIBase = contentView.getElementAt(i) as IUIBase;
+ if (child == null || !child.visible) {
+ childData.push({width:0, height:0, mt:0, ml:0, mr:0, mb:0, canAdjust:false});
+ continue;
+ }
- //trace("HorizontalFlexLayout for "+UIBase(host).id+" with remainingWidth: "+remainingWidth);
+ ilc = child as ILayoutChild;
+
+ var margins:Object = childMargins(child, hostWidth, hostHeight);
+
+ var flexGrow:Object = ValuesManager.valuesImpl.getValue(child, "flex-grow");
+ var growValue:Number = 0;
+ if (flexGrow != null) {
+ growValue = Number(flexGrow);
+ if (!isNaN(growValue) && growValue > 0) growCount++;
+ else growValue = 0;
+ }
- // First pass determines the data about the child.
- for(var i:int=0; i < n; i++)
- {
- var child:IUIBase = contentView.getElementAt(i) as IUIBase;
- if (child == null || !child.visible) {
- childData.push({width:0, height:0, mt:0, ml:0, mr:0, mb:0, canAdjust:false});
- continue;
+ var useHeight:Number = -1;
+ if (!hostHeightSizedToContent) {
+ if (ilc) {
+ if (!isNaN(ilc.percentHeight)) useHeight = hostHeight * (ilc.percentHeight/100.0);
+ else if (!isNaN(ilc.explicitHeight)) useHeight = ilc.explicitHeight;
+ else useHeight = hostHeight;
}
+ }
- ilc = child as ILayoutChild;
-
- var margins:Object = childMargins(child, hostWidth, hostHeight);
-
- var flexGrow:Object = ValuesManager.valuesImpl.getValue(child, "flex-grow");
- var growValue:Number = 0;
- if (flexGrow != null) {
- growValue = Number(flexGrow);
- if (!isNaN(growValue) && growValue > 0) growCount++;
- else growValue = 0;
- }
+ var useWidth:Number = -1;
+ if (ilc) {
+ if (!isNaN(ilc.explicitWidth)) useWidth = ilc.explicitWidth;
+ else if (!isNaN(ilc.percentWidth)) useWidth = hostWidth * (ilc.percentWidth/100.0);
+ else if (ilc.width > 0) useWidth = ilc.width;
+ }
+ if (growValue == 0 && useWidth > 0) remainingWidth -= useWidth + margins.left + margins.right;
+ else remainingWidth -= margins.left + margins.right;
- var useHeight:Number = -1;
- if (!hostHeightSizedToContent) {
- if (ilc) {
- if (!isNaN(ilc.percentHeight)) useHeight = hostHeight * (ilc.percentHeight/100.0);
- else if (!isNaN(ilc.explicitHeight)) useHeight = ilc.explicitHeight;
- else useHeight = hostHeight;
- }
- }
+ if (maxWidth < useWidth) maxWidth = useWidth;
+ if (maxHeight < useHeight) maxHeight = useHeight;
- var useWidth:Number = -1;
- if (ilc) {
- if (!isNaN(ilc.explicitWidth)) useWidth = ilc.explicitWidth;
- else if (!isNaN(ilc.percentWidth)) useWidth = hostWidth * (ilc.percentWidth/100.0);
- else if (ilc.width > 0) useWidth = ilc.width;
- }
- if (growValue == 0 && useWidth > 0) remainingWidth -= useWidth + margins.left + margins.right;
- else remainingWidth -= margins.left + margins.right;
+ childData.push({width:useWidth, height:useHeight,
+ mt:margins.top, ml:margins.left, mr:margins.right, mb:margins.bottom,
+ grow:growValue, canAdjust:canAdjust});
+ }
- if (maxWidth < useWidth) maxWidth = useWidth;
- if (maxHeight < useHeight) maxHeight = useHeight;
+ var xpos:Number = borderMetrics.left + paddingMetrics.left;
+ var ypos:Number = borderMetrics.top + paddingMetrics.top;
- childData.push({width:useWidth, height:useHeight,
- mt:margins.top, ml:margins.left, mr:margins.right, mb:margins.bottom,
- grow:growValue, canAdjust:canAdjust});
- }
+ // Second pass sizes and positions the children based on the data gathered.
+ for(i=0; i < n; i++)
+ {
+ child = contentView.getElementAt(i) as IUIBase;
+ data = childData[i];
+ //if (data.width == 0 || data.height == 0) continue;
- var xpos:Number = borderMetrics.left + paddingMetrics.left;
- var ypos:Number = borderMetrics.top + paddingMetrics.top;
+ useHeight = (data.height < 0 ? maxHeight : data.height);
- // Second pass sizes and positions the children based on the data gathered.
- for(i=0; i < n; i++)
- {
- child = contentView.getElementAt(i) as IUIBase;
- data = childData[i];
- //if (data.width == 0 || data.height == 0) continue;
-
- useHeight = (data.height < 0 ? maxHeight : data.height);
-
- var setWidth:Boolean = true;
- if (data.width != 0) {
- if (data.grow > 0 && growCount > 0) {
- useWidth = remainingWidth / growCount;
- setWidth = false;
- } else {
- useWidth = data.width;
- }
+ var setWidth:Boolean = true;
+ if (data.width != 0) {
+ if (data.grow > 0 && growCount > 0) {
+ useWidth = remainingWidth / growCount;
+ setWidth = false;
} else {
- useWidth = child.width;
+ useWidth = data.width;
}
+ } else {
+ useWidth = child.width;
+ }
- ilc = child as ILayoutChild;
- if (ilc) {
- ilc.setX(xpos + data.ml);
- ilc.setY(ypos + data.mt);
- if (data.height > 0) {
- //ilc.height = useHeight;
- ilc.setHeight(useHeight);
- }
- if (useWidth > 0) {
- if (setWidth) ilc.setWidth(useWidth);
- else ilc.width = useWidth;
- }
- } else {
- child.x = xpos + data.ml;
- child.y = ypos + data.mt;
- child.height = useHeight;
- if (data.width > 0) {
- child.width = useWidth;
- }
+ ilc = child as ILayoutChild;
+ if (ilc) {
+ ilc.setX(xpos + data.ml);
+ ilc.setY(ypos + data.mt);
+ if (data.height > 0) {
+ //ilc.height = useHeight;
+ ilc.setHeight(useHeight);
+ }
+ if (useWidth > 0) {
+ if (setWidth) ilc.setWidth(useWidth);
+ else ilc.width = useWidth;
+ }
+ } else {
+ child.x = xpos + data.ml;
+ child.y = ypos + data.mt;
+ child.height = useHeight;
+ if (data.width > 0) {
+ child.width = useWidth;
}
-
- xpos += useWidth + data.mr + data.ml;
-
- //trace("HorizontalFlexLayout: setting child "+i+" to "+child.width+" x "+child.height+" at "+child.x+", "+child.y);
}
- //trace("HorizontalFlexLayout: complete");
+ xpos += useWidth + data.mr + data.ml;
- return true;
+ //trace("HorizontalFlexLayout: setting child "+i+" to "+child.width+" x "+child.height+" at "+child.x+", "+child.y);
}
- COMPILE::JS {
- var contentView:ILayoutView = layoutView;
-
- // set the display on the contentView
- contentView.element.style["display"] = "flex";
- contentView.element.style["flex-flow"] = "row";
-
- var n:int = contentView.numElements;
- if (n == 0) return false;
-
- for(var i:int=0; i < n; i++) {
- var child:UIBase = contentView.getElementAt(i) as UIBase;
- if (!child)
- {
- continue;
- }
-
- if (grow >= 0) child.element.style["flex-grow"] = String(grow);
- if (shrink >= 0) child.element.style["flex-shrink"] = String(shrink);
- if (!isNaN(child.percentWidth))
- child.element.style["flex-basis"] = child.percentWidth.toString() + "%";
- child.dispatchEvent(new Event("layoutNeeded"));
- }
+ //trace("HorizontalFlexLayout: complete");
+
+ return true;
+ }
+ /**
+ * @copy org.apache.flex.core.IBeadLayout#layout
+ * @flexjsignorecoercion org.apache.flex.core.ILayoutHost
+ * @flexjsignorecoercion org.apache.flex.core.UIBase
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.8
+ */
+ COMPILE::JS
+ override public function layout():Boolean
+ {
+
+ var contentView:ILayoutView = layoutView;
- return true;
+ // set the display on the contentView
+ (contentView as UIBase).setDisplayStyleForLayout("flex");
+ // contentView.element.style["display"] = "flex";
+ contentView.element.style["flex-flow"] = "row";
+
+ var n:int = contentView.numElements;
+ if (n == 0) return false;
+
+ for(var i:int=0; i < n; i++) {
+ var child:UIBase = contentView.getElementAt(i) as UIBase;
+ if (!child)
+ {
+ continue;
+ }
+
+ if (grow >= 0) child.element.style["flex-grow"] = String(grow);
+ if (shrink >= 0) child.element.style["flex-shrink"] = String(shrink);
+ if (!isNaN(child.percentWidth))
+ child.element.style["flex-basis"] = child.percentWidth.toString() + "%";
+ child.dispatchEvent(new Event("layoutNeeded"));
}
+
+ return true;
}
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0bc728cf/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as
index f0853fa..abfe593 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as
@@ -153,7 +153,8 @@ package org.apache.flex.html.beads.layouts
actualChild = document[flexibleChild];
// set the display on the contentView
- contentView.element.style["display"] = "flex";
+ (contentView as UIBase).setDisplayStyleForLayout("flex");
+ // contentView.element.style["display"] = "flex";
contentView.element.style["flex-flow"] = "row";
var align:String = ValuesManager.valuesImpl.getValue(host, "alignItems");
if (align == "center")
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0bc728cf/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as
index c4d70e1..e7c1d58 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as
@@ -154,7 +154,8 @@ package org.apache.flex.html.beads.layouts
actualChild = document[flexibleChild];
// set the display on the contentView
- contentView.element.style["display"] = "flex";
+ (contentView as UIBase).setDisplayStyleForLayout("flex");
+ // contentView.element.style["display"] = "flex";
contentView.element.style["flex-flow"] = "column";
var align:String = ValuesManager.valuesImpl.getValue(host, "alignItems");
if (align == "center")
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0bc728cf/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 2126616..d0b1c23 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
@@ -102,173 +102,183 @@ package org.apache.flex.html.beads.layouts
* @playerversion AIR 2.6
* @productversion FlexJS 0.8
*/
+ COMPILE::SWF
override public function layout():Boolean
{
- COMPILE::SWF {
- var contentView:ILayoutView = layoutView;
-
- var n:Number = contentView.numElements;
- if (n == 0) return false;
-
- var maxWidth:Number = 0;
- var maxHeight:Number = 0;
- var growCount:Number = 0;
- var childData:Array = [];
- var hostWidthSizedToContent:Boolean = host.isWidthSizedToContent();
- var hostHeightSizedToContent:Boolean = host.isHeightSizedToContent();
- var hostWidth:Number = host.width;
- var hostHeight:Number = host.height;
-
- var ilc:ILayoutChild;
- var data:Object;
- var canAdjust:Boolean = false;
-
- var paddingMetrics:Rectangle = CSSContainerUtils.getPaddingMetrics(host);
- var borderMetrics:Rectangle = CSSContainerUtils.getBorderMetrics(host);
-
- // adjust the host's usable size by the metrics. If hostSizedToContent, then the
- // resulting adjusted value may be less than zero.
- var extra:Number = paddingMetrics.left + paddingMetrics.right + borderMetrics.left + borderMetrics.right;
- if (hostWidthSizedToContent)
- hostWidth += extra;
- else
- hostWidth -= extra;
- extra = paddingMetrics.top + paddingMetrics.bottom + borderMetrics.top + borderMetrics.bottom;
- if (hostHeightSizedToContent)
- hostHeight += extra;
- else
- hostHeight -= extra;
-
- var remainingHeight:Number = hostHeight;
+ var contentView:ILayoutView = layoutView;
+
+ var n:Number = contentView.numElements;
+ if (n == 0) return false;
+
+ var maxWidth:Number = 0;
+ var maxHeight:Number = 0;
+ var growCount:Number = 0;
+ var childData:Array = [];
+ var hostWidthSizedToContent:Boolean = host.isWidthSizedToContent();
+ var hostHeightSizedToContent:Boolean = host.isHeightSizedToContent();
+ var hostWidth:Number = host.width;
+ var hostHeight:Number = host.height;
+
+ var ilc:ILayoutChild;
+ var data:Object;
+ var canAdjust:Boolean = false;
+
+ var paddingMetrics:Rectangle = CSSContainerUtils.getPaddingMetrics(host);
+ var borderMetrics:Rectangle = CSSContainerUtils.getBorderMetrics(host);
+
+ // adjust the host's usable size by the metrics. If hostSizedToContent, then the
+ // resulting adjusted value may be less than zero.
+ var extra:Number = paddingMetrics.left + paddingMetrics.right + borderMetrics.left + borderMetrics.right;
+ if (hostWidthSizedToContent)
+ hostWidth += extra;
+ else
+ hostWidth -= extra;
+ extra = paddingMetrics.top + paddingMetrics.bottom + borderMetrics.top + borderMetrics.bottom;
+ if (hostHeightSizedToContent)
+ hostHeight += extra;
+ else
+ hostHeight -= extra;
+
+ var remainingHeight:Number = hostHeight;
+
+ //trace("VerticalFlexLayout for "+UIBase(host).id+" with remainingHeight: "+remainingHeight);
+
+ // First pass determines the data about the child.
+ for(var i:int=0; i < n; i++)
+ {
+ var child:IUIBase = contentView.getElementAt(i) as IUIBase;
+ if (child == null || !child.visible) {
+ childData.push({width:0, height:0, mt:0, ml:0, mr:0, mb:0, grow:0, canAdjust:false});
+ continue;
+ }
- //trace("VerticalFlexLayout for "+UIBase(host).id+" with remainingHeight: "+remainingHeight);
+ ilc = child as ILayoutChild;
+
+ var margins:Object = childMargins(child, hostWidth, hostHeight);
+
+ var flexGrow:Object = ValuesManager.valuesImpl.getValue(child, "flex-grow");
+ var growValue:Number = 0;
+ if (flexGrow != null) {
+ growValue = Number(flexGrow);
+ if (!isNaN(growValue) && growValue > 0) growCount++;
+ else growValue = 0;
+ }
- // First pass determines the data about the child.
- for(var i:int=0; i < n; i++)
- {
- var child:IUIBase = contentView.getElementAt(i) as IUIBase;
- if (child == null || !child.visible) {
- childData.push({width:0, height:0, mt:0, ml:0, mr:0, mb:0, grow:0, canAdjust:false});
- continue;
+ var useWidth:Number = -1;
+ if (ilc) {
+ if (!isNaN(ilc.percentWidth)) useWidth = hostWidth * (ilc.percentWidth/100.0);
+ else if (!isNaN(ilc.explicitWidth)) useWidth = ilc.explicitWidth;
+ else if (!hostWidthSizedToContent) {
+ useWidth = hostWidth;
}
+ }
- ilc = child as ILayoutChild;
-
- var margins:Object = childMargins(child, hostWidth, hostHeight);
-
- var flexGrow:Object = ValuesManager.valuesImpl.getValue(child, "flex-grow");
- var growValue:Number = 0;
- if (flexGrow != null) {
- growValue = Number(flexGrow);
- if (!isNaN(growValue) && growValue > 0) growCount++;
- else growValue = 0;
- }
+ var useHeight:Number = -1;
+ if (ilc) {
+ if (!isNaN(ilc.explicitHeight)) useHeight = ilc.explicitHeight;
+ else if (!isNaN(ilc.percentHeight)) useHeight = hostHeight * (ilc.percentHeight/100.0);
+ else if (ilc.height > 0) useHeight = ilc.height;
+ }
+ if (growValue == 0 && useHeight > 0) remainingHeight -= useHeight + margins.top + margins.bottom;
+ else remainingHeight -= margins.top + margins.bottom;
- var useWidth:Number = -1;
- if (ilc) {
- if (!isNaN(ilc.percentWidth)) useWidth = hostWidth * (ilc.percentWidth/100.0);
- else if (!isNaN(ilc.explicitWidth)) useWidth = ilc.explicitWidth;
- else if (!hostWidthSizedToContent) {
- useWidth = hostWidth;
- }
- }
+ if (maxWidth < useWidth) maxWidth = useWidth;
+ if (maxHeight < useHeight) maxHeight = useHeight;
- var useHeight:Number = -1;
- if (ilc) {
- if (!isNaN(ilc.explicitHeight)) useHeight = ilc.explicitHeight;
- else if (!isNaN(ilc.percentHeight)) useHeight = hostHeight * (ilc.percentHeight/100.0);
- else if (ilc.height > 0) useHeight = ilc.height;
- }
- if (growValue == 0 && useHeight > 0) remainingHeight -= useHeight + margins.top + margins.bottom;
- else remainingHeight -= margins.top + margins.bottom;
+ childData.push({width:useWidth, height:useHeight,
+ mt:margins.top, ml:margins.left, mr:margins.right, mb:margins.bottom,
+ grow:growValue, canAdjust:canAdjust});
+ }
- if (maxWidth < useWidth) maxWidth = useWidth;
- if (maxHeight < useHeight) maxHeight = useHeight;
+ var xpos:Number = borderMetrics.left + paddingMetrics.left;
+ var ypos:Number = borderMetrics.top + paddingMetrics.top;
- childData.push({width:useWidth, height:useHeight,
- mt:margins.top, ml:margins.left, mr:margins.right, mb:margins.bottom,
- grow:growValue, canAdjust:canAdjust});
- }
+ // Second pass sizes and positions the children based on the data gathered.
+ for(i=0; i < n; i++)
+ {
+ child = contentView.getElementAt(i) as IUIBase;
+ data = childData[i];
- var xpos:Number = borderMetrics.left + paddingMetrics.left;
- var ypos:Number = borderMetrics.top + paddingMetrics.top;
+ useWidth = (data.width < 0 ? hostWidth : data.width);
- // Second pass sizes and positions the children based on the data gathered.
- for(i=0; i < n; i++)
- {
- child = contentView.getElementAt(i) as IUIBase;
- data = childData[i];
-
- useWidth = (data.width < 0 ? hostWidth : data.width);
-
- var setHeight:Boolean = true;
- if (data.height != 0 && !hostHeightSizedToContent) {
- if (data.grow > 0 && growCount > 0) {
- useHeight = remainingHeight / growCount;
- setHeight = false;
- } else {
- useHeight = data.height;
- }
+ var setHeight:Boolean = true;
+ if (data.height != 0 && !hostHeightSizedToContent) {
+ if (data.grow > 0 && growCount > 0) {
+ useHeight = remainingHeight / growCount;
+ setHeight = false;
} else {
- useHeight = child.height;
+ useHeight = data.height;
}
+ } else {
+ useHeight = child.height;
+ }
- ilc = child as ILayoutChild;
- if (ilc) {
- ilc.setX(xpos + data.ml);
- ilc.setY(ypos + data.mt);
- if (data.width > 0) {
- //ilc.width = useWidth;
- ilc.setWidth(useWidth);
- }
- if (useHeight > 0) {
- if (setHeight) ilc.setHeight(useHeight);
- else ilc.height = useHeight;
- }
- } else {
- child.x = xpos + data.ml;
- child.y = ypos + data.mt;
- child.width = useWidth;
- if (useHeight > 0) {
- child.height = useHeight;
- }
+ ilc = child as ILayoutChild;
+ if (ilc) {
+ ilc.setX(xpos + data.ml);
+ ilc.setY(ypos + data.mt);
+ if (data.width > 0) {
+ //ilc.width = useWidth;
+ ilc.setWidth(useWidth);
+ }
+ if (useHeight > 0) {
+ if (setHeight) ilc.setHeight(useHeight);
+ else ilc.height = useHeight;
+ }
+ } else {
+ child.x = xpos + data.ml;
+ child.y = ypos + data.mt;
+ child.width = useWidth;
+ if (useHeight > 0) {
+ child.height = useHeight;
}
-
- ypos += useHeight + data.mt + data.mb;
-
- //trace("VerticalFlexLayout: setting child "+i+" to "+child.width+" x "+child.height+" at "+child.x+", "+child.y);
}
- //trace("VerticalFlexLayout: complete");
+ ypos += useHeight + data.mt + data.mb;
- return true;
+ //trace("VerticalFlexLayout: setting child "+i+" to "+child.width+" x "+child.height+" at "+child.x+", "+child.y);
}
- COMPILE::JS {
- var contentView:ILayoutView = layoutView;
+ //trace("VerticalFlexLayout: complete");
- contentView.element.style["display"] = "flex";
- contentView.element.style["flex-flow"] = "column";
+ return true;
+ }
+ /**
+ *
+ * @flexjsignorecoercion org.apache.flex.core.ILayoutHost
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.8
+ */
+ COMPILE::JS
+ override public function layout():Boolean
+ {
+ var contentView:ILayoutView = layoutView;
- var n:int = contentView.numElements;
- if (n == 0) return false;
+ (contentView as UIBase).setDisplayStyleForLayout("flex");
+ // contentView.element.style["display"] = "flex";
+ contentView.element.style["flex-flow"] = "column";
- for(var i:int=0; i < n; i++) {
- var child:UIBase = contentView.getElementAt(i) as UIBase;
- if (!child)
- {
- continue;
- }
+ var n:int = contentView.numElements;
+ if (n == 0) return false;
- if (grow >= 0) child.element.style["flex-grow"] = String(grow);
- if (shrink >= 0) child.element.style["flex-shrink"] = String(shrink);
- if (!isNaN(child.percentHeight))
- child.element.style["flex-basis"] = child.percentHeight.toString() + "%";
- child.dispatchEvent(new Event("layoutNeeded"));
+ for(var i:int=0; i < n; i++) {
+ var child:UIBase = contentView.getElementAt(i) as UIBase;
+ if (!child)
+ {
+ continue;
}
- return true;
+ if (grow >= 0) child.element.style["flex-grow"] = String(grow);
+ if (shrink >= 0) child.element.style["flex-shrink"] = String(shrink);
+ if (!isNaN(child.percentHeight))
+ child.element.style["flex-basis"] = child.percentHeight.toString() + "%";
+ child.dispatchEvent(new Event("layoutNeeded"));
}
+
+ return true;
}
}
}
[10/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
Added SingleSelectionDropIndicatorBead and used it with the other
single-selection drag and drop beads. Updated comments throughout.
Posted by ha...@apache.org.
Added SingleSelectionDropIndicatorBead and used it with the other single-selection drag and drop beads. Updated comments throughout.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/96ee5429
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/96ee5429
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/96ee5429
Branch: refs/heads/feature/strand-work
Commit: 96ee5429f5e418658b0908689c692f2d47f128dc
Parents: 01bc1dd
Author: Peter Ent <pe...@apache.org>
Authored: Thu Jul 27 11:37:12 2017 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Thu Jul 27 11:37:12 2017 -0400
----------------------------------------------------------------------
.../DragDrop/src/main/flex/DragDropClasses.as | 1 +
.../html/beads/SingleSelectionDragImageBead.as | 22 ++--
.../html/beads/SingleSelectionDragSourceBead.as | 77 +++++++++---
.../beads/SingleSelectionDropIndicatorBead.as | 111 ++++++++++++++++
.../html/beads/SingleSelectionDropTargetBead.as | 125 ++++++++++++++++---
.../beads/controllers/DragMouseController.as | 24 ++--
.../beads/controllers/DropMouseController.as | 16 +--
.../src/main/resources/basic-manifest.xml | 1 +
8 files changed, 315 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/96ee5429/frameworks/projects/DragDrop/src/main/flex/DragDropClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/DragDrop/src/main/flex/DragDropClasses.as b/frameworks/projects/DragDrop/src/main/flex/DragDropClasses.as
index 440b540..f2fd9c1 100644
--- a/frameworks/projects/DragDrop/src/main/flex/DragDropClasses.as
+++ b/frameworks/projects/DragDrop/src/main/flex/DragDropClasses.as
@@ -32,6 +32,7 @@ internal class DragDropClasses
import org.apache.flex.html.beads.SingleSelectionDragImageBead; SingleSelectionDragImageBead;
import org.apache.flex.html.beads.SingleSelectionDragSourceBead; SingleSelectionDragSourceBead;
+ import org.apache.flex.html.beads.SingleSelectionDropIndicatorBead; SingleSelectionDropIndicatorBead;
import org.apache.flex.html.beads.SingleSelectionDropTargetBead; SingleSelectionDropTargetBead;
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/96ee5429/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/SingleSelectionDragImageBead.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/SingleSelectionDragImageBead.as b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/SingleSelectionDragImageBead.as
index 6fb10c9..d1ff17b 100644
--- a/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/SingleSelectionDragImageBead.as
+++ b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/SingleSelectionDragImageBead.as
@@ -50,15 +50,23 @@ package org.apache.flex.html.beads
*
* The createDragImage() function can be overridden and a different component returned.
*
- * @see org.apache.flex.html.beads.SingleSelectionDropTargetBead.
+ * @see org.apache.flex.html.beads.SingleSelectionDragSourceBead.
*
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion FlexJS 0.0
+ * @productversion FlexJS 0.8
*/
public class SingleSelectionDragImageBead extends EventDispatcher implements IBead
{
+ /**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.8
+ */
public function SingleSelectionDragImageBead()
{
super();
@@ -66,6 +74,9 @@ package org.apache.flex.html.beads
private var _strand:IStrand;
+ /**
+ * @private
+ */
public function set strand(value:IStrand):void
{
_strand = value;
@@ -73,11 +84,6 @@ package org.apache.flex.html.beads
IEventDispatcher(_strand).addEventListener(DragEvent.DRAG_START, handleDragStart);
}
- public function get strand():IStrand
- {
- return _strand;
- }
-
/**
* Creates an example/temporary component to be dragged and returns it.
*
@@ -87,7 +93,7 @@ package org.apache.flex.html.beads
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion FlexJS 0.0
+ * @productversion FlexJS 0.8
*/
protected function createDragImage(ir:DataItemRenderer):UIBase
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/96ee5429/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 5fd8e28..6ed7b62 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
@@ -39,6 +39,7 @@ package org.apache.flex.html.beads
import org.apache.flex.html.beads.controllers.DragMouseController;
import org.apache.flex.html.supportClasses.DataItemRenderer;
import org.apache.flex.utils.PointUtils;
+ import org.apache.flex.utils.UIUtils;
/**
@@ -55,10 +56,18 @@ package org.apache.flex.html.beads
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion FlexJS 0.0
+ * @productversion FlexJS 0.8
*/
public class SingleSelectionDragSourceBead extends EventDispatcher implements IBead, IDragInitiator
{
+ /**
+ * Constructor
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.8
+ */
public function SingleSelectionDragSourceBead()
{
super();
@@ -67,16 +76,16 @@ package org.apache.flex.html.beads
private var _strand:IStrand;
private var _dragController:DragMouseController;
- private var _itemRendererParent:IParent;
- public function get itemRendererParent():IParent
- {
- if (_itemRendererParent == null) {
- _itemRendererParent = _strand.getBeadByType(IItemRendererParent) as IParent;
- }
- return _itemRendererParent;
- }
-
private var _dragType:String = "move";
+
+ /**
+ * The type of drag and drop operation: move or copy.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.8
+ */
public function get dragType():String
{
return _dragType;
@@ -86,6 +95,9 @@ package org.apache.flex.html.beads
_dragType = value;
}
+ /**
+ * @private
+ */
public function set strand(value:IStrand):void
{
_strand = value;
@@ -94,15 +106,15 @@ package org.apache.flex.html.beads
_strand.addBead(_dragController);
IEventDispatcher(_strand).addEventListener(DragEvent.DRAG_START, handleDragStart);
- }
-
- public function get strand():IStrand
- {
- return _strand;
+ IEventDispatcher(_strand).addEventListener(DragEvent.DRAG_MOVE, handleDragMove);
+ IEventDispatcher(_strand).addEventListener(DragEvent.DRAG_END, handleDragEnd);
}
private var indexOfDragSource:int = -1;
+ /**
+ * @private
+ */
private function handleDragStart(event:DragEvent):void
{
trace("SingleSelectionDragSourceBead received the DragStart");
@@ -118,15 +130,34 @@ package org.apache.flex.html.beads
var ir:DataItemRenderer = startHere as DataItemRenderer;
var p:UIBase = (ir as UIBase).parent as UIBase;
- indexOfDragSource = p.getElementIndex(ir);
-
- trace("SingleSelectionDragSourceBead index of dragged object: "+indexOfDragSource);
+ indexOfDragSource = p.getElementIndex(ir);
}
-
+ }
+
+ /**
+ * @private
+ */
+ protected function handleDragMove(event:DragEvent):void
+ {
+ }
+
+ /**
+ * @private
+ */
+ protected function handleDragEnd(event:DragEvent):void
+ {
}
/* IDragInitiator */
+ /**
+ * Handles pre-drop actions.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.8
+ */
public function acceptingDrop(dropTarget:Object, type:String):void
{
trace("SingleSelectionDragSourceBead accepting drop of type "+type);
@@ -155,6 +186,14 @@ package org.apache.flex.html.beads
}
}
+ /**
+ * Handles post-drop actions.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.8
+ */
public function acceptedDrop(dropTarget:Object, type:String):void
{
trace("SingleSelectionDragSourceBead accepted drop of type "+type);
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/96ee5429/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/SingleSelectionDropIndicatorBead.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/SingleSelectionDropIndicatorBead.as b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/SingleSelectionDropIndicatorBead.as
new file mode 100644
index 0000000..9dbf6bc
--- /dev/null
+++ b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/SingleSelectionDropIndicatorBead.as
@@ -0,0 +1,111 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.IBead;
+ import org.apache.flex.core.IDataProviderModel;
+ import org.apache.flex.core.IDocument;
+ import org.apache.flex.core.IDragInitiator;
+ import org.apache.flex.core.IItemRenderer;
+ import org.apache.flex.core.IItemRendererParent;
+ import org.apache.flex.core.IParent;
+ import org.apache.flex.core.IStrand;
+ import org.apache.flex.core.UIBase;
+ import org.apache.flex.events.DragEvent;
+ import org.apache.flex.events.Event;
+ import org.apache.flex.events.EventDispatcher;
+ import org.apache.flex.events.IEventDispatcher;
+ import org.apache.flex.geom.Point;
+ import org.apache.flex.geom.Rectangle;
+ import org.apache.flex.html.Group;
+ import org.apache.flex.html.Label;
+ import org.apache.flex.html.beads.controllers.DragMouseController;
+ import org.apache.flex.utils.PointUtils;
+ import org.apache.flex.svg.Rect;
+ import org.apache.flex.graphics.SolidColor;
+
+
+ /**
+ * The SingleSelectionDropIndicatorBead provides a graphic used to help the user
+ * place the item being dropped.
+ *
+ * @see org.apache.flex.html.beads.SingleSelectionDropTargetBead.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.8
+ */
+ public class SingleSelectionDropIndicatorBead extends EventDispatcher implements IBead
+ {
+ /**
+ * Constructor
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.8
+ */
+ public function SingleSelectionDropIndicatorBead()
+ {
+ super();
+ }
+
+ private var _strand:IStrand;
+
+ /**
+ * @private
+ */
+ public function set strand(value:IStrand):void
+ {
+ _strand = value;
+ }
+
+ private var _dropIndicator:Rect;
+
+ /**
+ * This function returns a UIBase component that is used to indicate where a drop action will occur or
+ * be accepted. This function is called once by the SingleSelectionDropTargetBead (or its derivatives)
+ * when the drop target is entered. After that only its (x,y) coordinates will be changed.
+ *
+ * @param ir Object The object that will be dragged. You can use this to help customize the drop indicator.
+ * @param width Number The preferred width of the drop indicator.
+ * @param height Number The preferred height of the drop indicator.
+ * @return UIBase A component that will show where the drop can be accepted.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.8
+ */
+ public function getDropIndicator(ir:Object, width:Number, height:Number):UIBase
+ {
+ if (_dropIndicator == null) {
+ _dropIndicator = new Rect();
+ _dropIndicator.fill = new SolidColor(0x000000);
+ }
+
+ _dropIndicator.width = width;
+ _dropIndicator.height = height;
+
+ return _dropIndicator;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/96ee5429/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/SingleSelectionDropTargetBead.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/SingleSelectionDropTargetBead.as b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/SingleSelectionDropTargetBead.as
index 186613b..fcf8ec4 100644
--- a/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/SingleSelectionDropTargetBead.as
+++ b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/SingleSelectionDropTargetBead.as
@@ -34,6 +34,9 @@ package org.apache.flex.html.beads
import org.apache.flex.geom.Point;
import org.apache.flex.geom.Rectangle;
import org.apache.flex.html.beads.controllers.DropMouseController;
+ import org.apache.flex.html.supportClasses.DataItemRenderer;
+ import org.apache.flex.utils.PointUtils;
+ import org.apache.flex.utils.UIUtils;
/**
@@ -41,15 +44,23 @@ package org.apache.flex.html.beads
* components. This bead can be used with SingleSelectionDragSourceBead to enable the re-arrangement
* of rows within the same list.
*
- * @see org.apache.flex.html.beads.SingleSelectionDropTargetBead
+ * @see org.apache.flex.html.beads.SingleSelectionDropIndicatorBead
*
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion FlexJS 0.0
+ * @productversion FlexJS 0.8
*/
public class SingleSelectionDropTargetBead extends EventDispatcher implements IBead
{
+ /**
+ * Constructor
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.8
+ */
public function SingleSelectionDropTargetBead()
{
super();
@@ -57,16 +68,27 @@ package org.apache.flex.html.beads
private var _strand:IStrand;
private var _dropController:DropMouseController;
+ private var _dropIndicator:UIBase;
+ private var lastItemVisited:Object;
+ private var indicatorVisible:Boolean = false;
- private var _itemRendererParent:IParent;
- public function get itemRendererParent():IParent
+ /**
+ * @private
+ */
+ protected function getDropIndicator(ir:Object, width:Number, height:Number):UIBase
{
- if (_itemRendererParent == null) {
- _itemRendererParent = _strand.getBeadByType(IItemRendererParent) as IParent;
+ if (_dropIndicator == null) {
+ var bead:SingleSelectionDropIndicatorBead = _strand.getBeadByType(SingleSelectionDropIndicatorBead) as SingleSelectionDropIndicatorBead;
+ if (bead == null) return null;
+
+ _dropIndicator = bead.getDropIndicator(ir, width, height);
}
- return _itemRendererParent;
+ return _dropIndicator;
}
+ /**
+ * @private
+ */
public function set strand(value:IStrand):void
{
_strand = value;
@@ -80,31 +102,104 @@ package org.apache.flex.html.beads
IEventDispatcher(_dropController).addEventListener(DragEvent.DRAG_DROP, handleDragDrop);
}
- public function get strand():IStrand
- {
- return _strand;
- }
-
+ /**
+ * @private
+ */
private function handleDragEnter(event:DragEvent):void
{
- trace("SingleSelectionDropTargetBead received DragEnter via: "+event.target.toString());
+ trace("SingleSelectionDropTargetBead received DragEnter via: "+event.relatedObject.toString());
_dropController.acceptDragDrop(event.target as IUIBase, DropType.COPY);
+
+ var startHere:Object = event.relatedObject;
+ while( !(startHere is DataItemRenderer) && startHere != null) {
+ startHere = startHere.parent;
+ }
+
+ if (startHere is DataItemRenderer) {
+ var ir:DataItemRenderer = startHere as DataItemRenderer;
+ lastItemVisited = ir;
+ }
+
+ if (lastItemVisited && !indicatorVisible) {
+ var host:UIBase = UIUtils.findPopUpHost(_strand as UIBase) as UIBase;
+ var orgPoint:Point = new Point((lastItemVisited as UIBase).x, (lastItemVisited as UIBase).y);
+ var pt1:Point = PointUtils.localToGlobal(orgPoint, lastItemVisited.parent);
+ var pt2:Point = PointUtils.globalToLocal(pt1, host);
+ indicatorVisible = true;
+ var di:UIBase = getDropIndicator(lastItemVisited, (_strand as UIBase).width, 4);
+ di.x = pt2.x;
+ di.y = pt2.y;
+
+ trace("=== over item "+(lastItemVisited as DataItemRenderer).data.toString()+", at "+pt2.x+", "+pt2.y);
+
+ if (_dropIndicator) host.addElement(di);
+ }
+
}
+ /**
+ * @private
+ */
private function handleDragExit(event:DragEvent):void
{
- trace("SingleSelectionDropTargetBead received DragExit via: "+event.target.toString());
+ trace("SingleSelectionDropTargetBead received DragExit via: "+event.relatedObject.toString());
+
+ if (indicatorVisible) {
+ var host:UIBase = UIUtils.findPopUpHost(_strand as UIBase) as UIBase;
+ if (_dropIndicator) host.removeElement(_dropIndicator);
+ indicatorVisible = false;
+ }
}
+ /**
+ * @private
+ */
private function handleDragOver(event:DragEvent):void
{
- trace("SingleSelectionDropTargetBead received DragOver via: "+event.target.toString());
+ trace("SingleSelectionDropTargetBead received DragOver via: "+event.relatedObject.toString());
+
+ var startHere:Object = event.relatedObject;
+ while( !(startHere is DataItemRenderer) && startHere != null) {
+ startHere = startHere.parent;
+ }
+ if ((startHere is DataItemRenderer) && _dropIndicator != null) {
+ var host:UIBase = UIUtils.findPopUpHost(_strand as UIBase) as UIBase;
+ var orgPoint:Point = new Point((startHere as UIBase).x, (startHere as UIBase).y);
+ var pt1:Point = PointUtils.localToGlobal(orgPoint, startHere.parent);
+ var pt2:Point = PointUtils.globalToLocal(pt1, host);
+ _dropIndicator.x = pt2.x;
+ _dropIndicator.y = pt2.y - 1;
+
+ lastItemVisited = startHere;
+
+ trace("== over item "+(startHere as DataItemRenderer).data.toString()+", at "+pt2.x+", "+pt2.y);
+ } else if (lastItemVisited && _dropIndicator != null) {
+ trace("== beyond last item");
+
+ var p:UIBase = (lastItemVisited as UIBase).parent as UIBase;
+ if (p == null) return;
+
+ var n:int = p.numElements;
+ var lastItem:UIBase = p.getElementAt(n-1) as UIBase;
+
+ host = UIUtils.findPopUpHost(_strand as UIBase) as UIBase;
+ orgPoint = new Point(lastItem.x, lastItem.y);
+ pt1 = PointUtils.localToGlobal(orgPoint, p);
+ pt2 = PointUtils.globalToLocal(pt1, host);
+ _dropIndicator.x = pt2.x;
+ _dropIndicator.y = pt2.y + lastItem.height + 1;
+ }
}
+ /**
+ * @private
+ */
private function handleDragDrop(event:DragEvent):void
{
trace("SingleSelectionDropTargetBead received DragDrop via: "+event.relatedObject.toString());
+
+ handleDragExit(event);
var targetIndex:int = -1; // indicates drop beyond length of items
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/96ee5429/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 c7ac3ba..96965b3 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
@@ -44,7 +44,7 @@ package org.apache.flex.html.beads.controllers
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion FlexJS 0.0
+ * @productversion FlexJS 0.8
*/
[Event(name="dragStart", type="org.apache.flex.events.DragEvent")]
@@ -55,7 +55,7 @@ package org.apache.flex.html.beads.controllers
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion FlexJS 0.0
+ * @productversion FlexJS 0.8
*/
[Event(name="dragMove", type="org.apache.flex.events.DragEvent")]
@@ -65,7 +65,7 @@ package org.apache.flex.html.beads.controllers
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion FlexJS 0.0
+ * @productversion FlexJS 0.8
*/
[Event(name="dragEnd", type="org.apache.flex.events.DragEvent")]
@@ -79,7 +79,7 @@ package org.apache.flex.html.beads.controllers
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion FlexJS 0.0
+ * @productversion FlexJS 0.8
*/
public class DragMouseController extends EventDispatcher implements IBead
{
@@ -90,7 +90,7 @@ package org.apache.flex.html.beads.controllers
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion FlexJS 0.0
+ * @productversion FlexJS 0.8
*/
public static var dragging:Boolean = false;
@@ -100,7 +100,7 @@ package org.apache.flex.html.beads.controllers
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion FlexJS 0.0
+ * @productversion FlexJS 0.8
*/
public static var dragImage:IUIBase;
@@ -110,7 +110,7 @@ package org.apache.flex.html.beads.controllers
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion FlexJS 0.0
+ * @productversion FlexJS 0.8
*/
public static var dragImageOffsetX:Number = 0;
@@ -120,7 +120,7 @@ package org.apache.flex.html.beads.controllers
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion FlexJS 0.0
+ * @productversion FlexJS 0.8
*/
public static var dragImageOffsetY:Number = 0;
@@ -131,7 +131,7 @@ package org.apache.flex.html.beads.controllers
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion FlexJS 0.0
+ * @productversion FlexJS 0.8
*/
public static var defaultThreshold:int = 4;
@@ -141,7 +141,7 @@ package org.apache.flex.html.beads.controllers
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion FlexJS 0.0
+ * @productversion FlexJS 0.8
*/
public function DragMouseController()
{
@@ -155,7 +155,7 @@ package org.apache.flex.html.beads.controllers
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion FlexJS 0.0
+ * @productversion FlexJS 0.8
*/
public var threshold:int = 4;
@@ -167,7 +167,7 @@ package org.apache.flex.html.beads.controllers
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion FlexJS 0.0
+ * @productversion FlexJS 0.8
*/
public function set strand(value:IStrand):void
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/96ee5429/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 6f39239..f9eee77 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
@@ -40,7 +40,7 @@ package org.apache.flex.html.beads.controllers
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion FlexJS 0.0
+ * @productversion FlexJS 0.8
*/
[Event(name="dragEnter", type="org.apache.flex.events.DragEvent")]
@@ -51,7 +51,7 @@ package org.apache.flex.html.beads.controllers
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion FlexJS 0.0
+ * @productversion FlexJS 0.8
*/
[Event(name="dragOver", type="org.apache.flex.events.DragEvent")]
@@ -62,7 +62,7 @@ package org.apache.flex.html.beads.controllers
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion FlexJS 0.0
+ * @productversion FlexJS 0.8
*/
[Event(name="dragExit", type="org.apache.flex.events.DragEvent")]
@@ -72,7 +72,7 @@ package org.apache.flex.html.beads.controllers
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion FlexJS 0.0
+ * @productversion FlexJS 0.8
*/
[Event(name="dragDrop", type="org.apache.flex.events.DragEvent")]
@@ -85,7 +85,7 @@ package org.apache.flex.html.beads.controllers
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion FlexJS 0.0
+ * @productversion FlexJS 0.8
*/
public class DropMouseController extends EventDispatcher implements IBead
{
@@ -95,7 +95,7 @@ package org.apache.flex.html.beads.controllers
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion FlexJS 0.0
+ * @productversion FlexJS 0.8
*/
public function DropMouseController()
{
@@ -109,7 +109,7 @@ package org.apache.flex.html.beads.controllers
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion FlexJS 0.0
+ * @productversion FlexJS 0.8
*/
public function set strand(value:IStrand):void
{
@@ -144,7 +144,7 @@ package org.apache.flex.html.beads.controllers
*/
private function dragMoveHandler(event:DragEvent):void
{
- trace("DROP-MOUSE: dragMove" + event.target.toString());
+// trace("DROP-MOUSE: dragMove" + event.target.toString());
var dragEvent:DragEvent;
if (!inside)
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/96ee5429/frameworks/projects/DragDrop/src/main/resources/basic-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/DragDrop/src/main/resources/basic-manifest.xml b/frameworks/projects/DragDrop/src/main/resources/basic-manifest.xml
index 381c96f..ba07658 100644
--- a/frameworks/projects/DragDrop/src/main/resources/basic-manifest.xml
+++ b/frameworks/projects/DragDrop/src/main/resources/basic-manifest.xml
@@ -23,6 +23,7 @@
<component id="SingleSelectionDragImageBead" class="org.apache.flex.html.beads.SingleSelectionDragImageBead" />
<component id="SingleSelectionDragSourceBead" class="org.apache.flex.html.beads.SingleSelectionDragSourceBead" />
+ <component id="SingleSelectionDropIndicatorBead" class="org.apache.flex.html.beads.SingleSelectionDropIndicatorBead"/>
<component id="SingleSelectionDropTargetBead" class="org.apache.flex.html.beads.SingleSelectionDropTargetBead" />
<component id="DragMouseController" class="org.apache.flex.html.beads.controllers.DragMouseController" />
<component id="DropMouseController" class="org.apache.flex.html.beads.controllers.DropMouseController" />
[46/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
Upgrade should wait for other beads (e.g. IDataProviderItemRendererMapper) to
do their thing
Posted by ha...@apache.org.
Upgrade should wait for other beads (e.g. IDataProviderItemRendererMapper) to do their thing
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/89dc8f1b
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/89dc8f1b
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/89dc8f1b
Branch: refs/heads/feature/strand-work
Commit: 89dc8f1bb5973aa59c3712e749e468d9813d17dd
Parents: ab9384c
Author: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
Authored: Mon Aug 7 13:48:39 2017 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Mon Aug 7 14:34:53 2017 +0300
----------------------------------------------------------------------
.../src/main/flex/org/apache/flex/mdl/Menu.as | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/89dc8f1b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Menu.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Menu.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Menu.as
index bc69fc4..193addd 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Menu.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Menu.as
@@ -18,6 +18,7 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.mdl
{
+ import org.apache.flex.events.Event;
import org.apache.flex.html.List;
import org.apache.flex.mdl.beads.UpgradeElement;
@@ -58,9 +59,14 @@ package org.apache.flex.mdl
super();
className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user;
- addBead(new UpgradeElement());
+ addEventListener("beadsAdded", addUpgradeBead);
}
-
+
+ protected function addUpgradeBead(event:Event):void
+ {
+ addBead(new UpgradeElement());
+ }
+
/**
* Default position for Menu in MDL is bottom/left (or no class selector specified)
*
[26/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
Make MDLExample compiled to JS only since MDL library do not have swf part
Posted by ha...@apache.org.
Make MDLExample compiled to JS only since MDL library do not have swf part
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/4dab4229
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/4dab4229
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/4dab4229
Branch: refs/heads/feature/strand-work
Commit: 4dab42290f200e51e4c66a5b86ae3329a6363109
Parents: 49a47f9
Author: piotrz <pi...@apache.org>
Authored: Wed Aug 2 00:11:07 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Wed Aug 2 00:11:07 2017 +0200
----------------------------------------------------------------------
examples/flexjs/MDLExample/pom.xml | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4dab4229/examples/flexjs/MDLExample/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/pom.xml b/examples/flexjs/MDLExample/pom.xml
index fb88e3c..6d9db6e 100644
--- a/examples/flexjs/MDLExample/pom.xml
+++ b/examples/flexjs/MDLExample/pom.xml
@@ -53,6 +53,7 @@
<extensions>true</extensions>
<configuration>
<mainClass>App.mxml</mainClass>
+ <targets>JSFlex</targets>
<htmlTemplate>${basedir}/target/javascript/bin/js-debug/mdl-js-index-template.html</htmlTemplate>
<additionalCompilerOptions>-compiler.exclude-defaults-css-files=Basic-0.9.0-SNAPSHOT-js.swc:defaults.css</additionalCompilerOptions>
</configuration>
@@ -66,24 +67,8 @@
<artifactId>MaterialDesignLite</artifactId>
<version>0.9.0-SNAPSHOT</version>
<type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>MaterialDesignLite</artifactId>
- <version>0.9.0-SNAPSHOT</version>
- <type>swc</type>
<classifier>js</classifier>
</dependency>
-
- <!-- Needed for Flash compilation -->
- <dependency>
- <groupId>com.adobe.flash.framework</groupId>
- <artifactId>playerglobal</artifactId>
- <version>20.0</version>
- <type>swc</type>
- <scope>provided</scope>
- </dependency>
</dependencies>
</project>
[21/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
unnecessary import
Posted by ha...@apache.org.
unnecessary import
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/498d3113
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/498d3113
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/498d3113
Branch: refs/heads/feature/strand-work
Commit: 498d3113f6f90d2ec5914c11ab42db06f780d4ac
Parents: 637cb43
Author: Harbs <ha...@in-tools.com>
Authored: Wed Aug 2 00:25:09 2017 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Wed Aug 2 00:25:09 2017 +0300
----------------------------------------------------------------------
.../flex/org/apache/flex/textLayout/compose/TextLineRecycler.as | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/498d3113/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/compose/TextLineRecycler.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/compose/TextLineRecycler.as b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/compose/TextLineRecycler.as
index 1be1f57..51ebc2f 100644
--- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/compose/TextLineRecycler.as
+++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/compose/TextLineRecycler.as
@@ -21,7 +21,7 @@ package org.apache.flex.textLayout.compose
import org.apache.flex.text.engine.ITextLine;
import org.apache.flex.utils.ObjectMap;
- CONFIG::debug { import org.apache.flex.textLayout.debug.assert; }
+ // CONFIG::debug { import org.apache.flex.textLayout.debug.assert; }
[39/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
Fix MDLExample
Posted by ha...@apache.org.
Fix MDLExample
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/19fa436d
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/19fa436d
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/19fa436d
Branch: refs/heads/feature/strand-work
Commit: 19fa436d6d02e4aeb54cd60c8ec3c3302c4f9de7
Parents: 04045d3
Author: piotrz <pi...@apache.org>
Authored: Thu Aug 3 23:09:06 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Thu Aug 3 23:09:06 2017 +0200
----------------------------------------------------------------------
examples/flexjs/MDLExample/src/main/flex/Toggles.mxml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/19fa436d/examples/flexjs/MDLExample/src/main/flex/Toggles.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/Toggles.mxml b/examples/flexjs/MDLExample/src/main/flex/Toggles.mxml
index 7162c0a..74927e8 100644
--- a/examples/flexjs/MDLExample/src/main/flex/Toggles.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/Toggles.mxml
@@ -83,7 +83,7 @@ limitations under the License.
<js:Label text="Switch throw 'click' event {counter4} times"/>
- <mdl:Switch id="s2" text="Switch" click="onClickSwitch(event)"/>
+ <mdl:Switch id="s2" text="Switch" click="counter5++"/>
<js:Label text="Switch throw 'click' event {counter5} times"/>
[20/50] flex-asjs git commit: Added OverflowViewport for containers which require visible overflow. Changed default ScrollingViewport to the standard Viewport. We might want to make it simply “Viewport”. Right now, both ScrollingViewport and Viewport poi
Posted by ha...@apache.org.
Added OverflowViewport for containers which require visible overflow.
Changed default ScrollingViewport to the standard Viewport.
We might want to make it simply “Viewport”. Right now, both ScrollingViewport and Viewport point to the same thing.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/637cb437
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/637cb437
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/637cb437
Branch: refs/heads/feature/strand-work
Commit: 637cb4376541f2c2e946769e49259507364e0529
Parents: 8ce67e2
Author: Harbs <ha...@in-tools.com>
Authored: Wed Aug 2 00:24:44 2017 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Wed Aug 2 00:24:44 2017 +0300
----------------------------------------------------------------------
.../html/supportClasses/OverflowViewport.as | 129 +++++++++++++++++++
.../Basic/src/main/resources/basic-manifest.xml | 4 +-
2 files changed, 132 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/637cb437/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/OverflowViewport.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/OverflowViewport.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/OverflowViewport.as
new file mode 100644
index 0000000..c123e96
--- /dev/null
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/OverflowViewport.as
@@ -0,0 +1,129 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.flex.html.supportClasses
+{
+ import org.apache.flex.core.IBead;
+ import org.apache.flex.core.IContentView;
+ import org.apache.flex.core.IParentIUIBase;
+ import org.apache.flex.core.IStrand;
+ import org.apache.flex.core.IUIBase;
+ import org.apache.flex.core.IViewport;
+ import org.apache.flex.core.IViewportModel;
+ import org.apache.flex.core.UIBase;
+ import org.apache.flex.core.ValuesManager;
+ import org.apache.flex.events.Event;
+ import org.apache.flex.geom.Rectangle;
+ import org.apache.flex.geom.Size;
+ import org.apache.flex.html.beads.models.ScrollBarModel;
+ import org.apache.flex.utils.CSSContainerUtils;
+ COMPILE::SWF
+ {
+ import flash.geom.Rectangle;
+ }
+
+ /**
+ * A OverflowViewport is the area of a Container set aside for displaying
+ * content. If the content exceeds the visible area of the viewport
+ * it will show.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public class OverflowViewport implements IBead, IViewport
+ {
+ /**
+ * Constructor
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function OverflowViewport()
+ {
+ }
+
+ /**
+ * Get the actual parent of the container's content.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ * @flexjsignorecoercion org.apache.flex.core.IUIBase
+ */
+ public function get contentView():IUIBase
+ {
+ return _strand as IUIBase;
+ }
+
+ protected var _strand:IStrand;
+
+ /**
+ * @flexjsignorecoercion org.apache.flex.core.IUIBase
+ */
+ public function set strand(value:IStrand):void
+ {
+ _strand = value;
+ COMPILE::JS
+ {
+ (_strand as IUIBase).element.style.overflow = "visible";
+ }
+ }
+
+ /**
+ * @copy org.apache.flex.core.IViewport#setPosition()
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function setPosition(x:Number, y:Number):void
+ {
+ }
+
+ /**
+ * @copy org.apache.flex.core.IViewport#layoutViewportBeforeContentLayout()
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function layoutViewportBeforeContentLayout(width:Number, height:Number):void
+ {
+ }
+
+ /**
+ * @copy org.apache.flex.core.IViewport#layoutViewportAfterContentLayout()
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function layoutViewportAfterContentLayout(contentSize:Size):void
+ {
+ }
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/637cb437/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
index b391ee0..43206f7 100644
--- a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
+++ b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
@@ -120,7 +120,9 @@
<component id="ImageAndTextButtonView" class="org.apache.flex.html.beads.ImageAndTextButtonView" />
-->
<component id="ScrollingViewport" class="org.apache.flex.html.supportClasses.ScrollingViewport" />
- <component id="ClippingViewport" class="org.apache.flex.html.supportClasses.ClippingViewport" />
+ <component id="ClippingViewport" class="org.apache.flex.html.supportClasses.Viewport" />
+ <component id="Viewport" class="org.apache.flex.html.supportClasses.Viewport" />
+ <component id="OverflowViewport" class="org.apache.flex.html.supportClasses.OverflowViewport" />
<component id="ArraySelectionModel" class="org.apache.flex.html.beads.models.ArraySelectionModel" />
<component id="ArrayListSelectionModel" class="org.apache.flex.html.beads.models.ArrayListSelectionModel" />
[38/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
FLEX-35347 - Add property "value" to CheckBox which will store additional
information Update MDLExample with new feature
Posted by ha...@apache.org.
FLEX-35347 - Add property "value" to CheckBox which will store additional information
Update MDLExample with new feature
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/04045d39
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/04045d39
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/04045d39
Branch: refs/heads/feature/strand-work
Commit: 04045d39edefa636babe52760abadd45c95ce8af
Parents: 0bc728c
Author: piotrz <pi...@apache.org>
Authored: Thu Aug 3 22:58:34 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Thu Aug 3 22:58:34 2017 +0200
----------------------------------------------------------------------
.../MDLExample/src/main/flex/Toggles.mxml | 15 +++++------
.../main/flex/org/apache/flex/mdl/CheckBox.as | 26 ++++++++++++++++++--
2 files changed, 32 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/04045d39/examples/flexjs/MDLExample/src/main/flex/Toggles.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/Toggles.mxml b/examples/flexjs/MDLExample/src/main/flex/Toggles.mxml
index 784a7f6..7162c0a 100644
--- a/examples/flexjs/MDLExample/src/main/flex/Toggles.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/Toggles.mxml
@@ -24,8 +24,8 @@ limitations under the License.
<fx:Script>
<![CDATA[
- import org.apache.flex.events.MouseEvent;
- import org.apache.flex.mdl.materialIcons.MaterialIconType;
+ import org.apache.flex.events.MouseEvent;
+ import org.apache.flex.mdl.materialIcons.MaterialIconType;
[Bindable]
public var counter:int = 0;
@@ -47,6 +47,7 @@ limitations under the License.
[Bindable]
public var counter7:int = 0;
+
]]>
</fx:Script>
@@ -57,7 +58,7 @@ limitations under the License.
<mdl:Grid width="250">
<!-- Toggles :: https://getmdl.io/components/index.html#toggles-section -->
- <mdl:CheckBox id="mdlchk" text="Disabled at start" change="counter++"/>
+ <mdl:CheckBox id="mdlchk" text="Disabled at start" value="CheckBox Description" change="counter++"/>
<js:Label text="Chebox throw 'change' event {counter} times"/>
<mdl:CheckBox id="mdlchk1" text="Selected and with Ripple" selected="true" ripple="true"/>
@@ -82,13 +83,13 @@ limitations under the License.
<js:Label text="Switch throw 'click' event {counter4} times"/>
- <mdl:Switch id="s2" text="Switch" click="counter5++"/>
+ <mdl:Switch id="s2" text="Switch" click="onClickSwitch(event)"/>
<js:Label text="Switch throw 'click' event {counter5} times"/>
- <mdl:RadioButton groupName="g1" text="Ripple 1" ripple="true" change="counter6++"/>
- <mdl:RadioButton groupName="g1" text="Ripple 2" ripple="true" change="counter6++"/>
- <mdl:RadioButton groupName="g1" text="Ripple 3" ripple="true" change="counter6++"/>
+ <mdl:RadioButton groupName="g1" text="Ripple 1" value="Test 1" ripple="true" change="counter6++"/>
+ <mdl:RadioButton groupName="g1" text="Ripple 2" value="Test 2" ripple="true" change="counter6++"/>
+ <mdl:RadioButton groupName="g1" text="Ripple 3" value="Test 3" ripple="true" change="counter6++"/>
<js:Label text="RadioButtons throw 'change' event {counter6} times"/>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/04045d39/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as
index 698be69..aeafe00 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/CheckBox.as
@@ -18,7 +18,7 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.mdl
{
- import org.apache.flex.html.CheckBox;
+ import org.apache.flex.html.CheckBox;
import org.apache.flex.core.IToggleButtonModel;
import org.apache.flex.mdl.beads.UpgradeChildren;
import org.apache.flex.mdl.beads.UpgradeElement;
@@ -103,7 +103,7 @@ package org.apache.flex.mdl
element.flexjs_wrapper = this;
return element;
- };
+ }
protected var _ripple:Boolean = false;
@@ -165,6 +165,28 @@ package org.apache.flex.mdl
}
}
+ /**
+ * The value associated with the CheckBox.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.9
+ */
+ public function get value():String
+ {
+ return IToggleButtonModel(model).html;
+ }
+ public function set value(newValue:String):void
+ {
+ IToggleButtonModel(model).html = newValue;
+
+ COMPILE::JS
+ {
+ input.value = newValue;
+ }
+ }
+
COMPILE::JS
protected var textNode:Text;
[45/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs
into develop
Posted by ha...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/dee26275
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/dee26275
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/dee26275
Branch: refs/heads/feature/strand-work
Commit: dee26275eaea12a8a36a689906b6e0bac2a21897
Parents: 9dac303 8d6d7ca
Author: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
Authored: Mon Aug 7 14:27:56 2017 +0300
Committer: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
Committed: Mon Aug 7 14:27:56 2017 +0300
----------------------------------------------------------------------
.../flexjs/examples/tests/ExampleBuildTest.java | 3 +
examples/flexjs/FlexTeamPage_MDL/pom.xml | 32 +-
.../src/main/config/compile-app-config.xml | 2 +-
.../MDLExample/src/main/flex/Toggles.mxml | 13 +-
examples/flexjs/TeamPage/pom.xml | 15 -
examples/flexjs/pom.xml | 1 +
.../main/flex/org/apache/flex/css2/Cursors.as | 1 -
.../html/beads/layouts/HorizontalFlexLayout.as | 298 ++++++++++---------
.../layouts/OneFlexibleChildHorizontalLayout.as | 3 +-
.../layouts/OneFlexibleChildVerticalLayout.as | 3 +-
.../html/beads/layouts/VerticalFlexLayout.as | 288 +++++++++---------
.../html/beads/SingleSelectionDragSourceBead.as | 2 +
.../beads/controllers/DragMouseController.as | 1 -
.../beads/controllers/DropMouseController.as | 9 +-
.../main/flex/org/apache/flex/mdl/CheckBox.as | 26 +-
.../textLayout/compose/utils/AdornmentUtils.as | 4 +-
.../textLayout/elements/FlowGroupElement.as | 14 +-
.../flex/textLayout/elements/FlowLeafElement.as | 14 +-
.../apache/flex/text/engine/ElementFormat.as | 3 +-
.../org/apache/flex/text/engine/FontMetrics.as | 20 ++
.../org/apache/flex/text/engine/ITextLine.as | 4 +-
.../flex/org/apache/flex/text/html/TextLine.as | 11 +-
frameworks/projects/XML/src/main/flex/XML.as | 30 +-
23 files changed, 423 insertions(+), 374 deletions(-)
----------------------------------------------------------------------
[13/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
Changed to the normal flexible layouts
Posted by ha...@apache.org.
Changed to the normal flexible layouts
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/235ce586
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/235ce586
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/235ce586
Branch: refs/heads/feature/strand-work
Commit: 235ce5860bafe7de1a5aa2ed92ea10ee1aa07674
Parents: e32fc22
Author: Harbs <ha...@in-tools.com>
Authored: Mon Jul 31 10:56:25 2017 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Mon Jul 31 10:56:25 2017 +0300
----------------------------------------------------------------------
examples/flexjs/ASDoc/src/main/flex/ASDocMainView.mxml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/235ce586/examples/flexjs/ASDoc/src/main/flex/ASDocMainView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/ASDoc/src/main/flex/ASDocMainView.mxml b/examples/flexjs/ASDoc/src/main/flex/ASDocMainView.mxml
index d1b7158..4df58a6 100644
--- a/examples/flexjs/ASDoc/src/main/flex/ASDocMainView.mxml
+++ b/examples/flexjs/ASDoc/src/main/flex/ASDocMainView.mxml
@@ -59,19 +59,19 @@ limitations under the License.
</fx:Style>
<js:beads>
<js:ViewDataBinding />
- <js:OneFlexibleChildVerticalLayoutForOverflow flexibleChild="topContainer" />
+ <js:OneFlexibleChildVerticalLayout flexibleChild="topContainer" />
</js:beads>
<js:Group width="100%" id="titleGroup">
<js:beads>
- <js:OneFlexibleChildHorizontalLayoutForOverflow flexibleChild="title" />
+ <js:OneFlexibleChildHorizontalLayout flexibleChild="title" />
</js:beads>
- <js:Label text="FlexJS ActionScript Library Reference" id="title" height="30" style="fontSize:20"/>
+ <js:Label text="FlexJS ActionScript Library Reference" id="title" height="30" style="fontSize:20" width="0%"/>
<js:CheckBox id="topLevel" text="Top-Level" click="showTopLevel()" />
<js:CheckBox id="viewBeads" text="View Bead" click="showViewBeads()" />
</js:Group>
- <js:Group width="100%" className="topContainer" id="topContainer">
+ <js:Group width="100%" className="topContainer" id="topContainer" height="0%">
<js:beads>
- <js:OneFlexibleChildHorizontalLayoutForOverflow flexibleChild="rightSide" />
+ <js:OneFlexibleChildHorizontalLayout flexibleChild="rightSide" />
<js:LayoutChangeNotifier watchedProperty="{ASDocModel(applicationModel).packageList}" initialValue="null" />
</js:beads>
<js:Group width="300" height="100%" className="leftSide" id="leftSide">
@@ -81,7 +81,7 @@ limitations under the License.
<js:List id="packageList" dataProvider="{ASDocModel(applicationModel).packageList}" change="packageChangedHandler()" width="100%" height="50%"/>
<js:List id="classList" dataProvider="{ASDocModel(applicationModel).classList}" change="classChangedHandler()" width="100%" height="50%"/>
</js:Group>
- <js:Container className="rightSide" id="rightSide" height="100%">
+ <js:Container className="rightSide" id="rightSide" height="100%" width="0%">
<js:beads>
<js:VerticalLayout />
<js:ScrollingViewport />
[43/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
Condition not necessary
Posted by ha...@apache.org.
Condition not necessary
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8d6d7ca8
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8d6d7ca8
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8d6d7ca8
Branch: refs/heads/feature/strand-work
Commit: 8d6d7ca847aa66316050d6b104816ab5382a7288
Parents: bc50901
Author: Harbs <ha...@in-tools.com>
Authored: Mon Aug 7 00:13:33 2017 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Mon Aug 7 00:13:33 2017 +0300
----------------------------------------------------------------------
.../flex/textLayout/elements/FlowGroupElement.as | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8d6d7ca8/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowGroupElement.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowGroupElement.as b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowGroupElement.as
index 8664a29..e869c75 100644
--- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowGroupElement.as
+++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowGroupElement.as
@@ -968,19 +968,7 @@ package org.apache.flex.textLayout.elements
if (curFlowElement.parentRelativeStart != relativePosition)
{
- if (curFlowElement.className == "FlowGroupElement")
- {
- FlowGroupElement(curFlowElement).splitAtPosition(relativePosition - curFlowElement.parentRelativeStart);
- }
- else
- {
- // I would imagine that it has to be a span. That's the only non-FlowGroupElement
- // type that can take up more than a textLength of 1.
- CONFIG::debug
- {
- assert(curFlowElement.className == "SpanElement", "SpanElements are the only leaf elements that can currently have > 1 textLength"); }
- ISpanElement(curFlowElement).splitAtPosition(relativePosition - curFlowElement.parentRelativeStart);
- }
+ curFlowElement.splitAtPosition(relativePosition - curFlowElement.parentRelativeStart);
// increase by one. It's the new element that we want to move over.
curElementIdx++;
}
[06/50] flex-asjs git commit: I’m not positive, but without this, there is likely going to be problems with variable renaming in minified code.
Posted by ha...@apache.org.
I’m not positive, but without this, there is likely going to be problems with variable renaming in minified code.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/c1661203
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/c1661203
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/c1661203
Branch: refs/heads/feature/strand-work
Commit: c16612031792e5c8ace964bcabaf131c89ddfd9a
Parents: 60f223a
Author: Harbs <ha...@in-tools.com>
Authored: Wed Jul 26 14:58:15 2017 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Wed Jul 26 14:58:15 2017 +0300
----------------------------------------------------------------------
.../src/main/flex/org/apache/flex/events/KeyboardEvent.as | 10 ++++++++--
.../src/main/flex/org/apache/flex/events/MouseEvent.as | 8 +++++++-
2 files changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1661203/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as
index dda7e0a..71b4dd1 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as
@@ -221,7 +221,13 @@ package org.apache.flex.events
COMPILE::JS
override public function preventDefault():void
{
- wrappedEvent ? wrappedEvent.preventDefault() : super.preventDefault();
+ if(wrappedEvent)
+ wrappedEvent.preventDefault();
+ else
+ {
+ super.preventDefault();
+ _defaultPrevented = true;
+ }
}
COMPILE::JS
@@ -245,7 +251,7 @@ package org.apache.flex.events
{
_defaultPrevented = value;
}
-
+
/**
* Create a copy/clone of the KeyboardEvent object.
*
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c1661203/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as
index 1b6fe7e..14a3af7 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as
@@ -449,7 +449,13 @@ package org.apache.flex.events
*/
override public function preventDefault():void
{
- wrappedEvent ? wrappedEvent.preventDefault() : super.preventDefault();
+ if(wrappedEvent)
+ wrappedEvent.preventDefault();
+ else
+ {
+ super.preventDefault();
+ _defaultPrevented = true;
+ }
}
private var _defaultPrevented:Boolean;
[24/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
FLEX-35344 - Fix by adding to Menu IBeadController
(ListSingleSelectionMouseController) which handle "itemClick" on each
renderer and emits "change" event
Posted by ha...@apache.org.
FLEX-35344 - Fix by adding to Menu IBeadController (ListSingleSelectionMouseController) which handle "itemClick" on each renderer and emits "change" event
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/53ded5a8
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/53ded5a8
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/53ded5a8
Branch: refs/heads/feature/strand-work
Commit: 53ded5a89017e2441bc05ca117cb29db3a4fe153
Parents: 88c62cb
Author: piotrz <pi...@apache.org>
Authored: Wed Aug 2 00:09:02 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Wed Aug 2 00:09:02 2017 +0200
----------------------------------------------------------------------
.../projects/MaterialDesignLite/src/main/resources/defaults.css | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/53ded5a8/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css b/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
index 95d3b03..096f442 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
+++ b/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
@@ -116,6 +116,7 @@ Menu
IBeadView: ClassReference("org.apache.flex.mdl.beads.views.ListView");
IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
IBeadLayout: ClassReference(null); /*"org.apache.flex.html.beads.layouts.VerticalLayout"*/
+ IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController");
IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.DataItemRendererFactoryForArrayData");
IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
IItemRenderer: ClassReference("org.apache.flex.mdl.itemRenderers.MenuItemRenderer");
[03/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
Merge branch 'develop' into feature/browser-event
Posted by ha...@apache.org.
Merge branch 'develop' into feature/browser-event
* develop:
Make sure selected item doesn't mess with mdl styling
Fixed selection of lines which are justified
Setting the default TLFFactory is now required. No dependency on StandardTLFFactory (and HTML Text) unless used.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/840ac09f
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/840ac09f
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/840ac09f
Branch: refs/heads/feature/strand-work
Commit: 840ac09f959ed9ec45124dc03490dcbbbe66f8fb
Parents: 8645a4f 8c2a6bc
Author: Harbs <ha...@in-tools.com>
Authored: Wed Jul 26 12:02:07 2017 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Wed Jul 26 12:02:07 2017 +0300
----------------------------------------------------------------------
.../flex/mdl/itemRenderers/MenuItemRenderer.as | 5 ++
.../conversion/BaseTextLayoutImporter.as | 6 +-
.../textLayout/conversion/TextLayoutImporter.as | 6 +-
.../flex/textLayout/edit/SelectionManager.as | 60 ++++++++++----------
.../flex/textLayout/factory/TLFFactory.as | 9 ++-
.../apache/flex/textLayout/utils/FactoryUtil.as | 14 -----
6 files changed, 48 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
[25/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
Add small adjustment to MDLExample Menus
Posted by ha...@apache.org.
Add small adjustment to MDLExample Menus
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/49a47f96
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/49a47f96
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/49a47f96
Branch: refs/heads/feature/strand-work
Commit: 49a47f96f4fbf5c5af1f60e31abcd235003c35b3
Parents: 53ded5a
Author: piotrz <pi...@apache.org>
Authored: Wed Aug 2 00:09:41 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Wed Aug 2 00:09:41 2017 +0200
----------------------------------------------------------------------
.../flexjs/MDLExample/src/main/flex/Menus.mxml | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/49a47f96/examples/flexjs/MDLExample/src/main/flex/Menus.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/Menus.mxml b/examples/flexjs/MDLExample/src/main/flex/Menus.mxml
index d7bc721..b6e4ee7 100644
--- a/examples/flexjs/MDLExample/src/main/flex/Menus.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/Menus.mxml
@@ -24,15 +24,13 @@ limitations under the License.
<fx:Script>
<![CDATA[
- import org.apache.flex.mdl.materialIcons.MaterialIconType;
- import org.apache.flex.events.Event;
- import org.apache.flex.html.SimpleAlert;
-
- protected function myMenu_changeHandler(event:org.apache.flex.events.Event):void
- {
- SimpleAlert.show("You selected: " + myMenu.selectedItem.label, topMostEventDispatcher);
- }
+ import org.apache.flex.mdl.materialIcons.MaterialIconType;
+ import org.apache.flex.html.SimpleAlert;
+ protected function onMyMenuChange(event:Event):void
+ {
+ SimpleAlert.show("You selected: " + myMenu.selectedItem.label, topMostEventDispatcher);
+ }
]]>
</fx:Script>
@@ -51,7 +49,7 @@ limitations under the License.
</mdl:materialIcon>
</mdl:Button>
- <mdl:Menu id="myMenu" dataMdlFor="menu_btn" ripple="true" bottom="true" left="false" change="myMenu_changeHandler"
+ <mdl:Menu id="myMenu" dataMdlFor="menu_btn" ripple="true" bottom="true" left="false" change="onMyMenuChange(event)"
labelField="label" className="customMenuItemRenderer">
<mdl:beads>
<js:ConstantBinding
@@ -61,4 +59,4 @@ limitations under the License.
</mdl:beads>
</mdl:Menu>
</mdl:Grid>
-</mdl:TabBarPanel>
+</mdl:TabBarPanel>
\ No newline at end of file
[44/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
Upgrade should wait for other beads (e.g. IDataProviderItemRendererMapper) to
do their thing
Posted by ha...@apache.org.
Upgrade should wait for other beads (e.g. IDataProviderItemRendererMapper) to do their thing
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/9dac303c
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/9dac303c
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/9dac303c
Branch: refs/heads/feature/strand-work
Commit: 9dac303cbf5c4bf7dd2a3f2f2a37e2d809fc281b
Parents: 253e73b
Author: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
Authored: Mon Aug 7 13:48:39 2017 +0300
Committer: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
Committed: Mon Aug 7 13:48:39 2017 +0300
----------------------------------------------------------------------
.../src/main/flex/org/apache/flex/mdl/Menu.as | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9dac303c/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Menu.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Menu.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Menu.as
index bc69fc4..193addd 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Menu.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Menu.as
@@ -18,6 +18,7 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.mdl
{
+ import org.apache.flex.events.Event;
import org.apache.flex.html.List;
import org.apache.flex.mdl.beads.UpgradeElement;
@@ -58,9 +59,14 @@ package org.apache.flex.mdl
super();
className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user;
- addBead(new UpgradeElement());
+ addEventListener("beadsAdded", addUpgradeBead);
}
-
+
+ protected function addUpgradeBead(event:Event):void
+ {
+ addBead(new UpgradeElement());
+ }
+
/**
* Default position for Menu in MDL is bottom/left (or no class selector specified)
*
[22/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - -
Fix failing Maven build of TLF module by adding CONFIG::debug and
CONFIG:release to defines - Surround assert function by curly brackets in TLF
debug package
Posted by ha...@apache.org.
- Fix failing Maven build of TLF module by adding CONFIG::debug and CONFIG:release to defines
- Surround assert function by curly brackets in TLF debug package
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b52122d9
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b52122d9
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b52122d9
Branch: refs/heads/feature/strand-work
Commit: b52122d95e925da051ad889e18681b830acbc802
Parents: 8ce67e2
Author: piotrz <pi...@apache.org>
Authored: Tue Aug 1 23:29:05 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Tue Aug 1 23:29:05 2017 +0200
----------------------------------------------------------------------
frameworks/projects/TLF/pom.xml | 10 +++++
.../org/apache/flex/textLayout/debug/assert.as | 43 ++++++++++----------
2 files changed, 32 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b52122d9/frameworks/projects/TLF/pom.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/TLF/pom.xml b/frameworks/projects/TLF/pom.xml
index 1b7aac0..a052743 100644
--- a/frameworks/projects/TLF/pom.xml
+++ b/frameworks/projects/TLF/pom.xml
@@ -63,6 +63,16 @@
</includeFiles>
<allowSubclassOverrides>true</allowSubclassOverrides>
<skipExtern>true</skipExtern>
+ <defines>
+ <define>
+ <name>CONFIG::debug</name>
+ <value>false</value>
+ </define>
+ <define>
+ <name>CONFIG::release</name>
+ <value>true</value>
+ </define>
+ </defines>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b52122d9/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/debug/assert.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/debug/assert.as b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/debug/assert.as
index 62ec778..09b6edf 100644
--- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/debug/assert.as
+++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/debug/assert.as
@@ -16,32 +16,33 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.textLayout.debug
+package org.apache.flex.textLayout.debug
{
-
-
-
-
/** @private
* Debug only function that prints a trace message if condition is false.
* @return count of errors reported this assert: 1 or 0.
* */
CONFIG::debug
- public function assert(condition:Boolean, warning:String):int
- {
- if (!condition)
- {
- trace("ERROR: " + warning);
- // throw if the bit is set
- if (Debugging.throwOnAssert)
- throw(new Error("TextLayoutAssert: " + warning));
- return 1;
- }
- return 0;
- }
+ {
+ public function assert(condition:Boolean, warning:String):int
+ {
+ if (!condition)
+ {
+ trace("ERROR: " + warning);
+ // throw if the bit is set
+ if (Debugging.throwOnAssert)
+ throw(new Error("TextLayoutAssert: " + warning));
+ return 1;
+ }
+ return 0;
+ }
+ }
+
/** @private */
- CONFIG::release
- public function assert(condition:Boolean, warning:String):void
- {
- }
+ CONFIG::release
+ {
+ public function assert(condition:Boolean, warning:String):void
+ {
+ }
+ }
} // end package
[32/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
Strikethru needs this too.
Posted by ha...@apache.org.
Strikethru needs this 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/66ac90c1
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/66ac90c1
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/66ac90c1
Branch: refs/heads/feature/strand-work
Commit: 66ac90c159842604366ed396d9f6e4dffe4e65d8
Parents: de15fe6
Author: Harbs <ha...@in-tools.com>
Authored: Thu Aug 3 00:52:27 2017 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Thu Aug 3 00:52:27 2017 +0300
----------------------------------------------------------------------
.../org/apache/flex/textLayout/compose/utils/AdornmentUtils.as | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/66ac90c1/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/compose/utils/AdornmentUtils.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/compose/utils/AdornmentUtils.as b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/compose/utils/AdornmentUtils.as
index 9fa970e..664a82f 100644
--- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/compose/utils/AdornmentUtils.as
+++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/compose/utils/AdornmentUtils.as
@@ -222,7 +222,9 @@ package org.apache.flex.textLayout.compose.utils
var stOffset:Number = calculateStrikeThrough(element,tLine, blockProgression, metrics);
var ulOffset:Number = calculateUnderlineOffset(element, stOffset, blockProgression, metrics, tLine);
- ulOffset += tLine.getAdornmentOffsetBase();
+ var offset:Number = tLine.getAdornmentOffsetBase();
+ ulOffset += offset;
+ stOffset += offset;
}
if (blockProgression != BlockProgression.RL)
[31/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
Added special cursor for drag and drop operation.
Posted by ha...@apache.org.
Added special cursor for drag and drop operation.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/de15fe6b
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/de15fe6b
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/de15fe6b
Branch: refs/heads/feature/strand-work
Commit: de15fe6b031e47378d768524dcb059f1b146bccb
Parents: e6dc3e1
Author: Peter Ent <pe...@apache.org>
Authored: Wed Aug 2 11:08:36 2017 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Wed Aug 2 11:08:36 2017 -0400
----------------------------------------------------------------------
.../apache/flex/html/beads/SingleSelectionDragSourceBead.as | 2 ++
.../flex/html/beads/controllers/DragMouseController.as | 1 -
.../flex/html/beads/controllers/DropMouseController.as | 9 ++++++++-
3 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/de15fe6b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/SingleSelectionDragSourceBead.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/SingleSelectionDragSourceBead.as b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/SingleSelectionDragSourceBead.as
index 6ed7b62..aaab245 100644
--- a/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/SingleSelectionDragSourceBead.as
+++ b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/SingleSelectionDragSourceBead.as
@@ -120,6 +120,8 @@ package org.apache.flex.html.beads
trace("SingleSelectionDragSourceBead received the DragStart");
DragEvent.dragInitiator = this;
+ DragMouseController.dragImageOffsetX = -5;
+ DragMouseController.dragImageOffsetY = -5;
var startHere:Object = event.target;
while( !(startHere is DataItemRenderer) && startHere != null) {
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/de15fe6b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/controllers/DragMouseController.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/controllers/DragMouseController.as b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/controllers/DragMouseController.as
index 96965b3..fc6b07a 100644
--- a/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/controllers/DragMouseController.as
+++ b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/controllers/DragMouseController.as
@@ -236,7 +236,6 @@ package org.apache.flex.html.beads.controllers
COMPILE::JS {
dragImage.element.style['pointer-events'] = 'none';
dragImage.element.style['position'] = 'absolute';
- dragImage.element.style['cursor'] = 'pointer';
}
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/de15fe6b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/controllers/DropMouseController.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/controllers/DropMouseController.as b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/controllers/DropMouseController.as
index f9eee77..cc2c7ac 100644
--- a/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/controllers/DropMouseController.as
+++ b/frameworks/projects/DragDrop/src/main/flex/org/apache/flex/html/beads/controllers/DropMouseController.as
@@ -28,6 +28,7 @@ package org.apache.flex.html.beads.controllers
import org.apache.flex.events.MouseEvent;
import org.apache.flex.geom.Point;
import org.apache.flex.utils.PointUtils;
+ import org.apache.flex.css2.Cursors;
COMPILE::SWF {
import flash.display.InteractiveObject;
@@ -153,6 +154,8 @@ package org.apache.flex.html.beads.controllers
inside = true;
IUIBase(_strand).addEventListener(DragEvent.DRAG_END, dragEndHandler);
IUIBase(_strand).addEventListener(MouseEvent.ROLL_OUT, rollOutHandler);
+
+ Cursors.setCursor(_strand as IUIBase, Cursors.MOVE);
}
else
{
@@ -170,6 +173,8 @@ package org.apache.flex.html.beads.controllers
dragEvent = DragEvent.createDragEvent("dragExit", event);
dispatchEvent(dragEvent);
inside = false;
+
+ Cursors.setCursor(_strand as IUIBase, Cursors.AUTO);
}
IUIBase(_strand).removeEventListener(DragEvent.DRAG_END, dragEndHandler);
IUIBase(_strand).removeEventListener(MouseEvent.ROLL_OUT, rollOutHandler);
@@ -199,7 +204,9 @@ package org.apache.flex.html.beads.controllers
inside = false;
IUIBase(_strand).removeEventListener(DragEvent.DRAG_END, dragEndHandler);
- IUIBase(_strand).removeEventListener(MouseEvent.ROLL_OUT, rollOutHandler);
+ IUIBase(_strand).removeEventListener(MouseEvent.ROLL_OUT, rollOutHandler);
+
+ Cursors.setCursor(_strand as IUIBase, Cursors.AUTO);
}
}
[09/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
DragMouseController now dispatches events with itself as target;
useful in MXML files.
Posted by ha...@apache.org.
DragMouseController now dispatches events with itself as target; useful in MXML files.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/01bc1dd0
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/01bc1dd0
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/01bc1dd0
Branch: refs/heads/feature/strand-work
Commit: 01bc1dd0220b6244940efa05d632546370bf8f4d
Parents: 28bf352
Author: Peter Ent <pe...@apache.org>
Authored: Wed Jul 26 13:59:13 2017 -0400
Committer: Peter Ent <pe...@apache.org>
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 @@
<path-element>../../../../../libs/Core.swc</path-element>
<path-element>../../../../../libs/Basic.swc</path-element>
<path-element>../../../../../libs/Collections.swc</path-element>
+ <path-element>../../../../../libs/Graphics.swc</path-element>
</external-library-path>
<mxml>
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 != null)
{
@@ -234,6 +235,8 @@ 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';
}
}
}
@@ -246,6 +249,7 @@ package org.apache.flex.html.beads.controllers
dragImage.x = pt.x + dragImageOffsetX;
dragImage.y = pt.y + dragImageOffsetY;
DragEvent.dispatchDragEvent(dragEvent, event.target);
+ dispatchEvent(dragEvent);
}
}
@@ -265,6 +269,7 @@ package org.apache.flex.html.beads.controllers
dragEvent.clientY = newPoint.y;
DragEvent.dispatchDragEvent(dragEvent, event.target);
+ dispatchEvent(dragEvent);
event.preventDefault();
}
[04/50] flex-asjs git commit: alpha should work…
Posted by ha...@apache.org.
alpha should work…
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/9767786d
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/9767786d
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/9767786d
Branch: refs/heads/feature/strand-work
Commit: 9767786df78b37308e22a27dc8598c81f7cb1880
Parents: 840ac09
Author: Harbs <ha...@in-tools.com>
Authored: Wed Jul 26 12:55:11 2017 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Wed Jul 26 12:55:11 2017 +0300
----------------------------------------------------------------------
.../org/apache/flex/textLayout/container/ContainerController.as | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9767786d/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/container/ContainerController.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/container/ContainerController.as b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/container/ContainerController.as
index 1bf69cb..8bf5d07 100644
--- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/container/ContainerController.as
+++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/container/ContainerController.as
@@ -3009,7 +3009,7 @@ package org.apache.flex.textLayout.container
var curAlpha:Number = (interactionManager.activePosition == interactionManager.anchorPosition) ? selFormat.pointAlpha : selFormat.rangeAlpha;
if (selectionSprite.alpha != curAlpha)
- selectionSprite.alpha = 1;//curAlpha; testing remove this
+ selectionSprite.alpha = curAlpha;
if (selectionSprite.numElements == 0)
addSelectionContainer(selectionSprite);
[02/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs
into develop
Posted by ha...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8c2a6bc4
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8c2a6bc4
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8c2a6bc4
Branch: refs/heads/feature/strand-work
Commit: 8c2a6bc4153208bb0141c61f3ab53def0b157b7d
Parents: 1644608 c3b6d32
Author: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
Authored: Wed Jul 26 11:46:16 2017 +0300
Committer: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
Committed: Wed Jul 26 11:46:16 2017 +0300
----------------------------------------------------------------------
.../flex/textLayout/edit/SelectionManager.as | 60 ++++++++++----------
1 file changed, 31 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
[18/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
Added typename to Container
Posted by ha...@apache.org.
Added typename to Container
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/6bd14d2f
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/6bd14d2f
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/6bd14d2f
Branch: refs/heads/feature/strand-work
Commit: 6bd14d2f14da59b3278aa66719391eeb706bfec5
Parents: 562a130
Author: Harbs <ha...@in-tools.com>
Authored: Mon Jul 31 13:04:47 2017 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Mon Jul 31 13:04:47 2017 +0300
----------------------------------------------------------------------
.../Basic/src/main/flex/org/apache/flex/html/Container.as | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6bd14d2f/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/Container.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/Container.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/Container.as
index cbcf526..b21ec83 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/Container.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/Container.as
@@ -79,6 +79,10 @@ package org.apache.flex.html
*/
public function Container()
{
+ COMPILE::JS
+ {
+ typeNames = 'Container';
+ }
super();
}
[27/50] flex-asjs git commit: This doesn’t compile correctly. Reverting.
Posted by ha...@apache.org.
This doesn’t compile correctly. Reverting.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/253e73b5
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/253e73b5
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/253e73b5
Branch: refs/heads/feature/strand-work
Commit: 253e73b5c1e5d97a4d24c8505f5b0c2b45cf4b51
Parents: 4dab422
Author: Harbs <ha...@in-tools.com>
Authored: Wed Aug 2 11:45:05 2017 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Wed Aug 2 11:45:05 2017 +0300
----------------------------------------------------------------------
.../org/apache/flex/textLayout/debug/assert.as | 43 ++++++++++----------
1 file changed, 21 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/253e73b5/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/debug/assert.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/debug/assert.as b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/debug/assert.as
index 09b6edf..62ec778 100644
--- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/debug/assert.as
+++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/debug/assert.as
@@ -16,33 +16,32 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.textLayout.debug
+package org.apache.flex.textLayout.debug
{
+
+
+
+
/** @private
* Debug only function that prints a trace message if condition is false.
* @return count of errors reported this assert: 1 or 0.
* */
CONFIG::debug
- {
- public function assert(condition:Boolean, warning:String):int
- {
- if (!condition)
- {
- trace("ERROR: " + warning);
- // throw if the bit is set
- if (Debugging.throwOnAssert)
- throw(new Error("TextLayoutAssert: " + warning));
- return 1;
- }
- return 0;
- }
- }
-
+ public function assert(condition:Boolean, warning:String):int
+ {
+ if (!condition)
+ {
+ trace("ERROR: " + warning);
+ // throw if the bit is set
+ if (Debugging.throwOnAssert)
+ throw(new Error("TextLayoutAssert: " + warning));
+ return 1;
+ }
+ return 0;
+ }
/** @private */
- CONFIG::release
- {
- public function assert(condition:Boolean, warning:String):void
- {
- }
- }
+ CONFIG::release
+ public function assert(condition:Boolean, warning:String):void
+ {
+ }
} // end package
[07/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
Added delta, deltaX and deltaY for mouse wheel events Needs tests
Posted by ha...@apache.org.
Added delta, deltaX and deltaY for mouse wheel events
Needs tests
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/0d9fe0cc
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/0d9fe0cc
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/0d9fe0cc
Branch: refs/heads/feature/strand-work
Commit: 0d9fe0ccf79f14212d14f7ac59aa958894c45520
Parents: c166120
Author: Harbs <ha...@in-tools.com>
Authored: Wed Jul 26 19:24:03 2017 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Wed Jul 26 19:24:03 2017 +0300
----------------------------------------------------------------------
.../org/apache/flex/events/KeyboardEvent.as | 9 +-
.../flex/org/apache/flex/events/MouseEvent.as | 110 +++++++++++++++++--
2 files changed, 111 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0d9fe0cc/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as
index 71b4dd1..b3992d4 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as
@@ -43,10 +43,17 @@ package org.apache.flex.events
COMPILE::JS
private var wrappedEvent:Object;
+ /**
+ * @type {KeyboardEvent}
+ */
+ COMPILE::JS
+ private var nativeEvent:Object;
+
COMPILE::JS
public function wrapEvent(event:goog.events.BrowserEvent):void
{
wrappedEvent = event;
+ nativeEvent = event.getBrowserEvent();
}
public function KeyboardEvent(
@@ -194,7 +201,7 @@ package org.apache.flex.events
if(wrappedEvent)
{
wrappedEvent.stopPropagation();
- wrappedEvent.getBrowserEvent().stopImmediatePropagation();
+ nativeEvent.stopImmediatePropagation();
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0d9fe0cc/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as
index 14a3af7..d35ade7 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as
@@ -151,7 +151,44 @@ package org.apache.flex.events
{
return cloneEvent() as flash.events.Event;
}
-
+ /**
+ * The horizontal scroll delta for wheel events
+ * In Flash this always returns 0.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.9
+ */
+ public function get deltaX():int
+ {
+ return 0;
+ }
+ /**
+ * Horizontal wheel events are not supported in Flash
+ */
+ public function set deltaX(value:int):void
+ {
+
+ }
+
+ /**
+ * The vertical scroll delta for wheel events
+ * In Flash this just proxies to the delta
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.9
+ */
+ public function get deltaY():int
+ {
+ return delta
+ }
+ public function set deltaY(value:int):void
+ {
+ delta = value;
+ }
/**
* Create a copy/clone of the Event object.
*
@@ -261,10 +298,16 @@ package org.apache.flex.events
* @type {?goog.events.BrowserEvent}
*/
private var wrappedEvent:Object;
+
+ /**
+ * @type {MouseEvent}
+ */
+ private var nativeEvent:Object;
public function wrapEvent(event:goog.events.BrowserEvent):void
{
wrappedEvent = event;
+ nativeEvent = event.getBrowserEvent();
}
public var relatedObject:Object;
@@ -278,12 +321,11 @@ package org.apache.flex.events
return _buttons == 1;
if(!wrappedEvent)
return false;
- var ev:* = wrappedEvent.getBrowserEvent();
//Safari does not yet support buttons
- if ('buttons' in ev)
- _buttons = ev["buttons"];
+ if ('buttons' in nativeEvent)
+ _buttons = nativeEvent["buttons"];
else
- _buttons = ev["which"];
+ _buttons = nativeEvent["which"];
return _buttons == 1;
}
public function set buttonDown(value:Boolean):void
@@ -299,7 +341,61 @@ package org.apache.flex.events
{
_buttons = value;
}
- public var delta:int;
+
+ private var _delta:int;
+ /**
+ * The vertical scroll delta for wheel events
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.9
+ */
+ public function get delta():int
+ {
+ return nativeEvent ? nativeEvent.deltaY : _delta;
+ }
+ public function set delta(value:int):void
+ {
+ _delta = value;
+ }
+
+ private var _deltaX:int;
+ /**
+ * The horizontal scroll delta for wheel events
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.9
+ */
+ public function get deltaX():int
+ {
+ return nativeEvent ? nativeEvent.deltaX : _deltaX;
+ }
+ public function set deltaX(value:int):void
+ {
+ _deltaX = value;
+ }
+
+ private var _deltaY:int;
+ /**
+ * The vertical scroll delta for wheel events
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.9
+ */
+ public function get deltaY():int
+ {
+ return nativeEvent ? nativeEvent.deltaY : _deltaY;
+ }
+ public function set deltaY(value:int):void
+ {
+ _deltaY = value;
+ }
+
public var commandKey:Boolean;
public var controlKey:Boolean;
public var clickCount:int;
@@ -606,7 +702,7 @@ package org.apache.flex.events
if(wrappedEvent)
{
wrappedEvent.stopPropagation();
- wrappedEvent.getBrowserEvent().stopImmediatePropagation();
+ nativeEvent.stopImmediatePropagation();
}
}
[33/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
Fix config of MDLExample used for Ant build
Posted by ha...@apache.org.
Fix config of MDLExample used for Ant build
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/25ae9b10
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/25ae9b10
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/25ae9b10
Branch: refs/heads/feature/strand-work
Commit: 25ae9b101b8d5d56e48bcaf6cd1371168deefbfa
Parents: de15fe6
Author: piotrz <pi...@apache.org>
Authored: Thu Aug 3 00:47:24 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Thu Aug 3 00:47:24 2017 +0200
----------------------------------------------------------------------
examples/flexjs/MDLExample/src/main/config/compile-app-config.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/25ae9b10/examples/flexjs/MDLExample/src/main/config/compile-app-config.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/config/compile-app-config.xml b/examples/flexjs/MDLExample/src/main/config/compile-app-config.xml
index e306790..f612ccb 100644
--- a/examples/flexjs/MDLExample/src/main/config/compile-app-config.xml
+++ b/examples/flexjs/MDLExample/src/main/config/compile-app-config.xml
@@ -20,7 +20,7 @@
<compiler>
<targets><target>JSFlex</target></targets>
<exclude-defaults-css-files>
- <filename>HTML.swc:defaults.css</filename>
+ <filename>Basic.swc:defaults.css</filename>
</exclude-defaults-css-files>
</compiler>
<html-template>../resources/mdl-js-index-template.html</html-template>
[16/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
Made JS FlexibleLayouts consistent with swf ones.
Posted by ha...@apache.org.
Made JS FlexibleLayouts consistent with swf ones.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a631f066
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a631f066
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a631f066
Branch: refs/heads/feature/strand-work
Commit: a631f066eb8ae3bb9b4e4cf17060a44152156062
Parents: 0ad0cdd
Author: Harbs <ha...@in-tools.com>
Authored: Mon Jul 31 12:15:57 2017 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Mon Jul 31 12:15:57 2017 +0300
----------------------------------------------------------------------
.../flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as | 3 ++-
.../flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as | 3 ++-
frameworks/projects/Basic/src/main/resources/defaults.css | 1 +
3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a631f066/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as
index 2f81699..f0853fa 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as
@@ -155,7 +155,8 @@ package org.apache.flex.html.beads.layouts
// set the display on the contentView
contentView.element.style["display"] = "flex";
contentView.element.style["flex-flow"] = "row";
- if (!contentView.element.style["align-items"])
+ var align:String = ValuesManager.valuesImpl.getValue(host, "alignItems");
+ if (align == "center")
contentView.element.style["align-items"] = "center";
var n:int = contentView.numElements;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a631f066/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as
index 53617fb..c4d70e1 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as
@@ -156,7 +156,8 @@ package org.apache.flex.html.beads.layouts
// set the display on the contentView
contentView.element.style["display"] = "flex";
contentView.element.style["flex-flow"] = "column";
- if (!contentView.element.style["align-items"])
+ var align:String = ValuesManager.valuesImpl.getValue(host, "alignItems");
+ if (align == "center")
contentView.element.style["align-items"] = "center";
var n:int = contentView.numElements;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a631f066/frameworks/projects/Basic/src/main/resources/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/resources/defaults.css b/frameworks/projects/Basic/src/main/resources/defaults.css
index 91d7932..7f7973b 100644
--- a/frameworks/projects/Basic/src/main/resources/defaults.css
+++ b/frameworks/projects/Basic/src/main/resources/defaults.css
@@ -58,6 +58,7 @@ Application
{
padding: 0px;
margin: 0px;
+ align-content: flex-start;
}
Button
[36/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] - -
Switch FlexTeamPage_MDL example to compile JSFlex - Clean up native TeamPage
Posted by ha...@apache.org.
- Switch FlexTeamPage_MDL example to compile JSFlex
- Clean up native TeamPage
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ff5cf8e0
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ff5cf8e0
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ff5cf8e0
Branch: refs/heads/feature/strand-work
Commit: ff5cf8e07173813732d31dfba8ef49c5b6c132d3
Parents: d360e9c
Author: piotrz <pi...@apache.org>
Authored: Thu Aug 3 08:31:10 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Thu Aug 3 08:31:10 2017 +0200
----------------------------------------------------------------------
examples/flexjs/FlexTeamPage_MDL/pom.xml | 32 +--------------------------
examples/flexjs/TeamPage/pom.xml | 15 -------------
2 files changed, 1 insertion(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ff5cf8e0/examples/flexjs/FlexTeamPage_MDL/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexTeamPage_MDL/pom.xml b/examples/flexjs/FlexTeamPage_MDL/pom.xml
index 3c73743..a99e301 100644
--- a/examples/flexjs/FlexTeamPage_MDL/pom.xml
+++ b/examples/flexjs/FlexTeamPage_MDL/pom.xml
@@ -53,6 +53,7 @@
<extensions>true</extensions>
<configuration>
<mainClass>App.mxml</mainClass>
+ <targets>JSFlex</targets>
<htmlTemplate>${basedir}/target/javascript/bin/js-debug/mdl-js-index-template.html</htmlTemplate>
<additionalCompilerOptions>-compiler.exclude-defaults-css-files=Basic-0.9.0-SNAPSHOT-js.swc:defaults.css</additionalCompilerOptions>
</configuration>
@@ -66,13 +67,6 @@
<artifactId>MaterialDesignLite</artifactId>
<version>0.9.0-SNAPSHOT</version>
<type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>MaterialDesignLite</artifactId>
- <version>0.9.0-SNAPSHOT</version>
- <type>swc</type>
<classifier>js</classifier>
</dependency>
<dependency>
@@ -80,13 +74,6 @@
<artifactId>FontAwesome</artifactId>
<version>0.9.0-SNAPSHOT</version>
<type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>FontAwesome</artifactId>
- <version>0.9.0-SNAPSHOT</version>
- <type>swc</type>
<classifier>js</classifier>
</dependency>
<dependency>
@@ -94,24 +81,7 @@
<artifactId>Network</artifactId>
<version>0.9.0-SNAPSHOT</version>
<type>swc</type>
- <classifier>swf</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>Network</artifactId>
- <version>0.9.0-SNAPSHOT</version>
- <type>swc</type>
<classifier>js</classifier>
</dependency>
-
- <!-- Needed for Flash compilation -->
- <dependency>
- <groupId>com.adobe.flash.framework</groupId>
- <artifactId>playerglobal</artifactId>
- <version>20.0</version>
- <type>swc</type>
- <scope>provided</scope>
- </dependency>
</dependencies>
-
</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ff5cf8e0/examples/flexjs/TeamPage/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/TeamPage/pom.xml b/examples/flexjs/TeamPage/pom.xml
index a41460f..e461a13 100644
--- a/examples/flexjs/TeamPage/pom.xml
+++ b/examples/flexjs/TeamPage/pom.xml
@@ -72,21 +72,6 @@
<type>swc</type>
<scope>provided</scope>
</dependency>
-
- <!-- Needed for JavaScript compilation -->
- <!-- Already added in parent -->
- <!--dependency>
- <groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>HTML</artifactId>
- <version>0.8.0</version>
- <type>swc</type>
- </dependency>
- <dependency>
- <groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>Language</artifactId>
- <version>0.8.0</version>
- <type>swc</type>
- </dependency-->
</dependencies>
</project>
[05/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
Fixed preventDefault()
Posted by ha...@apache.org.
Fixed preventDefault()
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/60f223a2
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/60f223a2
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/60f223a2
Branch: refs/heads/feature/strand-work
Commit: 60f223a2d0e39b092cd392ab159aeca72174bedf
Parents: 9767786
Author: Harbs <ha...@in-tools.com>
Authored: Wed Jul 26 14:51:44 2017 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Wed Jul 26 14:51:44 2017 +0300
----------------------------------------------------------------------
.../org/apache/flex/events/KeyboardEvent.as | 35 ++++++++++++++++++++
.../flex/org/apache/flex/events/MouseEvent.as | 32 ++++++++++++++++++
2 files changed, 67 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/60f223a2/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as
index 29761f7..dda7e0a 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/KeyboardEvent.as
@@ -210,7 +210,42 @@ package org.apache.flex.events
if(wrappedEvent)
wrappedEvent.stopPropagation();
}
+ /**
+ * Whether the default action has been prevented.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ COMPILE::JS
+ override public function preventDefault():void
+ {
+ wrappedEvent ? wrappedEvent.preventDefault() : super.preventDefault();
+ }
+ COMPILE::JS
+ private var _defaultPrevented:Boolean;
+ /**
+ * Whether the default action has been prevented.
+ * @type {boolean}
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ COMPILE::JS
+ public function get defaultPrevented():Boolean
+ {
+ return wrappedEvent ? wrappedEvent.defaultPrevented : _defaultPrevented;
+ }
+ COMPILE::JS
+ public function set defaultPrevented(value:Boolean):void
+ {
+ _defaultPrevented = value;
+ }
+
/**
* Create a copy/clone of the KeyboardEvent object.
*
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/60f223a2/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as
index cb52298..1b6fe7e 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/events/MouseEvent.as
@@ -440,6 +440,38 @@ package org.apache.flex.events
}
/**
+ * Whether the default action has been prevented.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ override public function preventDefault():void
+ {
+ wrappedEvent ? wrappedEvent.preventDefault() : super.preventDefault();
+ }
+
+ private var _defaultPrevented:Boolean;
+ /**
+ * Whether the default action has been prevented.
+ * @type {boolean}
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function get defaultPrevented():Boolean
+ {
+ return wrappedEvent ? wrappedEvent.defaultPrevented : _defaultPrevented;
+ }
+ public function set defaultPrevented(value:Boolean):void
+ {
+ _defaultPrevented = value;
+ }
+
+ /**
* @private
*/
private static function installRollOverMixin():Boolean
[28/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
FontMetrics should not be scaled
Posted by ha...@apache.org.
FontMetrics should not be scaled
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/adf157ac
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/adf157ac
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/adf157ac
Branch: refs/heads/feature/strand-work
Commit: adf157ac4d462095153739706d485f55b9926bd2
Parents: 253e73b
Author: Harbs <ha...@in-tools.com>
Authored: Wed Aug 2 13:04:16 2017 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Wed Aug 2 13:04:16 2017 +0300
----------------------------------------------------------------------
.../src/main/flex/org/apache/flex/text/engine/ElementFormat.as | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/adf157ac/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ElementFormat.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ElementFormat.as b/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ElementFormat.as
index d5ab61c..b144b90 100644
--- a/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ElementFormat.as
+++ b/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ElementFormat.as
@@ -86,8 +86,7 @@ package org.apache.flex.text.engine
public function getFontMetrics():FontMetrics
{
assert(fontDescription != null,"fontDescription not assigned!");
- var metrics:FontMetrics = fontDescription.fontLoader.getFont(fontDescription.fontName,fontDescription.fontStyle).fontMetrics;
- return metrics.getScaledMetrics(fontSize);
+ return fontDescription.fontLoader.getFont(fontDescription.fontName,fontDescription.fontStyle).fontMetrics;
}
}
}
\ No newline at end of file
[15/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
Merge branch 'feature/browser-event' into develop
Posted by ha...@apache.org.
Merge branch 'feature/browser-event' into develop
* feature/browser-event:
Fixing SimpleDataProviderChangeNotifier which was broken after recent changes to DataProviderChangeNotifier
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/0ad0cdd5
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/0ad0cdd5
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/0ad0cdd5
Branch: refs/heads/feature/strand-work
Commit: 0ad0cdd577de3973c91878cac6fe336b4b7e0a51
Parents: 235ce58 fd2ba63
Author: Harbs <ha...@in-tools.com>
Authored: Mon Jul 31 11:45:18 2017 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Mon Jul 31 11:45:18 2017 +0300
----------------------------------------------------------------------
.../html/beads/DataProviderChangeNotifier.as | 26 ++++++++++++++------
.../beads/SimpleDataProviderChangeNotifier.as | 3 ++-
2 files changed, 20 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
[29/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
The Text Engine needs to specify base offset for adornments
Posted by ha...@apache.org.
The Text Engine needs to specify base offset for adornments
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/6066f252
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/6066f252
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/6066f252
Branch: refs/heads/feature/strand-work
Commit: 6066f2528ddcbbf4f2060c7e31125b68674cd910
Parents: adf157a
Author: Harbs <ha...@in-tools.com>
Authored: Wed Aug 2 17:31:44 2017 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Wed Aug 2 17:31:44 2017 +0300
----------------------------------------------------------------------
.../textLayout/compose/utils/AdornmentUtils.as | 2 +-
.../flex/textLayout/elements/FlowLeafElement.as | 14 +++++++++++++-
.../apache/flex/text/engine/ElementFormat.as | 2 +-
.../org/apache/flex/text/engine/FontMetrics.as | 20 ++++++++++++++++++++
.../org/apache/flex/text/engine/ITextLine.as | 3 ++-
.../flex/org/apache/flex/text/html/TextLine.as | 5 +++++
6 files changed, 42 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6066f252/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/compose/utils/AdornmentUtils.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/compose/utils/AdornmentUtils.as b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/compose/utils/AdornmentUtils.as
index abaa81e..9fa970e 100644
--- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/compose/utils/AdornmentUtils.as
+++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/compose/utils/AdornmentUtils.as
@@ -210,7 +210,6 @@ package org.apache.flex.textLayout.compose.utils
var metrics:FontMetrics = element.getComputedFontMetrics();
-
var backgroundOnly:Boolean = !(element.computedFormat.textDecoration == TextDecoration.UNDERLINE || element.computedFormat.lineThrough);
if (!backgroundOnly)
@@ -223,6 +222,7 @@ package org.apache.flex.textLayout.compose.utils
var stOffset:Number = calculateStrikeThrough(element,tLine, blockProgression, metrics);
var ulOffset:Number = calculateUnderlineOffset(element, stOffset, blockProgression, metrics, tLine);
+ ulOffset += tLine.getAdornmentOffsetBase();
}
if (blockProgression != BlockProgression.RL)
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6066f252/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowLeafElement.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowLeafElement.as b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowLeafElement.as
index cee6fac..8f78fa3 100644
--- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowLeafElement.as
+++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowLeafElement.as
@@ -329,7 +329,19 @@ package org.apache.flex.textLayout.elements
var tf:ITextFlow = getTextFlow();
if (tf && tf.flowComposer && tf.flowComposer.swfContext)
return tf.flowComposer.swfContext.callInContext(ef.getFontMetrics, ef, null, true);
- return ef.getFontMetrics();
+ COMPILE::SWF
+ {
+ return ef.getFontMetrics();
+ }
+ COMPILE::JS
+ {
+ var metrics:FontMetrics = ef.getFontMetrics();
+ metrics.underlineOffset *= ef.fontSize;
+ metrics.underlineThickness *= ef.fontSize;
+ metrics.strikethroughOffset *= ef.fontSize;
+ metrics.strikethroughThickness *= ef.fontSize;
+ return metrics;
+ }
}
/** @private */
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6066f252/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ElementFormat.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ElementFormat.as b/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ElementFormat.as
index b144b90..00a5c82 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,7 @@ 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;
+ return fontDescription.fontLoader.getFont(fontDescription.fontName,fontDescription.fontStyle).fontMetrics.clone();
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6066f252/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/FontMetrics.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/FontMetrics.as b/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/FontMetrics.as
index 5472c73..6cde245 100644
--- a/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/FontMetrics.as
+++ b/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/FontMetrics.as
@@ -87,5 +87,25 @@ package org.apache.flex.text.engine
{
return 1 / unitsPerEm * fontSize;
}
+ public function clone():FontMetrics
+ {
+ var metrics:FontMetrics = new FontMetrics();
+ if(emBox)
+ metrics.emBox = emBox.clone();
+ metrics.lineGap = lineGap;
+ metrics.strikethroughOffset = strikethroughOffset;
+ metrics.strikethroughThickness = strikethroughThickness;
+ metrics.subscriptOffset = subscriptOffset;
+ metrics.subscriptScale = subscriptScale;
+ metrics.superscriptOffset = superscriptOffset;
+ metrics.superscriptScale = superscriptScale;
+ metrics.underlineOffset = underlineOffset;
+ metrics.underlineThickness = underlineThickness;
+ metrics.ascender = ascender;
+ metrics.descender = descender;
+ metrics.xHeight = xHeight;
+ metrics.capsHeight = capsHeight;
+ return metrics;
+ }
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6066f252/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ITextLine.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ITextLine.as b/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ITextLine.as
index f451ee8..60b6082 100644
--- a/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ITextLine.as
+++ b/frameworks/projects/Text/src/main/flex/org/apache/flex/text/engine/ITextLine.as
@@ -69,7 +69,8 @@ package org.apache.flex.text.engine
function getAtomTextRotation(atomIndex:int):String;
function getAtomWordBoundaryOnLeft(atomIndex:int):Boolean;
function getBaselinePosition(baseline:String):Number;
-
+ function getAdornmentOffsetBase():Number;
+
[SWFOverride(returns="flash.geom.Rectangle",params="flash.display.DisplayObject",altparams="Object")]
function getBounds(ref:Object):Rectangle;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6066f252/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 5818a60..33d4b22 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
@@ -506,5 +506,10 @@ package org.apache.flex.text.html
_numberLine = value;
}
+ public function getAdornmentOffsetBase():Number
+ {
+ return 0;
+ }
+
}
}
\ No newline at end of file
[14/50] git commit: [flex-asjs] [refs/heads/feature/strand-work] -
Fixing SimpleDataProviderChangeNotifier which was broken after recent changes
to DataProviderChangeNotifier
Posted by ha...@apache.org.
Fixing SimpleDataProviderChangeNotifier which was broken after recent
changes to DataProviderChangeNotifier
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/fd2ba63a
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/fd2ba63a
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/fd2ba63a
Branch: refs/heads/feature/strand-work
Commit: fd2ba63a27aa7bc67ab0cd29094a9ed2c90ec6c2
Parents: e32fc22
Author: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
Authored: Mon Jul 31 11:06:16 2017 +0300
Committer: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
Committed: Mon Jul 31 11:06:16 2017 +0300
----------------------------------------------------------------------
.../html/beads/DataProviderChangeNotifier.as | 26 ++++++++++++++------
.../beads/SimpleDataProviderChangeNotifier.as | 3 ++-
2 files changed, 20 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd2ba63a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataProviderChangeNotifier.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataProviderChangeNotifier.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataProviderChangeNotifier.as
index 22155cb..9b2315f 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataProviderChangeNotifier.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/DataProviderChangeNotifier.as
@@ -54,16 +54,10 @@ package org.apache.flex.html.beads
{
if(object[propertyName] == dataProvider)
return;
- dataProvider.removeEventListener("itemAdded", handleDataProviderChanges);
- dataProvider.removeEventListener("itemRemoved", handleDataProviderChanges);
- dataProvider.removeEventListener("itemUpdated", handleDataProviderChanges);
- dataProvider.removeEventListener("collectionChanged", handleDataProviderChanges);
+ detachEventListeners();
}
dataProvider = object[propertyName] as ArrayList;
- dataProvider.addEventListener("itemAdded", handleDataProviderChanges);
- dataProvider.addEventListener("itemRemoved", handleDataProviderChanges);
- dataProvider.addEventListener("itemUpdated", handleDataProviderChanges);
- dataProvider.addEventListener("collectionChanged", handleDataProviderChanges);
+ attachEventListeners();
}
private function handleDataProviderChanges(event:Event):void
@@ -71,5 +65,21 @@ package org.apache.flex.html.beads
var selectionModel:ISelectionModel = _strand.getBeadByType(ISelectionModel) as ISelectionModel;
selectionModel.dispatchEvent(new Event("dataProviderChanged"));
}
+
+ protected function attachEventListeners():void
+ {
+ dataProvider.addEventListener("itemAdded", handleDataProviderChanges);
+ dataProvider.addEventListener("itemRemoved", handleDataProviderChanges);
+ dataProvider.addEventListener("itemUpdated", handleDataProviderChanges);
+ dataProvider.addEventListener("collectionChanged", handleDataProviderChanges);
+ }
+
+ protected function detachEventListeners():void
+ {
+ dataProvider.removeEventListener("itemAdded", handleDataProviderChanges);
+ dataProvider.removeEventListener("itemRemoved", handleDataProviderChanges);
+ dataProvider.removeEventListener("itemUpdated", handleDataProviderChanges);
+ dataProvider.removeEventListener("collectionChanged", handleDataProviderChanges);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd2ba63a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/SimpleDataProviderChangeNotifier.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/SimpleDataProviderChangeNotifier.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/SimpleDataProviderChangeNotifier.as
index 718f6bb..1d55c76 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/SimpleDataProviderChangeNotifier.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/SimpleDataProviderChangeNotifier.as
@@ -64,7 +64,8 @@ package org.apache.flex.html.beads
selectionModel.addEventListener("dataProviderChanged", setFirstDataProvider);
} else
{
- super.destinationChangedHandler(event);
+ detachEventListeners();
+ attachEventListeners();
}
}