Skip to content
This repository has been archived by the owner on Jan 10, 2020. It is now read-only.

Commit

Permalink
Changes for js in. Need to change as.
Browse files Browse the repository at this point in the history
  • Loading branch information
trippb committed Jul 3, 2009
1 parent a53164c commit 8d273b5
Show file tree
Hide file tree
Showing 9 changed files with 624 additions and 1,531 deletions.
Binary file modified build/charts/assets/charts.swf
Binary file not shown.
1,059 changes: 303 additions & 756 deletions build/charts/charts-debug.js

Large diffs are not rendered by default.

14 changes: 3 additions & 11 deletions build/charts/charts-min.js

Large diffs are not rendered by default.

1,055 changes: 302 additions & 753 deletions build/charts/charts.js

Large diffs are not rendered by default.

Binary file modified src/charts/as/charts.swc
Binary file not shown.
5 changes: 2 additions & 3 deletions src/charts/as/com/yahoo/yui/YUIAdapter.as
Expand Up @@ -57,7 +57,6 @@ package com.yahoo.yui
if(ExternalInterface.available) if(ExternalInterface.available)
{ {
this.initializeComponent(); this.initializeComponent();

var swfReady:Object = {type: "swfReady"}; var swfReady:Object = {type: "swfReady"};
this.dispatchEventToJavaScript(swfReady); this.dispatchEventToJavaScript(swfReady);
} }
Expand Down Expand Up @@ -152,8 +151,8 @@ package com.yahoo.yui
*/ */
protected function initializeComponent():void protected function initializeComponent():void
{ {
this.elementID = this.loaderInfo.parameters.elementID; this.elementID = this.loaderInfo.parameters.YUISwfId;
this.javaScriptEventHandler = this.loaderInfo.parameters.eventHandler; this.javaScriptEventHandler = this.loaderInfo.parameters.YUIBridgeCallback;


var allowedDomain:String = this.loaderInfo.parameters.allowedDomain; var allowedDomain:String = this.loaderInfo.parameters.allowedDomain;
if(allowedDomain) if(allowedDomain)
Expand Down
7 changes: 4 additions & 3 deletions src/charts/build.properties
Expand Up @@ -6,10 +6,11 @@ component=charts


component.mainclass=YAHOO.widget.Chart component.mainclass=YAHOO.widget.Chart


component.jsfiles=swfobject.js,FlashAdapter.js,Chart.js,PieChart.js,CartesianChart.js,ChartTypes.js,Axis.js,NumericAxis.js,TimeAxis.js,CategoryAxis.js,Series.js component.jsfiles=Chart.js,PieChart.js,CartesianChart.js,ChartTypes.js,Axis.js,NumericAxis.js,TimeAxis.js,CategoryAxis.js,Series.js


#flexbin: you will need to change the source of this property to match the location of the flex bin directory on your machine #flexbin: you will need to change the source of this property to match the location of the flex bin directory on your machine
flexbin=C:/Program Files/Adobe/Flex Builder 3/sdks/3.0.0/bin flexbin=/Users/trippb/bin/flex_sdk_3/bin


#flashbin: you will need to change the source of this property to match the location of your Adobe Flash CS3 files #flashbin: you will need to change the source of this property to match the location of your Adobe Flash CS3 files
flashbin=C:/Program Files/Adobe/Adobe Flash CS3 flashbin=/Applications/Adobe\ Flash\ CS3

9 changes: 5 additions & 4 deletions src/charts/build.xml
Expand Up @@ -7,13 +7,14 @@
<import file="${builddir}/2.x/bootstrap.xml" description="Default Build Properties and Targets" /> <import file="${builddir}/2.x/bootstrap.xml" description="Default Build Properties and Targets" />


<!-- custom properties --> <!-- custom properties -->

<property name="astra.srcdir" value="${component.basedir}/as"/> <property name="astra.srcdir" value="${component.basedir}/as"/>


<target name="build" depends="YuiModuleTargets.build, swfbuild" /> <target name="build" depends="YuiModuleTargets.build, swfbuild" />
<target name="deploybuild" depends="YuiSharedTargets.deploybuild, swfdeploy" /> <target name="deploybuild" depends="YuiSharedTargets.deploybuild, swfdeploy" />


<target name="swfbuild" description="Charts Override to Build SWF" depends="build-swc"> <target name="swfbuild" description="Charts Override to Build SWF" depends="build-swc">
<exec executable="${flexbin}/mxmlc.exe" failonerror="true"> <exec executable="${flexbin}/mxmlc" failonerror="true">


<!-- start with the classes from the SWC --> <!-- start with the classes from the SWC -->
<arg line="--library-path+='${astra.srcdir}'"/> <arg line="--library-path+='${astra.srcdir}'"/>
Expand All @@ -27,14 +28,14 @@
</target> </target>


<target name="build-swc" description="builds the SWC required for the Charts SWF"> <target name="build-swc" description="builds the SWC required for the Charts SWF">
<exec executable="${flexbin}/compc.exe" failonerror="true"> <exec executable="${flexbin}/compc" failonerror="true">


<!-- Flash Platform Source Files --> <!-- Flash Platform Source Files -->
<arg line="--source-path+='${astra.srcdir}'"/> <arg line="--source-path+='${astra.srcdir}'"/>


<!-- Core Flash CS3 Source Files --> <!-- Core Flash CS3 Source Files -->
<arg line="--source-path+='${flashbin}/en/Configuration/ActionScript 3.0/Classes'"/> <arg line="--source-path+='${flashbin}/Configuration/ActionScript 3.0/Classes'"/>
<arg line="--source-path+='${flashbin}/en/Configuration/Component Source/ActionScript 3.0/User Interface'"/> <arg line="--source-path+='${flashbin}/Configuration/Component Source/ActionScript 3.0/User Interface'"/>


<!-- Main Classes to Include (will also add dependencies) --> <!-- Main Classes to Include (will also add dependencies) -->
<arg line="--include-classes com.yahoo.astra.fl.charts.LineChart"/> <arg line="--include-classes com.yahoo.astra.fl.charts.LineChart"/>
Expand Down
6 changes: 5 additions & 1 deletion src/swf/js/swf.js
Expand Up @@ -103,7 +103,11 @@ YAHOO.extend(YAHOO.widget.SWF, YAHOO.util.Element, {
}, },
callSWF: function (func, args) callSWF: function (func, args)
{ {
this._swf[func].call(this._swf, args); if (this._swf[func]) {
return(this._swf[func].apply(this._swf, args));
} else {
return null;
}
} }
}); });


Expand Down

0 comments on commit 8d273b5

Please sign in to comment.