Repository: flex-asjs Updated Branches: refs/heads/feature/flexjs_wrapper f00227649 -> 386dc04dd
Removed code for setting flexjs_wrapper in CreateJS Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/386dc04d Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/386dc04d Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/386dc04d Branch: refs/heads/feature/flexjs_wrapper Commit: 386dc04dd35eb36f07bd54aba60c37c381314315 Parents: f002276 Author: Harbs <ha...@in-tools.com> Authored: Tue Sep 26 21:08:27 2017 +0300 Committer: Harbs <ha...@in-tools.com> Committed: Tue Sep 26 21:08:27 2017 +0300 ---------------------------------------------------------------------- .../src/main/flex/org/apache/flex/createjs/Application.as | 1 - .../src/main/flex/org/apache/flex/createjs/Container.as | 10 ++-------- .../src/main/flex/org/apache/flex/createjs/Label.as | 4 ---- .../src/main/flex/org/apache/flex/createjs/TextButton.as | 3 +-- .../src/main/flex/org/apache/flex/createjs/core/UIBase.as | 3 --- .../src/main/flex/org/apache/flex/createjs/core/View.as | 10 ++-------- .../org/apache/flex/createjs/graphics/GraphicShape.as | 4 ---- 7 files changed, 5 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/386dc04d/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Application.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Application.as b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Application.as index d778020..98b0e17 100644 --- a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Application.as +++ b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Application.as @@ -202,7 +202,6 @@ package org.apache.flex.createjs // and it provides convenient access to the stage. element = document.createElement('canvas') as WrappedHTMLElement; - element.flexjs_wrapper = this; canvas = element as HTMLCanvasElement; canvas.id = 'flexjsCanvas'; canvas.width = 700; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/386dc04d/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Container.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Container.as b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Container.as index 5b2ca3f..9314fac 100644 --- a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Container.as +++ b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Container.as @@ -98,18 +98,12 @@ package org.apache.flex.createjs */ override protected function createElement():WrappedHTMLElement { - if (element == null) { + if (!element) { var container:createjs.Container = new createjs.Container(); container.name = 'container'; element = container as WrappedHTMLElement; } - if (positioner == null) { - positioner = element; - } - - element.flexjs_wrapper = this; - - return positioner; + return element; } /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/386dc04d/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Label.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Label.as b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Label.as index 577e6da..be13bea 100644 --- a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Label.as +++ b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/Label.as @@ -143,10 +143,6 @@ package org.apache.flex.createjs text.textBaseline = 'alphabetic'; element = text as WrappedHTMLElement; - element.flexjs_wrapper = this; - - positioner = element; - return element; } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/386dc04d/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/TextButton.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/TextButton.as b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/TextButton.as index c0c1a83..7daf039 100644 --- a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/TextButton.as +++ b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/TextButton.as @@ -159,8 +159,7 @@ package org.apache.flex.createjs button.addChild(buttonBackground); button.addChild(buttonLabel); - positioner = element = button as WrappedHTMLElement; - element.flexjs_wrapper = this; + element = button as WrappedHTMLElement; return element; } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/386dc04d/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/core/UIBase.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/core/UIBase.as b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/core/UIBase.as index d29fa51..38e1c27 100644 --- a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/core/UIBase.as +++ b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/core/UIBase.as @@ -400,9 +400,6 @@ package org.apache.flex.createjs.core protected function createElement():WrappedHTMLElement { element = new createjs.Container() as WrappedHTMLElement; - element.flexjs_wrapper = this; - - positioner = this.element; return element; } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/386dc04d/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/core/View.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/core/View.as b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/core/View.as index 548a32f..c99048c 100644 --- a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/core/View.as +++ b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/core/View.as @@ -119,20 +119,14 @@ package org.apache.flex.createjs.core */ override protected function createElement():WrappedHTMLElement { - if (element == null) { + if (!element) { var container:createjs.Container = new createjs.Container(); container.name = 'viewbase'; container.x = 0; container.y = 0; element = container as WrappedHTMLElement; } - if (positioner == null) { - positioner = element; - } - - element.flexjs_wrapper = this; - - return positioner; + return element; } public function childrenAdded():void http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/386dc04d/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/graphics/GraphicShape.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/graphics/GraphicShape.as b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/graphics/GraphicShape.as index 6b09fc5..01c46ea 100644 --- a/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/graphics/GraphicShape.as +++ b/frameworks/projects/CreateJS/src/main/flex/org/apache/flex/createjs/graphics/GraphicShape.as @@ -65,10 +65,6 @@ package org.apache.flex.createjs.graphics var base:createjs.Shape = new createjs.Shape(null); element = base as WrappedHTMLElement; - element.flexjs_wrapper = this; - - positioner = element; - return element; }
