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 2016/11/30 19:58:39 UTC

[1/5] git commit: [flex-asjs] [refs/heads/develop] - Updated ComboBox by separating its model/view/controller more cleanly on the JS side.

Repository: flex-asjs
Updated Branches:
  refs/heads/develop 3f4d5edce -> 0b0ec4488


Updated ComboBox by separating its model/view/controller more cleanly on the JS side.


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

Branch: refs/heads/develop
Commit: 33fd39ec7a3f462a577c5414c938c27a1e85ea54
Parents: 751aa39
Author: Peter Ent <pe...@apache.org>
Authored: Tue Nov 29 15:27:14 2016 -0500
Committer: Peter Ent <pe...@apache.org>
Committed: Tue Nov 29 15:27:14 2016 -0500

----------------------------------------------------------------------
 .../projects/HTML/src/main/flex/HTMLClasses.as  |   4 +-
 .../main/flex/org/apache/flex/html/ComboBox.as  | 147 ----------
 .../org/apache/flex/html/beads/ComboBoxView.as  | 279 +++++++++++++++++--
 .../org/apache/flex/html/beads/IComboBoxView.as |  12 +-
 .../beads/controllers/ComboBoxController.as     |  83 ++++++
 .../HTML/src/main/resources/defaults.css        |   4 +-
 6 files changed, 349 insertions(+), 180 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/33fd39ec/frameworks/projects/HTML/src/main/flex/HTMLClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/HTMLClasses.as b/frameworks/projects/HTML/src/main/flex/HTMLClasses.as
index cf8e2d2..7332cda 100644
--- a/frameworks/projects/HTML/src/main/flex/HTMLClasses.as
+++ b/frameworks/projects/HTML/src/main/flex/HTMLClasses.as
@@ -41,8 +41,8 @@ internal class HTMLClasses
 	COMPILE::SWF
 	{
 		import org.apache.flex.html.beads.CheckBoxView; CheckBoxView;
-	    import org.apache.flex.html.beads.ComboBoxView; ComboBoxView;
 	}
+	import org.apache.flex.html.beads.ComboBoxView; ComboBoxView;
     import org.apache.flex.html.beads.ContainerView; ContainerView;
 	COMPILE::SWF
 	{
@@ -117,10 +117,10 @@ internal class HTMLClasses
 	COMPILE::SWF
 	{
 	    import org.apache.flex.html.beads.controllers.AlertController; AlertController;
-		import org.apache.flex.html.beads.controllers.ComboBoxController; ComboBoxController;
     	import org.apache.flex.html.beads.controllers.DropDownListController; DropDownListController;
 		import org.apache.flex.html.beads.controllers.EditableTextKeyboardController; EditableTextKeyboardController;
 	}
+	import org.apache.flex.html.beads.controllers.ComboBoxController; ComboBoxController;
 	import org.apache.flex.html.beads.controllers.AccordionItemRendererMouseController; AccordionItemRendererMouseController;
     import org.apache.flex.html.beads.controllers.ItemRendererMouseController; ItemRendererMouseController;
     import org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController; ListSingleSelectionMouseController;

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/33fd39ec/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/ComboBox.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/ComboBox.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/ComboBox.as
index 6932972..628154b 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/ComboBox.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/ComboBox.as
@@ -117,11 +117,6 @@ package org.apache.flex.html
 			IComboBoxModel(model).selectedItem = value;
 		}
 		
-		COMPILE::JS {
-			private var input: WrappedHTMLElement;
-			private var button: WrappedHTMLElement;
-		}
-		
         /**
          * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
          */
@@ -130,152 +125,10 @@ package org.apache.flex.html
         {            
             element = document.createElement('div') as WrappedHTMLElement;
             
-            input = document.createElement('input') as WrappedHTMLElement;
-            input.style.position = 'absolute';
-            input.style.width = '80px';
-            element.appendChild(input);
-            
-            button = document.createElement('div') as WrappedHTMLElement;
-            button.style.position = 'absolute';
-            button.style.top = '0px';
-            button.style.right = '0px';
-            button.style.background = '#bbb';
-            button.style.width = '16px';
-            button.style.height = '20px';
-            button.style.margin = '0';
-            button.style.border = 'solid #609 1px';
-            goog.events.listen(button, 'click', buttonClicked);
-            element.appendChild(button);
-            
             positioner = element;
             positioner.style.position = 'relative';
             
-            // add a click handler so that a click outside of the combo box can
-            // dismiss the pop-up should it be visible.
-            goog.events.listen(document, 'click',
-                dismissPopup);
-            
-            input.flexjs_wrapper = this;
-            
             return element;
-        }        
-
-        COMPILE::JS
-        private var popup:HTMLElement;
-        
-        /**
-         * @param event The event.
-         * @flexjsignorecoercion HTMLSelectElement
-		 * @flexjsignorecoercion HTMLInputElement
-         */
-        COMPILE::JS
-        private function selectChanged(event:Event):void
-        {
-            var select:HTMLSelectElement;
-            
-            select = event.currentTarget as HTMLSelectElement;
-            
-            selectedItem = select.options[select.selectedIndex].value;
-			(input as HTMLInputElement).value = selectedItem.toString();
-            
-            popup.parentNode.removeChild(popup);
-            popup = null;
-            
-            dispatchEvent(event);
         }
-        
-        
-        /**
-         * @param event The event.
-         */
-        COMPILE::JS
-        private function dismissPopup(event:Event):void
-        {
-            // remove the popup if it already exists
-            if (popup) {
-                popup.parentNode.removeChild(popup);
-                popup = null;
-            }
-        }
-        
-        
-        /**
-         * @export
-         * @param {Object} event The event.
-         * @flexjsignorecoercion HTMLInputElement
-         * @flexjsignorecoercion HTMLElement
-         * @flexjsignorecoercion HTMLSelectElement
-         * @flexjsignorecoercion HTMLOptionElement
-         * @flexjsignorecoercion Array
-         */
-        COMPILE::JS
-        private function buttonClicked(event:Event):void
-        {
-            var dp:Array;
-            var i:int;
-            var input:HTMLInputElement;
-            var left:Number;
-            var n:int;
-            var opt:HTMLOptionElement;
-            var pn:HTMLElement;
-            var popup:HTMLElement;
-            var select:HTMLSelectElement;
-            var si:int;
-            var top:Number;
-            var width:Number;
-            
-            event.stopPropagation();
-            
-            if (popup) {
-                dismissPopup(null);
-                
-                return;
-            }
-            
-            input = element.childNodes.item(0) as HTMLInputElement;
-            
-            pn = element;
-            top = pn.offsetTop + input.offsetHeight;
-            left = pn.offsetLeft;
-            width = pn.offsetWidth;
-            
-            popup = document.createElement('div') as HTMLElement;
-            popup.className = 'popup';
-            popup.id = 'test';
-            popup.style.position = 'absolute';
-            popup.style.top = top.toString() + 'px';
-            popup.style.left = left.toString() + 'px';
-            popup.style.width = width.toString() + 'px';
-            popup.style.margin = '0px auto';
-            popup.style.padding = '0px';
-            popup.style.zIndex = '10000';
-            
-            select = document.createElement('select') as HTMLSelectElement;
-            select.style.width = width.toString() + 'px';
-            goog.events.listen(select, 'change', selectChanged);
-            
-            dp = dataProvider as Array;
-            n = dp.length;
-            for (i = 0; i < n; i++) {
-                opt = document.createElement('option') as HTMLOptionElement;
-                opt.text = dp[i];
-                select.add(opt, null);
-            }
-            
-            select.size = n;
-            
-            si = selectedIndex;
-            if (si < 0) {
-                select.value = null;
-            } else {
-                select.value = dp[si];
-            }
-            
-            this.popup = popup;
-            
-            popup.appendChild(select);
-            document.body.appendChild(popup);
-        }
-
 	}
 }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/33fd39ec/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ComboBoxView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ComboBoxView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ComboBoxView.as
