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 2014/11/27 09:28:14 UTC

[1/2] git commit: [flex-tlf] [refs/heads/tables] - the original change broke a few tests. I think this one is better

Repository: flex-tlf
Updated Branches:
  refs/heads/tables 863d00f86 -> 5357c43c2


the original change broke a few tests.  I think this one is better


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

Branch: refs/heads/tables
Commit: 222d745e8023772bf9be38b907e0a7089ac86da1
Parents: 1d79e24
Author: Alex Harui <ah...@apache.org>
Authored: Wed Nov 19 23:13:00 2014 +0000
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Nov 19 23:13:00 2014 +0000

----------------------------------------------------------------------
 textLayout/src/flashx/textLayout/container/TextContainerManager.as | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-tlf/blob/222d745e/textLayout/src/flashx/textLayout/container/TextContainerManager.as
----------------------------------------------------------------------
diff --git a/textLayout/src/flashx/textLayout/container/TextContainerManager.as b/textLayout/src/flashx/textLayout/container/TextContainerManager.as
index 04d8366..a89566a 100644
--- a/textLayout/src/flashx/textLayout/container/TextContainerManager.as
+++ b/textLayout/src/flashx/textLayout/container/TextContainerManager.as
@@ -578,7 +578,7 @@ package flashx.textLayout.container
 					hadPreviousSelection = true;
 					
 					//preserve the selection state [bug #2931406 from Flex SDK]
-					if (_preserveSelectionOnSetText && text)
+					if (_preserveSelectionOnSetText && text != null)
                     {
                         oldAnchorPosition = Math.min(_textFlow.interactionManager.anchorPosition, text.length);
                         oldActivePosition = Math.min(_textFlow.interactionManager.activePosition, text.length);


[2/2] git commit: [flex-tlf] [refs/heads/tables] - Merge branch 'develop' into tables

Posted by ha...@apache.org.
Merge branch 'develop' into tables

* develop:
  the original change broke a few tests.  I think this one is better


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

Branch: refs/heads/tables
Commit: 5357c43c29f00b6e131dce7ec9ed9288643ecbf6
Parents: 863d00f 222d745
Author: Harbs <ha...@in-tools.com>
Authored: Thu Nov 27 10:28:06 2014 +0200
Committer: Harbs <ha...@in-tools.com>
Committed: Thu Nov 27 10:28:06 2014 +0200

----------------------------------------------------------------------
 textLayout/src/flashx/textLayout/container/TextContainerManager.as | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------