Repository: flex-asjs Updated Branches: refs/heads/develop 1302393fd -> 68eabbab9
Rename fields in DropDownList to more meaningfull Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/68eabbab Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/68eabbab Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/68eabbab Branch: refs/heads/develop Commit: 68eabbab96d4ee50820f4d280bf4211fce0521ff Parents: 1302393 Author: piotrz <[email protected]> Authored: Mon May 1 23:45:46 2017 +0200 Committer: piotrz <[email protected]> Committed: Mon May 1 23:45:46 2017 +0200 ---------------------------------------------------------------------- .../beads/controllers/DropDownListController.as | 4 +-- .../flex/mdl/beads/views/DropDownListView.as | 30 ++++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/68eabbab/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/DropDownListController.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/DropDownListController.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/DropDownListController.as index ec79b6d..cdb7ca7 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/DropDownListController.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/controllers/DropDownListController.as @@ -78,7 +78,7 @@ package org.apache.flex.mdl.beads.controllers _model = _strand.getBeadByType(ISelectionModel) as ISelectionModel; _dropDownListView = value.getBeadByType(DropDownListView) as DropDownListView; - _dropDownListView.displayList.addEventListener(MouseEvent.CLICK, onDisplayItemClick); + _dropDownListView.dropDown.addEventListener(MouseEvent.CLICK, onDisplayItemClick); } private function onDisplayItemClick(event:MouseEvent):void @@ -88,7 +88,7 @@ package org.apache.flex.mdl.beads.controllers _model.selectedIndex = eventTarget.index; _model.selectedItem = eventTarget.data; - _dropDownListView.displayLabel.text = !_model.labelField ? + _dropDownListView.labelDisplay.text = !_model.labelField ? eventTarget.data : eventTarget.data[_model.labelField]; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/68eabbab/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/DropDownListView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/DropDownListView.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/DropDownListView.as index 60d16b3..552edf3 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/DropDownListView.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/views/DropDownListView.as @@ -46,17 +46,17 @@ package org.apache.flex.mdl.beads.views super(); } - protected var _displayList:Menu; - protected var _displayLabel:Div; + protected var _dropDown:Menu; + protected var _labelDisplay:Div; - public function get displayList():Menu + public function get dropDown():Menu { - return _displayList; + return _dropDown; } - public function get displayLabel():Div + public function get labelDisplay():Div { - return _displayLabel; + return _labelDisplay; } /** * @copy org.apache.flex.core.IBead#strand @@ -72,15 +72,15 @@ package org.apache.flex.mdl.beads.views var dropDownList:DropDownList = (value as DropDownList); - _displayList = new Menu(); - _displayList.bottom = true; + _dropDown = new Menu(); + _dropDown.bottom = true; COMPILE::JS { setIdForDisplayList(); } - _displayLabel = new Div(); + _labelDisplay = new Div(); if (!dropDownList.icon) { @@ -90,11 +90,11 @@ package org.apache.flex.mdl.beads.views } var model:ISelectionModel = _strand.getBeadByType(ISelectionModel) as ISelectionModel; - _displayList.model = model; + _dropDown.model = model; - dropDownList.addElement(_displayLabel); + dropDownList.addElement(_labelDisplay); dropDownList.addElement(dropDownList.icon); - dropDownList.addElement(_displayList); + dropDownList.addElement(_dropDown); } override protected function handleInitComplete(event:org.apache.flex.events.Event):void @@ -105,8 +105,8 @@ package org.apache.flex.mdl.beads.views { host.element.classList.add("DropDownList"); } - _displayList.width = isNaN(host.width) ? 100 : host.width - 1; - _displayLabel.width = isNaN(host.width) ? 100 : host.width - 25; + _dropDown.width = isNaN(host.width) ? 100 : host.width - 1; + _labelDisplay.width = isNaN(host.width) ? 100 : host.width - 25; } COMPILE::JS @@ -117,7 +117,7 @@ package org.apache.flex.mdl.beads.views host.element.id = "dropDownList" + Math.random(); } - _displayList.dataMdlFor = host.element.id; + _dropDown.dataMdlFor = host.element.id; } } }