index 1bb67e1..a3b70be 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ComboBoxView.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ComboBoxView.as
@@ -18,9 +18,11 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.html.beads
 {
-	import flash.display.DisplayObject;
-	import flash.display.DisplayObjectContainer;
-	import flash.display.Sprite;
+	COMPILE::SWF {
+		import flash.display.DisplayObject;
+		import flash.display.DisplayObjectContainer;
+		import flash.display.Sprite;
+	}
 	
     import org.apache.flex.core.BeadViewBase;
 	import org.apache.flex.core.ElementWrapper;
@@ -38,6 +40,13 @@ package org.apache.flex.html.beads
 	import org.apache.flex.html.Button;
 	import org.apache.flex.html.TextInput;
     import org.apache.flex.utils.UIUtils;
+	import org.apache.flex.core.IComboBoxModel;
+	
+	COMPILE::JS
+	{
+		import goog.events;
+		import org.apache.flex.core.WrappedHTMLElement;            
+	}
 	
 	/**
 	 *  The ComboBoxView class creates the visual elements of the org.apache.flex.html.ComboBox 
@@ -49,26 +58,68 @@ package org.apache.flex.html.beads
 	 *  @playerversion AIR 2.6
 	 *  @productversion FlexJS 0.0
 	 */
+	COMPILE::JS
 	public class ComboBoxView extends BeadViewBase implements IBeadView, IComboBoxView
 	{
+		public function ComboBoxView()
+		{
+			
+		}
+		
+		private var input: WrappedHTMLElement;
+		private var button: WrappedHTMLElement;
+		private var _popup:HTMLElement;
+		
+		public function get strand():IStrand
+		{
+			return _strand;
+		}
+		
 		/**
-		 *  constructor.
+		 * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
+		 */
+		override public function set strand(value:IStrand):void
+		{
+			super.strand = value;
+			
+			var element:WrappedHTMLElement = (_strand as UIBase).element;
+			
+			input = document.createElement('input') as WrappedHTMLElement;
+			input.style.position = 'absolute';
+			input.style.width = '80px';
+			element.appendChild(input);
+			
+			button = document.createElement('div') as WrappedHTMLElement;
+			button.style.position = 'absolute';
+			button.style.top = '0px';
+			button.style.right = '0px';
+			button.style.background = '#bbb';
+			button.style.width = '16px';
+			button.style.height = '20px';
+			button.style.margin = '0';
+			button.style.border = 'solid #609 1px';
+			element.appendChild(button);
+
+			input.flexjs_wrapper = this;
+		}
+		
+		/**
+		 *  The TextInput component of the ComboBox.
+		 * 
+		 *  @copy org.apache.flex.html.beads.IComboBoxView#text
 		 *
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
 		 *  @playerversion AIR 2.6
 		 *  @productversion FlexJS 0.0
 		 */
-		public function ComboBoxView()
+		public function get textInputField():Object 
 		{
+			return input;
 		}
 		
-		private var textInput:TextInput;
-		private var button:Button;
-		private var selectionModel:IComboBoxModel;
-		
 		/**
-		 *  The value of the TextInput component of the ComboBox.
+		 *  The Button component of the ComboBox.
 		 * 
 		 *  @copy org.apache.flex.html.beads.IComboBoxView#text
 		 *
@@ -77,35 +128,189 @@ package org.apache.flex.html.beads
 		 *  @playerversion AIR 2.6
 		 *  @productversion FlexJS 0.0
 		 */
-		public function get text():String
+		public function get popupButton():Object
 		{
-			return textInput.text;
+			return button;
 		}
-		public function set text(value:String):void
+		
+		/**
+		 *  The pop-up list component of the ComboBox.
+		 * 
+		 *  @copy org.apache.flex.html.beads.IComboBoxView#text
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get popUp():Object
 		{
-			textInput.text = value;
+			return _popup;
 		}
 		
 		/**
-		 *  The HTML value of the TextInput component of the ComboBox.
+		 *  Returns whether or not the pop-up is visible.
 		 * 
-		 *  @copy org.apache.flex.html.beads.IComboBoxView#html
+		 *  @copy org.apache.flex.html.beads.IComboBoxView#text
 		 *
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
 		 *  @playerversion AIR 2.6
 		 *  @productversion FlexJS 0.0
 		 */
-		public function get html():String
+		public function get popUpVisible():Boolean
+		{
+			return _popup != null;
+		}
+		public function set popUpVisible(value:Boolean):void
+		{
+			if (value && _popup == null) {
+				showPopup();
+			}
+			else {
+				dismissPopup();
+			}
+		}
+		
+		/**
+		 * @param event The event.
+		 * @flexjsignorecoercion HTMLSelectElement
+		 * @flexjsignorecoercion HTMLInputElement
+		 */
+		private function selectChanged(event:Event):void
 		{
-			return textInput.html;
+			var select:HTMLSelectElement;
+			
+			select = event.currentTarget as HTMLSelectElement;
+			
+			var model:IComboBoxModel = (_strand as UIBase).model as IComboBoxModel;
+			model.selectedItem = select.options[select.selectedIndex].value;
+			(input as HTMLInputElement).value = model.selectedItem.toString();
+			
+			_popup.parentNode.removeChild(_popup);
+			_popup = null;
+			
+			dispatchEvent(event);
 		}
-		public function set html(value:String):void
+		
+		/**
+		 */
+		private function dismissPopup():void
 		{
-			textInput.html = value;
+			// remove the popup if it already exists
+			if (_popup) {
+				_popup.parentNode.removeChild(_popup);
+				_popup = null;
+			}
 		}
 		
 		/**
+		 * @export
+		 * @param {Object} event The event.
+		 * @flexjsignorecoercion HTMLInputElement
+		 * @flexjsignorecoercion HTMLElement
+		 * @flexjsignorecoercion HTMLSelectElement
+		 * @flexjsignorecoercion HTMLOptionElement
+		 * @flexjsignorecoercion Array
+		 */
+		private function showPopup():void
+		{
+			var dp:Array;
+			var i:int;
+			var input:HTMLInputElement;
+			var left:Number;
+			var n:int;
+			var opt:HTMLOptionElement;
+			var pn:HTMLElement;
+			var select:HTMLSelectElement;
+			var si:int;
+			var top:Number;
+			var width:Number;
+			
+			if (_popup) {
+				dismissPopup();
+				
+				return;
+			}
+			
+			var element:WrappedHTMLElement = (_strand as UIBase).element;
+			
+			input = element.childNodes.item(0) as HTMLInputElement;
+			
+			pn = element;
+			top = pn.offsetTop + input.offsetHeight;
+			left = pn.offsetLeft;
+			width = pn.offsetWidth;
+			
+			_popup = document.createElement('div') as HTMLElement;
+			_popup.className = 'popup';
+			_popup.id = 'test';
+			_popup.style.position = 'absolute';
+			_popup.style.top = top.toString() + 'px';
+			_popup.style.left = left.toString() + 'px';
+			_popup.style.width = width.toString() + 'px';
+			_popup.style.margin = '0px auto';
+			_popup.style.padding = '0px';
+			_popup.style.zIndex = '10000';
+			
+			select = document.createElement('select') as HTMLSelectElement;
+			select.style.width = width.toString() + 'px';
+			goog.events.listen(select, 'change', selectChanged);
+			
+			var model:IComboBoxModel = (_strand as UIBase).model as IComboBoxModel;
+			
+			dp = model.dataProvider as Array;
+			n = dp.length;
+			for (i = 0; i < n; i++) {
+				opt = document.createElement('option') as HTMLOptionElement;
+				opt.text = dp[i];
+				select.add(opt, null);
+			}
+			
+			select.size = n;
+			
+			si = model.selectedIndex;
+			if (si < 0) {
+				select.value = null;
+			} else {
+				select.value = dp[si];
+			}
+						
+			_popup.appendChild(select);
+			document.body.appendChild(_popup);
+		}
+	}
+	
+	/**
+	 *  The ComboBoxView class creates the visual elements of the org.apache.flex.html.ComboBox 
+	 *  component. The job of the view bead is to put together the parts of the ComboBox such as the TextInput
+	 *  control and org.apache.flex.html.Button to trigger the pop-up.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	COMPILE::SWF
+	public class ComboBoxView extends BeadViewBase implements IBeadView, IComboBoxView
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function ComboBoxView()
+		{
+		}
+		
+		private var textInput:TextInput;
+		private var button:Button;
+		private var selectionModel:IComboBoxModel;
+		
+		/**
 		 *  @copy org.apache.flex.core.IBead#strand
 		 *  
 		 *  @langversion 3.0
@@ -176,6 +381,36 @@ package org.apache.flex.html.beads
 			sprite.graphics.lineTo(4,4);
 			sprite.graphics.endFill();
 		}
+		
+		/**
+		 *  The TextInput component of the ComboBox.
+		 * 
+		 *  @copy org.apache.flex.html.beads.IComboBoxView#text
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get textInputField():Object 
+		{
+			return textInput;
+		}
+		
+		/**
+		 *  The Button component of the ComboBox.
+		 * 
+		 *  @copy org.apache.flex.html.beads.IComboBoxView#text
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function get popupButton():Object
+		{
+			return button;
+		}
         
         private var _popUp:IStrand;
 		
@@ -187,7 +422,7 @@ package org.apache.flex.html.beads
          *  @playerversion AIR 2.6
          *  @productversion FlexJS 0.0
          */
-        public function get popUp():IStrand
+        public function get popUp():Object
         {
             if (!_popUp)
             {
@@ -240,7 +475,7 @@ package org.apache.flex.html.beads
 		 */
 		private function selectionChangeHandler(event:Event):void
 		{
-			text = selectionModel.selectedItem.toString();
+			textInput.text = selectionModel.selectedItem.toString();
 		}
 		
 		/**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/33fd39ec/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/IComboBoxView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/IComboBoxView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/IComboBoxView.as
index 650d300..e58d868 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/IComboBoxView.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/IComboBoxView.as
@@ -33,26 +33,24 @@ package org.apache.flex.html.beads
 	public interface IComboBoxView extends IBeadView
 	{
 		/**
-		 *  The string appearing in the input area for the ComboBox.
+		 *  The sub-component used for the input area of the ComboBox.
 		 *
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
 		 *  @playerversion AIR 2.6
 		 *  @productversion FlexJS 0.0
 		 */
-		function get text():String;
-		function set text(value:String):void;
+		function get textInputField():Object;
 		
 		/**
-		 *  The HTML string appearing in the input area for the ComboBox.
+		 *  The sub-component used for the button to activate the pop-up.
 		 *
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
 		 *  @playerversion AIR 2.6
 		 *  @productversion FlexJS 0.0
 		 */
-		function get html():String;
-		function set html(value:String):void;
+		function get popupButton():Object;
 		
 		/**
 		 *  The component housing the selection list.
@@ -62,7 +60,7 @@ package org.apache.flex.html.beads
 		 *  @playerversion AIR 2.6
 		 *  @productversion FlexJS 0.0
 		 */
-		function get popUp():IStrand;
+		function get popUp():Object;
 		
 		/**
 		 *  Determines whether or not the pop-up with the selection list is visible or not.

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/33fd39ec/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/ComboBoxController.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/ComboBoxController.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/ComboBoxController.as
index 9e91772..c9a9f1c 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/ComboBoxController.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/ComboBoxController.as
@@ -18,7 +18,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.html.beads.controllers
 {
+	COMPILE::SWF {
 	import flash.display.DisplayObject;
+	}
 	
 	import org.apache.flex.core.IBeadController;
 	import org.apache.flex.core.ISelectionModel;
@@ -28,6 +30,86 @@ package org.apache.flex.html.beads.controllers
 	import org.apache.flex.events.IEventDispatcher;
 	import org.apache.flex.events.MouseEvent;
 	import org.apache.flex.html.beads.IComboBoxView;
+	
+	COMPILE::JS {
+		import goog.events;
+		import org.apache.flex.core.WrappedHTMLElement; 
+	}
+	
+	/**
+	 *  The ComboBoxController class bead handles mouse events on the elements of
+	 *  the org.apache.flex.html.ComboBox. This includes selecting the 
+	 *  button to display the selection list pop-up as well as selecting an item from the 
+	 *  pop-up list.
+	 *  
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+	 */
+	COMPILE::JS
+	public class ComboBoxController implements IBeadController
+	{
+		private var _strand:IStrand;
+		
+		/**
+		 *  @copy org.apache.flex.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function set strand(value:IStrand):void
+		{
+			_strand = value;
+			
+			var viewBead:IComboBoxView = _strand.getBeadByType(IComboBoxView) as IComboBoxView;
+			if (viewBead) {
+				finishSetup(null);
+			} else {
+				IEventDispatcher(_strand).addEventListener("viewChanged", finishSetup);
+			}
+		}
+		
+		/**
+		 * @private
+		 * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
+		 */
+		private function finishSetup(event:Event):void
+		{
+			var viewBead:IComboBoxView = _strand.getBeadByType(IComboBoxView) as IComboBoxView;
+			var button:WrappedHTMLElement = viewBead.popupButton as WrappedHTMLElement;
+			goog.events.listen(button, 'click', showPopup);
+			
+			// add a click handler so that a click outside of the combo box can
+			// dismiss the pop-up should it be visible.
+			goog.events.listen(document, 'click',
+				dismissPopup);
+		}
+		
+		/**
+		 * @private
+		 */
+		private function dismissPopup(event:Event):void
+		{
+			var host:IUIBase = IUIBase(_strand);
+			var viewBead:IComboBoxView = _strand.getBeadByType(IComboBoxView) as IComboBoxView;
+			viewBead.popUpVisible = false;
+		}
+		
+		/**
+		 * @private
+		 */
+		private function showPopup(event:Event):void
+		{
+			event.stopPropagation();
+			
+			var host:IUIBase = IUIBase(_strand);
+			var viewBead:IComboBoxView = _strand.getBeadByType(IComboBoxView) as IComboBoxView;
+			viewBead.popUpVisible = true;
+		}
+	}
 
 	/**
 	 *  The ComboBoxController class bead handles mouse events on the elements of
@@ -40,6 +122,7 @@ package org.apache.flex.html.beads.controllers
 	 *  @playerversion AIR 2.6
 	 *  @productversion FlexJS 0.0
 	 */
+	COMPILE::SWF
 	public class ComboBoxController implements IBeadController
 	{
 		/**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/33fd39ec/frameworks/projects/HTML/src/main/resources/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/resources/defaults.css b/frameworks/projects/HTML/src/main/resources/defaults.css
index 29e75cc..02d2cda 100644
--- a/frameworks/projects/HTML/src/main/resources/defaults.css
+++ b/frameworks/projects/HTML/src/main/resources/defaults.css
@@ -86,6 +86,8 @@ ButtonBarButtonItemRenderer
 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");
 }
 
 Container
@@ -479,8 +481,6 @@ CloseButton
 
 ComboBox
 {
-    IBeadView: ClassReference("org.apache.flex.html.beads.ComboBoxView");
-    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ComboBoxController");
     IPopUp: ClassReference("org.apache.flex.html.supportClasses.DropDownListList");
     IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.TextItemRendererFactoryForArrayData");
     IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");


[4/5] git commit: [flex-asjs] [refs/heads/develop] - Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into develop

Posted by pe...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into develop

# By Carlos Rovira
# Via Carlos Rovira
* 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs:
  Change Button className management to classList. Please check and will comment what do you think in mailing list
  fix error introduced in last commit that makes navigation link not work


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

Branch: refs/heads/develop
Commit: 0d82ec5784c6a9190e43efbe1da93473bc5e903e
Parents: 1125ee4 3f4d5ed
Author: Peter Ent <pe...@apache.org>
Authored: Wed Nov 30 13:23:16 2016 -0500
Committer: Peter Ent <pe...@apache.org>
Committed: Wed Nov 30 13:23:16 2016 -0500

----------------------------------------------------------------------
 .../src/main/flex/org/apache/flex/mdl/Button.as | 40 ++++++++++++++++----
 .../flex/org/apache/flex/mdl/NavigationLink.as  |  2 +-
 2 files changed, 33 insertions(+), 9 deletions(-)
----------------------------------------------------------------------



[3/5] git commit: [flex-asjs] [refs/heads/develop] - Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into develop

Posted by pe...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into develop

# By Carlos Rovira
# Via Carlos Rovira
* 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs:
  Fill example links in drawer and navigation
  Other MDL Tabs Example
  HTML Ul and Li elements
  Tabs working
  Refactor to \u201cRestrict\u201d bead to allow all kind of restrictions
  Numeric TextField bead
  Initial Tabs


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

Branch: refs/heads/develop
Commit: 1125ee4de0347e861c4b12e8097dee73cbd599dc
Parents: 9273772 e8a913e
Author: Peter Ent <pe...@apache.org>
Authored: Wed Nov 30 07:15:05 2016 -0500
Committer: Peter Ent <pe...@apache.org>
Committed: Wed Nov 30 07:15:05 2016 -0500

----------------------------------------------------------------------
 .../src/main/flex/MainNavigation.mxml           |  23 +--
 .../flexjs/MDLExample/src/main/flex/Tabs.mxml   |  85 ++++++++++++
 .../MDLExample/src/main/flex/TextFields.mxml    |  16 ++-
 .../src/main/flex/org/apache/flex/html/Li.as    |  69 +++++++++
 .../src/main/flex/org/apache/flex/html/Ul.as    |  69 +++++++++
 .../HTML/src/main/resources/basic-manifest.xml  |   2 +
 .../flex/org/apache/flex/mdl/NavigationLink.as  |   2 +-
 .../src/main/flex/org/apache/flex/mdl/TabBar.as |  33 ++++-
 .../flex/org/apache/flex/mdl/TabBarButton.as    |  31 ++++-
 .../flex/org/apache/flex/mdl/TabBarPanel.as     |  34 ++++-
 .../src/main/flex/org/apache/flex/mdl/Tabs.as   |  97 +++++++++++++
 .../main/flex/org/apache/flex/mdl/TextField.as  |  16 ++-
 .../flex/org/apache/flex/mdl/beads/Restrict.as  | 139 +++++++++++++++++++
 .../src/main/resources/mdl-manifest.xml         |   2 +
 14 files changed, 592 insertions(+), 26 deletions(-)
----------------------------------------------------------------------



[5/5] git commit: [flex-asjs] [refs/heads/develop] - Fix for defaults.css enabling ComboBox to work correctly on SWF and JS platforms.

Posted by pe...@apache.org.
Fix for defaults.css enabling ComboBox to work correctly on SWF and JS platforms.


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

Branch: refs/heads/develop
Commit: 0b0ec448829749261623da82ffae954c4db4e4d1
Parents: 0d82ec5
Author: Peter Ent <pe...@apache.org>
Authored: Wed Nov 30 14:58:22 2016 -0500
Committer: Peter Ent <pe...@apache.org>
Committed: Wed Nov 30 14:58:22 2016 -0500

----------------------------------------------------------------------
 .../HTML/src/main/resources/defaults.css        | 290 ++-----------------
 1 file changed, 18 insertions(+), 272 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0b0ec448/frameworks/projects/HTML/src/main/resources/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/resources/defaults.css b/frameworks/projects/HTML/src/main/resources/defaults.css
index d7074e8..6eef06d 100644
--- a/frameworks/projects/HTML/src/main/resources/defaults.css
+++ b/frameworks/projects/HTML/src/main/resources/defaults.css
@@ -1,21 +1,21 @@
 /*
- *
- *  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.
- *
- */
+*
+*  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.
+*
+*/
 
 @namespace "library://ns.apache.org/flexjs/basic";
 @namespace svg "library://ns.apache.org/flexjs/svg";
@@ -85,9 +85,7 @@ ButtonBarButtonItemRenderer
 
 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");
+	IBeadModel: ClassReference("org.apache.flex.html.beads.models.ComboBoxModel");
 }
 
 Container
@@ -707,255 +705,3 @@ global
 	}
 	
 }
-
-Border
-{
-  border-color: inherit;
-  border-style: inherit;
-  border-radius: inherit;
-  border-width: inherit;
-  border: inherit;
-}
-
-Button
-{
-    IBeadView: ClassReference("org.apache.flex.html.beads.CSSButtonView");
-}
-
-CheckBox
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ToggleButtonModel");
-    IBeadView:  ClassReference("org.apache.flex.html.beads.CheckBoxView");			
-}
-
-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");
-}
-
-Container
-{
-    iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
-    iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
-}
-
-ControlBar
-{
-	IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.FlexibleFirstChildHorizontalLayout");
-    iMeasurementBead: ClassReference("org.apache.flex.html.beads.ControlBarMeasurementBead");
-    iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
-    iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");    
-}
-
-DropDownList
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
-    IBeadView: ClassReference("org.apache.flex.html.beads.DropDownListView");
-    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.DropDownListController");
-    IPopUp: ClassReference("org.apache.flex.html.supportClasses.DropDownListList");
-}
-
-DropDownListList
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
-    IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.TextItemRendererFactoryForArrayData");
-    IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
-    IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
-    iBackgroundBead: ClassReference('org.apache.flex.html.beads.SolidBackgroundBead');
-    border-style: solid;
-    border-radius: 4px;
-    border-color: #000000;
-    border-width: 1px;
-    background-color: #FFFFFF;
-}
-
-HRule
-{
-    IBeadView:  ClassReference("org.apache.flex.html.beads.HRuleView");
-}
-
-ImageButton
-{
-    IBeadView: ClassReference("org.apache.flex.html.beads.ImageButtonView");
-}
-
-ImageAndTextButton
-{
-    IBeadView: ClassReference("org.apache.flex.html.beads.CSSImageAndTextButtonView");
-}
-
-Label
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
-    IBeadView: ClassReference("org.apache.flex.html.beads.TextFieldView");
-	iMeasurementBead: ClassReference("org.apache.flex.html.beads.TextFieldLabelMeasurementBead");
-}
-
-List
-{
-    iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
-    iBorderModel: ClassReference('org.apache.flex.html.beads.models.SingleLineBorderModel');
-}
-
-MultilineLabel
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
-    IBeadView: ClassReference("org.apache.flex.html.beads.MultilineTextFieldView");
-}
-
-NumericStepper
-{
-    IBeadView: ClassReference("org.apache.flex.html.beads.NumericStepperView");
-    
-    padding: 0px;
-    border-style: solid;
-    border-color: #000000;
-    border-width: 1px;
-    background-color: #FFFFFF;
-    iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
-    iBackgroundBead: ClassReference('org.apache.flex.html.beads.SolidBackgroundBead');
-}
-
-Panel
-{
-    iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
-    iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");    
-}
-
-PanelWithControlBar
-{
-    iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
-    iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
-}
-
-RadioButton
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ValueToggleButtonModel");
-    IBeadView:  ClassReference("org.apache.flex.html.beads.RadioButtonView");			
-}
-
-VScrollBar
-{
-    IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.VScrollBarLayout");
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ScrollBarModel");
-    IBeadView: ClassReference("org.apache.flex.html.beads.VScrollBarView");
-    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.VScrollBarMouseController");
-}
-
-HScrollBar
-{
-	IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.HScrollBarLayout");
-	IBeadModel: ClassReference("org.apache.flex.html.beads.models.ScrollBarModel");
-	IBeadView: ClassReference("org.apache.flex.html.beads.HScrollBarView");
-	IBeadController: ClassReference("org.apache.flex.html.beads.controllers.HScrollBarMouseController");
-}
-
-SimpleAlert
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.AlertModel");
-    IBeadView:  ClassReference("org.apache.flex.html.beads.SimpleAlertView");
-    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.AlertController");
-    iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
-    iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
-    
-    background-color: #FFFFFF;
-    border-style: solid;
-    border-color: #000000;
-    border-width: 1px;
-}
-
-Slider
-{
-    iBeadView:  ClassReference("org.apache.flex.html.beads.SliderView");
-    iBeadController: ClassReference("org.apache.flex.html.beads.controllers.SliderMouseController");
-    iThumbView: ClassReference("org.apache.flex.html.beads.SliderThumbView");
-    iTrackView: ClassReference("org.apache.flex.html.beads.SliderTrackView");
-}
-
-Spinner
-{
-    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.SpinnerMouseController");
-}
-
-TextArea
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
-    IBeadView: ClassReference("org.apache.flex.html.beads.TextAreaView");
-    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.EditableTextKeyboardController");
-    iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
-    iBorderModel: ClassReference('org.apache.flex.html.beads.models.SingleLineBorderModel');
-    border-style: solid;
-    border-color: #000000;
-    border-width: 1px;
-    background-color: #FFFFFF;
-}
-
-TextButton
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
-    IBeadView: ClassReference("org.apache.flex.html.beads.CSSTextButtonView");
-    iMeasurementBead: ClassReference("org.apache.flex.html.beads.TextButtonMeasurementBead");
-}
-
-/*
-TextFieldItemRenderer
-{
-    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ItemRendererMouseController");
-    height: 16;
-}
-*/
-
-TextInput
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
-    IBeadView: ClassReference("org.apache.flex.html.beads.TextInputWithBorderView");
-    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.EditableTextKeyboardController");
-    iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
-    iBackgroundBead: ClassReference('org.apache.flex.html.beads.SolidBackgroundBead');
-    border-style: solid;
-    border-color: #000000;
-    border-width: 1px;
-    background-color: #FFFFFF;
-}
-
-TitleBar
-{
-    iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
-    iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
-}
-
-ToggleTextButton
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.ToggleButtonModel");
-    IBeadView:  ClassReference("org.apache.flex.html.beads.CSSTextToggleButtonView");
-}
-
-View
-{
-    iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
-    iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
-}
-
-VRule
-{
-    IBeadView:  ClassReference("org.apache.flex.html.beads.VRuleView");
-}
-
-/* SVG */
-
-svg|TextButton
-{
-    IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
-    IBeadView: ClassReference("org.apache.flex.html.beads.CSSTextButtonView");
-    iMeasurementBead: ClassReference("org.apache.flex.html.beads.TextButtonMeasurementBead");
-}
-
-}


