Permalink
Browse files

Changes for js in. Need to change as.

  • Loading branch information...
1 parent a53164c commit 8d273b56771486c316390b7e2971611d4185e144 trippb committed Jul 3, 2009
Binary file not shown.
View
Oops, something went wrong.
View
Oops, something went wrong.
View
Oops, something went wrong.
View
Binary file not shown.
@@ -57,7 +57,6 @@ package com.yahoo.yui
if(ExternalInterface.available)
{
this.initializeComponent();
-
var swfReady:Object = {type: "swfReady"};
this.dispatchEventToJavaScript(swfReady);
}
@@ -152,8 +151,8 @@ package com.yahoo.yui
*/
protected function initializeComponent():void
{
- this.elementID = this.loaderInfo.parameters.elementID;
- this.javaScriptEventHandler = this.loaderInfo.parameters.eventHandler;
+ this.elementID = this.loaderInfo.parameters.YUISwfId;
+ this.javaScriptEventHandler = this.loaderInfo.parameters.YUIBridgeCallback;
var allowedDomain:String = this.loaderInfo.parameters.allowedDomain;
if(allowedDomain)
@@ -6,10 +6,11 @@ component=charts
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=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=C:/Program Files/Adobe/Adobe Flash CS3
+flashbin=/Applications/Adobe\ Flash\ CS3
+
View
@@ -7,13 +7,14 @@
<import file="${builddir}/2.x/bootstrap.xml" description="Default Build Properties and Targets" />
<!-- custom properties -->
+
<property name="astra.srcdir" value="${component.basedir}/as"/>
<target name="build" depends="YuiModuleTargets.build, swfbuild" />
<target name="deploybuild" depends="YuiSharedTargets.deploybuild, swfdeploy" />
<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 -->
<arg line="--library-path+='${astra.srcdir}'"/>
@@ -27,14 +28,14 @@
</target>
<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 -->
<arg line="--source-path+='${astra.srcdir}'"/>
<!-- Core Flash CS3 Source Files -->
- <arg line="--source-path+='${flashbin}/en/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/ActionScript 3.0/Classes'"/>
+ <arg line="--source-path+='${flashbin}/Configuration/Component Source/ActionScript 3.0/User Interface'"/>
<!-- Main Classes to Include (will also add dependencies) -->
<arg line="--include-classes com.yahoo.astra.fl.charts.LineChart"/>
View
@@ -103,7 +103,11 @@ YAHOO.extend(YAHOO.widget.SWF, YAHOO.util.Element, {
},
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;
+ }
}
});

0 comments on commit 8d273b5

Please sign in to comment.