flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ha...@apache.org
Subject git commit: [flex-tlf] [refs/heads/develop] - Fixed issue with undo failing
Date Wed, 24 Dec 2014 19:05:23 GMT
Repository: flex-tlf
Updated Branches:
  refs/heads/develop 94c5c870e -> d3c95c512


Fixed issue with undo failing


Project: http://git-wip-us.apache.org/repos/asf/flex-tlf/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-tlf/commit/d3c95c51
Tree: http://git-wip-us.apache.org/repos/asf/flex-tlf/tree/d3c95c51
Diff: http://git-wip-us.apache.org/repos/asf/flex-tlf/diff/d3c95c51

Branch: refs/heads/develop
Commit: d3c95c51265a1e51e0ed47645c1a92557e1b44bb
Parents: 94c5c87
Author: Harbs <harbs@in-tools.com>
Authored: Wed Dec 24 21:05:17 2014 +0200
Committer: Harbs <harbs@in-tools.com>
Committed: Wed Dec 24 21:05:17 2014 +0200

----------------------------------------------------------------------
 textLayout/src/flashx/textLayout/edit/ModelEdit.as        | 3 ++-
 textLayout/src/flashx/textLayout/elements/TableElement.as | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-tlf/blob/d3c95c51/textLayout/src/flashx/textLayout/edit/ModelEdit.as
----------------------------------------------------------------------
diff --git a/textLayout/src/flashx/textLayout/edit/ModelEdit.as b/textLayout/src/flashx/textLayout/edit/ModelEdit.as
index b18f55f..2703a28 100644
--- a/textLayout/src/flashx/textLayout/edit/ModelEdit.as
+++ b/textLayout/src/flashx/textLayout/edit/ModelEdit.as
@@ -383,7 +383,8 @@ class InternalSplitFGEMemento extends BaseMemento implements IMemento
 		prevSibling.replaceChildren(prevSibling.numChildren,prevSibling.numChildren,target.mxmlChildren);
 		
 		// paragraphs only - watch out for trailing empty spans that need to be removed
-		if (prevSibling is ParagraphElement && lastLeaf.textLength == 0)
+		// Harbs 12-24-14 Added check that lastLeaf still exists in the paragraph
+		if (prevSibling is ParagraphElement && lastLeaf.parent && lastLeaf.textLength
== 0)
 			prevSibling.removeChild(lastLeaf);
 		
 		// debugCheckTextFlow("After InternalSplitFGEMemento.undo");

http://git-wip-us.apache.org/repos/asf/flex-tlf/blob/d3c95c51/textLayout/src/flashx/textLayout/elements/TableElement.as
----------------------------------------------------------------------
diff --git a/textLayout/src/flashx/textLayout/elements/TableElement.as b/textLayout/src/flashx/textLayout/elements/TableElement.as
index 6f230c0..bdacfaf 100644
--- a/textLayout/src/flashx/textLayout/elements/TableElement.as
+++ b/textLayout/src/flashx/textLayout/elements/TableElement.as
@@ -1556,6 +1556,10 @@ package flashx.textLayout.elements
 			column.table = this;
 			return column;
 		}
+		tlf_internal override function normalizeRange(normalizeStart:uint,normalizeEnd:uint):void
+		{
+			
+		}
 	}
 }
 class CellCoords


Mime
View raw message