[2/5] git commit: [flex-asjs] [refs/heads/develop] - Merge branch 'combowork' into develop

Posted by pe...@apache.org.
Merge branch 'combowork' into develop

* combowork:
  Updated ComboBox by separating its model/view/controller more cleanly on the JS side.

Conflicts:
	frameworks/projects/HTML/src/main/resources/defaults.css


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

Branch: refs/heads/develop
Commit: 9273772de9a612cba88e8d1d41073efa30b2943c
Parents: 8dcedd2 33fd39e
Author: Peter Ent <pe...@apache.org>
Authored: Wed Nov 30 07:14:57 2016 -0500
Committer: Peter Ent <pe...@apache.org>
Committed: Wed Nov 30 07:14:57 2016 -0500

----------------------------------------------------------------------
 .../projects/HTML/src/main/flex/HTMLClasses.as  |   4 +-
 .../main/flex/org/apache/flex/html/ComboBox.as  | 147 ----------
 .../org/apache/flex/html/beads/ComboBoxView.as  | 279 ++++++++++++++++--
 .../org/apache/flex/html/beads/IComboBoxView.as |  12 +-
 .../beads/controllers/ComboBoxController.as     |  83 ++++++
 .../HTML/src/main/resources/defaults.css        | 290 +++++++++++++++++--
 6 files changed, 619 insertions(+), 196 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9273772d/frameworks/projects/HTML/src/main/resources/defaults.css
