flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [01/50] [abbrv] git commit: [flex-asjs] [refs/heads/dual] - replicate 11e9e87b46778873d6b22edac03a434e51a840d3 to Basic
Date Thu, 09 Feb 2017 05:44:53 GMT
Repository: flex-asjs
Updated Branches:
  refs/heads/dual [created] d89659f59


replicate 11e9e87b46778873d6b22edac03a434e51a840d3 to Basic


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

Branch: refs/heads/dual
Commit: b1d5a51657ddd14859de31187408d4fcc70bc031
Parents: 77b587f
Author: Alex Harui <aharui@apache.org>
Authored: Fri Feb 3 18:00:08 2017 -0800
Committer: Alex Harui <aharui@apache.org>
Committed: Fri Feb 3 18:00:08 2017 -0800

----------------------------------------------------------------------
 .../main/flex/org/apache/flex/html/ComboBox.as  | 33 +++--------
 .../flex/html/supportClasses/ComboBoxList.as    | 62 ++++++++++++++++++++
 .../Basic/src/main/resources/defaults.css       | 27 +++++++--
 3 files changed, 91 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b1d5a516/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ComboBox.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ComboBox.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ComboBox.as
index 0f338f9..8def207 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ComboBox.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ComboBox.as
@@ -18,15 +18,11 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.html
 {
-	import org.apache.flex.core.IComboBoxModel;
+    import org.apache.flex.core.IUIBase;
 	import org.apache.flex.core.UIBase;
-	import org.apache.flex.events.Event;
 
-    COMPILE::JS
-    {
-        import goog.events;
-        import org.apache.flex.core.WrappedHTMLElement;            
-    }
+    import org.apache.flex.core.IComboBoxModel;
+    import org.apache.flex.core.beads.models.ComboBoxModel;
 	
 	[Event(name="change", type="org.apache.flex.events.Event")]
 	
@@ -40,9 +36,6 @@ package org.apache.flex.html
 	 *  so forth.
 	 *  org.apache.flex.core.IBeadView:  the bead that constructs the visual parts of the component.
 	 *  org.apache.flex.core.IBeadController: the bead that handles input and output.
-	 *  org.apache.flex.core.IPopUp: the bead responsible for displaying the selection list.
-	 *  org.apache.flex.core.IDataProviderItemRendererMapper: the bead responsible for creating
the itemRenders.
-	 *  org.apache.flex.core.IItemRenderer: the class or factory used to display an item in
the component.
 	 * 
 	 *  @langversion 3.0
 	 *  @playerversion Flash 10.2
@@ -52,7 +45,7 @@ package org.apache.flex.html
 	public class ComboBox extends UIBase
 	{
 		/**
-		 *  constructor.
+		 *  Constructor.
 		 *
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
@@ -62,6 +55,8 @@ package org.apache.flex.html
 		public function ComboBox()
 		{
 			super();
+            
+            className = "ComboBox";
 		}
 		
 		/**
@@ -81,6 +76,7 @@ package org.apache.flex.html
 			IComboBoxModel(model).dataProvider = value;
 		}
 		
+        [Bindable("change")]
 		/**
 		 *  The index of the currently selected item. Changing this item changes
 		 *  the selectedItem value.
@@ -99,6 +95,7 @@ package org.apache.flex.html
 			IComboBoxModel(model).selectedIndex = value;
 		}
 		
+        [Bindable("change")]
 		/**
 		 *  The item that is currently selected. Changing this item changes
 		 *  the selectedIndex.
@@ -117,19 +114,5 @@ package org.apache.flex.html
 			IComboBoxModel(model).selectedItem = value;
 		}
 		
-        /**
-         * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
-         */
-        COMPILE::JS
-        override protected function createElement():WrappedHTMLElement
-        {            
-            element = document.createElement('div') as WrappedHTMLElement;
-            
-            positioner = element;
-            positioner.style.position = 'relative';
-            
-            return element;
-        }        
-
 	}
 }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b1d5a516/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/ComboBoxList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/ComboBoxList.as
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/ComboBoxList.as
new file mode 100644
index 0000000..78dbeb7
--- /dev/null
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/ComboBoxList.as
@@ -0,0 +1,62 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.flex.html.supportClasses
+{
+    import org.apache.flex.core.IPopUp;
+    import org.apache.flex.html.List;
+    
+    //--------------------------------------
+    //  Events
+    //--------------------------------------
+    
+    /**
+     *  @copy org.apache.flex.core.ISelectionModel#change
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+    [Event(name="change", type="org.apache.flex.events.Event")]
+    
+    /**
+     *  The ComboBoxList class is the List class used internally
+     *  by ComboBox as the dropdown/popup.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class ComboBoxList extends List implements IPopUp
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function ComboBoxList()
+		{
+			super();
+		}
+	}
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b1d5a516/frameworks/projects/Basic/src/main/resources/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/resources/defaults.css b/frameworks/projects/Basic/src/main/resources/defaults.css
index eb04983..1c23519 100644
--- a/frameworks/projects/Basic/src/main/resources/defaults.css
+++ b/frameworks/projects/Basic/src/main/resources/defaults.css
@@ -111,6 +111,24 @@ ComboBox
     IBeadModel: ClassReference("org.apache.flex.html.beads.models.ComboBoxModel");
     IBeadView: ClassReference("org.apache.flex.html.beads.ComboBoxView");
     IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ComboBoxController");
+	IPopUp: ClassReference("org.apache.flex.html.supportClasses.ComboBoxList");
+}
+
+ComboBoxList
+{
+	IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.TextItemRendererFactoryForArrayData");
+	IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
+	IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
+	border-style: solid;
+	border-radius: 4px;
+	border-color: #000000;
+	border-width: 1px;
+	background-color: #FFFFFF;
+}
+
+.ComboBoxButton {
+	padding: 0px;
+	margin: 0px;
 }
 
 Container
@@ -261,6 +279,7 @@ List
 	IViewportModel: ClassReference("org.apache.flex.html.beads.models.ViewportModel");
 	border-style: solid;
 	border-color: #222222;
+	background-color: #FFFFFF;
 }
 
 Tree
@@ -475,12 +494,8 @@ CloseButton
     IBeadView: ClassReference("org.apache.flex.html.beads.CloseButtonView");
 }
 
-ComboBox
-{
-    IPopUp: ClassReference("org.apache.flex.html.supportClasses.DropDownListList");
-    IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.TextItemRendererFactoryForArrayData");
-    IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
-    IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
+ComboBoxList {
+	iBackgroundBead: ClassReference('org.apache.flex.html.beads.SolidBackgroundBead');
 }
 
 Container


Mime
View raw message