Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
FLEX-35100 CAUSE: TextBlock.createTextLine() orTextBlock.recreateTextLine() return null when there's no more text to create lines for (as indicated by the previousLine parameter) or the TextBlock's content's text is null or "". (It's also possible when the width parameter is insufficient, but in this case the fitSomething parameter is true, which excludes this case).

SOLUTION: Added a null check for textLine.

FLEX-35078 Changes while reading the code: minor asdoc edits, code formatting changes, and Array instantiation simplification.

  1. … 1 more file in changeset.
Moved the logic for composing the table on cell resizing out of EditManager and into StandardFlowComposer where it belongs.

  1. … 1 more file in changeset.
FLEX-34769

Fixed a RTE when trying to justify lines which contain Table Blocks

FLEX-34756 Split the functionality provided by FlowComposerBase.isDamaged() and StandardFlowComposer.isDamaged() into two separate functions, because 1) they do very different things, and 2) to solve FLEX-34756 I need the former. -Also improved some comments and imports.

  1. … 3 more files in changeset.
add missing headers

  1. … 2 more files in changeset.
Reverted a commit from Alex that was lost with the last merge. Fixed line start index for TextFlowLine initialization

Ignore table space-before mid-paragraph

Fixed vertical placement of table blocks to take into account the previous line descent and paragraph space before/space after.

Some code cleanup

Merge remote-tracking branch 'remotes/origin/develop' into tables

* remotes/origin/develop: (31 commits)

Add TabTest with ingnored noTabStop test

Add WritingModeTest, UndoRedoTest, TextFlowEditTest Remove unused variable from TestDescriptorRunner

Back to the original implementation Ignore arrowUp and arrowDown tests in GeneralFunctionsTest

Add echo to build.xml for print minimalTests value

Set minimalTests property to true just for check ContainerTypeTest

Add property minimalTests to make MinimalTestsSuite runnable

FLEX-34611: Application crash when textFlow property set to null with preserveSelection

FLEX-26478 Responding to dev review by adding curly braces around if clauses. Also optimised imports and renamed comment parameters in StandardFlowComposer and ContainerController.

Remove unused import in ContainerAttributeTest

FLEX-26478 CAUSE: When replacing ContainerControllers (triggered when the text changes in a TextField / TextArea), StandardFlowComposer tried to dispose of the discarded ones first. It did this by calling clearSelectionShapes() and setRootElement(null) on the ContainerControllers. However, if that controller was already listening for mouse scroll events (when the user selects text and moves the mouse outside the text field in such a way that causes the text to scroll), this listener wasn't removed. Which meant that the next time scrollTimerHandler() was called (on the inactive ContainerController), textFlow was null due to the call to setRootElement(null).

Revert "revert these to see if they made a difference"

revert these to see if they made a difference

Attempt to fix build - set forkValue to true

another attempt to fix flex-tlf

Try to fix build with really high values -Xmx1024m -XX:MaxPermSize=1024m

Try to fix build increase -Xmx512m

Try to fix build - higher values for MaxPermSize=768

Back to the original values for jvm.args

Remove additional mxmlc buld of Flow.swf from testApps target in build.xml

try even more PermGen

...

Conflicts:

textLayout/src/flashx/textLayout/compose/StandardFlowComposer.as

textLayout/src/flashx/textLayout/container/ContainerController.as

  1. … 1 more file in changeset.
FLEX-26478 Responding to dev review by adding curly braces around if clauses. Also optimised imports and renamed comment parameters in StandardFlowComposer and ContainerController.

  1. … 1 more file in changeset.
FLEX-26478 CAUSE: When replacing ContainerControllers (triggered when the text changes in a TextField / TextArea), StandardFlowComposer tried to dispose of the discarded ones first. It did this by calling clearSelectionShapes() and setRootElement(null) on the ContainerControllers. However, if that controller was already listening for mouse scroll events (when the user selects text and moves the mouse outside the text field in such a way that causes the text to scroll), this listener wasn't removed. Which meant that the next time scrollTimerHandler() was called (on the inactive ContainerController), textFlow was null due to the call to setRootElement(null).

SOLUTION:

StandardFlowComposer now calls a new method 'discard' on the ContainerControllers which are not needed anymore. This method now also stops the selection scroll timer ('_scrollTimer').

  1. … 1 more file in changeset.
