You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by bi...@apache.org on 2014/09/20 02:10:31 UTC

[1/2] git commit: [flex-asjs] [refs/heads/develop] - Better name for gradients

Repository: flex-asjs
Updated Branches:
  refs/heads/develop 8e46d2e18 -> 24d052e97


Better name for gradients

Conflicts:
	frameworks/js/FlexJS/src/org/apache/flex/core/graphics/GradientBase.js


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/0677ce56
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/0677ce56
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/0677ce56

Branch: refs/heads/develop
Commit: 0677ce562fd07a03e7a0d45cebc60d2a2b1d49dd
Parents: 8e46d2e
Author: Om <bi...@gmail.com>
Authored: Wed Sep 17 13:04:18 2014 -0700
Committer: Om <bi...@gmail.com>
Committed: Thu Sep 18 12:53:11 2014 -0700

----------------------------------------------------------------------
 examples/FlexJSTest_SVG/src/GraphicsView.mxml                  | 6 +++---
 .../FlexJS/src/org/apache/flex/core/graphics/GradientBase.js   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0677ce56/examples/FlexJSTest_SVG/src/GraphicsView.mxml
----------------------------------------------------------------------
diff --git a/examples/FlexJSTest_SVG/src/GraphicsView.mxml b/examples/FlexJSTest_SVG/src/GraphicsView.mxml
index 61f5723..6907b3f 100644
--- a/examples/FlexJSTest_SVG/src/GraphicsView.mxml
+++ b/examples/FlexJSTest_SVG/src/GraphicsView.mxml
@@ -37,8 +37,8 @@ limitations under the License.
 
 			protected function viewbase1_initCompleteHandler(event:org.apache.flex.events.Event):void
 			{
-				drawIndividualShapes();
-				//drawOnGraphicsContainer();
+				//drawIndividualShapes();
+				drawOnGraphicsContainer();
 			}
 			
 			private function drawIndividualShapes():void
@@ -238,7 +238,7 @@ limitations under the License.
 				//var lg:LinearGradient = new LinearGradient();
 				lg.entries = [new GradientEntry(1,0xFF0000,0.33),new GradientEntry(1,0x00FF00,0.66), new GradientEntry(1,0x0000FF,0.99)];
 				lg.scaleX = 1;
-				lg.rotation = 45;
+				lg.rotation = 90;
 				container.drawCircle(400, 400, 300);
 				container.drawPath("M 800 800 L 900 800 A 100 100 0 0 0 800 700 Z");
 				container.drawPath("M 100 350 q 150 -300 300 0");

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0677ce56/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/GradientBase.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/GradientBase.js b/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/GradientBase.js
index 0d6c06a..66873b6 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/GradientBase.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/GradientBase.js
@@ -158,7 +158,7 @@ org.apache.flex.core.graphics.GradientBase.prototype.get_y = function() {
  * @return {string} A new gradient id value.
  */
 org.apache.flex.core.graphics.GradientBase.prototype.get_newId = function() {
-  return String(Math.floor((Math.random() * 100000) + 1));
+  return 'gradient' + String(Math.floor((Math.random() * 100000) + 1));
 };
 
 


[2/2] git commit: [flex-asjs] [refs/heads/develop] - Remove reference to IChartItemRenderer.fillColor as that property does not exist. This fixes the FlexJSJX build.

Posted by bi...@apache.org.
Remove reference to IChartItemRenderer.fillColor as that property does not exist.  This fixes the FlexJSJX build.


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/24d052e9
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/24d052e9
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/24d052e9

Branch: refs/heads/develop
Commit: 24d052e976acc20b7822c54e8740ea61680139a3
Parents: 0677ce5
Author: Om <bi...@gmail.com>
Authored: Fri Sep 19 17:09:30 2014 -0700
Committer: Om <bi...@gmail.com>
Committed: Fri Sep 19 17:09:30 2014 -0700

----------------------------------------------------------------------
 .../src/org/apache/flex/charts/beads/ChartItemRendererFactory.as   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/24d052e9/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartItemRendererFactory.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartItemRendererFactory.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartItemRendererFactory.as
index 0582c45..f62fb13 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartItemRendererFactory.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartItemRendererFactory.as
@@ -114,7 +114,7 @@ package org.apache.flex.charts.beads
 					k.itemRendererParent = dataGroup;
 					k.xField = s.xField;
 					k.yField = s.yField;
-					k.fillColor = s.fillColor;
+					//k.fillColor = s.fillColor;
 					k.data = dp[j];
 					k.index = j;