FYI, I’ve been getting the dialog polyfill included in my app for a while now.
I spent time trying to track down the cause and I was not very successful. For some reason the compiler seemed to think the dialogPolyfill typedef was being used even though it wasn’t. The only reliable solution was to switch the “inject” to a class instead of an extern. It’s slightly less elegant, but at least it doesn’t have undesired side-effects... > On Aug 17, 2020, at 4:33 PM, ha...@apache.org wrote: > > This is an automated email from the ASF dual-hosted git repository. > > harbs 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 df5c974 Switched dialog polyfill to a class For some reason > including it in a typedef causes it to be added randomly > df5c974 is described below > > commit df5c974f83c9d8c65c3662e31e304b9d556fdff7 > Author: Harbs <ha...@in-tools.com> > AuthorDate: Mon Aug 17 16:33:38 2020 +0300 > > Switched dialog polyfill to a class > For some reason including it in a typedef causes it to be added randomly > --- > .../projects/Basic/src/main/royale/BasicClasses.as | 159 +++++++++++---------- > .../org/apache/royale/html/util/DialogPolyfill.as} | 36 ++--- > .../projects/Jewel/src/main/royale/JewelClasses.as | 2 +- > .../main/royale/org/apache/royale/jewel/Alert.as | 115 +++++++-------- > .../main/royale/org/apache/royale/mdl/Dialog.as | 15 +- > 5 files changed, 162 insertions(+), 165 deletions(-) > > diff --git a/frameworks/projects/Basic/src/main/royale/BasicClasses.as > b/frameworks/projects/Basic/src/main/royale/BasicClasses.as > index c963ef6..1605f98 100644 > --- a/frameworks/projects/Basic/src/main/royale/BasicClasses.as > +++ b/frameworks/projects/Basic/src/main/royale/BasicClasses.as > @@ -7,7 +7,7 @@ > // (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 > +// 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, > @@ -34,18 +34,18 @@ internal class BasicClasses > import org.apache.royale.html.util.createSVG; createSVG; > import org.apache.royale.html.util.removeCSSStyleProperty; > removeCSSStyleProperty; > } > - import org.apache.royale.html.ToolTip; ToolTip; > + import org.apache.royale.html.ToolTip; ToolTip; > import org.apache.royale.html.accessories.NumericOnlyTextInputBead; > NumericOnlyTextInputBead; > - import org.apache.royale.html.accessories.RestrictTextInputBead; > RestrictTextInputBead; > - import org.apache.royale.html.accessories.PasswordInputBead; > PasswordInputBead; > + import org.apache.royale.html.accessories.RestrictTextInputBead; > RestrictTextInputBead; > + import org.apache.royale.html.accessories.PasswordInputBead; > PasswordInputBead; > import org.apache.royale.html.accessories.PasswordInputRemovableBead; > PasswordInputRemovableBead; > import org.apache.royale.html.accessories.TextPromptBead; > TextPromptBead; > import org.apache.royale.html.beads.AbsolutePositioningViewBeadBase; > AbsolutePositioningViewBeadBase; > - import org.apache.royale.html.beads.AlertView; AlertView; > - import org.apache.royale.html.beads.ColorSpectrumView; ColorSpectrumView; > - import org.apache.royale.html.supportClasses.ColorPickerPopUp; > ColorPickerPopUp; > - import org.apache.royale.html.beads.controllers.AlertController; > AlertController; > - import > org.apache.royale.html.beads.controllers.ColorSpectrumMouseController; > ColorSpectrumMouseController; > + import org.apache.royale.html.beads.AlertView; AlertView; > + import org.apache.royale.html.beads.ColorSpectrumView; > ColorSpectrumView; > + import org.apache.royale.html.supportClasses.ColorPickerPopUp; > ColorPickerPopUp; > + import org.apache.royale.html.beads.controllers.AlertController; > AlertController; > + import > org.apache.royale.html.beads.controllers.ColorSpectrumMouseController; > ColorSpectrumMouseController; > > import org.apache.royale.html.beads.DividedContainerView; > DividedContainerView; > import org.apache.royale.html.beads.models.DividedContainerModel; > DividedContainerModel; > @@ -74,9 +74,9 @@ internal class BasicClasses > import org.apache.royale.html.beads.models.CascadingMenuModel; > CascadingMenuModel; > import > org.apache.royale.html.beads.controllers.CascadingMenuSelectionMouseController; > CascadingMenuSelectionMouseController; > import org.apache.royale.html.supportClasses.CascadingMenuItemRenderer; > CascadingMenuItemRenderer; > - import > org.apache.royale.html.beads.SolidBackgroundSelectableItemRendererBead; > SolidBackgroundSelectableItemRendererBead; > - import > org.apache.royale.html.beads.SolidBackgroundRuntimeSelectableItemRendererBead; > SolidBackgroundRuntimeSelectableItemRendererBead; > - import > org.apache.royale.html.beads.AlternatingBackgroundColorSelectableItemRendererBead; > AlternatingBackgroundColorSelectableItemRendererBead; > + import > org.apache.royale.html.beads.SolidBackgroundSelectableItemRendererBead; > SolidBackgroundSelectableItemRendererBead; > + import > org.apache.royale.html.beads.SolidBackgroundRuntimeSelectableItemRendererBead; > SolidBackgroundRuntimeSelectableItemRendererBead; > + import > org.apache.royale.html.beads.AlternatingBackgroundColorSelectableItemRendererBead; > AlternatingBackgroundColorSelectableItemRendererBead; > > COMPILE::SWF > { > @@ -89,25 +89,25 @@ internal class BasicClasses > { > import org.apache.royale.html.beads.CheckBoxView; CheckBoxView; > } > - import org.apache.royale.html.beads.ComboBoxView; ComboBoxView; > - import org.apache.royale.html.beads.ColorPickerView; ColorPickerView; > - import org.apache.royale.html.MXMLBeadView; MXMLBeadView; > - import org.apache.royale.html.beads.GroupView; GroupView; > + import org.apache.royale.html.beads.ComboBoxView; ComboBoxView; > + import org.apache.royale.html.beads.ColorPickerView; ColorPickerView; > + import org.apache.royale.html.MXMLBeadView; MXMLBeadView; > + import org.apache.royale.html.beads.GroupView; GroupView; > import org.apache.royale.html.beads.ContainerView; ContainerView; > import org.apache.royale.core.supportClasses.StyledImageBase; > StyledImageBase; > - import org.apache.royale.html.beads.plugin.ModalDisplay; ModalDisplay; > + import org.apache.royale.html.beads.plugin.ModalDisplay; ModalDisplay; > > > COMPILE::SWF > { > - import org.apache.royale.html.beads.ControlBarMeasurementBead; > ControlBarMeasurementBead; > - import org.apache.royale.html.beads.CSSButtonView; CSSButtonView; > - import org.apache.royale.html.beads.CSSImageAndTextButtonView; > CSSImageAndTextButtonView; > + import org.apache.royale.html.beads.ControlBarMeasurementBead; > ControlBarMeasurementBead; > + import org.apache.royale.html.beads.CSSButtonView; > CSSButtonView; > + import org.apache.royale.html.beads.CSSImageAndTextButtonView; > CSSImageAndTextButtonView; > import org.apache.royale.html.beads.CSSTextButtonView; > CSSTextButtonView; > - import org.apache.royale.html.beads.CSSTextToggleButtonView; > CSSTextToggleButtonView; > + import org.apache.royale.html.beads.CSSTextToggleButtonView; > CSSTextToggleButtonView; > import org.apache.royale.html.beads.DropDownListView; > DropDownListView; > import org.apache.royale.html.beads.CloseButtonView; > CloseButtonView; > - import org.apache.royale.html.beads.ImageAndTextButtonView; > ImageAndTextButtonView; > + import org.apache.royale.html.beads.ImageAndTextButtonView; > ImageAndTextButtonView; > import org.apache.royale.html.beads.ImageView; > org.apache.royale.html.beads.ImageView; > } > import org.apache.royale.html.beads.ImageButtonView; ImageButtonView; > @@ -115,19 +115,19 @@ internal class BasicClasses > import org.apache.royale.html.beads.models.BinaryImageModel; > BinaryImageModel; > > import org.apache.royale.html.beads.ListView; ListView; > - import > org.apache.royale.html.beads.ListOwnerViewItemRendererInitializer; > ListOwnerViewItemRendererInitializer; > - import org.apache.royale.html.beads.TreeItemRendererInitializer; > TreeItemRendererInitializer; > - import > org.apache.royale.html.beads.HorizontalListItemRendererInitializer; > HorizontalListItemRendererInitializer; > + import > org.apache.royale.html.beads.ListOwnerViewItemRendererInitializer; > ListOwnerViewItemRendererInitializer; > + import org.apache.royale.html.beads.TreeItemRendererInitializer; > TreeItemRendererInitializer; > + import > org.apache.royale.html.beads.HorizontalListItemRendererInitializer; > HorizontalListItemRendererInitializer; > > import org.apache.royale.html.beads.MultiSelectionListView; > MultiSelectionListView; > import org.apache.royale.html.beads.NumericStepperView; > NumericStepperView; > - import org.apache.royale.html.beads.PanelView; PanelView; > + import org.apache.royale.html.beads.PanelView; PanelView; > import org.apache.royale.html.supportClasses.PanelLayoutProxy; > PanelLayoutProxy; > - import org.apache.royale.html.beads.SliderView; SliderView; > + import org.apache.royale.html.beads.SliderView; SliderView; > import org.apache.royale.html.beads.layouts.HorizontalSliderLayout; > HorizontalSliderLayout; > import org.apache.royale.html.beads.layouts.VerticalSliderLayout; > VerticalSliderLayout; > - import org.apache.royale.html.beads.PanelWithControlBarView; > PanelWithControlBarView; > - import org.apache.royale.html.beads.AccordionItemRendererView; > AccordionItemRendererView; > + import org.apache.royale.html.beads.PanelWithControlBarView; > PanelWithControlBarView; > + import org.apache.royale.html.beads.AccordionItemRendererView; > AccordionItemRendererView; > import org.apache.royale.html.supportClasses.MXMLItemRenderer; > MXMLItemRenderer; > import org.apache.royale.core.StyledMXMLItemRenderer; > StyledMXMLItemRenderer; > > @@ -136,11 +136,11 @@ internal class BasicClasses > import org.apache.royale.html.beads.RadioButtonView; > RadioButtonView; > import org.apache.royale.html.beads.VScrollBarView; > VScrollBarView; > import org.apache.royale.html.beads.HScrollBarView; > HScrollBarView; > - import org.apache.royale.html.beads.ScrollBarView; ScrollBarView; > + import org.apache.royale.html.beads.ScrollBarView; > ScrollBarView; > import org.apache.royale.html.beads.SimpleAlertView; > SimpleAlertView; > - import org.apache.royale.html.beads.SingleLineBorderBead; > SingleLineBorderBead; > - import org.apache.royale.html.beads.SliderThumbView; SliderThumbView; > - import org.apache.royale.html.beads.SliderTrackView; SliderTrackView; > + import org.apache.royale.html.beads.SingleLineBorderBead; > SingleLineBorderBead; > + import org.apache.royale.html.beads.SliderThumbView; > SliderThumbView; > + import org.apache.royale.html.beads.SliderTrackView; > SliderTrackView; > import > org.apache.royale.html.beads.SingleLineBorderWithChangeListenerBead; > SingleLineBorderWithChangeListenerBead; > } > > @@ -149,13 +149,13 @@ internal class BasicClasses > { > import org.apache.royale.html.beads.SolidBackgroundBead; > SolidBackgroundBead; > import > org.apache.royale.html.beads.SolidBackgroundWithChangeListenerBead; > SolidBackgroundWithChangeListenerBead; > - import org.apache.royale.html.beads.TextButtonMeasurementBead; > TextButtonMeasurementBead; > + import org.apache.royale.html.beads.TextButtonMeasurementBead; > TextButtonMeasurementBead; > import > org.apache.royale.html.beads.TextFieldLabelMeasurementBead; > TextFieldLabelMeasurementBead; > - import org.apache.royale.html.beads.TextAreaView; TextAreaView; > - import org.apache.royale.html.beads.TextButtonView; TextButtonView; > - import org.apache.royale.html.beads.TextFieldView; TextFieldView; > - import org.apache.royale.html.beads.TextInputView; TextInputView; > - import org.apache.royale.html.beads.TextInputWithBorderView; > TextInputWithBorderView; > + import org.apache.royale.html.beads.TextAreaView; TextAreaView; > + import org.apache.royale.html.beads.TextButtonView; > TextButtonView; > + import org.apache.royale.html.beads.TextFieldView; > TextFieldView; > + import org.apache.royale.html.beads.TextInputView; > TextInputView; > + import org.apache.royale.html.beads.TextInputWithBorderView; > TextInputWithBorderView; > } > import org.apache.royale.html.beads.models.AlertModel; AlertModel; > import org.apache.royale.html.beads.models.ArraySelectionModel; > ArraySelectionModel; > @@ -165,27 +165,27 @@ internal class BasicClasses > import org.apache.royale.html.beads.models.TreeModel; TreeModel; > import org.apache.royale.html.beads.models.MultiSelectionTreeModel; > MultiSelectionTreeModel; > import org.apache.royale.html.beads.models.MenuModel; MenuModel; > - import org.apache.royale.html.beads.models.RangeModel; RangeModel; > - import org.apache.royale.html.beads.models.RangeModelExtended; > RangeModelExtended; > + import org.apache.royale.html.beads.models.RangeModel; RangeModel; > + import org.apache.royale.html.beads.models.RangeModelExtended; > RangeModelExtended; > import org.apache.royale.html.beads.models.ComboBoxModel; ComboBoxModel; > import org.apache.royale.html.beads.models.ViewportModel; ViewportModel; > > COMPILE::SWF > { > import org.apache.royale.html.beads.models.ImageModel; > ImageModel; > - import org.apache.royale.html.beads.models.ImageAndTextModel; > ImageAndTextModel; > + import org.apache.royale.html.beads.models.ImageAndTextModel; > ImageAndTextModel; > } > import org.apache.royale.html.beads.models.PanelModel; PanelModel; > COMPILE::SWF > { > - import org.apache.royale.html.beads.models.SingleLineBorderModel; > SingleLineBorderModel; > + import > org.apache.royale.html.beads.models.SingleLineBorderModel; > SingleLineBorderModel; > } > > import org.apache.royale.html.beads.models.ColorModel; ColorModel; > import org.apache.royale.html.beads.models.ColorSpectrumModel; > ColorSpectrumModel; > import org.apache.royale.html.beads.models.TextModel; TextModel; > - import org.apache.royale.html.beads.models.NonNullTextModel; > NonNullTextModel; > - import org.apache.royale.html.beads.models.TitleBarModel; TitleBarModel; > + import org.apache.royale.html.beads.models.NonNullTextModel; > NonNullTextModel; > + import org.apache.royale.html.beads.models.TitleBarModel; TitleBarModel; > import org.apache.royale.html.beads.models.ToggleButtonModel; > ToggleButtonModel; > COMPILE::SWF > { > @@ -194,35 +194,35 @@ internal class BasicClasses > import org.apache.royale.html.beads.models.ViewportModel; ViewportModel; > COMPILE::SWF > { > - import org.apache.royale.html.beads.controllers.DropDownListController; > DropDownListController; > + import > org.apache.royale.html.beads.controllers.DropDownListController; > DropDownListController; > import > org.apache.royale.html.beads.controllers.EditableTextKeyboardController; > EditableTextKeyboardController; > } > - import org.apache.royale.html.beads.controllers.ComboBoxController; > ComboBoxController; > - import > org.apache.royale.html.beads.controllers.AccordionItemRendererMouseController; > AccordionItemRendererMouseController; > - import > org.apache.royale.html.beads.controllers.ItemRendererMouseController; > ItemRendererMouseController; > - import > org.apache.royale.html.beads.controllers.ListSingleSelectionMouseController; > ListSingleSelectionMouseController; > - import > org.apache.royale.html.beads.controllers.ListMultiSelectionMouseController; > ListMultiSelectionMouseController; > - import > org.apache.royale.html.beads.MultiSelectionItemRendererClassFactory; > MultiSelectionItemRendererClassFactory; > + import org.apache.royale.html.beads.controllers.ComboBoxController; > ComboBoxController; > + import > org.apache.royale.html.beads.controllers.AccordionItemRendererMouseController; > AccordionItemRendererMouseController; > + import > org.apache.royale.html.beads.controllers.ItemRendererMouseController; > ItemRendererMouseController; > + import > org.apache.royale.html.beads.controllers.ListSingleSelectionMouseController; > ListSingleSelectionMouseController; > + import > org.apache.royale.html.beads.controllers.ListMultiSelectionMouseController; > ListMultiSelectionMouseController; > + import > org.apache.royale.html.beads.MultiSelectionItemRendererClassFactory; > MultiSelectionItemRendererClassFactory; > import > org.apache.royale.html.beads.controllers.TreeMultiSelectionMouseController; > TreeMultiSelectionMouseController; > import > org.apache.royale.html.beads.controllers.TreeSingleSelectionMouseController; > TreeSingleSelectionMouseController; > import > org.apache.royale.html.beads.controllers.MenuSelectionMouseController; > MenuSelectionMouseController; > - import org.apache.royale.html.beads.controllers.HSliderMouseController; > HSliderMouseController; > + import org.apache.royale.html.beads.controllers.HSliderMouseController; > HSliderMouseController; > import org.apache.royale.html.beads.controllers.VSliderMouseController; > VSliderMouseController; > COMPILE::SWF > { > import > org.apache.royale.html.beads.controllers.SpinnerMouseController; > SpinnerMouseController; > - import > org.apache.royale.html.beads.controllers.VScrollBarMouseController; > VScrollBarMouseController; > + import > org.apache.royale.html.beads.controllers.VScrollBarMouseController; > VScrollBarMouseController; > import > org.apache.royale.html.beads.controllers.HScrollBarMouseController; > HScrollBarMouseController; > } > import org.apache.royale.html.beads.layouts.ButtonBarLayout; > ButtonBarLayout; > - import org.apache.royale.html.beads.layouts.VerticalLayout; > VerticalLayout; > - import > org.apache.royale.html.beads.layouts.VerticalLayoutWithPaddingAndGap; > VerticalLayoutWithPaddingAndGap; > + import org.apache.royale.html.beads.layouts.VerticalLayout; > VerticalLayout; > + import > org.apache.royale.html.beads.layouts.VerticalLayoutWithPaddingAndGap; > VerticalLayoutWithPaddingAndGap; > import org.apache.royale.html.beads.layouts.VerticalFlexLayout; > VerticalFlexLayout; > import org.apache.royale.html.beads.layouts.HorizontalLayout; > HorizontalLayout; > - import > org.apache.royale.html.beads.layouts.HorizontalLayoutWithPaddingAndGap; > HorizontalLayoutWithPaddingAndGap; > + import > org.apache.royale.html.beads.layouts.HorizontalLayoutWithPaddingAndGap; > HorizontalLayoutWithPaddingAndGap; > import org.apache.royale.html.beads.layouts.HorizontalFlexLayout; > HorizontalFlexLayout; > - import org.apache.royale.html.beads.layouts.BasicLayout; BasicLayout; > - import org.apache.royale.html.beads.layouts.RemovableBasicLayout; > RemovableBasicLayout; > + import org.apache.royale.html.beads.layouts.BasicLayout; BasicLayout; > + import org.apache.royale.html.beads.layouts.RemovableBasicLayout; > RemovableBasicLayout; > import > org.apache.royale.html.beads.layouts.OneFlexibleChildHorizontalLayout; > OneFlexibleChildHorizontalLayout; > import > org.apache.royale.html.beads.layouts.OneFlexibleChildVerticalLayout; > OneFlexibleChildVerticalLayout; > > @@ -231,13 +231,13 @@ internal class BasicClasses > COMPILE::SWF > { > import org.apache.royale.html.beads.layouts.HScrollBarLayout; > HScrollBarLayout; > - import org.apache.royale.html.beads.layouts.VScrollBarLayout; > VScrollBarLayout; > + import org.apache.royale.html.beads.layouts.VScrollBarLayout; > VScrollBarLayout; > import > org.apache.royale.html.supportClasses.ContainerContentArea; > ContainerContentArea; > } > import org.apache.royale.html.beads.layouts.TileLayout; TileLayout; > - import org.apache.royale.html.beads.TextItemRendererFactoryForArrayData; > TextItemRendererFactoryForArrayData; > + import > org.apache.royale.html.beads.TextItemRendererFactoryForArrayData; > TextItemRendererFactoryForArrayData; > import > org.apache.royale.html.beads.DataItemRendererFactoryForArrayData; > DataItemRendererFactoryForArrayData; > - import > org.apache.royale.html.beads.DynamicItemsRendererFactoryForArrayListData; > DynamicItemsRendererFactoryForArrayListData; > + import > org.apache.royale.html.beads.DynamicItemsRendererFactoryForArrayListData; > DynamicItemsRendererFactoryForArrayListData; > import > org.apache.royale.html.beads.DataItemRendererFactoryForArrayList; > DataItemRendererFactoryForArrayList; > import > org.apache.royale.html.beads.DataItemRendererFactoryForHierarchicalData; > DataItemRendererFactoryForHierarchicalData; > import > org.apache.royale.html.beads.DataItemRendererFactoryForCollectionView; > DataItemRendererFactoryForCollectionView; > @@ -261,7 +261,7 @@ internal class BasicClasses > import org.apache.royale.html.beads.DecrementButtonView; > DecrementButtonView; > import org.apache.royale.html.beads.IncrementButtonView; > IncrementButtonView; > import org.apache.royale.html.beads.RangeStepperView; RangeStepperView; > - import > org.apache.royale.html.beads.layouts.FlexibleFirstChildHorizontalLayout; > FlexibleFirstChildHorizontalLayout; > + import > org.apache.royale.html.beads.layouts.FlexibleFirstChildHorizontalLayout; > FlexibleFirstChildHorizontalLayout; > import org.apache.royale.html.beads.models.DataGridModel; DataGridModel; > import org.apache.royale.html.beads.models.DataGridCollectionViewModel; > DataGridCollectionViewModel; > import org.apache.royale.html.beads.models.DateChooserModel; > DateChooserModel; > @@ -272,20 +272,20 @@ internal class BasicClasses > import org.apache.royale.html.supportClasses.DataGridColumn; > DataGridColumn; > import org.apache.royale.html.supportClasses.DateChooserButton; > DateChooserButton; > import org.apache.royale.html.supportClasses.DateHeaderButton; > DateHeaderButton; > - import org.apache.royale.html.supportClasses.DateChooserList; > DateChooserList; > - import org.apache.royale.html.supportClasses.DateItemRenderer; > DateItemRenderer; > + import org.apache.royale.html.supportClasses.DateChooserList; > DateChooserList; > + import org.apache.royale.html.supportClasses.DateItemRenderer; > DateItemRenderer; > import org.apache.royale.html.supportClasses.GraphicsItemRenderer; > GraphicsItemRenderer; > import org.apache.royale.html.supportClasses.NestedStringItemRenderer; > NestedStringItemRenderer; > > - import org.apache.royale.html.beads.TitleBarView; TitleBarView; > - import org.apache.royale.html.beads.TitleBarMeasurementBead; > TitleBarMeasurementBead; > + import org.apache.royale.html.beads.TitleBarView; TitleBarView; > + import org.apache.royale.html.beads.TitleBarMeasurementBead; > TitleBarMeasurementBead; > > import org.apache.royale.html.beads.WebBrowserView; WebBrowserView; > import org.apache.royale.html.beads.models.WebBrowserModel; > WebBrowserModel; > > import org.apache.royale.core.Lookalike; Lookalike; > import org.apache.royale.core.FilledRectangle; FilledRectangle; > - import org.apache.royale.core.UIBase; UIBase; > + import org.apache.royale.core.UIBase; UIBase; > import org.apache.royale.core.StyledUIBase; StyledUIBase; > import org.apache.royale.core.GroupBase; GroupBase; > import org.apache.royale.core.ContainerBase; ContainerBase; > @@ -295,7 +295,7 @@ internal class BasicClasses > { > import org.apache.royale.core.UIElement; UIElement; > } > - import org.apache.royale.core.SimpleApplication; SimpleApplication; > + import org.apache.royale.core.SimpleApplication; SimpleApplication; > import org.apache.royale.svg.GraphicContainer; GraphicContainer; > import org.apache.royale.svg.DOMWrapper; DOMWrapper; > > @@ -311,7 +311,7 @@ internal class BasicClasses > import org.apache.royale.svg.CompoundGraphic; CompoundGraphic; > import org.apache.royale.svg.TransformableCompoundGraphic; > TransformableCompoundGraphic; > > - import org.apache.royale.html.beads.models.DataProviderModel; > DataProviderModel; > + import org.apache.royale.html.beads.models.DataProviderModel; > DataProviderModel; > import org.apache.royale.html.beads.DataContainerView; > DataContainerView; > > COMPILE::SWF > @@ -332,13 +332,13 @@ internal class BasicClasses > import org.apache.royale.html.beads.layouts.TableCellLayout; > TableCellLayout; > import org.apache.royale.html.beads.layouts.TableHeaderLayout; > TableHeaderLayout; > > - import org.apache.royale.css2.Cursors; Cursors; > - COMPILE::SWF > - { > - import org.apache.royale.css2.Copy; Copy; > + import org.apache.royale.css2.Cursors; Cursors; > + COMPILE::SWF > + { > + import org.apache.royale.css2.Copy; Copy; > import org.apache.royale.css2.DragMove; DragMove; > import org.apache.royale.css2.DragReject; DragReject; > - } > + } > > import org.apache.royale.html.TreeGrid; TreeGrid; > import org.apache.royale.html.supportClasses.TreeGridColumn; > TreeGridColumn; > @@ -346,11 +346,16 @@ internal class BasicClasses > import org.apache.royale.html.beads.models.TreeGridModel; TreeGridModel; > import org.apache.royale.html.beads.layouts.TreeGridLayout; > TreeGridLayout; > import org.apache.royale.html.beads.TreeGridView; TreeGridView; > - > - import org.apache.royale.utils.UIModuleUtils; UIModuleUtils; > + > + import org.apache.royale.utils.UIModuleUtils; UIModuleUtils; > > > import org.apache.royale.html.util.getLabelFromData; getLabelFromData; > + > + COMPILE::JS > + { > + import org.apache.royale.html.util.DialogPolyfill; > DialogPolyfill; > + } > } > > } > diff --git a/frameworks/projects/Jewel/src/main/royale/dialogPolyfill.as > b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/util/DialogPolyfill.as > similarity index 53% > rename from frameworks/projects/Jewel/src/main/royale/dialogPolyfill.as > rename to > frameworks/projects/Basic/src/main/royale/org/apache/royale/html/util/DialogPolyfill.as > index 190f9f2..828cae9 100644 > --- a/frameworks/projects/Jewel/src/main/royale/dialogPolyfill.as > +++ > b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/util/DialogPolyfill.as > @@ -7,7 +7,7 @@ > // (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 > +// 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, > @@ -16,28 +16,28 @@ > // limitations under the License. > // > //////////////////////////////////////////////////////////////////////////////// > -package > +package org.apache.royale.html.util > { > - /** > - * @externs > - */ > COMPILE::JS > - public class dialogPolyfill > + public class DialogPolyfill > { > /** > - * <inject_script> > - * var script = document.createElement("script"); > - * script.setAttribute("src", > "https://cdnjs.cloudflare.com/ajax/libs/dialog-polyfill/0.4.9/dialog-polyfill.min.js";); > - * document.head.appendChild(script) > - * var link = document.createElement("link"); > - * link.setAttribute("rel", "stylesheet"); > - * link.setAttribute("type", "text/css"); > - * link.setAttribute("href", > "https://cdnjs.cloudflare.com/ajax/libs/dialog-polyfill/0.4.9/dialog-polyfill.min.css";); > - * document.head.appendChild(link); > - * </inject_script> > + * <inject_script> > + * var script = document.createElement("script"); > + * script.setAttribute("src", > "https://cdnjs.cloudflare.com/ajax/libs/dialog-polyfill/0.4.9/dialog-polyfill.min.js";); > + * document.head.appendChild(script) > + * var link = document.createElement("link"); > + * link.setAttribute("rel", "stylesheet"); > + * link.setAttribute("type", "text/css"); > + * link.setAttribute("href", > "https://cdnjs.cloudflare.com/ajax/libs/dialog-polyfill/0.4.9/dialog-polyfill.min.css";); > + * document.head.appendChild(link); > + * </inject_script> > */ > - public function dialogPolyfill(){} > + public function DialogPolyfill(){} > > - public static function registerDialog(dialog:Element):void {} > + public static function registerDialog(dialog:Element):void > + { > + > window["dialogPolyfill"]["registerDialog"](dialog); > + } > } > } > \ No newline at end of file > diff --git a/frameworks/projects/Jewel/src/main/royale/JewelClasses.as > b/frameworks/projects/Jewel/src/main/royale/JewelClasses.as > index c56d1e0..e9429d6 100644 > --- a/frameworks/projects/Jewel/src/main/royale/JewelClasses.as > +++ b/frameworks/projects/Jewel/src/main/royale/JewelClasses.as > @@ -132,9 +132,9 @@ import org.apache.royale.utils.observeElementSize; > > COMPILE::JS > { > - import dialogPolyfill; dialogPolyfill; > import org.apache.royale.utils.transparentPixelElement; > transparentPixelElement; > import org.apache.royale.utils.observeElementSize; > observeElementSize; > + import org.apache.royale.utils.transparentPixelElement; > transparentPixelElement; > } > > import org.apache.royale.jewel.itemRenderers.DatagridHeaderRenderer; > DatagridHeaderRenderer; > diff --git > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Alert.as > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Alert.as > index e07401c..72aa408 100644 > --- > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Alert.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Alert.as > @@ -7,7 +7,7 @@ > // (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 > +// 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, > @@ -18,17 +18,18 @@ > //////////////////////////////////////////////////////////////////////////////// > package org.apache.royale.jewel > { > - COMPILE::JS > - { > - import org.apache.royale.core.WrappedHTMLElement; > - import org.apache.royale.html.util.addElementToWrapper; > - } > - import org.apache.royale.core.IAlertModel; > - import org.apache.royale.core.IPopUp; > - import org.apache.royale.events.CloseEvent; > - import org.apache.royale.jewel.Group; > + COMPILE::JS > + { > + import org.apache.royale.core.WrappedHTMLElement; > + import org.apache.royale.html.util.addElementToWrapper; > + import org.apache.royale.html.util.DialogPolyfill; > + } > + import org.apache.royale.core.IAlertModel; > + import org.apache.royale.core.IPopUp; > + import org.apache.royale.events.CloseEvent; > + import org.apache.royale.jewel.Group; > > - [Event(name="close", type="org.apache.royale.events.CloseEvent")] > + [Event(name="close", type="org.apache.royale.events.CloseEvent")] > /** > * The Alert class is a component that displays a message and one or > more buttons > * in a view that pops up over all other controls and views. The Alert > component > @@ -62,7 +63,7 @@ package org.apache.royale.jewel > * @playerversion AIR 2.6 > * @productversion Royale 0.9.4 > */ > - public static const YES:uint = 0x000001; > + public static const YES:uint = 0x000001; > > /** > * The bitmask button flag to show the NO button. > @@ -72,7 +73,7 @@ package org.apache.royale.jewel > * @playerversion AIR 2.6 > * @productversion Royale 0.9.4 > */ > - public static const NO:uint = 0x000002; > + public static const NO:uint = 0x000002; > > /** > * The bitmask button flag to show the OK button. > @@ -82,7 +83,7 @@ package org.apache.royale.jewel > * @playerversion AIR 2.6 > * @productversion Royale 0.9.4 > */ > - public static const OK:uint = 0x000004; > + public static const OK:uint = 0x000004; > > /** > * The bitmask button flag to show the Cancel button. > @@ -148,9 +149,9 @@ package org.apache.royale.jewel > * The buttons to display on the Alert as bit-mask values. > * > * Alert.YES > - * Alert.NO > - * Alert.OK > - * Alert.CANCEL > + * Alert.NO > + * Alert.OK > + * Alert.CANCEL > * > * @langversion 3.0 > * @playerversion Flash 10.2 > @@ -166,29 +167,29 @@ package org.apache.royale.jewel > IAlertModel(model).flags = value; > } > > - /** > + /** > * The html dialog component that parents the alert content > */ > COMPILE::JS > private var dialog:HTMLDialogElement; > > - /** > - * @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement > + /** > + * @royaleignorecoercion > org.apache.royale.core.WrappedHTMLElement > * @royaleignorecoercion HTMLDialogElement > - */ > - COMPILE::JS > - override protected function createElement():WrappedHTMLElement > - { > - dialog = addElementToWrapper(this,'dialog') as HTMLDialogElement; > - return element; > - } > + */ > + COMPILE::JS > + override protected function createElement():WrappedHTMLElement > + { > + dialog = addElementToWrapper(this,'dialog') as > HTMLDialogElement; > + return element; > + } > > - /** > + /** > * flag to ensure only one dialog is created > */ > private var lockDialogCreation:Boolean = false; > - > - /** > + > + /** > * This function make the dialog be added only once to > document.body if parent is not > * provided (null) or to parent if indicated. > * > @@ -199,7 +200,7 @@ package org.apache.royale.jewel > */ > private function prepareAlert(parent:Object = null):void > { > - COMPILE::JS > + COMPILE::JS > { > if(!lockDialogCreation) > { > @@ -217,7 +218,7 @@ package org.apache.royale.jewel > > if (!("showModal" in dialog)) > { > - > dialogPolyfill.registerDialog(dialog); > + > DialogPolyfill.registerDialog(dialog); > } > > //avoid scroll in html > @@ -226,31 +227,31 @@ package org.apache.royale.jewel > } > } > > - /** > - * This static method is a convenience function to quickly create > and display an Alert. The > - * text and parent paramters are required, the others will default. > - * > - * @param String message The message content of the Alert. > - * @param String title An optional title for the Alert. > - * @param uint flags Identifies which buttons to display in the > alert. > - * @param Object parent The object that hosts the pop-up. > - * > - * @langversion 3.0 > - * @playerversion Flash 10.2 > - * @playerversion AIR 2.6 > - * @productversion Royale 0.9.4 > - */ > - static public function show(message:String, title:String="", > flags:uint=Alert.OK, parent:Object = null, modal:Boolean = true) : Alert > + /** > + * This static method is a convenience function to quickly > create and display an Alert. The > + * text and parent paramters are required, the others will > default. > + * > + * @param String message The message content of the Alert. > + * @param String title An optional title for the Alert. > + * @param uint flags Identifies which buttons to display in > the alert. > + * @param Object parent The object that hosts the pop-up. > + * > + * @langversion 3.0 > + * @playerversion Flash 10.2 > + * @playerversion AIR 2.6 > + * @productversion Royale 0.9.4 > + */ > + static public function show(message:String, title:String="", > flags:uint=Alert.OK, parent:Object = null, modal:Boolean = true) : Alert > { > - var alert:Alert = new Alert(); > - alert.message = message; > - alert.title = title; > - alert.flags = flags; > - > + var alert:Alert = new Alert(); > + alert.message = message; > + alert.title = title; > + alert.flags = flags; > + > if(modal) > alert.showModal(parent); > else > - alert.show(parent); > + alert.show(parent); > > return alert; > } > @@ -294,20 +295,20 @@ package org.apache.royale.jewel > */ > public function show(parent:Object = null) : void > { > - prepareAlert(parent); > + prepareAlert(parent); > > - COMPILE::SWF > + COMPILE::SWF > { > parent.addElement(this); > } > > - COMPILE::JS > + COMPILE::JS > { > dialog.show(); > } > } > > - /** > + /** > * Closes the dialog element. > * > * @langversion 3.0 > diff --git > a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/Dialog.as > > b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/Dialog.as > index 4b537c8..1c46dbd 100644 > --- > a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/Dialog.as > +++ > b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/Dialog.as > @@ -27,6 +27,7 @@ package org.apache.royale.mdl > { > import org.apache.royale.core.WrappedHTMLElement; > import org.apache.royale.html.util.addElementToWrapper; > + import org.apache.royale.html.util.DialogPolyfill; > } > > [Event(name="close", type="org.apache.royale.events.Event")] > @@ -51,17 +52,6 @@ package org.apache.royale.mdl > { > /** > * constructor. > - * > - * <inject_script> > - * var link = document.createElement("link"); > - * link.setAttribute("rel", "stylesheet"); > - * link.setAttribute("type", "text/css"); > - * link.setAttribute("href", > "https://cdnjs.cloudflare.com/ajax/libs/dialog-polyfill/0.4.9/dialog-polyfill.min.css";); > - * document.head.appendChild(link); > - * var script = document.createElement("script"); > - * script.setAttribute("src", > "https://cdnjs.cloudflare.com/ajax/libs/dialog-polyfill/0.4.9/dialog-polyfill.min.js";); > - * document.head.appendChild(script); > - * </inject_script> > * > * @langversion 3.0 > * @playerversion Flash 10.2 > @@ -118,8 +108,9 @@ package org.apache.royale.mdl > > if (!("showModal" in dialog)) > { > - > window["dialogPolyfill"]["registerDialog"](dialog); > + > DialogPolyfill.registerDialog(dialog); > } > + > } > } > } >