Small change to getting selection rects

Added missing files

    • -0
    • +215
    ./TextFlowTableBlock.as
  1. … 9 more files in changeset.
Commit of table work

  1. … 34 more files in changeset.
FLEX-34247 improve TLF performance. I added a flag in case some scenario really needs composition to start from the beginning, but the default is now more like the TLF version that shipped with Adobe Flex 4.6

  1. … 1 more file in changeset.
Fixed some "Warning: variable definition duplicates function parameter" issues that popped up when compiling TLF with Falcon.

Signed-off-by: Erik de Bruin <erik@ixsoftware.nl>

  1. … 4 more files in changeset.
FLEX-33409: workaround player bugs involving discretionary hyphens

  1. … 5 more files in changeset.
.as files should not be executable

  1. … 439 more files in changeset.
Text Layout Framework Donation From Adobe

git-svn-id: https://svn.apache.org/repos/asf/incubator/flex/tlf/branches/2.0@1374090 13f79535-47bb-0310-9956-ffa450edef68

    • -0
    • +2536
    ./BaseCompose.as
    • -0
    • +469
    ./ComposeState.as
    • -0
    • +59
    ./FloatCompositionData.as
    • -0
    • +635
    ./FlowComposerBase.as
    • -0
    • +497
    ./IFlowComposer.as
    • -0
    • +93
    ./IVerticalJustificationLine.as
    • -0
    • +441
    ./SimpleCompose.as
    • -0
    • +865
    ./StandardFlowComposer.as
    • -0
    • +2727
    ./TextFlowLine.as
    • -0
    • +71
    ./TextFlowLineLocation.as
  1. … 737 more files in changeset.
Text Layout Framework Donation From Adobe

git-svn-id: https://svn.apache.org/repos/asf/incubator/flex/tlf/branches/3.0@1374090 13f79535-47bb-0310-9956-ffa450edef68

    • -0
    • +2664
    ./BaseCompose.as
    • -0
    • +469
    ./ComposeState.as
    • -0
    • +59
    ./FloatCompositionData.as
    • -0
    • +635
    ./FlowComposerBase.as
    • -0
    • +497
    ./IFlowComposer.as
    • -0
    • +93
    ./IVerticalJustificationLine.as
    • -0
    • +441
    ./SimpleCompose.as
    • -0
    • +865
    ./StandardFlowComposer.as
    • -0
    • +2748
    ./TextFlowLine.as
    • -0
    • +71
    ./TextFlowLineLocation.as
  1. … 760 more files in changeset.
Text Layout Framework Donation From Adobe

git-svn-id: https://svn.apache.org/repos/asf/incubator/flex/tlf/trunk@1374090 13f79535-47bb-0310-9956-ffa450edef68

    • -0
    • +3126
    ./BaseCompose.as
    • -0
    • +472
    ./ComposeState.as
    • -0
    • +59
    ./FloatCompositionData.as
    • -0
    • +635
    ./FlowComposerBase.as
    • -0
    • +497
    ./IFlowComposer.as
    • -0
    • +93
    ./IVerticalJustificationLine.as
    • -0
    • +441
    ./SimpleCompose.as
    • -0
    • +865
    ./StandardFlowComposer.as
    • -0
    • +2750
    ./TextFlowLine.as
    • -0
    • +71
    ./TextFlowLineLocation.as
  1. … 776 more files in changeset.
Text Layout Framework Donation From Adobe

git-svn-id: https://svn.apache.org/repos/asf/incubator/flex/tlf/branches/2.1@1374090 13f79535-47bb-0310-9956-ffa450edef68

    • -0
    • +2539
    ./BaseCompose.as
    • -0
    • +469
    ./ComposeState.as
    • -0
    • +59
    ./FloatCompositionData.as
    • -0
    • +635
    ./FlowComposerBase.as
    • -0
    • +497
    ./IFlowComposer.as
    • -0
    • +93
    ./IVerticalJustificationLine.as
    • -0
    • +441
    ./SimpleCompose.as
    • -0
    • +865
    ./StandardFlowComposer.as
    • -0
    • +2727
    ./TextFlowLine.as
    • -0
    • +71
    ./TextFlowLineLocation.as
  1. … 739 more files in changeset.