http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/basic-manifest.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/basic-manifest.xml b/frameworks/projects/Core/basic-manifest.xml index 6eb5ae0..69dab36 100644 --- a/frameworks/projects/Core/basic-manifest.xml +++ b/frameworks/projects/Core/basic-manifest.xml @@ -22,22 +22,22 @@ <componentPackage> <component id="Application" class="org.apache.flex.core.Application"/> + <component id="SimpleCSSValuesImpl" class="org.apache.flex.core.SimpleCSSValuesImpl"/> + <component id="CSSFontFaceBead" class="org.apache.flex.core.CSSFontFaceBead" /> + <component id="ViewBase" class="org.apache.flex.core.ViewBase"/> <!-- temporarily remove these classes while we try to get Application to compile <component id="BrowserScroller" class="org.apache.flex.core.BrowserScroller"/> <component id="BrowserResizeHandler" class="org.apache.flex.core.BrowserResizeListener"/> <component id="SimpleValuesImpl" class="org.apache.flex.core.SimpleValuesImpl"/> - <component id="SimpleCSSValuesImpl" class="org.apache.flex.core.SimpleCSSValuesImpl"/> - <component id="ViewBase" class="org.apache.flex.core.ViewBase"/> <component id="MXMLDragInitiator" class="org.apache.flex.core.MXMLDragInitiator" /> <component id="CallLaterBead" class="org.apache.flex.core.CallLaterBead" /> - <component id="CSSFontFaceBead" class="org.apache.flex.core.CSSFontFaceBead" /> <component id="BindableCSSStyles" class="org.apache.flex.core.BindableCSSStyles"/> <component id="SimpleCSSStyles" class="org.apache.flex.core.SimpleCSSStyles"/> <component id="ParentDocumentBead" class="org.apache.flex.core.ParentDocumentBead"/> <component id="MixinManager" class="org.apache.flex.utils.MixinManager" /> + --> <component id="ViewSourceContextMenuOption" class="org.apache.flex.utils.ViewSourceContextMenuOption" /> <component id="State" class="org.apache.flex.states.State"/> - --> </componentPackage>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/build.xml b/frameworks/projects/Core/build.xml index d32f0f0..77fa48d 100644 --- a/frameworks/projects/Core/build.xml +++ b/frameworks/projects/Core/build.xml @@ -174,8 +174,6 @@ <target name="compile-as-for-js" > <!-- copy js.swc into frameworks/libs --> - <copy file="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" todir="${basedir}/../../libs" /> - <copy file="${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" todir="${basedir}/../../libs" /> <echo message="Cross-compiling Core/as for js"/> <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" > @@ -191,6 +189,9 @@ <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> + <arg value="-external-library-path+=${FALCONJX_HOME}/../externs/js/out/bin/js.swc" /> + <!-- this is not on external-library path otherwise goog.requires are not generated --> + <arg value="-library-path+=${FALCONJX_HOME}/../externs/GCL/out/bin/GCL.swc" /> <arg value="-define=COMPILE::AS3,false" /> <arg value="-define=COMPILE::JS,true" /> </java> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/compile-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/compile-config.xml b/frameworks/projects/Core/compile-config.xml index 7ad8c2c..51d36de 100644 --- a/frameworks/projects/Core/compile-config.xml +++ b/frameworks/projects/Core/compile-config.xml @@ -63,10 +63,12 @@ <name>js/out/*</name> <path>js/out/*</path> </include-file> + <!-- <include-file> <name>js/src/*</name> <path>js/src/*</path> </include-file> + --> <include-classes> <class>CoreClasses</class> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/Core/compile-js-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/compile-js-config.xml b/frameworks/projects/Core/compile-js-config.xml index 061dd2d..3c3784b 100644 --- a/frameworks/projects/Core/compile-js-config.xml +++ b/frameworks/projects/Core/compile-js-config.xml @@ -23,8 +23,6 @@ <external-library-path> <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element> - <path-element>../../libs/js.swc</path-element> - <path-element>../../libs/GCL.swc</path-element> </external-library-path> <mxml> @@ -65,11 +63,13 @@ <name>js/out/*</name> <path>js/out/*</path> </include-file> + <!-- <include-file> <name>js/src/*</name> <path>js/src/*</path> </include-file> - + --> + <include-classes> <class>CoreJSClasses</class> <!-- leave out for now until we get Application to compile http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/HTML/js/src/org/apache/flex/html/DropDownList.js ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/DropDownList.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/DropDownList.js index 2fb57a9..3b060df 100644 --- a/frameworks/projects/HTML/js/src/org/apache/flex/html/DropDownList.js +++ b/frameworks/projects/HTML/js/src/org/apache/flex/html/DropDownList.js @@ -139,5 +139,4 @@ Object.defineProperties(org.apache.flex.html.DropDownList.prototype, { org.apache.flex.html.DropDownList.prototype.changeHandler = function() { this.model.selectedIndex = this.element.selectedIndex; - this.dispatchEvent('change'); }; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/037c9124/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ContainerView.js ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ContainerView.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ContainerView.js index db88a86..39158f6 100644 --- a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ContainerView.js +++ b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ContainerView.js @@ -16,6 +16,7 @@ goog.provide('org.apache.flex.html.beads.ContainerView'); goog.require('org.apache.flex.core.BeadViewBase'); goog.require('org.apache.flex.core.IBeadLayout'); +goog.require('org.apache.flex.core.IContainerView'); goog.require('org.apache.flex.core.ILayoutHost'); goog.require('org.apache.flex.core.IViewport'); goog.require('org.apache.flex.core.IViewportModel'); @@ -49,7 +50,7 @@ goog.inherits( org.apache.flex.html.beads.ContainerView.prototype.FLEXJS_CLASS_INFO = { names: [{ name: 'ContainerView', qName: 'org.apache.flex.html.beads.ContainerView' }], - interfaces: [org.apache.flex.core.ILayoutHost] + interfaces: [org.apache.flex.core.ILayoutHost, org.apache.flex.core.IContainerView] };
