Repository: flex-asjs Updated Branches: refs/heads/tlf ff285e6c9 -> ccfe255e1
Fixed some runtime errors Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ccfe255e Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ccfe255e Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ccfe255e Branch: refs/heads/tlf Commit: ccfe255e13fca0ec16261b54746eb71b5b23eec5 Parents: ff285e6 Author: Harbs <[email protected]> Authored: Tue May 9 15:13:27 2017 +0300 Committer: Harbs <[email protected]> Committed: Tue May 9 15:13:27 2017 +0300 ---------------------------------------------------------------------- .../projects/HTML/src/main/flex/org/apache/flex/svg/Rect.as | 6 ++++-- .../apache/flex/textLayout/conversion/TextFieldHtmlImporter.as | 2 +- .../flex/org/apache/flex/textLayout/edit/SelectionManager.as | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ccfe255e/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Rect.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Rect.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Rect.as index 4791208..4921f6c 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Rect.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Rect.as @@ -141,8 +141,10 @@ package org.apache.flex.svg _rect.setAttribute('x', 0); _rect.setAttribute('y', 0); } - _rect.setAttribute('width', width); - _rect.setAttribute('height', height); + if(width) + _rect.setAttribute('width', width); + if(height) + _rect.setAttribute('height', height); resize(x, y, getBBox(_rect)); } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ccfe255e/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/conversion/TextFieldHtmlImporter.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/conversion/TextFieldHtmlImporter.as b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/conversion/TextFieldHtmlImporter.as index bb47d85..9f67d20 100644 --- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/conversion/TextFieldHtmlImporter.as +++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/conversion/TextFieldHtmlImporter.as @@ -196,7 +196,7 @@ package org.apache.flex.textLayout.conversion return _activeFormat_; } /** @private */ - static private var _activeParaFormat_:TextLayoutFormat = new TextLayoutFormat(); // to be applied to paras only + static private var _activeParaFormat_:TextLayoutFormat; // to be applied to paras only static private function get _activeParaFormat():TextLayoutFormat { if(_activeParaFormat_ == null) http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ccfe255e/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/edit/SelectionManager.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/edit/SelectionManager.as b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/edit/SelectionManager.as index 919f12c..5fdc97f 100644 --- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/edit/SelectionManager.as +++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/edit/SelectionManager.as @@ -2215,7 +2215,7 @@ package org.apache.flex.textLayout.edit { var leftEdge:int = 5; var topEdge:int = 5; - var globalPoint:Point = new Point(event.screenX, event.screenX); + var globalPoint:Point = new Point(event.clientX, event.clientY); var cellContainer:CellContainer = event.currentTarget as CellContainer; var point:Point;
