You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by pe...@apache.org on 2015/01/07 20:29:22 UTC
git commit: [flex-asjs] [refs/heads/develop] - Added strong
data-typing to the ActionScript of DataTipBead so the cross-compiled code is
generated correctly. Added flexjs_wrapper properties to the JavaScript
versions of the core.graphics package.
Repository: flex-asjs
Updated Branches:
refs/heads/develop 3affd11b5 -> 4644861a9
Added strong data-typing to the ActionScript of DataTipBead so the cross-compiled code is generated correctly. Added flexjs_wrapper properties to the JavaScript versions of the core.graphics package.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/4644861a
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/4644861a
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/4644861a
Branch: refs/heads/develop
Commit: 4644861a9c9f0676cb6e54731d38b74024fd236d
Parents: 3affd11
Author: Peter Ent <pe...@apache.org>
Authored: Wed Jan 7 14:29:19 2015 -0500
Committer: Peter Ent <pe...@apache.org>
Committed: Wed Jan 7 14:29:19 2015 -0500
----------------------------------------------------------------------
.../FlexJSJX/src/org/apache/flex/charts/beads/DataTipBead.as | 8 +++++---
.../js/FlexJS/src/org/apache/flex/core/graphics/Circle.js | 1 +
.../js/FlexJS/src/org/apache/flex/core/graphics/Ellipse.js | 1 +
.../js/FlexJS/src/org/apache/flex/core/graphics/Line.js | 1 +
.../js/FlexJS/src/org/apache/flex/core/graphics/Path.js | 1 +
.../js/FlexJS/src/org/apache/flex/core/graphics/Rect.js | 1 +
.../js/FlexJS/src/org/apache/flex/core/graphics/Text.js | 1 +
7 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4644861a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/DataTipBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/DataTipBead.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/DataTipBead.as
index 04f11ee..559a7b9 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/DataTipBead.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/DataTipBead.as
@@ -23,6 +23,7 @@ package org.apache.flex.charts.beads
import org.apache.flex.charts.core.IChartSeries;
import org.apache.flex.core.IBead;
import org.apache.flex.core.IStrand;
+ import org.apache.flex.core.UIBase;
import org.apache.flex.events.Event;
import org.apache.flex.events.IEventDispatcher;
import org.apache.flex.events.MouseEvent;
@@ -150,10 +151,11 @@ package org.apache.flex.charts.beads
}
else
{
- while (base != null && !(base is IChartItemRenderer)) {
- base = base.parent;
+ var chain:UIBase = base as UIBase;
+ while (chain != null && !(chain is IChartItemRenderer)) {
+ chain = chain.parent as UIBase;
}
- return base as IChartItemRenderer;
+ return chain as IChartItemRenderer;
}
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4644861a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Circle.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Circle.js b/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Circle.js
index c009bba..205b9a9 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Circle.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Circle.js
@@ -72,6 +72,7 @@ org.apache.flex.core.graphics.Circle.prototype.get_radius = function() {
org.apache.flex.core.graphics.Circle.prototype.drawCircle = function(x, y, radius) {
var style = this.getStyleStr();
var circle = document.createElementNS('http://www.w3.org/2000/svg', 'ellipse');
+ circle.flexjs_wrapper = this;
circle.setAttribute('style', style);
if (this.get_stroke())
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4644861a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Ellipse.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Ellipse.js b/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Ellipse.js
index 3063064..9ce333a 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Ellipse.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Ellipse.js
@@ -50,6 +50,7 @@ org.apache.flex.core.graphics.Ellipse.prototype.FLEXJS_CLASS_INFO =
org.apache.flex.core.graphics.Ellipse.prototype.drawEllipse = function(x, y, width, height) {
var style = this.getStyleStr();
var ellipse = document.createElementNS('http://www.w3.org/2000/svg', 'ellipse');
+ ellipse.flexjs_wrapper = this;
ellipse.setAttribute('style', style);
if (this.get_stroke())
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4644861a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Line.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Line.js b/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Line.js
index 6fe9d4c..abfbd4e 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Line.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Line.js
@@ -50,6 +50,7 @@ org.apache.flex.core.graphics.Line.prototype.FLEXJS_CLASS_INFO =
org.apache.flex.core.graphics.Line.prototype.drawLine = function(x1, y1, x2, y2) {
var style = this.getStyleStr();
var line = document.createElementNS('http://www.w3.org/2000/svg', 'line');
+ line.flexjs_wrapper = this;
line.setAttribute('style', style);
line.setAttribute('x1', 0);
line.setAttribute('y1', y1);
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4644861a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Path.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Path.js b/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Path.js
index ae37a59..d986a16 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Path.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Path.js
@@ -79,6 +79,7 @@ org.apache.flex.core.graphics.Path.prototype.drawPath = function(x, y, data) {
if (data == null || data.length === 0) return;
var style = this.getStyleStr();
var path = document.createElementNS('http://www.w3.org/2000/svg', 'path');
+ path.flexjs_wrapper = this;
path.setAttribute('style', style);
path.setAttribute('d', data);
this.element.appendChild(path);
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4644861a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Rect.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Rect.js b/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Rect.js
index 2a2caaf..33392c8 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Rect.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Rect.js
@@ -50,6 +50,7 @@ org.apache.flex.core.graphics.Rect.prototype.FLEXJS_CLASS_INFO =
org.apache.flex.core.graphics.Rect.prototype.drawRect = function(x, y, width, height) {
var style = this.getStyleStr();
var rect = document.createElementNS('http://www.w3.org/2000/svg', 'rect');
+ rect.flexjs_wrapper = this;
rect.setAttribute('style', style);
if (this.get_stroke())
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4644861a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Text.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Text.js b/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Text.js
index 18137e1..adffeaa 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Text.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Text.js
@@ -49,6 +49,7 @@ org.apache.flex.core.graphics.Text.prototype.FLEXJS_CLASS_INFO =
org.apache.flex.core.graphics.Text.prototype.drawText = function(value, x, y) {
var style = this.getStyleStr();
var text = document.createElementNS('http://www.w3.org/2000/svg', 'text');
+ text.flexjs_wrapper = this;
text.setAttribute('style', style);
text.setAttribute('x', String(x) + 'px');
text.setAttribute('y', String(y) + 'px');