This is an automated email from the ASF dual-hosted git repository. carlosrovira pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push: new c826321 remove old table mapper and update DateChooser visuals c826321 is described below commit c826321bce29e0e7db34b81ff7c5284c5a92bf92 Author: Carlos Rovira <carlosrov...@apache.org> AuthorDate: Thu Aug 9 10:26:26 2018 +0200 remove old table mapper and update DateChooser visuals --- .../Jewel/src/main/resources/jewel-manifest.xml | 3 +- .../ListSingleSelectionMouseController.as | 4 +- .../itemRenderers/TableMapperForArrayListData.as | 202 --------------------- .../royale/jewel/itemRenderers/DateItemRenderer.as | 10 - .../itemRenderers/NavigationLinkItemRenderer.as | 1 + .../JewelTheme/src/main/resources/defaults.css | 2 + .../main/sass/components-primary/_datechooser.sass | 3 + 7 files changed, 8 insertions(+), 217 deletions(-) diff --git a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml index 52fec4f..5fc7914 100644 --- a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml +++ b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml @@ -118,8 +118,7 @@ <component id="DataItemRendererFactoryForArrayData" class="org.apache.royale.jewel.beads.itemRenderers.DataItemRendererFactoryForArrayData"/> <component id="DataItemRendererFactoryForCollectionView" class="org.apache.royale.jewel.beads.itemRenderers.DataItemRendererFactoryForCollectionView"/> <component id="TableItemRendererFactoryForCollectionView" class="org.apache.royale.jewel.beads.itemRenderers.TableItemRendererFactoryForCollectionView"/> - <component id="TableMapperForArrayListData" class="org.apache.royale.jewel.beads.itemRenderers.TableMapperForArrayListData"/> - + <!-- <component id="JewelLabelViewBead" class="org.apache.royale.jewel.beads.views.JewelLabelViewBead"/> --> </componentPackage> diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ListSingleSelectionMouseController.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ListSingleSelectionMouseController.as index cddfdbf..0f2934b 100644 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ListSingleSelectionMouseController.as +++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ListSingleSelectionMouseController.as @@ -27,11 +27,9 @@ package org.apache.royale.jewel.beads.controllers import org.apache.royale.events.Event; import org.apache.royale.events.IEventDispatcher; import org.apache.royale.events.ItemAddedEvent; + import org.apache.royale.events.ItemClickedEvent; import org.apache.royale.events.ItemRemovedEvent; - import org.apache.royale.events.MouseEvent; import org.apache.royale.html.beads.IListView; - - import org.apache.royale.events.ItemClickedEvent; /** * The ListSingleSelectionMouseController class is a controller for diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/TableMapperForArrayListData.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/TableMapperForArrayListData.as deleted file mode 100644 index beca0c6..0000000 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/TableMapperForArrayListData.as +++ /dev/null @@ -1,202 +0,0 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// Licensed to the Apache Software Foundation (ASF) under one or more -// contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. -// The ASF licenses this file to You under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with -// the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -//////////////////////////////////////////////////////////////////////////////// -package org.apache.royale.jewel.beads.itemRenderers -{ - import org.apache.royale.collections.ArrayList; - import org.apache.royale.core.IBead; - import org.apache.royale.core.IBeadModel; - import org.apache.royale.core.IBeadView; - import org.apache.royale.core.IChild; - import org.apache.royale.core.IDataProviderItemRendererMapper; - import org.apache.royale.core.IItemRendererClassFactory; - import org.apache.royale.core.IItemRendererParent; - import org.apache.royale.core.IStrand; - import org.apache.royale.events.Event; - import org.apache.royale.events.IEventDispatcher; - import org.apache.royale.jewel.Label; - import org.apache.royale.jewel.Table; - import org.apache.royale.jewel.supportClasses.table.TableCell; - import org.apache.royale.jewel.supportClasses.table.TableHeaderCell; - import org.apache.royale.jewel.supportClasses.table.TableRow; - import org.apache.royale.jewel.beads.models.TableModel; - import org.apache.royale.jewel.beads.views.TableView; - import org.apache.royale.jewel.itemRenderers.TableItemRenderer; - import org.apache.royale.jewel.supportClasses.table.TBody; - import org.apache.royale.jewel.supportClasses.table.THead; - import org.apache.royale.jewel.supportClasses.table.TableColumn; - import org.apache.royale.utils.loadBeadFromValuesManager; - - public class TableMapperForArrayListData implements IBead, IDataProviderItemRendererMapper - { - public function TableMapperForArrayListData() - { - } - - private var _strand:IStrand; - - public function set strand(value:IStrand):void - { - _strand = value; - - model = _strand.getBeadByType(IBeadModel) as TableModel; - if (model == null) return; - - view = _strand.getBeadByType(IBeadView) as TableView; - - table = _strand as Table; - dataGroup = table.dataGroup; - - IEventDispatcher(_strand).addEventListener("tableComplete", createTableFromData); - } - - private var _itemRendererFactory:IItemRendererClassFactory; - - /** - * The org.apache.royale.core.IItemRendererClassFactory used - * to generate instances of item renderers. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion Royale 0.9.3 - * @royaleignorecoercion org.apache.royale.core.IItemRendererClassFactory - */ - public function get itemRendererFactory():IItemRendererClassFactory - { - if(!_itemRendererFactory) - _itemRendererFactory = loadBeadFromValuesManager(IItemRendererClassFactory, "iItemRendererClassFactory", _strand) as IItemRendererClassFactory; - - return _itemRendererFactory; - } - - /** - * @private - */ - public function set itemRendererFactory(value:IItemRendererClassFactory):void - { - _itemRendererFactory = value; - } - - private var thead:THead; - private var tbody:TBody; - private var model:TableModel; - private var view:TableView; - private var table:Table; - private var dataGroup:IItemRendererParent; - - private var headerRow:TableRow; - private var row:TableRow; - private var tableHeader:TableHeaderCell; - private function cleanTable():void - { - //THead - dataGroup.removeAllItemRenderers(); - - //TBody - if(tbody != null) - { - while (tbody.numElements > 0) { - var child:IChild = tbody.getElementAt(0); - tbody.removeElement(child); - } - - } - } - private function createTableFromData(event:Event):void - { - cleanTable(); - - var dp:ArrayList = model.dataProvider as ArrayList; - if (dp == null || dp.length == 0) return; - - var createHeaderRow:Boolean = false; - var test:TableColumn; - var c:int; - for(c=0; c < model.columns.length; c++) - { - test = model.columns[c] as TableColumn; - if (test.label != null) { - createHeaderRow = true; - break; - } - } - - if (createHeaderRow) { - view.thead = new THead(); - thead = view.thead; - headerRow = new TableRow(); - - for(c=0; c < model.columns.length; c++) - { - test = model.columns[c] as TableColumn; - tableHeader = new TableHeaderCell(); - var label:Label = new Label(); - tableHeader.addElement(label); - label.text = test.label == null ? "" : test.label; - headerRow.addElement(tableHeader); - } - - thead.addElement(headerRow); - table.addElement(thead); - } - - tbody = view.tbody; - table.addElement(tbody); - - var column:TableColumn; - var tableCell:TableCell; - var ir:TableItemRenderer; - - for(var i:int=0; i < dp.length; i++) - { - row = new TableRow(); - - for(var j:int=0; j < model.columns.length; j++) - { - column = model.columns[j] as TableColumn; - tableCell = new TableCell(); - - if(column.itemRenderer != null) - { - ir = column.itemRenderer.newInstance() as TableItemRenderer; - } else - { - ir = itemRendererFactory.createItemRenderer(dataGroup) as TableItemRenderer; - } - - tableCell.addElement(ir); - row.addElement(tableCell); - - ir.labelField = column.dataField; - ir.index = i; - ir.data = dp.getItemAt(i); - - if(column.align != "") - { - ir.align = column.align; - } - } - - tbody.addElement(row); - } - - table.dispatchEvent(new Event("layoutNeeded")); - } - } -} diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/DateItemRenderer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/DateItemRenderer.as index c1addcc..d37b374 100644 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/DateItemRenderer.as +++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/DateItemRenderer.as @@ -84,15 +84,5 @@ package org.apache.royale.jewel.itemRenderers className = "empty-cell"; } } - - /** - * @private - */ - COMPILE::JS - override public function set height(value:Number):void - { - super.height = value; - // element.style["line-height"] = String(value)+"px"; - } } } diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/NavigationLinkItemRenderer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/NavigationLinkItemRenderer.as index 21e6f40..9f72dcc 100644 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/NavigationLinkItemRenderer.as +++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/NavigationLinkItemRenderer.as @@ -168,6 +168,7 @@ package org.apache.royale.jewel.itemRenderers override public function updateRenderer():void { // override all and do nothing, all is managed in CSS + // there's no selection only hover state } } } diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css b/frameworks/themes/JewelTheme/src/main/resources/defaults.css index 20ff2d3..9500822 100644 --- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css +++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css @@ -235,6 +235,8 @@ j|Card { .jewel.datechooser { background: white; + border: 1px solid #d9d9d9; + border-radius: 0.25rem; } .jewel.datechooser .jewel.table { background: white; diff --git a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_datechooser.sass b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_datechooser.sass index a0ba9a2..3d7f826 100644 --- a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_datechooser.sass +++ b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_datechooser.sass @@ -20,9 +20,12 @@ // Jewel DateChooser // DateChooser variables +$datechooser-border-radius: $border-radius .jewel.datechooser background: lighten($default-color, 20%) + border: 1px solid $default-color + border-radius: $datechooser-border-radius // width: 282px .jewel.table