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/27 19:09:40 UTC
git commit: [flex-asjs] [refs/heads/tlf] - Lose the paragraph
terminator when composing lines.
Repository: flex-asjs
Updated Branches:
refs/heads/tlf ea666a1f2 -> f12ae3ad2
Lose the paragraph terminator when composing lines.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f12ae3ad
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f12ae3ad
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f12ae3ad
Branch: refs/heads/tlf
Commit: f12ae3ad28772836ecdddfa66d8342c071f4ea77
Parents: ea666a1
Author: Harbs <ha...@in-tools.com>
Authored: Thu Apr 27 22:09:34 2017 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Thu Apr 27 22:09:34 2017 +0300
----------------------------------------------------------------------
.../main/flex/org/apache/flex/textLayout/elements/SpanElement.as | 2 +-
.../flex/org/apache/flex/textLayout/formats/ListMarkerFormat.as | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f12ae3ad/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/SpanElement.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/SpanElement.as b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/SpanElement.as
index 57887f2..284b7d9 100644
--- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/SpanElement.as
+++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/SpanElement.as
@@ -77,7 +77,7 @@ package org.apache.flex.textLayout.elements
return;
calculateComputedFormat(); // BEFORE creating the element
- _blockElement = new TextElement(_text,null);
+ _blockElement = new TextElement(text,null);
CONFIG::debug { Debugging.traceFTECall(_blockElement,null,"new TextElement()"); }
CONFIG::debug { Debugging.traceFTEAssign(_blockElement, "text", _text); }
super.createContentElement();
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f12ae3ad/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/formats/ListMarkerFormat.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/formats/ListMarkerFormat.as b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/formats/ListMarkerFormat.as
index 76d6290..6fe7ac1 100644
--- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/formats/ListMarkerFormat.as
+++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/formats/ListMarkerFormat.as
@@ -127,6 +127,7 @@ package org.apache.flex.textLayout.formats
}
// at this point we know that both TextLayoutFormat and ListMarkerFormat are initialized so can setup the Property objects
+ // (moved to getter initialization in PropertyFactory)
// PropertyFactory.sharedTextLayoutFormatHandler.converter = TextLayoutFormat.createTextLayoutFormat;
// PropertyFactory.sharedListMarkerFormatHandler.converter = ListMarkerFormat.createListMarkerFormat;