Repository: flex-asjs Updated Branches: refs/heads/develop 13bbf5437 -> 3faaa5f69
Cleaned up Slider component and made it work again. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/3faaa5f6 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/3faaa5f6 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/3faaa5f6 Branch: refs/heads/develop Commit: 3faaa5f69b1be67b395a2ffe862b2e3687d0f9ae Parents: 13bbf54 Author: Peter Ent <[email protected]> Authored: Tue Dec 6 14:14:31 2016 -0500 Committer: Peter Ent <[email protected]> Committed: Tue Dec 6 14:14:31 2016 -0500 ---------------------------------------------------------------------- .../projects/HTML/src/main/flex/HTMLClasses.as | 8 +- .../main/flex/org/apache/flex/html/Slider.as | 47 ++--------- .../org/apache/flex/html/beads/ISliderView.as | 11 +-- .../apache/flex/html/beads/SliderThumbView.as | 89 ++++++-------------- .../apache/flex/html/beads/SliderTrackView.as | 83 +++++------------- .../org/apache/flex/html/beads/SliderView.as | 67 ++++++++------- .../beads/controllers/SliderMouseController.as | 15 ++-- .../HTML/src/main/resources/defaults.css | 4 +- .../src/main/flex/org/apache/flex/mdl/Slider.as | 19 ++--- 9 files changed, 114 insertions(+), 229 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3faaa5f6/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 7332cda..a5ccd7c 100644 --- a/frameworks/projects/HTML/src/main/flex/HTMLClasses.as +++ b/frameworks/projects/HTML/src/main/flex/HTMLClasses.as @@ -65,6 +65,7 @@ internal class HTMLClasses import org.apache.flex.html.beads.NumericStepperView; NumericStepperView; } import org.apache.flex.html.beads.PanelView; PanelView; + import org.apache.flex.html.beads.SliderView; SliderView; COMPILE::SWF { import org.apache.flex.html.beads.PanelWithControlBarView; PanelWithControlBarView; @@ -72,12 +73,11 @@ internal class HTMLClasses import org.apache.flex.html.beads.VScrollBarView; VScrollBarView; import org.apache.flex.html.beads.HScrollBarView; HScrollBarView; import org.apache.flex.html.beads.ScrollBarView; ScrollBarView; + import org.apache.flex.html.beads.SliderThumbView; SliderThumbView; + import org.apache.flex.html.beads.SliderTrackView; SliderTrackView; import org.apache.flex.html.beads.SimpleAlertView; SimpleAlertView; import org.apache.flex.html.beads.SingleLineBorderBead; SingleLineBorderBead; - import org.apache.flex.html.beads.SliderView; SliderView; } - import org.apache.flex.html.beads.SliderThumbView; SliderThumbView; - import org.apache.flex.html.beads.SliderTrackView; SliderTrackView; import org.apache.flex.html.beads.SpinnerView; SpinnerView; COMPILE::SWF { @@ -125,9 +125,9 @@ internal class HTMLClasses import org.apache.flex.html.beads.controllers.ItemRendererMouseController; ItemRendererMouseController; import org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController; ListSingleSelectionMouseController; import org.apache.flex.html.beads.controllers.TreeSingleSelectionMouseController; TreeSingleSelectionMouseController; + import org.apache.flex.html.beads.controllers.SliderMouseController; SliderMouseController; COMPILE::SWF { - import org.apache.flex.html.beads.controllers.SliderMouseController; SliderMouseController; import org.apache.flex.html.beads.controllers.SpinnerMouseController; SpinnerMouseController; import org.apache.flex.html.beads.controllers.VScrollBarMouseController; VScrollBarMouseController; import org.apache.flex.html.beads.controllers.HScrollBarMouseController; HScrollBarMouseController; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3faaa5f6/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Slider.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Slider.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Slider.as index d10891c..2b6c4c6 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Slider.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Slider.as @@ -23,8 +23,6 @@ package org.apache.flex.html COMPILE::JS { - import org.apache.flex.html.beads.SliderTrackView; - import org.apache.flex.html.beads.SliderThumbView; import org.apache.flex.html.beads.controllers.SliderMouseController; import org.apache.flex.core.WrappedHTMLElement; } @@ -155,16 +153,7 @@ package org.apache.flex.html { IRangeModel(model).stepSize = value; } - - COMPILE::JS - private var track:SliderTrackView; - - COMPILE::JS - private var thumb:SliderThumbView; - - COMPILE::JS - private var controller:SliderMouseController; - + /** * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement */ @@ -172,18 +161,11 @@ package org.apache.flex.html override protected function createElement():WrappedHTMLElement { element = document.createElement('div') as WrappedHTMLElement; - element.style.width = '200px'; + + // just to give it some default values + element.style.width = '100px'; element.style.height = '30px'; - track = new SliderTrackView(); - addBead(track); - - thumb = new SliderThumbView(); - addBead(thumb); - - controller = new SliderMouseController(); - addBead(controller); - positioner = element; positioner.style.position = 'relative'; element.flexjs_wrapper = this; @@ -194,6 +176,7 @@ package org.apache.flex.html } /** + * @private */ COMPILE::JS public function snap(value:Number):Number @@ -210,24 +193,6 @@ package org.apache.flex.html if (value - n > n + si - value) return n + si; return n; - } - - - /** - * @param {number} value The value used to calculate new position of the thumb. - * @return {void} Moves the thumb to the corresponding position. - */ - COMPILE::JS - public function setThumbFromValue(value:Number):void - { - var min:Number = model.minimum; - var max:Number = model.maximum; - var p:Number = (value - min) / (max - min); - var xloc:Number = p * (parseInt(track.element.style.width, 10) - - parseInt(thumb.element.style.width, 10)); - - thumb.element.style.left = "" + xloc + 'px'; - } - + } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3faaa5f6/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ISliderView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ISliderView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ISliderView.as index 7cdd702..31ff9e9 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ISliderView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ISliderView.as @@ -18,11 +18,8 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.html.beads { - COMPILE::SWF - { - import org.apache.flex.html.Button; - } import org.apache.flex.core.IBead; + import org.apache.flex.core.IUIBase; /** * The ISliderView interface provides the protocol for any bead that @@ -43,8 +40,7 @@ package org.apache.flex.html.beads * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - COMPILE::SWF - function get track():Button; + function get track():IUIBase; /** * The component used for the thumb button of the org.apache.flex.html.Slider. @@ -54,7 +50,6 @@ package org.apache.flex.html.beads * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - COMPILE::SWF - function get thumb():Button; + function get thumb():IUIBase; } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3faaa5f6/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderThumbView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderThumbView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderThumbView.as index caa7a3e..b42066a 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderThumbView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderThumbView.as @@ -18,19 +18,14 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.html.beads { - COMPILE::SWF - { - import flash.display.Graphics; - import flash.display.Shape; - import flash.display.SimpleButton; - } + import flash.display.Graphics; + import flash.display.Shape; + import flash.display.SimpleButton; + import org.apache.flex.core.BeadViewBase; import org.apache.flex.core.IBeadView; import org.apache.flex.core.IStrand; - COMPILE::JS - { - import org.apache.flex.core.WrappedHTMLElement; - } + import org.apache.flex.html.Button; import org.apache.flex.events.Event; import org.apache.flex.events.IEventDispatcher; import org.apache.flex.core.IChild; @@ -56,30 +51,26 @@ package org.apache.flex.html.beads */ public function SliderThumbView() { - COMPILE::SWF - { - hitArea = new Shape(); - upView = new Shape(); - downView = new Shape(); - overView = new Shape(); - } + hitArea = new Shape(); + upView = new Shape(); + downView = new Shape(); + overView = new Shape(); } /** * @private */ - COMPILE::SWF private function drawView(g:Graphics, bgColor:uint):void { + var host:Button = Button(_strand); var button:SimpleButton = IChild(_strand).$displayObject as SimpleButton; g.clear(); g.lineStyle(1,0x000000); - g.beginFill(bgColor); - g.drawCircle(button.width/2, button.height/2, 10); + g.beginFill(bgColor,1.0); + g.drawCircle(host.width/2, host.height/2, 10); g.endFill(); } - COMPILE::SWF private var hitArea:Shape; /** @@ -96,58 +87,28 @@ package org.apache.flex.html.beads { super.strand = value; - COMPILE::SWF - { - drawView(hitArea.graphics, 0xDD0000); - drawView(upView.graphics, 0xFFFFFF); - drawView(downView.graphics, 0x999999); - drawView(overView.graphics, 0xDDDDDD); - - var button:SimpleButton = IChild(value).$displayObject as SimpleButton; - button.upState = upView; - button.downState = downView; - button.overState = overView; - button.hitTestState = hitArea; - - IEventDispatcher(value).addEventListener("widthChanged",sizeChangeHandler); - IEventDispatcher(value).addEventListener("heightChanged",sizeChangeHandler); - } - COMPILE::JS - { - - element = document.createElement('div') as WrappedHTMLElement; - element.className = 'SliderThumb'; - element.id = 'thumb'; - element.style.backgroundColor = '#949494'; - element.style.border = 'thin solid #747474'; - element.style.position = 'relative'; - element.style.height = '30px'; - element.style.width = '10px'; - element.style.zIndex = '2'; - element.style.top = '-10px'; - element.style.left = '20px'; - - (host.element as WrappedHTMLElement).appendChild(element); - - element.flexjs_wrapper = this; - - } + drawView(hitArea.graphics, 0xDD0000); + drawView(upView.graphics, 0xFFFFFF); + drawView(downView.graphics, 0x999999); + drawView(overView.graphics, 0xDDDDDD); + + var button:SimpleButton = IChild(value).$displayObject as SimpleButton; + button.upState = upView; + button.downState = downView; + button.overState = overView; + button.hitTestState = hitArea; + + IEventDispatcher(value).addEventListener("widthChanged",sizeChangeHandler); + IEventDispatcher(value).addEventListener("heightChanged",sizeChangeHandler); } - COMPILE::SWF private var upView:Shape; - COMPILE::SWF private var downView:Shape; - COMPILE::SWF private var overView:Shape; - - COMPILE::JS - public var element:WrappedHTMLElement; /** * @private */ - COMPILE::SWF private function sizeChangeHandler( event:Event ) : void { drawView(hitArea.graphics, 0xDD0000); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3faaa5f6/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderTrackView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderTrackView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderTrackView.as index bab413a..70f343c 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderTrackView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderTrackView.as @@ -18,21 +18,15 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.html.beads { - COMPILE::SWF - { - import flash.display.Graphics; - import flash.display.Shape; - import flash.display.SimpleButton; - } + import flash.display.Graphics; + import flash.display.Shape; + import flash.display.SimpleButton; import org.apache.flex.core.BeadViewBase; import org.apache.flex.core.IBeadView; import org.apache.flex.core.IStrand; import org.apache.flex.core.UIBase; - COMPILE::JS - { - import org.apache.flex.core.WrappedHTMLElement; - } + import org.apache.flex.html.Button; import org.apache.flex.events.Event; import org.apache.flex.events.IEventDispatcher; import org.apache.flex.core.IChild; @@ -58,30 +52,26 @@ package org.apache.flex.html.beads */ public function SliderTrackView() { - COMPILE::SWF - { - hitArea = new Shape(); - upView = new Shape(); - downView = new Shape(); - overView = new Shape(); - } + hitArea = new Shape(); + upView = new Shape(); + downView = new Shape(); + overView = new Shape(); } /** * @private */ - COMPILE::SWF private function drawView(g:Graphics, bgColor:uint):void { + var host:Button = Button(_strand); var button:SimpleButton = IChild(_strand).$displayObject as SimpleButton; g.clear(); g.lineStyle(1,0x000000); g.beginFill(bgColor); - g.drawRect(0, 0, button.width, button.height); + g.drawRect(0, 0, host.width, host.height); g.endFill(); } - COMPILE::SWF private var hitArea:Shape; /** @@ -97,55 +87,28 @@ package org.apache.flex.html.beads { super.strand = value; - COMPILE::SWF - { - drawView(hitArea.graphics, 0xDD0000); - drawView(upView.graphics, 0xCCCCCC); - drawView(downView.graphics, 0x808080); - drawView(overView.graphics, 0xEEEEEE); - - var button:SimpleButton = IChild(value).$displayObject as SimpleButton; - button.upState = upView; - button.downState = downView; - button.overState = overView; - button.hitTestState = hitArea; - - IEventDispatcher(value).addEventListener("widthChanged",sizeChangeHandler); - IEventDispatcher(value).addEventListener("heightChanged",sizeChangeHandler); - } - COMPILE::JS - { - element = document.createElement('div') as WrappedHTMLElement; - element.className = 'SliderTrack'; - element.id = 'track'; - element.style.backgroundColor = '#E4E4E4'; - element.style.height = '10px'; - element.style.width = '200px'; - element.style.border = 'thin solid #C4C4C4'; - element.style.position = 'relative'; - element.style.left = '0px'; - element.style.top = '10px'; - element.style.zIndex = '1'; - - var host:UIBase = value as UIBase; - host.element.appendChild(element); - } + drawView(hitArea.graphics, 0xDD0000); + drawView(upView.graphics, 0xCCCCCC); + drawView(downView.graphics, 0x808080); + drawView(overView.graphics, 0xEEEEEE); + + var button:SimpleButton = IChild(value).$displayObject as SimpleButton; + button.upState = upView; + button.downState = downView; + button.overState = overView; + button.hitTestState = hitArea; + + IEventDispatcher(value).addEventListener("widthChanged",sizeChangeHandler); + IEventDispatcher(value).addEventListener("heightChanged",sizeChangeHandler); } - COMPILE::JS - public var element:WrappedHTMLElement; - - COMPILE::SWF private var upView:Shape; - COMPILE::SWF private var downView:Shape; - COMPILE::SWF private var overView:Shape; /** * @private */ - COMPILE::SWF private function sizeChangeHandler( event:Event ) : void { drawView(hitArea.graphics, 0xDD0000); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3faaa5f6/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderView.as index f3a5025..5c5c107 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderView.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderView.as @@ -18,8 +18,10 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.html.beads { - import flash.display.DisplayObject; - import flash.display.Sprite; + COMPILE::SWF { + import flash.display.DisplayObject; + import flash.display.Sprite; + } import org.apache.flex.core.BeadViewBase; import org.apache.flex.core.IBead; @@ -28,6 +30,7 @@ package org.apache.flex.html.beads import org.apache.flex.core.IRangeModel; import org.apache.flex.core.IStrand; import org.apache.flex.core.UIBase; + import org.apache.flex.core.IUIBase; import org.apache.flex.core.ValuesManager; import org.apache.flex.events.Event; import org.apache.flex.events.IEventDispatcher; @@ -70,15 +73,29 @@ package org.apache.flex.html.beads { super.strand = value; - var s:UIBase = UIBase(_strand); - _track = new Button(); - _track.addBead(new (ValuesManager.valuesImpl.getValue(_strand, "iTrackView")) as IBead); - - _thumb = new Button(); - _thumb.addBead(new (ValuesManager.valuesImpl.getValue(_strand, "iThumbView")) as IBead); - - s.$sprite.addChild(_track.$button); - s.$sprite.addChild(_thumb.$button); + COMPILE::SWF { + var s:UIBase = UIBase(_strand); + + _track = new Button(); + _track.addBead(new (ValuesManager.valuesImpl.getValue(_strand, "iTrackView")) as IBead); + _track.className = "SliderTrack"; + s.addElement(_track); + + _thumb = new Button(); + _thumb.addBead(new (ValuesManager.valuesImpl.getValue(_strand, "iThumbView")) as IBead); + _thumb.className = "SliderThumb"; + s.addElement(_thumb); + + } + COMPILE::JS { + _track = new Button(); + _track.className = "SliderTrack"; + UIBase(_strand).addElement(_track); + + _thumb = new Button(); + _thumb.className = "SliderThumb"; + UIBase(_strand).addElement(_thumb); + } IEventDispatcher(value).addEventListener("widthChanged",sizeChangeHandler); IEventDispatcher(value).addEventListener("heightChanged",sizeChangeHandler); @@ -92,23 +109,13 @@ package org.apache.flex.html.beads IEventDispatcher(rangeModel).addEventListener("stepSizeChange",modelChangeHandler); IEventDispatcher(rangeModel).addEventListener("snapIntervalChange",modelChangeHandler); - // set a minimum size to trigger the size change handler - var needsSizing:Boolean = true; - if( s.width < 100 ) { - s.width = 100; - needsSizing = false; - } - if( s.height < 30 ) { - s.height = 30; - needsSizing = false; - } - - if( needsSizing ) sizeChangeHandler(null); + sizeChangeHandler(null); } private var _track:Button; private var _thumb:Button; + /** * The track component. * @@ -117,7 +124,7 @@ package org.apache.flex.html.beads * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - public function get track():Button + public function get track():IUIBase { return _track; } @@ -130,7 +137,7 @@ package org.apache.flex.html.beads * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - public function get thumb():Button + public function get thumb():IUIBase { return _thumb; } @@ -146,10 +153,7 @@ package org.apache.flex.html.beads _thumb.width = 20; _thumb.height = host.height; - - _thumb.x = 10; - _thumb.y = 0; - + // the track is inset 1/2 of the thumbwidth so the thumb can // overlay the track on either end with the thumb center being // on the track's edge @@ -157,6 +161,8 @@ package org.apache.flex.html.beads _track.height = 5; _track.x = _thumb.width/2; _track.y = (host.height - _track.height)/2; + + setThumbPositionFromValue(rangeModel.value); } /** @@ -173,8 +179,7 @@ package org.apache.flex.html.beads private function setThumbPositionFromValue( value:Number ) : void { var p:Number = (value-rangeModel.minimum)/(rangeModel.maximum-rangeModel.minimum); - var xloc:Number = p*(UIBase(_strand).width - _thumb.width); - + var xloc:Number = (p*_track.width); _thumb.x = xloc; } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3faaa5f6/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/SliderMouseController.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/SliderMouseController.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/SliderMouseController.as index 487b365..91589b5 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/SliderMouseController.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/SliderMouseController.as @@ -94,10 +94,9 @@ package org.apache.flex.html.beads.controllers } COMPILE::JS { - track = value.getBeadByType( - SliderTrackView) as SliderTrackView; - thumb = value.getBeadByType( - SliderThumbView) as SliderThumbView; + var sliderView:ISliderView = value.getBeadByType(ISliderView) as ISliderView; + track = sliderView.track as UIBase; + thumb = sliderView.thumb as UIBase; goog.events.listen(track.element, goog.events.EventType.CLICK, handleTrackClick, false, this); @@ -109,10 +108,10 @@ package org.apache.flex.html.beads.controllers } COMPILE::JS - private var track:SliderTrackView; + private var track:UIBase; COMPILE::JS - private var thumb:SliderThumbView; + private var thumb:UIBase; /** * @private @@ -158,7 +157,7 @@ package org.apache.flex.html.beads.controllers var thumbW:Number = sliderView.thumb.width/2; var newX:Number = thumb.x + deltaX; - var p:Number = newX/UIBase(_strand).width; + var p:Number = newX/sliderView.track.width; var n:Number = p*(rangeModel.maximum - rangeModel.minimum) + rangeModel.minimum; rangeModel.value = n; @@ -177,7 +176,7 @@ package org.apache.flex.html.beads.controllers var sliderView:ISliderView = _strand.getBeadByType(ISliderView) as ISliderView; var xloc:Number = event.localX; - var p:Number = xloc/UIBase(_strand).width; + var p:Number = xloc/sliderView.track.width; var n:Number = p*(rangeModel.maximum - rangeModel.minimum) + rangeModel.minimum; rangeModel.value = n; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3faaa5f6/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 1a17d67..ca1dcaf 100644 --- a/frameworks/projects/HTML/src/main/resources/defaults.css +++ b/frameworks/projects/HTML/src/main/resources/defaults.css @@ -326,6 +326,8 @@ SimpleList Slider { IBeadModel: ClassReference("org.apache.flex.html.beads.models.RangeModel"); + iBeadView: ClassReference("org.apache.flex.html.beads.SliderView"); + iBeadController: ClassReference("org.apache.flex.html.beads.controllers.SliderMouseController"); } Spinner @@ -620,8 +622,6 @@ global 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"); } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3faaa5f6/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Slider.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Slider.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Slider.as index 7f10ced..18a077b 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Slider.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Slider.as @@ -24,9 +24,6 @@ package org.apache.flex.mdl COMPILE::JS { - import org.apache.flex.html.beads.SliderTrackView; - import org.apache.flex.html.beads.SliderThumbView; - import org.apache.flex.html.beads.controllers.SliderMouseController; import org.apache.flex.core.WrappedHTMLElement; } @@ -175,14 +172,14 @@ package org.apache.flex.mdl } } - COMPILE::JS - private var track:SliderTrackView; + //COMPILE::JS + //private var track:SliderTrackView; - COMPILE::JS - private var thumb:SliderThumbView; + //COMPILE::JS + //private var thumb:SliderThumbView; - COMPILE::JS - private var controller:SliderMouseController; + //COMPILE::JS + //private var controller:SliderMouseController; COMPILE::JS private var input:HTMLInputElement; @@ -268,7 +265,7 @@ package org.apache.flex.mdl /** * @param {number} value The value used to calculate new position of the thumb. * @return {void} Moves the thumb to the corresponding position. - */ + * COMPILE::JS public function setThumbFromValue(value:Number):void { @@ -279,7 +276,7 @@ package org.apache.flex.mdl parseInt(thumb.element.style.width, 10)); thumb.element.style.left = "" + xloc + 'px'; - } + } */ } }
