Merge branch 'develop' into feature/browser-event * develop: Make sure selected item doesn't mess with mdl styling Fixed selection of lines which are justified Setting the default TLFFactory is now required. No dependency on StandardTLFFactory (and HTML Text) unless used.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/840ac09f Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/840ac09f Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/840ac09f Branch: refs/heads/feature/amf Commit: 840ac09f959ed9ec45124dc03490dcbbbe66f8fb Parents: 8645a4f 8c2a6bc Author: Harbs <[email protected]> Authored: Wed Jul 26 12:02:07 2017 +0300 Committer: Harbs <[email protected]> Committed: Wed Jul 26 12:02:07 2017 +0300 ---------------------------------------------------------------------- .../flex/mdl/itemRenderers/MenuItemRenderer.as | 5 ++ .../conversion/BaseTextLayoutImporter.as | 6 +- .../textLayout/conversion/TextLayoutImporter.as | 6 +- .../flex/textLayout/edit/SelectionManager.as | 60 ++++++++++---------- .../flex/textLayout/factory/TLFFactory.as | 9 ++- .../apache/flex/textLayout/utils/FactoryUtil.as | 14 ----- 6 files changed, 48 insertions(+), 52 deletions(-) ----------------------------------------------------------------------
