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/04/19 05:22:28 UTC
git commit: [flex-asjs] [refs/heads/tlf] - Added EditManager Added
support for text nodes in XML.appendChild()
Repository: flex-asjs
Updated Branches:
refs/heads/tlf 65bdee587 -> 0b3b20a57
Added EditManager
Added support for text nodes in XML.appendChild()
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/0b3b20a5
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/0b3b20a5
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/0b3b20a5
Branch: refs/heads/tlf
Commit: 0b3b20a572a966d18507714e55efea34be260344
Parents: 65bdee5
Author: Harbs <ha...@in-tools.com>
Authored: Wed Apr 19 01:22:25 2017 -0400
Committer: Harbs <ha...@in-tools.com>
Committed: Wed Apr 19 01:22:25 2017 -0400
----------------------------------------------------------------------
.../TLFJS/src/main/config/compile-js-config.xml | 1 +
frameworks/projects/TLF/src/main/flex/TLFClasses.as | 1 +
.../apache/flex/textLayout/edit/SelectionManager.as | 2 +-
frameworks/projects/XML/src/main/flex/XML.as | 15 ++++++++++++++-
frameworks/projects/XML/src/main/flex/XMLList.as | 2 +-
5 files changed, 18 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0b3b20a5/frameworks/js/FlexJS/projects/TLFJS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/TLFJS/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/TLFJS/src/main/config/compile-js-config.xml
index c74e940..eea3f3a 100644
--- a/frameworks/js/FlexJS/projects/TLFJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/FlexJS/projects/TLFJS/src/main/config/compile-js-config.xml
@@ -62,6 +62,7 @@
<path-element>../../../../../libs/HTMLJS.swc</path-element>
<path-element>../../../../../libs/NetworkJS.swc</path-element>
<path-element>../../../../../libs/ReflectionJS.swc</path-element>
+ <path-element>../../../../../libs/XMLJS.swc</path-element>
<path-element>../../../../../libs/TextJS.swc</path-element>
</library-path>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0b3b20a5/frameworks/projects/TLF/src/main/flex/TLFClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/TLF/src/main/flex/TLFClasses.as b/frameworks/projects/TLF/src/main/flex/TLFClasses.as
index f67e79a..38fd177 100644
--- a/frameworks/projects/TLF/src/main/flex/TLFClasses.as
+++ b/frameworks/projects/TLF/src/main/flex/TLFClasses.as
@@ -59,6 +59,7 @@ package
import org.apache.flex.textLayout.edit.SelectionFormat; SelectionFormat;
import org.apache.flex.textLayout.edit.SelectionState; SelectionState;
import org.apache.flex.textLayout.edit.SelectionType; SelectionType;
+ import org.apache.flex.textLayout.edit.EditManager; EditManager;
import org.apache.flex.textLayout.elements.SubParagraphGroupElementBase; SubParagraphGroupElementBase;
import org.apache.flex.textLayout.elements.BreakElement; BreakElement;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0b3b20a5/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/edit/SelectionManager.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/edit/SelectionManager.as b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/edit/SelectionManager.as
index 72bf132..c13373f 100644
--- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/edit/SelectionManager.as
+++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/edit/SelectionManager.as
@@ -2215,7 +2215,7 @@ package org.apache.flex.textLayout.edit
{
var leftEdge:int = 5;
var topEdge:int = 5;
- var globalPoint:Point = new Point(event.stageX, event.stageY);
+ var globalPoint:Point = new Point(event.screenX, event.screenX);
var cellContainer:CellContainer = event.currentTarget as CellContainer;
var point:Point;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0b3b20a5/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 711afb8..cba1bb7 100644
--- a/frameworks/projects/XML/src/main/flex/XML.as
+++ b/frameworks/projects/XML/src/main/flex/XML.as
@@ -465,7 +465,7 @@ package
* @return
*
*/
- public function appendChild(child:XML):XML
+ public function appendChild(child:*):XML
{
/*
[[Insert]] (P, V)
@@ -486,6 +486,19 @@ package
a. Call the [[Replace]] method of x with arguments i and V
12. Return
*/
+ var childType:String = typeof child;
+ if(childType != "object")
+ {
+ child = child.toString();
+ var xml:XML = new XML();
+ xml.setNodeKind("text");
+ xml.setValue(child);
+ child = xml;
+ }
+
+ if(child is XMLList)
+ child = child[0];
+
child.setParent(this);
_children.push(child);
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0b3b20a5/frameworks/projects/XML/src/main/flex/XMLList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/flex/XMLList.as b/frameworks/projects/XML/src/main/flex/XMLList.as
index dd5b662..d8887c1 100644
--- a/frameworks/projects/XML/src/main/flex/XMLList.as
+++ b/frameworks/projects/XML/src/main/flex/XMLList.as
@@ -148,7 +148,7 @@ package
}while(false);
}
- public function appendChild(child:XML):XML
+ public function appendChild(child:*):XML
{
if(isSingle())
return _xmlArray[0].appendChild(child);