move some static to instance so there aren't static initializer dependency issues. Also switch to using defaultPrevented
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/58bfcf8c Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/58bfcf8c Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/58bfcf8c Branch: refs/heads/tlf Commit: 58bfcf8cafb1fc5475d8bc6027f459a02aa24ae9 Parents: 15a223c Author: Alex Harui <[email protected]> Authored: Sun May 7 19:05:11 2017 -0700 Committer: Alex Harui <[email protected]> Committed: Mon May 8 11:59:03 2017 -0700 ---------------------------------------------------------------------- .../apache/flex/textLayout/container/TextContainerManager.as | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/58bfcf8c/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/container/TextContainerManager.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/container/TextContainerManager.as b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/container/TextContainerManager.as index 0cb267a..72ba0c1 100644 --- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/container/TextContainerManager.as +++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/container/TextContainerManager.as @@ -242,7 +242,7 @@ package org.apache.flex.textLayout.container public class TextContainerManager extends EventDispatcher implements ISWFContext, IInteractionEventHandler, ISandboxSupport, ITextContainerManager { // all events that are listened for need to be in this list. - static private const eventList:Array = [ + private const eventList:Array = [ FlowOperationEvent.FLOW_OPERATION_BEGIN, FlowOperationEvent.FLOW_OPERATION_END, FlowOperationEvent.FLOW_OPERATION_COMPLETE, @@ -327,7 +327,7 @@ package org.apache.flex.textLayout.container } /** Shared definition of the scrollPolicy property. @private */ - static public const editingModePropertyDefinition:Property = PropertyFactory.enumString("editingMode", EditingMode.READ_WRITE, false, null, + public const editingModePropertyDefinition:Property = PropertyFactory.enumString("editingMode", EditingMode.READ_WRITE, false, null, EditingMode.READ_WRITE, EditingMode.READ_ONLY, EditingMode.READ_SELECT); private var _container:IParentIUIBase; @@ -2187,7 +2187,7 @@ package org.apache.flex.textLayout.container */ public function mouseWheelHandler(event:MouseEvent):void { - if (event.isDefaultPrevented()) + if (event.defaultPrevented) return; if (_composeState == COMPOSE_FACTORY) @@ -2566,7 +2566,7 @@ class RemappedMouseEvent extends org.apache.flex.events.MouseEvent { _event.updateAfterEvent(); } public override function isDefaultPrevented():Boolean - { return _event.isDefaultPrevented(); } + { return _event.defaultPrevented; } public override function preventDefault():void { _event.preventDefault(); }
