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 2017/05/18 18:34:49 UTC
git commit: [flex-asjs] [refs/heads/release0.8.0] - Fix to get
DataBindingExample_Flat to work on HTML platform.
Repository: flex-asjs
Updated Branches:
refs/heads/release0.8.0 182203982 -> 9fb9294bf
Fix to get DataBindingExample_Flat to work on HTML platform.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/9fb9294b
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/9fb9294b
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/9fb9294b
Branch: refs/heads/release0.8.0
Commit: 9fb9294bfa0dbe44c2d59e76d18d9f0d32420606
Parents: 1822039
Author: Peter Ent <pe...@apache.org>
Authored: Thu May 18 14:34:47 2017 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Thu May 18 14:34:47 2017 -0400
----------------------------------------------------------------------
.../flexjs/DataBindingExample_Flat/build.xml | 16 ++++++++++++++
.../flex/org/apache/flex/flat/DropDownList.as | 22 +++++++++++---------
2 files changed, 28 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fb9294b/examples/flexjs/DataBindingExample_Flat/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DataBindingExample_Flat/build.xml b/examples/flexjs/DataBindingExample_Flat/build.xml
index b9bcecf..0149bc8 100644
--- a/examples/flexjs/DataBindingExample_Flat/build.xml
+++ b/examples/flexjs/DataBindingExample_Flat/build.xml
@@ -32,6 +32,22 @@
<include file="${basedir}/../../build_example.xml" />
<target name="main" depends="clean,build_example.compile" description="Clean build of ${example}">
+ <mkdir dir="${basedir}/bin/js-debug/fonts" />
+ <copy todir="${basedir}/bin/js-debug/fonts" >
+ <fileset dir="${FLEXJS_HOME}/frameworks/fonts">
+ <include name="flat-ui-icons-regular.svg" />
+ <include name="flat-ui-icons-regular.ttf" />
+ <include name="flat-ui-icons-regular.woff" />
+ </fileset>
+ </copy>
+ <mkdir dir="${basedir}/bin/js-release/fonts" />
+ <copy todir="${basedir}/bin/js-release/fonts" >
+ <fileset dir="${FLEXJS_HOME}/frameworks/fonts">
+ <include name="flat-ui-icons-regular.svg" />
+ <include name="flat-ui-icons-regular.ttf" />
+ <include name="flat-ui-icons-regular.woff" />
+ </fileset>
+ </copy>
</target>
<target name="clean">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fb9294b/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/DropDownList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/DropDownList.as b/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/DropDownList.as
index b1c6a9e..4e876e2 100644
--- a/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/DropDownList.as
+++ b/frameworks/projects/Flat/src/main/flex/org/apache/flex/flat/DropDownList.as
@@ -27,7 +27,7 @@ package org.apache.flex.flat
COMPILE::JS
{
import goog.events;
- import org.apache.flex.core.ListBase;
+ import org.apache.flex.html.List;
import org.apache.flex.core.WrappedHTMLElement;
import org.apache.flex.core.ISelectionModel;
import org.apache.flex.events.Event;
@@ -76,7 +76,7 @@ package org.apache.flex.flat
[Event(name="change", type="org.apache.flex.events.Event")]
COMPILE::JS
- public class DropDownList extends ListBase
+ public class DropDownList extends List
{
/**
* Constructor.
@@ -265,6 +265,8 @@ package org.apache.flex.flat
var strWidth:String = labelWidth.toString();
strWidth += 'px';
this.label.style.width = strWidth;
+
+ this.positioner.style.overflow = 'visible';
}
override public function set className(value:String):void
@@ -287,7 +289,7 @@ package org.apache.flex.flat
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public function get dataProvider():Object
+ override public function get dataProvider():Object
{
return ISelectionModel(model).dataProvider;
}
@@ -297,7 +299,7 @@ package org.apache.flex.flat
* @flexjsignorecoercion HTMLOptionElement
* @flexjsignorecoercion HTMLSelectElement
*/
- public function set dataProvider(value:Object):void
+ override public function set dataProvider(value:Object):void
{
ISelectionModel(model).dataProvider = value;
}
@@ -311,11 +313,11 @@ package org.apache.flex.flat
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public function get labelField():String
+ override public function get labelField():String
{
return ISelectionModel(model).labelField;
}
- public function set labelField(value:String):void
+ override public function set labelField(value:String):void
{
ISelectionModel(model).labelField = value;
}
@@ -329,7 +331,7 @@ package org.apache.flex.flat
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public function get selectedIndex():int
+ override public function get selectedIndex():int
{
return ISelectionModel(model).selectedIndex;
}
@@ -339,7 +341,7 @@ package org.apache.flex.flat
* @flexjsignorecoercion HTMLSelectElement
* @flexjsignorecoercion String
*/
- public function set selectedIndex(value:int):void
+ override public function set selectedIndex(value:int):void
{
ISelectionModel(model).selectedIndex = value;
var lf:String = this.labelField;
@@ -359,7 +361,7 @@ package org.apache.flex.flat
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public function get selectedItem():Object
+ override public function get selectedItem():Object
{
return ISelectionModel(model).selectedItem;
}
@@ -369,7 +371,7 @@ package org.apache.flex.flat
* @flexjsignorecoercion HTMLSelectElement
* @flexjsignorecoercion String
*/
- public function set selectedItem(value:Object):void
+ override public function set selectedItem(value:Object):void
{
ISelectionModel(model).selectedItem = value;
var lf:String = this.labelField;