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 case where terminator span was incorrectly being dropped
Date Tue, 30 Dec 2014 10:02:17 GMT
Repository: flex-tlf
Updated Branches:
  refs/heads/develop 3c7ad1b05 -> b3bb56e50


Fixed case where terminator span was incorrectly being dropped


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

Branch: refs/heads/develop
Commit: b3bb56e502bb8049a2d18735d55f2a1321b97a13
Parents: 3c7ad1b
Author: Harbs <harbs@in-tools.com>
Authored: Tue Dec 30 12:02:12 2014 +0200
Committer: Harbs <harbs@in-tools.com>
Committed: Tue Dec 30 12:02:12 2014 +0200

----------------------------------------------------------------------
 textLayout/src/flashx/textLayout/elements/ParagraphElement.as | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-tlf/blob/b3bb56e5/textLayout/src/flashx/textLayout/elements/ParagraphElement.as
----------------------------------------------------------------------
diff --git a/textLayout/src/flashx/textLayout/elements/ParagraphElement.as b/textLayout/src/flashx/textLayout/elements/ParagraphElement.as
index 325b3c0..dded72d 100644
--- a/textLayout/src/flashx/textLayout/elements/ParagraphElement.as
+++ b/textLayout/src/flashx/textLayout/elements/ParagraphElement.as
@@ -674,12 +674,7 @@ package flashx.textLayout.elements
 				var prev:FlowLeafElement = _terminatorSpan.getPreviousLeaf(this);
 				if(prev && prev.parent == this && prev is SpanElement)
 				{
-					_terminatorSpan.removeParaTerminator();
-					termIdx = getChildIndex(_terminatorSpan);
-					super.replaceChildren(termIdx, termIdx+1);
-					s = prev as SpanElement;
-					s.addParaTerminator();
-					this._terminatorSpan = s;
+					_terminatorSpan.mergeToPreviousIfPossible();
 				}
 			}
 		}


Mime
View raw message