This is an automated email from the ASF dual-hosted git repository. harbs pushed a commit to branch feature/sanitize in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 4c783b911d54df67a18eeb5cc4b347a8dc5139ce Merge: 37b973d 768cf00 Author: Harbs <[email protected]> AuthorDate: Mon Dec 27 12:24:33 2021 +0200 Merge branch 'develop' into feature/sanitize .../main/royale/TriStateCheckBoxPlayGround.mxml | 8 +- .../src/main/royale/ControlsExample.mxml | 73 +- .../src/main/royale/components/StackItem.mxml | 45 + .../TitleWindowPopupWindowWithViewStack.mxml | 66 + frameworks/build.xml | 12 + frameworks/js/projects/ExternsJSJS/build.xml | 136 ++ .../src/main/config/compile-js-config.xml | 40 +- .../src/main/config/compile-js-config.xml | 1 + .../royale/org/apache/royale/html/DataContainer.as | 3 +- .../royale/org/apache/royale/html/DropDownList.as | 3 +- .../org/apache/royale/html/ImageAndTextButton.as | 28 +- .../CollectionChangeUpdateForArrayListData.as | 17 +- .../royale/html/beads/DataFieldProviderBead.as | 3 +- .../apache/royale/html/beads/ITextItemRenderer.as | 3 +- .../html/beads/IndexedItemRendererInitializer.as | 17 +- .../beads/VirtualDataItemRendererFactoryBase.as | 32 +- .../html/beads/models/ArrayListSelectionModel.as | 3 +- .../html/beads/models/ArrayMultiSelectionModel.as | 3 +- .../html/beads/models/ArraySelectionModel.as | 3 +- .../royale/html/beads/models/DataProviderModel.as | 3 +- .../models/MultiSelectionCollectionViewModel.as | 3 +- .../models/SingleSelectionCollectionViewModel.as | 3 +- .../html/beads/models/StringSelectionModel.as | 3 +- .../royale/html/supportClasses/DataGridColumn.as | 3 +- .../royale/html/supportClasses/DataItemRenderer.as | 3 +- .../html/supportClasses/GraphicsItemRenderer.as | 4 +- .../html/supportClasses/StyledDataItemRenderer.as | 5 +- .../supportClasses/StyledUIItemRendererBase.as | 3 +- .../html/supportClasses/TextButtonItemRenderer.as | 3 +- .../html/supportClasses/TextFieldItemRenderer.as | 3 +- .../html/supportClasses/UIItemRendererBase.as | 3 +- .../apache/royale/html/util/getLabelFromData.as | 36 +- .../projects/Core/src/main/royale/CoreClasses.as | 3 + .../org/apache/royale/core/ElementWrapper.as | 11 +- .../org/apache/royale/core/IHasDataField.as} | 37 +- .../org/apache/royale/core/IHasLabelField.as} | 37 +- .../apache/royale/core/ILabelFieldItemRenderer.as | 3 +- .../royale/org/apache/royale/core/ILabeledData.as} | 35 +- .../org/apache/royale/events/utils/EventUtils.as | 35 + .../royale/org/apache/royale/utils/PointUtils.as | 32 +- .../src/test/royale/FlexUnitRoyaleApplication.mxml | 16 + .../src/test/royale/flexUnitTests/CoreTester.as | 2 + .../src/test/royale/flexUnitTests/EventsTest.as | 119 ++ .../src/main/config/compile-swf-config.xml | 4 - .../src/main/resources/externsjs-as-manifest.xml | 25 - .../inspiretree/InspireTreeBasicControl.as | 112 +- .../royale/FlexUnitRoyaleApplication-config.xml | 111 ++ .../src/test/royale/FlexUnitRoyaleApplication.mxml | 20 +- .../projects/ExternsJS/src/test/royale/build.xml | 116 ++ .../test/royale/flexUnitTests/ComponentTest.as} | 63 +- .../test/royale/flexUnitTests/ExternsJSTester.as} | 42 +- .../Jewel/src/main/resources/jewel-manifest.xml | 4 +- .../royale/org/apache/royale/jewel/ComboBox.as | 3 +- .../org/apache/royale/jewel/DataContainer.as | 3 +- .../royale/org/apache/royale/jewel/DropDownList.as | 3 +- .../org/apache/royale/jewel/TriStateCheckBox.as | 4 +- .../beads/controls/combobox/ComboBoxReadOnly.as | 93 ++ .../tristatecheckbox/TriStateCheckBoxLabelState.as | 7 +- ...BoxStatesValues.as => TriStateCheckBoxState.as} | 12 +- .../TriStateCheckBoxTooltipState.as | 112 ++ .../jewel/beads/models/ArrayListSelectionModel.as | 3 +- .../royale/jewel/beads/models/DataProviderModel.as | 3 +- .../jewel/itemRenderers/ButtonBarItemRenderer.as | 3 +- .../itemRenderers/IconButtonBarItemRenderer.as | 3 +- .../itemRenderers/ToggleButtonBarItemRenderer.as | 3 +- .../jewel/supportClasses/table/TableColumn.as | 3 +- frameworks/projects/MXRoyale/asconfig.json | 7 +- .../src/main/config/compile-swf-config.xml | 1 + .../MXRoyale/src/main/resources/defaults.css | 13 +- .../src/main/resources/mx-royale-manifest.xml | 1 + .../MXRoyale/src/main/royale/MXRoyaleClasses.as | 2 + .../src/main/royale/mx/charts/series/BarSeries.as | 3 +- .../main/royale/mx/charts/series/ColumnSeries.as | 3 +- .../src/main/royale/mx/charts/series/PieSeries.as | 3 +- .../src/main/royale/mx/containers/FormItem.as | 4 + .../src/main/royale/mx/containers/GridRow.as | 4 +- .../src/main/royale/mx/containers/Panel.as | 23 +- .../src/main/royale/mx/containers/PanelTitleBar.as | 4 + .../src/main/royale/mx/containers/TitleWindow.as | 14 +- .../src/main/royale/mx/containers/ViewStack.as | 9 +- .../royale/mx/containers/beads/CanvasLayout.as | 37 +- .../beads/supportClasses/ContainerContentArea.as | 78 + .../src/main/royale/mx/controls/ComboBox.as | 16 + .../MXRoyale/src/main/royale/mx/controls/HTML.as | 1626 ++++++++++++++++++++ .../MXRoyale/src/main/royale/mx/controls/Menu.as | 3 +- .../src/main/royale/mx/controls/MenuBar.as | 3 +- .../MXRoyale/src/main/royale/mx/controls/NavBar.as | 3 +- .../src/main/royale/mx/controls/PopUpMenuButton.as | 3 +- .../src/main/royale/mx/controls/TextArea.as | 39 +- .../src/main/royale/mx/controls/ToggleButtonBar.as | 3 +- .../MXRoyale/src/main/royale/mx/controls/VRule.as | 10 +- .../AdvancedDataGridHeaderRenderer.as | 4 +- ...actoryForICollectionViewAdvancedDataGridData.as | 31 +- .../beads/DataGridItemRendererInitializer.as | 20 +- .../beads/models/ArrayMultiSelectionModel.as | 3 +- .../models/SingleSelectionICollectionViewModel.as | 3 +- .../beads/models/SingleSelectionIListModel.as | 3 +- .../mx/controls/colorPickerClasses/SwatchPanel.as | 4 +- .../mx/controls/dataGridClasses/DataGridColumn.as | 3 +- .../dataGridClasses/DataGridHeaderRenderer.as | 4 +- .../controls/dataGridClasses/DataGridListData.as | 23 +- .../mx/controls/listClasses/AdvancedListBase.as | 6 +- .../mx/controls/listClasses/DataGridListBase.as | 13 +- .../royale/mx/controls/listClasses/ListBase.as | 46 +- .../mx/controls/listClasses/ListItemRenderer.as | 4 +- .../mx/controls/treeClasses/TreeItemRenderer.as | 8 +- .../MXRoyale/src/main/royale/mx/core/Container.as | 240 ++- .../main/royale/mx/core/IDeferredContentOwner.as | 103 ++ .../src/main/royale/mx/core/INavigatorContent.as | 2 +- .../mx/core/LayoutElementUIComponentUtils.as | 48 + .../src/main/royale/mx/core/UIComponent.as | 205 ++- .../src/main/royale/mx/core/UITextField.as | 12 +- .../src/main/royale/mx/managers/SystemManager.as | 13 +- .../royale/mx/supportClasses/ButtonItemRenderer.as | 8 +- .../src/main/royale/mx/events/FlexEvent.as | 2 +- .../src/main/royale/mx/utils/RoyaleUtil.as | 17 +- .../main/royale/org/apache/royale/mdl/TabBar.as | 3 +- .../src/main/royale/org/apache/royale/mdl/Tabs.as | 3 +- .../beads/TabsItemRendererFactoryForArrayData.as | 15 +- .../mdl/beads/TabsItemRendererInitializer.as | 12 +- frameworks/projects/SparkRoyale/asconfig.json | 26 +- .../src/main/config/compile-swf-config.xml | 1 + .../SparkRoyale/src/main/resources/defaults.css | 26 +- .../src/main/resources/spark-royale-manifest.xml | 1 - .../src/main/royale/SparkRoyaleClasses.as | 6 +- .../main/royale/spark/components/Application.as | 31 +- .../main/royale/spark/components/DataRenderer.as | 3 +- .../src/main/royale/spark/components/Grid.as | 4 +- .../src/main/royale/spark/components/List.as | 6 +- .../royale/spark/components/SkinnableContainer.as | 57 +- .../spark/components/SkinnableDataContainer.as | 81 +- .../src/main/royale/spark/components/TabBar.as | 12 +- .../royale/spark/components/beads/GroupView.as | 20 +- .../beads/SelfItemRendererInitializer.as | 13 +- .../components/beads/SkinnableContainerView.as | 173 +-- .../components/beads/SkinnableDataContainerView.as | 165 +- .../spark/components/beads/SparkContainerView.as | 236 +-- .../components/beads/SparkDataContainerView.as | 260 ++-- .../components/beads/SparkSkinScrollingViewport.as | 203 +-- .../spark/components/beads/SparkSkinViewport.as | 278 +--- ...nerView.as => TabBarItemRendererInitializer.as} | 40 +- ...BarSelectionUpdateFromSelectableDataProvider.as | 158 -- .../spark/components/beads/VirtualListView.as | 186 +++ .../spark/components/gridClasses/GridColumn.as | 3 +- .../components/supportClasses/DropDownListBase.as | 3 +- .../supportClasses/DropDownListButton.as | 163 +- .../spark/components/supportClasses/ListBase.as | 216 +-- .../supportClasses/SkinnableContainerBase.as | 53 +- .../supportClasses/SparkTextButtonItemRenderer.as | 34 +- .../src/main/royale/spark/core/ISparkContainer.as} | 49 +- .../ISparkLayoutHost.as} | 40 +- .../spark/layouts/supportClasses/LayoutBase.as | 5 +- .../layouts/supportClasses/SparkLayoutBead.as | 255 +-- frameworks/projects/XML/src/main/royale/XML.as | 9 +- .../test/royale/flexUnitTests/xml/XMLQNameTest.as | 33 +- .../src/main/resources/defaults.css | 67 + .../src/main/resources/defaults.css | 67 + .../src/main/resources/defaults.css | 67 + .../src/main/resources/defaults.css | 67 + .../src/main/resources/defaults.css | 67 + .../src/main/resources/defaults.css | 67 + .../src/main/resources/defaults.css | 67 + .../src/main/resources/defaults.css | 67 + .../src/main/resources/defaults.css | 67 + .../src/main/resources/defaults.css | 67 + .../src/main/resources/defaults.css | 67 + .../src/main/resources/defaults.css | 67 + .../src/main/resources/defaults.css | 21 +- .../src/main/resources/defaults.css | 21 +- .../src/main/resources/defaults.css | 21 +- .../src/main/resources/defaults.css | 21 +- .../src/main/resources/defaults.css | 21 +- .../src/main/resources/defaults.css | 21 +- .../src/main/resources/defaults.css | 21 +- .../src/main/resources/defaults.css | 21 +- .../src/main/resources/defaults.css | 21 +- .../src/main/resources/defaults.css | 21 +- .../src/main/resources/defaults.css | 21 +- .../src/main/resources/defaults.css | 21 +- .../src/main/resources/defaults.css | 66 + .../src/main/resources/defaults.css | 66 + .../src/main/resources/defaults.css | 66 + .../src/main/resources/defaults.css | 66 + .../src/main/resources/defaults.css | 66 + .../src/main/resources/defaults.css | 66 + .../src/main/resources/defaults.css | 66 + .../src/main/resources/defaults.css | 66 + .../src/main/resources/defaults.css | 66 + .../src/main/resources/defaults.css | 66 + .../src/main/resources/defaults.css | 66 + .../src/main/resources/defaults.css | 66 + .../src/main/resources/defaults.css | 67 + .../src/main/resources/defaults.css | 67 + .../src/main/resources/defaults.css | 67 + .../src/main/resources/defaults.css | 67 + .../src/main/resources/defaults.css | 67 + .../src/main/resources/defaults.css | 67 + .../src/main/resources/defaults.css | 67 + .../src/main/resources/defaults.css | 67 + .../src/main/resources/defaults.css | 67 + .../src/main/resources/defaults.css | 67 + .../src/main/resources/defaults.css | 67 + .../src/main/resources/defaults.css | 67 + .../src/main/resources/defaults.css | 21 +- .../src/main/resources/defaults.css | 21 +- .../src/main/resources/defaults.css | 21 +- .../src/main/resources/defaults.css | 21 +- .../src/main/resources/defaults.css | 21 +- .../src/main/resources/defaults.css | 21 +- .../src/main/resources/defaults.css | 21 +- .../src/main/resources/defaults.css | 21 +- .../src/main/resources/defaults.css | 21 +- .../src/main/resources/defaults.css | 21 +- .../src/main/resources/defaults.css | 21 +- .../src/main/resources/defaults.css | 21 +- .../src/main/resources/defaults.css | 66 + .../src/main/resources/defaults.css | 66 + .../src/main/resources/defaults.css | 66 + .../src/main/resources/defaults.css | 66 + .../src/main/resources/defaults.css | 66 + .../src/main/resources/defaults.css | 66 + .../src/main/resources/defaults.css | 66 + .../src/main/resources/defaults.css | 66 + .../src/main/resources/defaults.css | 66 + .../src/main/resources/defaults.css | 66 + .../src/main/resources/defaults.css | 66 + .../src/main/resources/defaults.css | 66 + .../src/main/resources/defaults.css | 67 + .../src/main/resources/defaults.css | 67 + .../src/main/resources/defaults.css | 67 + .../src/main/resources/defaults.css | 67 + .../src/main/resources/defaults.css | 67 + .../src/main/resources/defaults.css | 67 + .../src/main/resources/defaults.css | 67 + .../src/main/resources/defaults.css | 67 + .../src/main/resources/defaults.css | 67 + .../src/main/resources/defaults.css | 67 + .../src/main/resources/defaults.css | 67 + .../src/main/resources/defaults.css | 67 + .../src/main/resources/defaults.css | 21 +- .../src/main/resources/defaults.css | 21 +- .../src/main/resources/defaults.css | 21 +- .../src/main/resources/defaults.css | 21 +- .../src/main/resources/defaults.css | 21 +- .../src/main/resources/defaults.css | 21 +- .../src/main/resources/defaults.css | 21 +- .../src/main/resources/defaults.css | 21 +- .../src/main/resources/defaults.css | 21 +- .../src/main/resources/defaults.css | 21 +- .../src/main/resources/defaults.css | 21 +- .../src/main/resources/defaults.css | 21 +- .../src/main/resources/defaults.css | 66 + .../src/main/resources/defaults.css | 66 + .../src/main/resources/defaults.css | 66 + .../src/main/resources/defaults.css | 66 + .../src/main/resources/defaults.css | 66 + .../src/main/resources/defaults.css | 66 + .../src/main/resources/defaults.css | 66 + .../src/main/resources/defaults.css | 66 + .../src/main/resources/defaults.css | 66 + .../src/main/resources/defaults.css | 66 + .../src/main/resources/defaults.css | 66 + .../src/main/resources/defaults.css | 66 + .../JewelTheme/src/main/resources/defaults.css | 154 +- 264 files changed, 10789 insertions(+), 2181 deletions(-) diff --cc frameworks/projects/Core/src/test/royale/flexUnitTests/CoreTester.as index 9441daf,9d2a16d..f7f3ca1 --- a/frameworks/projects/Core/src/test/royale/flexUnitTests/CoreTester.as +++ b/frameworks/projects/Core/src/test/royale/flexUnitTests/CoreTester.as @@@ -42,6 -42,7 +42,8 @@@ package flexUnitTest public var keyConverterTest:KeyConverterTest; public var keyboardEventConverterTest:KeyboardEventConverterTest; public var stringUtilsTest:StringUtilsTest; + public var sanitizerTest:SanitizeTest; + public var eventsTest:EventsTest; + } }