----------------------------------------------------------------------
diff --cc frameworks/projects/HTML/src/main/resources/defaults.css
index 6eef06d,02d2cda..d7074e8
--- a/frameworks/projects/HTML/src/main/resources/defaults.css
+++ b/frameworks/projects/HTML/src/main/resources/defaults.css
@@@ -437,271 -439,269 +439,523 @@@ globa
  
  @media -flex-flash
  {
 -
 -Alert
 -{
 -    IBeadModel: ClassReference("org.apache.flex.html.beads.models.AlertModel");
 -    IBeadView:  ClassReference("org.apache.flex.html.beads.AlertView");
 -    IBeadController: ClassReference("org.apache.flex.html.beads.controllers.AlertController");
 -    iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
 -    iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
 -    
 -    background-color: #FFFFFF;
 -    border-style: solid;
 -    border-color: #000000;
 -    border-width: 1px;
 +	
 +	Alert
 +	{
 +		IBeadModel: ClassReference("org.apache.flex.html.beads.models.AlertModel");
 +		IBeadView:  ClassReference("org.apache.flex.html.beads.AlertView");
 +		IBeadController: ClassReference("org.apache.flex.html.beads.controllers.AlertController");
 +		iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
 +		iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
 +		
 +		background-color: #FFFFFF;
 +		border-style: solid;
 +		border-color: #000000;
 +		border-width: 1px;
 +	}
 +	
 +	Border
 +	{
 +		border-color: inherit;
 +		border-style: inherit;
 +		border-radius: inherit;
 +		border-width: inherit;
 +		border: inherit;
 +	}
 +	
 +	Button
 +	{
 +		IBeadView: ClassReference("org.apache.flex.html.beads.CSSButtonView");
 +	}
 +	
 +	CheckBox
 +	{
 +		IBeadModel: ClassReference("org.apache.flex.html.beads.models.ToggleButtonModel");
 +		IBeadView:  ClassReference("org.apache.flex.html.beads.CheckBoxView");			
 +	}
 +	
 +	CloseButton
 +	{
 +		IBeadView: ClassReference("org.apache.flex.html.beads.CloseButtonView");
 +	}
 +	
 +	ComboBox
 +	{
 +		IBeadView: ClassReference("org.apache.flex.html.beads.ComboBoxView");
 +		IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ComboBoxController");
 +		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");
 +	}
 +	
 +	Container
 +	{
 +		iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
 +		iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
 +	}
 +	
 +	ControlBar
 +	{
 +		IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.FlexibleFirstChildHorizontalLayout");
 +		iMeasurementBead: ClassReference("org.apache.flex.html.beads.ControlBarMeasurementBead");
 +		iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
 +		iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");    
 +	}
 +	
 +	DropDownList
 +	{
 +		IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
 +		IBeadView: ClassReference("org.apache.flex.html.beads.DropDownListView");
 +		IBeadController: ClassReference("org.apache.flex.html.beads.controllers.DropDownListController");
 +		IPopUp: ClassReference("org.apache.flex.html.supportClasses.DropDownListList");
 +	}
 +	
 +	DropDownListList
 +	{
 +		IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
 +		IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.TextItemRendererFactoryForArrayData");
 +		IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
 +		IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
 +		iBackgroundBead: ClassReference('org.apache.flex.html.beads.SolidBackgroundBead');
 +		border-style: solid;
 +		border-radius: 4px;
 +		border-color: #000000;
 +		border-width: 1px;
 +		background-color: #FFFFFF;
 +	}
 +	
 +	HRule
 +	{
 +		IBeadView:  ClassReference("org.apache.flex.html.beads.HRuleView");
 +	}
 +	
 +	ImageButton
 +	{
 +		IBeadView: ClassReference("org.apache.flex.html.beads.ImageButtonView");
 +	}
 +	
 +	ImageAndTextButton
 +	{
 +		IBeadView: ClassReference("org.apache.flex.html.beads.CSSImageAndTextButtonView");
 +	}
 +	
 +	Label
 +	{
 +		IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
 +		IBeadView: ClassReference("org.apache.flex.html.beads.TextFieldView");
 +		iMeasurementBead: ClassReference("org.apache.flex.html.beads.TextFieldLabelMeasurementBead");
 +	}
 +	
 +	List
 +	{
 +		iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
 +		iBorderModel: ClassReference('org.apache.flex.html.beads.models.SingleLineBorderModel');
 +	}
 +	
 +	MultilineLabel
 +	{
 +		IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
 +		IBeadView: ClassReference("org.apache.flex.html.beads.MultilineTextFieldView");
 +	}
 +	
 +	NumericStepper
 +	{
 +		IBeadView: ClassReference("org.apache.flex.html.beads.NumericStepperView");
 +		
 +		padding: 0px;
 +		border-style: solid;
 +		border-color: #000000;
 +		border-width: 1px;
 +		background-color: #FFFFFF;
 +		iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
 +		iBackgroundBead: ClassReference('org.apache.flex.html.beads.SolidBackgroundBead');
 +	}
 +	
 +	Panel
 +	{
 +		iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
 +		iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");    
 +	}
 +	
 +	PanelWithControlBar
 +	{
 +		iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
 +		iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
 +	}
 +	
 +	RadioButton
 +	{
 +		IBeadModel: ClassReference("org.apache.flex.html.beads.models.ValueToggleButtonModel");
 +		IBeadView:  ClassReference("org.apache.flex.html.beads.RadioButtonView");			
 +	}
 +	
 +	VScrollBar
 +	{
 +		IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.VScrollBarLayout");
 +		IBeadModel: ClassReference("org.apache.flex.html.beads.models.ScrollBarModel");
 +		IBeadView: ClassReference("org.apache.flex.html.beads.VScrollBarView");
 +		IBeadController: ClassReference("org.apache.flex.html.beads.controllers.VScrollBarMouseController");
 +	}
 +	
 +	HScrollBar
 +	{
 +		IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.HScrollBarLayout");
 +		IBeadModel: ClassReference("org.apache.flex.html.beads.models.ScrollBarModel");
 +		IBeadView: ClassReference("org.apache.flex.html.beads.HScrollBarView");
 +		IBeadController: ClassReference("org.apache.flex.html.beads.controllers.HScrollBarMouseController");
 +	}
 +	
 +	SimpleAlert
 +	{
 +		IBeadModel: ClassReference("org.apache.flex.html.beads.models.AlertModel");
 +		IBeadView:  ClassReference("org.apache.flex.html.beads.SimpleAlertView");
 +		IBeadController: ClassReference("org.apache.flex.html.beads.controllers.AlertController");
 +		iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
 +		iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
 +		
 +		background-color: #FFFFFF;
 +		border-style: solid;
 +		border-color: #000000;
 +		border-width: 1px;
 +	}
 +	
 +	Slider
 +	{
 +		iBeadView:  ClassReference("org.apache.flex.html.beads.SliderView");
 +		iBeadController: ClassReference("org.apache.flex.html.beads.controllers.SliderMouseController");
 +		iThumbView: ClassReference("org.apache.flex.html.beads.SliderThumbView");
 +		iTrackView: ClassReference("org.apache.flex.html.beads.SliderTrackView");
 +	}
 +	
 +	Spinner
 +	{
 +		IBeadController: ClassReference("org.apache.flex.html.beads.controllers.SpinnerMouseController");
 +	}
 +	
 +	TextArea
 +	{
 +		IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
 +		IBeadView: ClassReference("org.apache.flex.html.beads.TextAreaView");
 +		IBeadController: ClassReference("org.apache.flex.html.beads.controllers.EditableTextKeyboardController");
 +		iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
 +		iBorderModel: ClassReference('org.apache.flex.html.beads.models.SingleLineBorderModel');
 +		border-style: solid;
 +		border-color: #000000;
 +		border-width: 1px;
 +		background-color: #FFFFFF;
 +	}
 +	
 +	TextButton
 +	{
 +		IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
 +		IBeadView: ClassReference("org.apache.flex.html.beads.CSSTextButtonView");
 +		iMeasurementBead: ClassReference("org.apache.flex.html.beads.TextButtonMeasurementBead");
 +	}
 +	
 +	/*
 +	TextFieldItemRenderer
 +	{
 +	IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ItemRendererMouseController");
 +	height: 16;
 +	}
 +	*/
 +	
 +	TextInput
 +	{
 +		IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
 +		IBeadView: ClassReference("org.apache.flex.html.beads.TextInputWithBorderView");
 +		IBeadController: ClassReference("org.apache.flex.html.beads.controllers.EditableTextKeyboardController");
 +		iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
 +		iBackgroundBead: ClassReference('org.apache.flex.html.beads.SolidBackgroundBead');
 +		border-style: solid;
 +		border-color: #000000;
 +		border-width: 1px;
 +		background-color: #FFFFFF;
 +	}
 +	
 +	TitleBar
 +	{
 +		iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
 +		iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
 +	}
 +	
 +	ToggleTextButton
 +	{
 +		IBeadModel: ClassReference("org.apache.flex.html.beads.models.ToggleButtonModel");
 +		IBeadView:  ClassReference("org.apache.flex.html.beads.CSSTextToggleButtonView");
 +	}
 +	
 +	View
 +	{
 +		iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
 +		iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
 +	}
 +	
 +	VRule
 +	{
 +		IBeadView:  ClassReference("org.apache.flex.html.beads.VRuleView");
 +	}
 +	
 +	/* SVG */
 +	
 +	svg|TextButton
 +	{
 +		IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
 +		IBeadView: ClassReference("org.apache.flex.html.beads.CSSTextButtonView");
 +		iMeasurementBead: ClassReference("org.apache.flex.html.beads.TextButtonMeasurementBead");
 +	}
 +	
  }
+ 
+ Border
+ {
+   border-color: inherit;
+   border-style: inherit;
+   border-radius: inherit;
+   border-width: inherit;
+   border: inherit;
+ }
+ 
+ Button
+ {
+     IBeadView: ClassReference("org.apache.flex.html.beads.CSSButtonView");
+ }
+ 
+ CheckBox
+ {
+     IBeadModel: ClassReference("org.apache.flex.html.beads.models.ToggleButtonModel");
+     IBeadView:  ClassReference("org.apache.flex.html.beads.CheckBoxView");			
+ }
+ 
+ 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");
+ }
+ 
+ Container
+ {
+     iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
+     iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
+ }
+ 
+ ControlBar
+ {
+ 	IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.FlexibleFirstChildHorizontalLayout");
+     iMeasurementBead: ClassReference("org.apache.flex.html.beads.ControlBarMeasurementBead");
+     iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
+     iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");    
+ }
+ 
+ DropDownList
+ {
+     IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
+     IBeadView: ClassReference("org.apache.flex.html.beads.DropDownListView");
+     IBeadController: ClassReference("org.apache.flex.html.beads.controllers.DropDownListController");
+     IPopUp: ClassReference("org.apache.flex.html.supportClasses.DropDownListList");
+ }
+ 
+ DropDownListList
+ {
+     IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
+     IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.TextItemRendererFactoryForArrayData");
+     IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
+     IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
+     iBackgroundBead: ClassReference('org.apache.flex.html.beads.SolidBackgroundBead');
+     border-style: solid;
+     border-radius: 4px;
+     border-color: #000000;
+     border-width: 1px;
+     background-color: #FFFFFF;
+ }
+ 
+ HRule
+ {
+     IBeadView:  ClassReference("org.apache.flex.html.beads.HRuleView");
+ }
+ 
+ ImageButton
+ {
+     IBeadView: ClassReference("org.apache.flex.html.beads.ImageButtonView");
+ }
+ 
+ ImageAndTextButton
+ {
+     IBeadView: ClassReference("org.apache.flex.html.beads.CSSImageAndTextButtonView");
+ }
+ 
+ Label
+ {
+     IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
+     IBeadView: ClassReference("org.apache.flex.html.beads.TextFieldView");
+ 	iMeasurementBead: ClassReference("org.apache.flex.html.beads.TextFieldLabelMeasurementBead");
+ }
+ 
+ List
+ {
+     iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
+     iBorderModel: ClassReference('org.apache.flex.html.beads.models.SingleLineBorderModel');
+ }
+ 
+ MultilineLabel
+ {
+     IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
+     IBeadView: ClassReference("org.apache.flex.html.beads.MultilineTextFieldView");
+ }
+ 
+ NumericStepper
+ {
+     IBeadView: ClassReference("org.apache.flex.html.beads.NumericStepperView");
+     
+     padding: 0px;
+     border-style: solid;
+     border-color: #000000;
+     border-width: 1px;
+     background-color: #FFFFFF;
+     iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
+     iBackgroundBead: ClassReference('org.apache.flex.html.beads.SolidBackgroundBead');
+ }
+ 
+ Panel
+ {
+     iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
+     iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");    
+ }
+ 
+ PanelWithControlBar
+ {
+     iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
+     iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
+ }
+ 
+ RadioButton
+ {
+     IBeadModel: ClassReference("org.apache.flex.html.beads.models.ValueToggleButtonModel");
+     IBeadView:  ClassReference("org.apache.flex.html.beads.RadioButtonView");			
+ }
+ 
+ VScrollBar
+ {
+     IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.VScrollBarLayout");
+     IBeadModel: ClassReference("org.apache.flex.html.beads.models.ScrollBarModel");
+     IBeadView: ClassReference("org.apache.flex.html.beads.VScrollBarView");
+     IBeadController: ClassReference("org.apache.flex.html.beads.controllers.VScrollBarMouseController");
+ }
+ 
+ HScrollBar
+ {
+ 	IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.HScrollBarLayout");
+ 	IBeadModel: ClassReference("org.apache.flex.html.beads.models.ScrollBarModel");
+ 	IBeadView: ClassReference("org.apache.flex.html.beads.HScrollBarView");
+ 	IBeadController: ClassReference("org.apache.flex.html.beads.controllers.HScrollBarMouseController");
+ }
+ 
+ SimpleAlert
+ {
+     IBeadModel: ClassReference("org.apache.flex.html.beads.models.AlertModel");
+     IBeadView:  ClassReference("org.apache.flex.html.beads.SimpleAlertView");
+     IBeadController: ClassReference("org.apache.flex.html.beads.controllers.AlertController");
+     iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
+     iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
+     
+     background-color: #FFFFFF;
+     border-style: solid;
+     border-color: #000000;
+     border-width: 1px;
+ }
+ 
+ Slider
+ {
+     iBeadView:  ClassReference("org.apache.flex.html.beads.SliderView");
+     iBeadController: ClassReference("org.apache.flex.html.beads.controllers.SliderMouseController");
+     iThumbView: ClassReference("org.apache.flex.html.beads.SliderThumbView");
+     iTrackView: ClassReference("org.apache.flex.html.beads.SliderTrackView");
+ }
+ 
+ Spinner
+ {
+     IBeadController: ClassReference("org.apache.flex.html.beads.controllers.SpinnerMouseController");
+ }
+ 
+ TextArea
+ {
+     IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
+     IBeadView: ClassReference("org.apache.flex.html.beads.TextAreaView");
+     IBeadController: ClassReference("org.apache.flex.html.beads.controllers.EditableTextKeyboardController");
+     iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
+     iBorderModel: ClassReference('org.apache.flex.html.beads.models.SingleLineBorderModel');
+     border-style: solid;
+     border-color: #000000;
+     border-width: 1px;
+     background-color: #FFFFFF;
+ }
+ 
+ TextButton
+ {
+     IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
+     IBeadView: ClassReference("org.apache.flex.html.beads.CSSTextButtonView");
+     iMeasurementBead: ClassReference("org.apache.flex.html.beads.TextButtonMeasurementBead");
+ }
+ 
+ /*
+ TextFieldItemRenderer
+ {
+     IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ItemRendererMouseController");
+     height: 16;
+ }
+ */
+ 
+ TextInput
+ {
+     IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
+     IBeadView: ClassReference("org.apache.flex.html.beads.TextInputWithBorderView");
+     IBeadController: ClassReference("org.apache.flex.html.beads.controllers.EditableTextKeyboardController");
+     iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
+     iBackgroundBead: ClassReference('org.apache.flex.html.beads.SolidBackgroundBead');
+     border-style: solid;
+     border-color: #000000;
+     border-width: 1px;
+     background-color: #FFFFFF;
+ }
+ 
+ TitleBar
+ {
+     iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
+     iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
+ }
+ 
+ ToggleTextButton
+ {
+     IBeadModel: ClassReference("org.apache.flex.html.beads.models.ToggleButtonModel");
+     IBeadView:  ClassReference("org.apache.flex.html.beads.CSSTextToggleButtonView");
+ }
+ 
+ View
+ {
+     iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
+     iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
+ }
+ 
+ VRule
+ {
+     IBeadView:  ClassReference("org.apache.flex.html.beads.VRuleView");
+ }
+ 
+ /* SVG */
+ 
+ svg|TextButton
+ {
+     IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
+     IBeadView: ClassReference("org.apache.flex.html.beads.CSSTextButtonView");
+     iMeasurementBead: ClassReference("org.apache.flex.html.beads.TextButtonMeasurementBead");
+ }
+ 
+ }