Just a couple of notes on this: StyledUIBase and all of the associated files have been moved to org.apache.royale.jewel.
As long as clients are not referencing any of these classes directly, things should work without modification. If there are references in projects, there will be a need to adjust the imports to point to the correct paths. Besides Jewel, the following were touched by this: MediaElement and the subclasses of VideoElement and AudioElement in HTML5. My assumption is that the only clients of these classes were using Jewel — or at least the StyledUIBase aspects of them. I created a second MediaElement class in the org.apache.royale.jewel package which is based on StyledUIBase and reverted the HTML5 one to be based on UIBase. Jewel VideoPlayer and AudioPlayer now subclass the new MediaElement in Jewel. The other class using StyledUIBase was FontIconBase in the Icon project. I added an implementation of addClass, removeClass and toggleClass in there to preserve that existing interface. If anyone using these classes have any issues, please let me know ASAP so I can fix things. Thanks, Harbs > On Feb 19, 2026, at 4:59 PM, [email protected] 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 2392926036 Moved StyledUIBase to Jewel > 2392926036 is described below > > commit 23929260360836a6f505ea7a0d91b17b5a023ac9 > Author: Harbs <[email protected]> > AuthorDate: Thu Feb 19 16:58:56 2026 +0200 > > Moved StyledUIBase to Jewel > --- > .../Basic/src/main/resources/basic-manifest.xml | 2 - > .../projects/Basic/src/main/royale/BasicClasses.as | 3 - > .../projects/Core/src/main/royale/CoreClasses.as | 2 +- > .../royale/org/apache/royale/core/CSSClassList.as | 16 + > .../royale/org/apache/royale/html5/AudioElement.as | 94 +++-- > .../royale/org/apache/royale/html5/MediaElement.as | 4 +- > .../royale/org/apache/royale/html5/VideoElement.as | 139 ++++--- > .../royale/org/apache/royale/icons/FontIconBase.as | 428 ++++++++++++--------- > .../projects/Jewel/src/main/resources/defaults.css | 2 +- > .../Jewel/src/main/resources/jewel-manifest.xml | 2 + > .../projects/Jewel/src/main/royale/JewelClasses.as | 6 +- > .../royale/org/apache/royale/jewel/Application.as | 4 +- > .../royale/org/apache/royale/jewel/AudioPlayer.as | 66 +++- > .../royale/org/apache/royale/jewel/ComboBox.as | 2 +- > .../royale/org/apache/royale/jewel/DateField.as | 2 +- > .../main/royale/org/apache/royale/jewel/HSlider.as | 2 +- > .../royale/org/apache/royale/jewel}/IEmphasis.as | 2 +- > .../org/apache/royale/jewel}/IStyledUIBase.as | 4 +- > .../main/royale/org/apache/royale/jewel/Image.as | 2 +- > .../main/royale/org/apache/royale/jewel/Label.as | 2 +- > .../royale/org/apache/royale/jewel/ModuleLoader.as | 2 +- > .../org/apache/royale/jewel/NumericStepper.as | 2 +- > .../main/royale/org/apache/royale/jewel/PopUp.as | 2 +- > .../royale/org/apache/royale/jewel/SimpleLoader.as | 2 +- > .../royale/org/apache/royale/jewel/Snackbar.as | 2 +- > .../main/royale/org/apache/royale/jewel/Spacer.as | 2 +- > .../main/royale/org/apache/royale/jewel/Spinner.as | 2 +- > .../royale/jewel}/StyledBaseMXMLItemRenderer.as | 2 +- > .../apache/royale/jewel}/StyledDataItemRenderer.as | 2 +- > .../org/apache/royale/jewel}/StyledImageBase.as | 4 +- > .../apache/royale/jewel}/StyledMXMLItemRenderer.as | 4 +- > .../royale/jewel}/StyledMXMLStatesItemRenderer.as | 4 +- > .../org/apache/royale/jewel}/StyledUIBase.as | 349 +++++++++-------- > .../royale/jewel}/StyledUIItemRendererBase.as | 4 +- > .../royale/org/apache/royale/jewel/VideoPlayer.as | 155 ++++++-- > .../jewel/beads/controllers/ComboBoxController.as | 2 +- > .../TableCellSelectionMouseController.as | 2 +- > .../apache/royale/jewel/beads/controls/Badge.as | 2 +- > .../royale/jewel/beads/controls/ResponsiveSize.as | 2 +- > .../royale/jewel/beads/controls/SizeControl.as | 2 +- > .../controls/TextInputSubControlTruncateText.as | 2 +- > .../jewel/beads/controls/button/InputButtonSize.as | 2 +- > .../royale/jewel/beads/controls/image/ClipImage.as | 2 +- > .../beads/controls/list/ListAlternateRowColor.as | 2 +- > .../jewel/beads/controls/textinput/TruncateText.as | 2 +- > .../ButtonBarItemRendererInitializer.as | 2 +- > .../DataContainerItemRendererInitializer.as | 2 +- > .../DataGridColumnListItemRendererInitializer.as | 4 +- > .../IndexedItemRendererInitializer.as | 2 +- > .../itemRenderers/ListItemRendererInitializer.as | 6 +- > .../itemRenderers/TabBarItemRendererInitializer.as | 2 +- > .../itemRenderers/TableItemRendererInitializer.as | 2 +- > .../royale/jewel/beads/layouts/StyledLayoutBase.as | 2 +- > .../apache/royale/jewel/beads/views/AlertView.as | 2 +- > .../royale/jewel/beads/views/ComboBoxView.as | 2 +- > .../royale/jewel/beads/views/DataGridView.as | 4 +- > .../jewel/beads/views/JewelLabelViewBead.mxml | 2 +- > .../apache/royale/jewel/beads/views/ListView.as | 2 +- > .../apache/royale/jewel/beads/views/TabBarView.as | 4 +- > .../jewel/beads/views/ToggleButtonBarView.as | 2 +- > .../jewel/beads/views/VirtualDataGridView.as | 2 +- > .../royale/jewel/beads/views/VirtualListView.as | 2 +- > .../apache/royale/jewel/beads/views/WizardView.as | 2 +- > .../CollapsibleNavigationSectionRenderer.as | 2 +- > .../itemRenderers/DropDownListItemRenderer.as | 2 +- > .../royale/jewel/itemRenderers/ListItemRenderer.as | 2 +- > .../itemRenderers/NavigationLinkItemRenderer.as | 2 +- > .../jewel/itemRenderers/StringItemRenderer.as | 2 +- > .../royale/jewel/supportClasses/LayoutProxy.as | 2 +- > .../royale/jewel/supportClasses}/MediaElement.as | 6 +- > .../supportClasses/button/SelectableButtonBase.as | 2 +- > .../jewel/supportClasses/button/SimpleButton.as | 4 +- > .../jewel/supportClasses/combobox/ComboBoxPopUp.as | 2 +- > .../container/StyledContainerContentArea.as | 2 +- > .../supportClasses/datagrid/DataGridColumn.as | 2 +- > .../supportClasses/datagrid/IDataGridColumn.as | 2 +- > .../supportClasses/datagrid/IDataGridColumnList.as | 2 +- > .../royale/jewel/supportClasses/group/GroupBase.as | 2 +- > .../jewel/supportClasses/popup/PopUpContent.as | 2 +- > .../jewel/supportClasses/table/TBodyContentArea.as | 2 +- > .../supportClasses/textinput/TextInputBase.as | 2 +- > .../Jewel/src/main/sass/components/_popup.sass | 2 +- > 82 files changed, 840 insertions(+), 592 deletions(-) > > diff --git a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml > b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml > index 51a682c0e4..8d6e1231ec 100644 > --- a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml > +++ b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml > @@ -140,10 +140,8 @@ > <component id="Slider" class="org.apache.royale.html.Slider"/> > <component id="NumericStepper" > class="org.apache.royale.html.NumericStepper" /> > <component id="DataItemRenderer" > class="org.apache.royale.html.supportClasses.DataItemRenderer"/> > - <component id="StyledDataItemRenderer" > class="org.apache.royale.html.supportClasses.StyledDataItemRenderer"/> > <component id="MXMLBeadView" class="org.apache.royale.html.MXMLBeadView"/> > <component id="MXMLItemRenderer" > class="org.apache.royale.html.supportClasses.MXMLItemRenderer"/> > - <component id="StyledMXMLItemRenderer" > class="org.apache.royale.core.StyledMXMLItemRenderer"/> > <component id="MXMLStatesItemRenderer" > class="org.apache.royale.html.supportClasses.MXMLStatesItemRenderer"/> > <component id="AlternatingBackgroundColorStringItemRenderer" > class="org.apache.royale.html.supportClasses.AlternatingBackgroundColorStringItemRenderer"/> > <component id="StringItemRenderer" > class="org.apache.royale.html.supportClasses.StringItemRenderer"/> > diff --git a/frameworks/projects/Basic/src/main/royale/BasicClasses.as > b/frameworks/projects/Basic/src/main/royale/BasicClasses.as > index 91a45a7911..0f7739cfc3 100644 > --- a/frameworks/projects/Basic/src/main/royale/BasicClasses.as > +++ b/frameworks/projects/Basic/src/main/royale/BasicClasses.as > @@ -97,7 +97,6 @@ internal class BasicClasses > 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; > > > @@ -132,7 +131,6 @@ internal class BasicClasses > 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; > > COMPILE::SWF > { > @@ -291,7 +289,6 @@ internal class BasicClasses > 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.StyledUIBase; StyledUIBase; > import org.apache.royale.core.GroupBase; GroupBase; > import org.apache.royale.core.ContainerBase; ContainerBase; > import org.apache.royale.core.ViewBase; ViewBase; > diff --git a/frameworks/projects/Core/src/main/royale/CoreClasses.as > b/frameworks/projects/Core/src/main/royale/CoreClasses.as > index 38be706720..bc12a1fc65 100644 > --- a/frameworks/projects/Core/src/main/royale/CoreClasses.as > +++ b/frameworks/projects/Core/src/main/royale/CoreClasses.as > @@ -174,7 +174,6 @@ internal class CoreClasses > import org.apache.royale.core.ITitleBarModel; ITitleBarModel; > import org.apache.royale.core.IToggleButtonModel; IToggleButtonModel; > import org.apache.royale.core.IUIBase; IUIBase; > - import org.apache.royale.core.IStyledUIBase; IStyledUIBase; > import org.apache.royale.core.IValueToggleButtonModel; > IValueToggleButtonModel; > import org.apache.royale.core.IViewport; IViewport; > import org.apache.royale.core.IScrollingViewport; IScrollingViewport; > @@ -190,6 +189,7 @@ internal class CoreClasses > import org.apache.royale.core.SimpleStatesImpl; SimpleStatesImpl; > > import org.apache.royale.core.CSSClassList; CSSClassList; > + import org.apache.royale.utils.IClassSelectorListSupport; > IClassSelectorListSupport; > import org.apache.royale.core.StyleChangeNotifier; StyleChangeNotifier; > import org.apache.royale.core.StrandWithModel; StrandWithModel; > import org.apache.royale.events.CustomEvent; CustomEvent; > diff --git > a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/CSSClassList.as > > b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/CSSClassList.as > index 80acd7d699..e668f5e772 100644 > --- > a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/CSSClassList.as > +++ > b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/CSSClassList.as > @@ -43,6 +43,22 @@ package org.apache.royale.core > } > > private var _list:Array; > + > + /** > + * Determines if the list contains a specific className. > + * > + * @param className The class name to look for. > + * @return true if className exists in the list; false otherwise. > + * > + * @langversion 3.0 > + * @playerversion Flash 9 > + * @playerversion AIR 1.1 > + * @productversion Royale 0.9.2 > + */ > + public function has(className:String):Boolean > + { > + return _list ? _list.indexOf(className) != -1 : false; > + } > > /** > * Adds a className to the list of classes. > diff --git > a/frameworks/projects/HTML5/src/main/royale/org/apache/royale/html5/AudioElement.as > > b/frameworks/projects/HTML5/src/main/royale/org/apache/royale/html5/AudioElement.as > index 0404cd5c6e..0f27536b79 100644 > --- > a/frameworks/projects/HTML5/src/main/royale/org/apache/royale/html5/AudioElement.as > +++ > b/frameworks/projects/HTML5/src/main/royale/org/apache/royale/html5/AudioElement.as > @@ -1,4 +1,4 @@ > - > //////////////////////////////////////////////////////////////////////////////// > +//////////////////////////////////////////////////////////////////////////////// > // > // Licensed to the Apache Software Foundation (ASF) under one or more > // contributor license agreements. See the NOTICE file distributed with > @@ -19,72 +19,70 @@ > > package org.apache.royale.html5 > { > - import org.apache.royale.html5.MediaElement; > - > + > COMPILE::JS > - { > + { > import org.apache.royale.core.WrappedHTMLElement; > import org.apache.royale.html.util.addElementToWrapper; > - } > - > + } > > /** > - * The AudioElement class provides access to the properties of audio > elements, > + * The AudioElement class provides access to the properties of audio > elements, > * as well as methods to manipulate them. > - * > + * > * Some of the more commonly used properties of the audio element > include src, > * currentTime, duration, paused, muted, and volume > - * > - * @langversion 3.0 > - * @playerversion Flash 0.0 > - * @playerversion AIR 0.0 > - * @productversion Royale 0.0 > - */ > + * > + * @langversion 3.0 > + * @playerversion Flash 0.0 > + * @playerversion AIR 0.0 > + * @productversion Royale 0.0 > + */ > public class AudioElement extends MediaElement > { > > - > public function AudioElement() > { > super(); > } > - > + > /** > - * @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement > - */ > - COMPILE::JS > - override protected function createElement():WrappedHTMLElement > - { > - addElementToWrapper(this, 'audio'); > + * @royaleignorecoercion > org.apache.royale.core.WrappedHTMLElement > + */ > + COMPILE::JS > + override protected function createElement():WrappedHTMLElement > + { > + addElementToWrapper(this, 'audio'); > > - element.addEventListener("abort",handleEvent); > - element.addEventListener("canplay",handleEvent); > - element.addEventListener("canplaythrough",handleEvent); > - element.addEventListener("durationchange",handleEvent); > - element.addEventListener("emptied",handleEvent); > - element.addEventListener("ended",handleEvent); > - element.addEventListener("loadeddata",handleEvent); > - element.addEventListener("loadedmetadata",handleEvent); > - element.addEventListener("loadstart",handleEvent); > - element.addEventListener("pause",handleEvent); > - element.addEventListener("play",handleEvent); > - element.addEventListener("playing",handleEvent); > - element.addEventListener("progress",handleEvent); > - element.addEventListener("ratechange",handleEvent); > - element.addEventListener("seeked",handleEvent); > - element.addEventListener("seeking",handleEvent); > - element.addEventListener("stalled",handleEvent); > - element.addEventListener("suspend",handleEvent); > - element.addEventListener("timeupdate",handleEvent); > - element.addEventListener("volumechange",handleEvent); > - element.addEventListener("waiting",handleEvent); > - element.addEventListener("error",handleEvent); > - > - return element; > - } > + element.addEventListener("abort", handleEvent); > + element.addEventListener("canplay", handleEvent); > + element.addEventListener("canplaythrough", handleEvent); > + element.addEventListener("durationchange", handleEvent); > + element.addEventListener("emptied", handleEvent); > + element.addEventListener("ended", handleEvent); > + element.addEventListener("loadeddata", handleEvent); > + element.addEventListener("loadedmetadata", handleEvent); > + element.addEventListener("loadstart", handleEvent); > + element.addEventListener("pause", handleEvent); > + element.addEventListener("play", handleEvent); > + element.addEventListener("playing", handleEvent); > + element.addEventListener("progress", handleEvent); > + element.addEventListener("ratechange", handleEvent); > + element.addEventListener("seeked", handleEvent); > + element.addEventListener("seeking", handleEvent); > + element.addEventListener("stalled", handleEvent); > + element.addEventListener("suspend", handleEvent); > + element.addEventListener("timeupdate", handleEvent); > + element.addEventListener("volumechange", handleEvent); > + element.addEventListener("waiting", handleEvent); > + element.addEventListener("error", handleEvent); > + > + return element; > + } > > COMPILE::JS > - private function handleEvent(e:Event):void{ > + private function handleEvent(e:Event):void > + { > dispatchEvent(new Event(e.type)); > } > > diff --git > a/frameworks/projects/HTML5/src/main/royale/org/apache/royale/html5/MediaElement.as > > b/frameworks/projects/HTML5/src/main/royale/org/apache/royale/html5/MediaElement.as > index 4a029f3be3..c4402f8885 100644 > --- > a/frameworks/projects/HTML5/src/main/royale/org/apache/royale/html5/MediaElement.as > +++ > b/frameworks/projects/HTML5/src/main/royale/org/apache/royale/html5/MediaElement.as > @@ -19,7 +19,7 @@ > package org.apache.royale.html5 > { > > - import org.apache.royale.core.StyledUIBase; > + import org.apache.royale.core.UIBase; > > > > @@ -276,7 +276,7 @@ package org.apache.royale.html5 > * @playerversion AIR 0.0 > * @productversion Royale 0.0 > */ > - public class MediaElement extends StyledUIBase > + public class MediaElement extends UIBase > { > public function MediaElement() > { > diff --git > a/frameworks/projects/HTML5/src/main/royale/org/apache/royale/html5/VideoElement.as > > b/frameworks/projects/HTML5/src/main/royale/org/apache/royale/html5/VideoElement.as > index 489fca1c61..68b1523c6a 100644 > --- > a/frameworks/projects/HTML5/src/main/royale/org/apache/royale/html5/VideoElement.as > +++ > b/frameworks/projects/HTML5/src/main/royale/org/apache/royale/html5/VideoElement.as > @@ -1,4 +1,4 @@ > - > //////////////////////////////////////////////////////////////////////////////// > +//////////////////////////////////////////////////////////////////////////////// > // > // Licensed to the Apache Software Foundation (ASF) under one or more > // contributor license agreements. See the NOTICE file distributed with > @@ -20,96 +20,94 @@ > package org.apache.royale.html5 > { > import org.apache.royale.html5.MediaElement; > - > + > COMPILE::JS > - { > + { > import org.apache.royale.core.WrappedHTMLElement; > import org.apache.royale.html.util.addElementToWrapper; > - } > - > + } > > /** > - * Dispatched when the VideoElement enters picture-in-picture mode > successfully. > - * > - * @langversion 3.0 > - * @playerversion Flash 0.0 > - * @playerversion AIR 0.0 > - * @productversion Royale 0.0 > - */ > + * Dispatched when the VideoElement enters picture-in-picture mode > successfully. > + * > + * @langversion 3.0 > + * @playerversion Flash 0.0 > + * @playerversion AIR 0.0 > + * @productversion Royale 0.0 > + */ > [Event(name="enterpictureinpicture", > type="org.apache.royale.events.Event")] > > /** > - * Dispatched when the VideoElement leaves picture-in-picture mode > successfully. > - * > - * @langversion 3.0 > - * @playerversion Flash 0.0 > - * @playerversion AIR 0.0 > - * @productversion Royale 0.0 > - */ > + * Dispatched when the VideoElement leaves picture-in-picture mode > successfully. > + * > + * @langversion 3.0 > + * @playerversion Flash 0.0 > + * @playerversion AIR 0.0 > + * @productversion Royale 0.0 > + */ > [Event(name="leavepictureinpicture", > type="org.apache.royale.events.Event")] > > /** > - * VideoElement provides special properties and methods for > manipulating video objects. > + * VideoElement provides special properties and methods for > manipulating video objects. > * It also inherits properties and methods of MediaElement. > - * > + * > * The list of supported media formats varies from one browser to the > other. You should either > * provide your video in a single format that all the relevant > browsers supports, or provide > * multiple video sources in enough different formats that all the > browsers you need to support are covered. > - * > - * @langversion 3.0 > - * @playerversion Flash 0.0 > - * @playerversion AIR 0.0 > - * @productversion Royale 0.0 > - */ > + * > + * @langversion 3.0 > + * @playerversion Flash 0.0 > + * @playerversion AIR 0.0 > + * @productversion Royale 0.0 > + */ > public class VideoElement extends MediaElement > { > > - > public function VideoElement() > { > super(); > } > - > - /** > - * @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement > - */ > - COMPILE::JS > - override protected function createElement():WrappedHTMLElement > - { > - addElementToWrapper(this, 'video'); > - > - element.addEventListener("abort",handleEvent); > - element.addEventListener("canplay",handleEvent); > - element.addEventListener("canplaythrough",handleEvent); > - element.addEventListener("durationchange",handleEvent); > - element.addEventListener("emptied",handleEvent); > - element.addEventListener("ended",handleEvent); > - element.addEventListener("loadeddata",handleEvent); > - element.addEventListener("loadedmetadata",handleEvent); > - element.addEventListener("loadstart",handleEvent); > - element.addEventListener("pause",handleEvent); > - element.addEventListener("play",handleEvent); > - element.addEventListener("playing",handleEvent); > - element.addEventListener("progress",handleEvent); > - element.addEventListener("ratechange",handleEvent); > - element.addEventListener("seeked",handleEvent); > - element.addEventListener("seeking",handleEvent); > - element.addEventListener("stalled",handleEvent); > - element.addEventListener("suspend",handleEvent); > - element.addEventListener("timeupdate",handleEvent); > - element.addEventListener("volumechange",handleEvent); > - element.addEventListener("waiting",handleEvent); > - element.addEventListener("error",handleEvent); > - > - > element.addEventListener("enterpictureinpicture",handleEvent); > - > element.addEventListener("leavepictureinpicture",handleEvent); > - > - return element; > - } > > + /** > + * @royaleignorecoercion > org.apache.royale.core.WrappedHTMLElement > + */ > + COMPILE::JS > + override protected function createElement():WrappedHTMLElement > + { > + addElementToWrapper(this, 'video'); > + > + element.addEventListener("abort", handleEvent); > + element.addEventListener("canplay", handleEvent); > + element.addEventListener("canplaythrough", handleEvent); > + element.addEventListener("durationchange", handleEvent); > + element.addEventListener("emptied", handleEvent); > + element.addEventListener("ended", handleEvent); > + element.addEventListener("loadeddata", handleEvent); > + element.addEventListener("loadedmetadata", handleEvent); > + element.addEventListener("loadstart", handleEvent); > + element.addEventListener("pause", handleEvent); > + element.addEventListener("play", handleEvent); > + element.addEventListener("playing", handleEvent); > + element.addEventListener("progress", handleEvent); > + element.addEventListener("ratechange", handleEvent); > + element.addEventListener("seeked", handleEvent); > + element.addEventListener("seeking", handleEvent); > + element.addEventListener("stalled", handleEvent); > + element.addEventListener("suspend", handleEvent); > + element.addEventListener("timeupdate", handleEvent); > + element.addEventListener("volumechange", handleEvent); > + element.addEventListener("waiting", handleEvent); > + element.addEventListener("error", handleEvent); > + > + element.addEventListener("enterpictureinpicture", > handleEvent); > + element.addEventListener("leavepictureinpicture", > handleEvent); > + > + return element; > + } > > COMPILE::JS > - private function handleEvent(e:Event):void{ > + private function handleEvent(e:Event):void > + { > dispatchEvent(new Event(e.type)); > } > > @@ -120,13 +118,12 @@ package org.apache.royale.html5 > } > > COMPILE::JS > + > public function get videoWidth():uint > { > return (element as HTMLVideoElement).videoWidth; > } > > - > - > /*COMPILE::JS > public function set disablePictureInPicture(value:Boolean):void > { > @@ -150,7 +147,10 @@ package org.apache.royale.html5 > */ > public function requestFullscreen():void > { > - COMPILE::JS{(element as HTMLVideoElement).requestFullscreen();} > + COMPILE::JS > + { > + (element as > HTMLVideoElement).requestFullscreen(); > + } > } > > /*public function requestPictureInPicture():void > @@ -158,6 +158,5 @@ package org.apache.royale.html5 > COMPILE::JS{(element as > HTMLVideoElement).requestPictureInPicture();} > }*/ > > - > } > } > \ No newline at end of file > diff --git > a/frameworks/projects/Icons/src/main/royale/org/apache/royale/icons/FontIconBase.as > > b/frameworks/projects/Icons/src/main/royale/org/apache/royale/icons/FontIconBase.as > index 64dab451b2..3e599c7085 100644 > --- > a/frameworks/projects/Icons/src/main/royale/org/apache/royale/icons/FontIconBase.as > +++ > b/frameworks/projects/Icons/src/main/royale/org/apache/royale/icons/FontIconBase.as > @@ -18,190 +18,262 @@ > //////////////////////////////////////////////////////////////////////////////// > package org.apache.royale.icons > { > - COMPILE::JS > - { > - import org.apache.royale.core.WrappedHTMLElement; > - import org.apache.royale.html.util.addElementToWrapper; > - } > - import org.apache.royale.core.IIcon; > - import org.apache.royale.core.StyledUIBase; > - > - /** > - * FontIconBase is the base class to provide most common features > - * for all kinds of text based icons > - * > - * @langversion 3.0 > - * @playerversion Flash 10.2 > - * @playerversion AIR 2.6 > - * @productversion Royale 0.9.3 > - */ > - public class FontIconBase extends StyledUIBase implements IIcon > - { > - /** > - * constructor. > - * > - * @langversion 3.0 > - * @playerversion Flash 10.2 > - * @playerversion AIR 2.6 > - * @productversion Royale 0.9.3 > - */ > - public function FontIconBase() > - { > - super(); > - > - typeNames = ""; > - } > - > - protected var _text:String = ""; > - /** > - * The text of the icon > - * > - * @langversion 3.0 > - * @playerversion Flash 10.2 > - * @playerversion AIR 2.6 > - * @productversion Royale 0.9.7 > - */ > + COMPILE::JS > + { > + import org.apache.royale.core.WrappedHTMLElement; > + import org.apache.royale.html.util.addElementToWrapper; > + } > + import org.apache.royale.core.IIcon; > + import org.apache.royale.core.UIBase; > + import org.apache.royale.core.CSSClassList; > + > + /** > + * FontIconBase is the base class to provide most common features > + * for all kinds of text based icons > + * > + * @langversion 3.0 > + * @playerversion Flash 10.2 > + * @playerversion AIR 2.6 > + * @productversion Royale 0.9.3 > + */ > + public class FontIconBase extends UIBase implements IIcon > + { > + /** > + * constructor. > + * > + * @langversion 3.0 > + * @playerversion Flash 10.2 > + * @playerversion AIR 2.6 > + * @productversion Royale 0.9.3 > + */ > + public function FontIconBase() > + { > + super(); > + classList = new CSSClassList(); > + typeNames = ""; > + > + } > + protected var classList:CSSClassList; > + > + COMPILE::JS > + override protected function computeFinalClassNames():String > + { > + return (classList.compute() + > super.computeFinalClassNames()).trim(); > + } > + > + protected var _text:String = ""; > + > + /** > + * The text of the icon > + * > + * @langversion 3.0 > + * @playerversion Flash 10.2 > + * @playerversion AIR 2.6 > + * @productversion Royale 0.9.7 > + */ > public function get text():String > { > - return _text; > + return _text; > } > - public function set text(value:String):void > + public function set text(value:String):void > { > - _text = value; > + _text = value; > } > > - COMPILE::JS > - protected var textNode:Text; > + COMPILE::JS > + protected var textNode:Text; > > - /** > - * @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement > + /** > + * @royaleignorecoercion > org.apache.royale.core.WrappedHTMLElement > * @royaleignorecoercion HTMLElement > - * @royaleignorecoercion Text > - */ > - COMPILE::JS > - override protected function createElement():WrappedHTMLElement > - { > - var i:WrappedHTMLElement = > addElementToWrapper(this,'i'); > - > - textNode = document.createTextNode(iconText) as Text; > - textNode.textContent = ''; > - i.appendChild(textNode); > - > - return element; > - } > - > - /** > - * the icon text that matchs with font icon. > - * override in extending classes > - * > - * @langversion 3.0 > - * @playerversion Flash 10.2 > - * @playerversion AIR 2.6 > - * @productversion Royale 0.9.3 > - */ > - protected function get iconText():String > - { > - return ""; > - } > - > - private var _size:Number = 24; > - /** > - * Activate "size-XX" size class selector. Although the icons in > the > - * font can be scaled to any size, recommended sizes are 18, 24, 36 > or 48px. > - * > - * The default being 24px. > - * > - * @langversion 3.0 > - * @playerversion Flash 10.2 > - * @playerversion AIR 2.6 > - * @productversion Royale 0.8 > - */ > - public function get size():Number > - { > - return _size; > - } > - public function set size(value:Number):void > - { > - if (_size != value) > - { > - COMPILE::JS > - { > - removeClass("size-" + _size); > - _size = value; > - addClass("size-" + _size); > - } > - } > - } > - > - private var _dark:Boolean; > - /** > - * Activate "dark" class selector. > - * > - * @langversion 3.0 > - * @playerversion Flash 10.2 > - * @playerversion AIR 2.6 > - * @productversion Royale 0.9.3 > - */ > - public function get dark():Boolean > - { > - return _dark; > - } > - > - public function set dark(value:Boolean):void > - { > - if (_dark != value) > - { > - _dark = value; > - > - toggleClass("dark", _dark); > - } > - } > - > - private var _light:Boolean; > - /** > - * Activate "light" class selector. > - * > - * @langversion 3.0 > - * @playerversion Flash 10.2 > - * @playerversion AIR 2.6 > - * @productversion Royale 0.9.3 > - */ > - public function get light():Boolean > - { > - return _light; > - } > - public function set light(value:Boolean):void > - { > - if (_light != value) > - { > - _light = value; > - > - toggleClass("light", _light); > - } > - } > - > - private var _inactive:Boolean; > - /** > - * Activate "inactive" class selector. > - * To show the icon as inactive > - * > - * @langversion 3.0 > - * @playerversion Flash 10.2 > - * @playerversion AIR 2.6 > - * @productversion Royale 0.9.3 > - */ > - public function get inactive():Boolean > - { > - return _inactive; > - } > - public function set inactive(value:Boolean):void > - { > - if (_inactive != value) > - { > - _inactive = value; > - > - toggleClass("inactive", _inactive); > - } > - } > - } > + * @royaleignorecoercion Text > + */ > + COMPILE::JS > + override protected function createElement():WrappedHTMLElement > + { > + var i:WrappedHTMLElement = addElementToWrapper(this, > 'i'); > + > + textNode = document.createTextNode(iconText) as Text; > + textNode.textContent = ''; > + i.appendChild(textNode); > + > + return element; > + } > + > + /** > + * the icon text that matchs with font icon. > + * override in extending classes > + * > + * @langversion 3.0 > + * @playerversion Flash 10.2 > + * @playerversion AIR 2.6 > + * @productversion Royale 0.9.3 > + */ > + protected function get iconText():String > + { > + return ""; > + } > + > + private var _size:Number = 24; > + > + /** > + * Activate "size-XX" size class selector. Although the icons > in the > + * font can be scaled to any size, recommended sizes are 18, > 24, 36 or 48px. > + * > + * The default being 24px. > + * > + * @langversion 3.0 > + * @playerversion Flash 10.2 > + * @playerversion AIR 2.6 > + * @productversion Royale 0.8 > + */ > + public function get size():Number > + { > + return _size; > + } > + public function set size(value:Number):void > + { > + if (_size != value) > + { > + COMPILE::JS > + { > + classList.remove("size-" + _size); > + _size = value; > + classList.add("size-" + _size); > + computeInternal(); > + } > + } > + } > + > + private var _dark:Boolean; > + > + /** > + * Activate "dark" class selector. > + * > + * @langversion 3.0 > + * @playerversion Flash 10.2 > + * @playerversion AIR 2.6 > + * @productversion Royale 0.9.3 > + */ > + public function get dark():Boolean > + { > + return _dark; > + } > + > + public function set dark(value:Boolean):void > + { > + if (_dark != value) > + { > + _dark = value; > + value ? classList.add("dark") : > classList.remove("dark"); > + computeInternal(); > + } > + } > + > + private var _light:Boolean; > + > + /** > + * Activate "light" class selector. > + * > + * @langversion 3.0 > + * @playerversion Flash 10.2 > + * @playerversion AIR 2.6 > + * @productversion Royale 0.9.3 > + */ > + public function get light():Boolean > + { > + return _light; > + } > + public function set light(value:Boolean):void > + { > + if (_light != value) > + { > + _light = value; > + value ? classList.add("light") : > classList.remove("light"); > + computeInternal(); > + } > + } > + > + private var _inactive:Boolean; > + > + /** > + * Activate "inactive" class selector. > + * To show the icon as inactive > + * > + * @langversion 3.0 > + * @playerversion Flash 10.2 > + * @playerversion AIR 2.6 > + * @productversion Royale 0.9.3 > + */ > + public function get inactive():Boolean > + { > + return _inactive; > + } > + public function set inactive(value:Boolean):void > + { > + if (_inactive != value) > + { > + _inactive = value; > + > + value ? classList.add("inactive") : > classList.remove("inactive"); > + computeInternal(); > + } > + } > + > + /** > + * Adds a CSS class name to this icon. > + * > + * @param className The class name to add. > + * > + * @langversion 3.0 > + * @playerversion Flash 10.2 > + * @playerversion AIR 2.6 > + * @productversion Royale 0.9.3 > + */ > + public function addClass(className:String):void > + { > + classList.add(className); > + computeInternal(); > + } > + > + /** > + * Removes a CSS class name from this icon. > + * > + * @param className The class name to remove. > + * > + * @langversion 3.0 > + * @playerversion Flash 10.2 > + * @playerversion AIR 2.6 > + * @productversion Royale 0.9.3 > + */ > + public function removeClass(className:String):void > + { > + classList.remove(className); > + computeInternal(); > + } > + > + /** > + * Toggles a CSS class name on this icon. > + * > + * @param className The class name to toggle. > + * > + * @langversion 3.0 > + * @playerversion Flash 10.2 > + * @playerversion AIR 2.6 > + * @productversion Royale 0.9.3 > + */ > + public function toggleClass(className:String, > value:Boolean):void > + { > + value ? classList.add(className) : > classList.remove(className); > + computeInternal(); > + } > + private function computeInternal():void > + { > + COMPILE::JS > + { > + setClassName(computeFinalClassNames()); > + } > + } > + > + } > } > diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css > b/frameworks/projects/Jewel/src/main/resources/defaults.css > index f282d61b9b..34eb2a4fa5 100644 > --- a/frameworks/projects/Jewel/src/main/resources/defaults.css > +++ b/frameworks/projects/Jewel/src/main/resources/defaults.css > @@ -3582,7 +3582,7 @@ j|PopUp { > IBeadView: ClassReference("org.apache.royale.jewel.beads.views.PopUpView"); > IBeadModel: > ClassReference("org.apache.royale.jewel.beads.models.PopUpModel"); > IBeadController: > ClassReference("org.apache.royale.jewel.beads.controllers.PopUpMouseController"); > - IPopUpContent: ClassReference("org.apache.royale.core.StyledUIBase"); > + IPopUpContent: ClassReference("org.apache.royale.jewel.StyledUIBase"); > } > > .jewel.radiobutton { > diff --git a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml > b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml > index 558e5ed1f5..0a4f272ea4 100644 > --- a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml > +++ b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml > @@ -22,6 +22,8 @@ > <componentPackage> > > <component id="Application" class="org.apache.royale.jewel.Application"/> > + <component id="StyledDataItemRenderer" > class="org.apache.royale.jewel.StyledDataItemRenderer"/> > + <component id="StyledMXMLItemRenderer" > class="org.apache.royale.jewel.StyledMXMLItemRenderer"/> > <component id="Module" class="org.apache.royale.jewel.Module"/> > <component id="ModuleLoader" > class="org.apache.royale.jewel.ModuleLoader"/> > <component id="View" class="org.apache.royale.jewel.View"/> > diff --git a/frameworks/projects/Jewel/src/main/royale/JewelClasses.as > b/frameworks/projects/Jewel/src/main/royale/JewelClasses.as > index 8011f4bcdc..be362b41fe 100644 > --- a/frameworks/projects/Jewel/src/main/royale/JewelClasses.as > +++ b/frameworks/projects/Jewel/src/main/royale/JewelClasses.as > @@ -118,7 +118,11 @@ import org.apache.royale.utils.observeElementSize; > import org.apache.royale.jewel.supportClasses.table.TBodyContentArea; > TBodyContentArea; > import org.apache.royale.jewel.supportClasses.combobox.ComboBoxPopUp; > ComboBoxPopUp; > import > org.apache.royale.jewel.supportClasses.button.SelectableButtonBase; > SelectableButtonBase; > - > + > + import org.apache.royale.jewel.StyledUIBase; StyledUIBase; > + import org.apache.royale.jewel.StyledImageBase; StyledImageBase; > + import org.apache.royale.jewel.StyledMXMLItemRenderer; > StyledMXMLItemRenderer; > + > import org.apache.royale.jewel.beads.views.DataGridView; DataGridView; > import org.apache.royale.jewel.beads.layouts.DataGridLayout; > DataGridLayout; > > diff --git > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Application.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Application.as > index a74bc97d22..cdf22fc220 100644 > --- > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Application.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Application.as > @@ -32,7 +32,7 @@ package org.apache.royale.jewel > } > > COMPILE::JS { > - import org.apache.royale.core.StyledUIBase; > + import org.apache.royale.jewel.StyledUIBase; > } > import org.apache.royale.core.AllCSSValuesImpl; > import org.apache.royale.core.ApplicationBase; > @@ -704,7 +704,7 @@ package org.apache.royale.jewel > > /** > * @royaleignorecoercion org.apache.royale.core.IBead > - * @royaleignorecoercion org.apache.royale.core.StyledUIBase > + * @royaleignorecoercion org.apache.royale.jewel.StyledUIBase > */ > COMPILE::JS > protected function initialize():void > diff --git > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/AudioPlayer.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/AudioPlayer.as > index 834b976b80..1147837869 100644 > --- > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/AudioPlayer.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/AudioPlayer.as > @@ -18,11 +18,13 @@ > //////////////////////////////////////////////////////////////////////////////// > package org.apache.royale.jewel > { > - COMPILE::JS{ > - import org.apache.royale.html5.AudioElement; > + COMPILE::JS > + { > + import org.apache.royale.core.WrappedHTMLElement; > + import org.apache.royale.html.util.addElementToWrapper; > + import org.apache.royale.jewel.supportClasses.MediaElement; > } > > - > /** > * AudioPlayer let you to play audio with segments progressive > download. > * You can also seek to an unloaded part and change playback rate. > @@ -33,10 +35,9 @@ package org.apache.royale.jewel > * @productversion Royale 0.0 > */ > COMPILE::JS > - public class AudioPlayer extends AudioElement > + public class AudioPlayer extends MediaElement > { > > - > /** > * constructor. > * > @@ -48,18 +49,59 @@ package org.apache.royale.jewel > public function AudioPlayer() > { > super(); > - typeNames = "jewel audioplayer"; > + typeNames = "jewel audioplayer"; > } > - > - > -/* COMPILE::JS > + > + /* COMPILE::JS > public function showJewelControl(value:Boolean):void > { > } > */ > - > + > + /** > + * @royaleignorecoercion > org.apache.royale.core.WrappedHTMLElement > + */ > + COMPILE::JS > + override protected function createElement():WrappedHTMLElement > + { > + addElementToWrapper(this, 'audio'); > + > + element.addEventListener("abort", handleEvent); > + element.addEventListener("canplay", handleEvent); > + element.addEventListener("canplaythrough", handleEvent); > + element.addEventListener("durationchange", handleEvent); > + element.addEventListener("emptied", handleEvent); > + element.addEventListener("ended", handleEvent); > + element.addEventListener("loadeddata", handleEvent); > + element.addEventListener("loadedmetadata", handleEvent); > + element.addEventListener("loadstart", handleEvent); > + element.addEventListener("pause", handleEvent); > + element.addEventListener("play", handleEvent); > + element.addEventListener("playing", handleEvent); > + element.addEventListener("progress", handleEvent); > + element.addEventListener("ratechange", handleEvent); > + element.addEventListener("seeked", handleEvent); > + element.addEventListener("seeking", handleEvent); > + element.addEventListener("stalled", handleEvent); > + element.addEventListener("suspend", handleEvent); > + element.addEventListener("timeupdate", handleEvent); > + element.addEventListener("volumechange", handleEvent); > + element.addEventListener("waiting", handleEvent); > + element.addEventListener("error", handleEvent); > + > + return element; > + } > + > + COMPILE::JS > + private function handleEvent(e:Event):void > + { > + dispatchEvent(new Event(e.type)); > + } > } > > - COMPILE::SWF > - public class AudioPlayer{} > + COMPILE::SWF > + > + public class AudioPlayer > + { > + } > } > diff --git > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ComboBox.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ComboBox.as > index 5f55bf6a80..db7ef1930e 100644 > --- > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ComboBox.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ComboBox.as > @@ -23,7 +23,7 @@ package org.apache.royale.jewel > import org.apache.royale.core.IFactory; > import org.apache.royale.core.IItemRendererProvider; > import org.apache.royale.core.ISelectionModel; > - import org.apache.royale.core.StyledUIBase; > + import org.apache.royale.jewel.StyledUIBase; > import org.apache.royale.jewel.beads.models.ComboBoxPresentationModel; > import > org.apache.royale.jewel.supportClasses.combobox.IComboBoxPresentationModel; > import org.apache.royale.core.IHasLabelField; > diff --git > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/DateField.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/DateField.as > index 0d6fa25698..8bb2b52671 100644 > --- > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/DateField.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/DateField.as > @@ -21,7 +21,7 @@ package org.apache.royale.jewel > import org.apache.royale.core.IDateChooserModel; > import org.apache.royale.core.IDateControlConfigBead; > import org.apache.royale.core.IFormatter; > - import org.apache.royale.core.StyledUIBase; > + import org.apache.royale.jewel.StyledUIBase; > import org.apache.royale.events.Event; > import org.apache.royale.utils.loadBeadFromValuesManager; > > diff --git > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/HSlider.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/HSlider.as > index 7fadbdf977..4972294abf 100644 > --- > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/HSlider.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/HSlider.as > @@ -19,7 +19,7 @@ > package org.apache.royale.jewel > { > import org.apache.royale.core.IRangeModel; > - import org.apache.royale.core.StyledUIBase; > + import org.apache.royale.jewel.StyledUIBase; > > COMPILE::JS > { > diff --git > a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/IEmphasis.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/IEmphasis.as > similarity index 98% > rename from > frameworks/projects/Core/src/main/royale/org/apache/royale/utils/IEmphasis.as > rename to > frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/IEmphasis.as > index d0dd95b6ca..9ce2de1a84 100644 > --- > a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/IEmphasis.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/IEmphasis.as > @@ -16,7 +16,7 @@ > // limitations under the License. > // > //////////////////////////////////////////////////////////////////////////////// > -package org.apache.royale.utils > +package org.apache.royale.jewel > { > /** > * The IEmphasis is the interface a jewel control implements to get > diferent jewel > diff --git > a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IStyledUIBase.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/IStyledUIBase.as > similarity index 94% > rename from > frameworks/projects/Core/src/main/royale/org/apache/royale/core/IStyledUIBase.as > rename to > frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/IStyledUIBase.as > index 23b97627d3..5cc0b9f442 100644 > --- > a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IStyledUIBase.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/IStyledUIBase.as > @@ -16,10 +16,10 @@ > // limitations under the License. > // > //////////////////////////////////////////////////////////////////////////////// > -package org.apache.royale.core > +package org.apache.royale.jewel > { > import org.apache.royale.utils.IClassSelectorListSupport; > - import org.apache.royale.utils.IEmphasis; > + import org.apache.royale.core.IUIBase; > > /** > * The IStyledUIBase interface is the interface for advanced user > interface components. > diff --git > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Image.as > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Image.as > index 27eea5a0ef..e03e37f5b0 100644 > --- > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Image.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Image.as > @@ -18,7 +18,7 @@ > //////////////////////////////////////////////////////////////////////////////// > package org.apache.royale.jewel > { > - import org.apache.royale.core.supportClasses.StyledImageBase; > + import org.apache.royale.jewel.StyledImageBase; > > COMPILE::JS > { > diff --git > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Label.as > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Label.as > index d1e7cadcc9..0af7f9a74a 100644 > --- > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Label.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Label.as > @@ -27,7 +27,7 @@ package org.apache.royale.jewel > import org.apache.royale.core.WrappedHTMLElement; > import org.apache.royale.html.util.addElementToWrapper; > } > - import org.apache.royale.core.StyledUIBase; > + import org.apache.royale.jewel.StyledUIBase; > import org.apache.royale.utils.sendEvent; > > /** > diff --git > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ModuleLoader.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ModuleLoader.as > index 05d26e47da..7a018fabef 100644 > --- > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ModuleLoader.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ModuleLoader.as > @@ -27,7 +27,7 @@ package org.apache.royale.jewel > import flash.system.ApplicationDomain; > import flash.system.LoaderContext; > } > - import org.apache.royale.core.StyledUIBase; > + import org.apache.royale.jewel.StyledUIBase; > import org.apache.royale.utils.UIModuleUtils; > > /** > diff --git > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/NumericStepper.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/NumericStepper.as > index 109a538ab5..0f9db80eff 100644 > --- > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/NumericStepper.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/NumericStepper.as > @@ -24,7 +24,7 @@ package org.apache.royale.jewel > import org.apache.royale.html.util.addElementToWrapper; > } > import org.apache.royale.core.IRangeModel; > - import org.apache.royale.core.StyledUIBase; > + import org.apache.royale.jewel.StyledUIBase; > > [Event(name="valueChange", type="org.apache.royale.events.Event")] > > diff --git > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/PopUp.as > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/PopUp.as > index 78fc896276..3fcac7bcfa 100644 > --- > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/PopUp.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/PopUp.as > @@ -23,7 +23,7 @@ package org.apache.royale.jewel > import org.apache.royale.core.WrappedHTMLElement; > import org.apache.royale.html.util.addElementToWrapper; > } > - import org.apache.royale.core.StyledUIBase; > + import org.apache.royale.jewel.StyledUIBase; > import org.apache.royale.core.UIBase; > import org.apache.royale.events.Event; > > diff --git > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/SimpleLoader.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/SimpleLoader.as > index 91568dfd79..a5fae75237 100644 > --- > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/SimpleLoader.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/SimpleLoader.as > @@ -18,7 +18,7 @@ > //////////////////////////////////////////////////////////////////////////////// > package org.apache.royale.jewel > { > - import org.apache.royale.core.StyledUIBase; > + import org.apache.royale.jewel.StyledUIBase; > > /** > * The SimpleLoader class is widget used to show some progressing. > diff --git > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Snackbar.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Snackbar.as > index d9cdebc93e..a69b5d665a 100644 > --- > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Snackbar.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Snackbar.as > @@ -19,7 +19,7 @@ > package org.apache.royale.jewel > { > import org.apache.royale.core.IPopUp; > - import org.apache.royale.core.StyledUIBase; > + import org.apache.royale.jewel.StyledUIBase; > import org.apache.royale.events.Event; > import org.apache.royale.jewel.beads.models.SnackbarModel; > > diff --git > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Spacer.as > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Spacer.as > index 0ba9cae257..df4b883c37 100644 > --- > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Spacer.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Spacer.as > @@ -18,7 +18,7 @@ > //////////////////////////////////////////////////////////////////////////////// > package org.apache.royale.jewel > { > - import org.apache.royale.core.StyledUIBase; > + import org.apache.royale.jewel.StyledUIBase; > > /** > * The Spacer class takes up space in the UI layout. > diff --git > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Spinner.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Spinner.as > index 8a19208260..71e16ef2b2 100644 > --- > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Spinner.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Spinner.as > @@ -24,7 +24,7 @@ package org.apache.royale.jewel > import org.apache.royale.html.util.addElementToWrapper; > } > import org.apache.royale.core.IRangeModel; > - import org.apache.royale.core.StyledUIBase; > + import org.apache.royale.jewel.StyledUIBase; > > [Event(name="valueChange", type="org.apache.royale.events.Event")] > > diff --git > a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/StyledBaseMXMLItemRenderer.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/StyledBaseMXMLItemRenderer.as > similarity index 98% > rename from > frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/StyledBaseMXMLItemRenderer.as > rename to > frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/StyledBaseMXMLItemRenderer.as > index 3049dec80f..003fd40a38 100644 > --- > a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/StyledBaseMXMLItemRenderer.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/StyledBaseMXMLItemRenderer.as > @@ -16,7 +16,7 @@ > // limitations under the License. > // > //////////////////////////////////////////////////////////////////////////////// > -package org.apache.royale.html.supportClasses > +package org.apache.royale.jewel > { > import org.apache.royale.core.IBeadLayout; > import org.apache.royale.core.ILayoutHost; > diff --git > a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/StyledDataItemRenderer.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/StyledDataItemRenderer.as > similarity index 98% > rename from > frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/StyledDataItemRenderer.as > rename to > frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/StyledDataItemRenderer.as > index db4bdd7496..4f77913d06 100644 > --- > a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/StyledDataItemRenderer.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/StyledDataItemRenderer.as > @@ -16,7 +16,7 @@ > // limitations under the License. > // > //////////////////////////////////////////////////////////////////////////////// > -package org.apache.royale.html.supportClasses > +package org.apache.royale.jewel > { > COMPILE::SWF > { > diff --git > a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/supportClasses/StyledImageBase.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/StyledImageBase.as > similarity index 96% > rename from > frameworks/projects/Basic/src/main/royale/org/apache/royale/core/supportClasses/StyledImageBase.as > rename to > frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/StyledImageBase.as > index d09f8cf453..ca8ea682ca 100644 > --- > a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/supportClasses/StyledImageBase.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/StyledImageBase.as > @@ -16,11 +16,11 @@ > // limitations under the License. > // > //////////////////////////////////////////////////////////////////////////////// > -package org.apache.royale.core.supportClasses > +package org.apache.royale.jewel > { > import org.apache.royale.core.IImage; > import org.apache.royale.core.IImageModel; > - import org.apache.royale.core.StyledUIBase; > + import org.apache.royale.jewel.StyledUIBase; > > /** > * The StyledImageBase class serves as a base class for components > that displays a bitmap and used > diff --git > a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledMXMLItemRenderer.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/StyledMXMLItemRenderer.as > similarity index 95% > rename from > frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledMXMLItemRenderer.as > rename to > frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/StyledMXMLItemRenderer.as > index 1c87471989..eae7f4d857 100644 > --- > a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledMXMLItemRenderer.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/StyledMXMLItemRenderer.as > @@ -16,13 +16,11 @@ > // limitations under the License. > // > //////////////////////////////////////////////////////////////////////////////// > -package org.apache.royale.core > +package org.apache.royale.jewel > { > - import > org.apache.royale.html.supportClasses.StyledMXMLStatesItemRenderer; > import org.apache.royale.core.IItemRendererOwnerView; > import org.apache.royale.core.IOwnerViewItemRenderer; > import org.apache.royale.utils.IClassSelectorListSupport; > - import org.apache.royale.utils.IEmphasis; > > /** > * The StyledMXMLItemRenderer class is the base class for > itemRenderers that are MXML-based > diff --git > a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/StyledMXMLStatesItemRenderer.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/StyledMXMLStatesItemRenderer.as > similarity index 97% > rename from > frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/StyledMXMLStatesItemRenderer.as > rename to > frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/StyledMXMLStatesItemRenderer.as > index e9438f622f..a7281d047b 100644 > --- > a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/StyledMXMLStatesItemRenderer.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/StyledMXMLStatesItemRenderer.as > @@ -16,7 +16,7 @@ > // limitations under the License. > // > //////////////////////////////////////////////////////////////////////////////// > -package org.apache.royale.html.supportClasses > +package org.apache.royale.jewel > { > import org.apache.royale.core.IState; > import org.apache.royale.core.IStatesImpl; > @@ -26,7 +26,7 @@ package org.apache.royale.html.supportClasses > > /** > * Indicates that the state change has completed. All properties > - * that need to change have been changed, and all transitinos > + * that need to change have been changed, and all transitions > * that need to run have completed. However, any deferred work > * may not be completed, and the screen may not be updated until > * code stops executing. > diff --git > a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledUIBase.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/StyledUIBase.as > similarity index 71% > rename from > frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledUIBase.as > rename to > frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/StyledUIBase.as > index 0d7e934c75..9e08076a78 100644 > --- > a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledUIBase.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/StyledUIBase.as > @@ -16,25 +16,26 @@ > // limitations under the License. > // > //////////////////////////////////////////////////////////////////////////////// > -package org.apache.royale.core > +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.WrappedHTMLElement; > + import org.apache.royale.html.util.addElementToWrapper; > } > import org.apache.royale.core.IFocusable; > import org.apache.royale.utils.ClassSelectorList; > import org.apache.royale.utils.sendEvent; > + import org.apache.royale.core.UIBase; > > /** > * The StyledUIBase is the base class for UIBase components that makes > * heavy use of styles through IClassSelectorListSupport, and supports > emphasis property > * through IEmphasis. > - * > + * > * For Javascript platform it allows to default size properties (like > width and height) > * to broswer defaults by removing the property. This is done through > NaN value (that is the default) > - * > + * > * @langversion 3.0 > * @playerversion Flash 10.2 > * @playerversion AIR 2.6 > @@ -45,20 +46,20 @@ package org.apache.royale.core > public static const PRIMARY:String = "primary"; > public static const SECONDARY:String = "secondary"; > public static const EMPHASIZED:String = "emphasized"; > - > + > /** > * Constructor. > - * > + * > * @langversion 3.0 > * @playerversion Flash 10.2 > * @playerversion AIR 2.6 > * @productversion Royale 0.9.3 > */ > - public function StyledUIBase() > - { > + public function StyledUIBase() > + { > classSelectorList = new ClassSelectorList(this); > super(); > - } > + } > > protected var classSelectorList:ClassSelectorList; > > @@ -70,9 +71,9 @@ package org.apache.royale.core > > /** > * Add a class selector to the list. > - * > + * > * @param name Name of selector to add. > - * > + * > * @langversion 3.0 > * @playerversion Flash 10.2 > * @playerversion AIR 2.6 > @@ -82,19 +83,19 @@ package org.apache.royale.core > { > COMPILE::JS > { > - if(name != "" && name != null) > - classSelectorList.add(name); > + if (name != "" && name != null) > + classSelectorList.add(name); > } > } > > /** > * Removes a class selector from the list. > - * > + * > * @param name Name of selector to remove. > * > * @royaleignorecoercion HTMLElement > * @royaleignorecoercion DOMTokenList > - * > + * > * @langversion 3.0 > * @playerversion Flash 10.2 > * @playerversion AIR 2.6 > @@ -104,16 +105,16 @@ package org.apache.royale.core > { > COMPILE::JS > { > - classSelectorList.remove(name); > + classSelectorList.remove(name); > } > } > > /** > * Add or remove a class selector to/from the list. > - * > + * > * @param name Name of selector to add or remove. > * @param value True to add, False to remove. > - * > + * > * @langversion 3.0 > * @playerversion Flash 10.2 > * @playerversion AIR 2.6 > @@ -123,44 +124,45 @@ package org.apache.royale.core > { > COMPILE::JS > { > - classSelectorList.toggle(name, value); > + classSelectorList.toggle(name, value); > } > } > > /** > - * Search for the name in the element class list > - * > + * Search for the name in the element class list > + * > * @param name Name of selector to find. > * @return return true if the name is found or false otherwise. > - * > - * @langversion 3.0 > - * @playerversion Flash 10.2 > - * @playerversion AIR 2.6 > - * @productversion Royale 0.9.3 > - */ > - public function containsClass(name:String):Boolean > + * > + * @langversion 3.0 > + * @playerversion Flash 10.2 > + * @playerversion AIR 2.6 > + * @productversion Royale 0.9.3 > + */ > + public function containsClass(name:String):Boolean > { > COMPILE::JS > { > - return classSelectorList.contains(name); > + return classSelectorList.contains(name); > } > COMPILE::SWF > - {//not implemented > - return false; > + { > + // not implemented > + return false; > } > } > > /** > - * Replace a class for a new one > - * > + * Replace a class for a new one > + * > * @param oldClass Name of selector to remove. > * @param newClass Name of selector to set. > - * > - * @langversion 3.0 > - * @playerversion Flash 10.2 > - * @playerversion AIR 2.6 > - * @productversion Royale 0.9.8 > - */ > + * > + * @langversion 3.0 > + * @playerversion Flash 10.2 > + * @playerversion AIR 2.6 > + * @productversion Royale 0.9.8 > + */ > public function replaceClass(oldClass:String, newClass:String = > null):void > { > if (containsClass(oldClass)) > @@ -169,17 +171,18 @@ package org.apache.royale.core > } > > private var _emphasis:String; > + > /** > - * Applies emphasis color display. Possible constant values > are: PRIMARY, SECONDARY, EMPHASIZED. > + * Applies emphasis color display. Possible constant values are: > PRIMARY, SECONDARY, EMPHASIZED. > * Colors are defined in royale jewel theme CSS. > - * > + * > * Left without value to get the default look (light or dark). > * > - * @langversion 3.0 > - * @playerversion Flash 10.2 > - * @playerversion AIR 2.6 > - * @productversion Royale 0.9.6 > - */ > + * @langversion 3.0 > + * @playerversion Flash 10.2 > + * @playerversion AIR 2.6 > + * @productversion Royale 0.9.6 > + */ > public function get emphasis():String > { > return _emphasis; > @@ -188,7 +191,7 @@ package org.apache.royale.core > { > if (_emphasis != value) > { > - if(_emphasis) > + if (_emphasis) > { > removeClass(_emphasis); > } > @@ -205,71 +208,75 @@ package org.apache.royale.core > COMPILE::JS > override protected function createElement():WrappedHTMLElement > { > - addElementToWrapper(this,'div'); > + addElementToWrapper(this, 'div'); > return element; > } > > /** > * In Javascript platform for convenience we use NaN value to remove > style, since Browsers > * use defaults for unset style properties. > - * > + * > * @private > */ > - override public function set percentWidth(value:Number):void > - { > - COMPILE::SWF { > - if (_percentWidth == value) > - return; > - > - if (!isNaN(value)) > - _explicitWidth = NaN; > - > - _percentWidth = value; > - } > - COMPILE::JS { > - this._percentWidth = value; > - this.positioner.style.width = isNaN(value) ? > null : value.toString() + '%'; > - if (!isNaN(value)) > - this._explicitWidth = NaN; > - } > - > - sendEvent(this,"percentWidthChanged"); > - } > + override public function set percentWidth(value:Number):void > + { > + COMPILE::SWF > + { > + if (_percentWidth == value) > + return; > + > + if (!isNaN(value)) > + _explicitWidth = NaN; > + > + _percentWidth = value; > + } > + COMPILE::JS > + { > + this._percentWidth = value; > + this.positioner.style.width = isNaN(value) ? null : > value.toString() + '%'; > + if (!isNaN(value)) > + this._explicitWidth = NaN; > + } > + > + sendEvent(this, "percentWidthChanged"); > + } > > /** > * In Javascript platform for convenience we use NaN value to remove > style, since Browsers > * use defaults for unset style properties. > - * > + * > * @private > */ > - override public function set percentHeight(value:Number):void > - { > - COMPILE::SWF { > - if (_percentHeight == value) > - return; > - > - if (!isNaN(value)) > - _explicitHeight = NaN; > - > - _percentHeight = value; > - } > - > - COMPILE::JS { > - this._percentHeight = value; > - this.positioner.style.height = isNaN(value) ? > null : value.toString() + '%'; > - if (!isNaN(value)) > - this._explicitHeight = NaN; > - } > - > - sendEvent(this,"percentHeightChanged"); > - } > + override public function set percentHeight(value:Number):void > + { > + COMPILE::SWF > + { > + if (_percentHeight == value) > + return; > + > + if (!isNaN(value)) > + _explicitHeight = NaN; > + > + _percentHeight = value; > + } > + > + COMPILE::JS > + { > + this._percentHeight = value; > + this.positioner.style.height = isNaN(value) ? null : > value.toString() + '%'; > + if (!isNaN(value)) > + this._explicitHeight = NaN; > + } > + > + sendEvent(this, "percentHeightChanged"); > + } > > /** > * In Javascript platform for convenience we use NaN value to remove > style, since Browsers > * use defaults for unset style properties. > - * > + * > * @copy org.apache.royale.core.ILayoutChild#setHeight > - * > + * > * @langversion 3.0 > * @playerversion Flash 10.2 > * @playerversion AIR 2.6 > @@ -282,19 +289,19 @@ package org.apache.royale.core > _height = value; > COMPILE::JS > { > - this.positioner.style.height = isNaN(value) ? null : > value.toString() + 'px'; > + this.positioner.style.height = isNaN(value) ? null : > value.toString() + 'px'; > } > if (!noEvent) > - sendEvent(this,"heightChanged"); > - } > + sendEvent(this, "heightChanged"); > + } > } > > /** > * In Javascript platform for convenience we use NaN value to remove > style, since Browsers > * use defaults for unset style properties. > - * > + * > * @copy org.apache.royale.core.ILayoutChild#setWidth > - * > + * > * @langversion 3.0 > * @playerversion Flash 10.2 > * @playerversion AIR 2.6 > @@ -307,19 +314,19 @@ package org.apache.royale.core > _width = value; > COMPILE::JS > { > - this.positioner.style.width = isNaN(value) ? null : > value.toString() + 'px'; > + this.positioner.style.width = isNaN(value) ? null : > value.toString() + 'px'; > } > if (!noEvent) > - sendEvent(this,"widthChanged"); > + sendEvent(this, "widthChanged"); > } > } > > /** > * In Javascript platform for convenience we use NaN value to remove > style, since Browsers > * use defaults for unset style properties. > - * > + * > * @copy org.apache.royale.core.ILayoutChild#setWidthAndHeight > - * > + * > * @langversion 3.0 > * @playerversion Flash 10.2 > * @playerversion AIR 2.6 > @@ -328,15 +335,15 @@ package org.apache.royale.core > override public function setWidthAndHeight(newWidth:Number, > newHeight:Number, noEvent:Boolean = false):void > { > var widthChanged:Boolean = _width !== newWidth; > - var heightChanged:Boolean = _height !== newHeight; > + var heightChanged:Boolean = _height !== newHeight; > if (widthChanged) > { > _width = newWidth; > COMPILE::JS > { > - this.positioner.style.width = isNaN(newWidth) ? null : > newWidth.toString() + 'px'; > + this.positioner.style.width = isNaN(newWidth) ? null : > newWidth.toString() + 'px'; > } > - if (!noEvent && !heightChanged) > + if (!noEvent && !heightChanged) > sendEvent(this, "widthChanged"); > } > if (heightChanged) > @@ -344,21 +351,21 @@ package org.apache.royale.core > _height = newHeight; > COMPILE::JS > { > - this.positioner.style.height = isNaN(newHeight) ? null : > newHeight.toString() + 'px'; > + this.positioner.style.height = isNaN(newHeight) ? null : > newHeight.toString() + 'px'; > } > if (!noEvent && !widthChanged) > sendEvent(this, "heightChanged"); > } > - if (widthChanged && heightChanged) > + if (widthChanged && heightChanged) > sendEvent(this, "sizeChanged"); > } > > /** > * In Javascript platform for convenience we use NaN value to remove > style, since Browsers > * use defaults for unset style properties. > - * > + * > * @copy org.apache.royale.core.ILayoutChild#setX > - * > + * > * @langversion 3.0 > * @playerversion Flash 10.2 > * @playerversion AIR 2.6 > @@ -367,30 +374,31 @@ package org.apache.royale.core > */ > override public function setX(value:Number):void > { > - COMPILE::SWF > - { > - super.x = value; > > - } > - COMPILE::JS > - { > - if(!isNaN(value)) > + COMPILE::SWF > + { > + super.x = value; > + } > + COMPILE::JS > + { > + if (!isNaN(value)) > { > if (positioner.parentNode != positioner.offsetParent) > value += (positioner.parentNode as > HTMLElement).offsetLeft; > positioner.style.left = value.toString() + 'px'; > - } else > + } > + else > { > positioner.style.left = null; > } > - } > + } > } > > /** > * In Javascript platform for convenience we use NaN value to remove > style, since Browsers > * use defaults for unset style properties. > - * > + * > * @copy org.apache.royale.core.ILayoutChild#setY > - * > + * > * @langversion 3.0 > * @playerversion Flash 10.2 > * @playerversion AIR 2.6 > @@ -399,28 +407,30 @@ package org.apache.royale.core > */ > override public function setY(value:Number):void > { > - COMPILE::SWF > - { > - super.y = value; > > - } > - COMPILE::JS > - { > - if(!isNaN(value)) > + COMPILE::SWF > + { > + super.y = value; > + } > + COMPILE::JS > + { > + if (!isNaN(value)) > { > if (positioner.parentNode != positioner.offsetParent) > value += (positioner.parentNode as > HTMLElement).offsetTop; > positioner.style.top = value.toString() + 'px'; > - } else > + } > + else > { > positioner.style.top = null; > } > - } > + } > } > > protected var _minWidth:Number; > + > /** > * the minimun width for this component > - * > + * > * @langversion 3.0 > * @playerversion Flash 10.2 > * @playerversion AIR 2.6 > @@ -436,16 +446,17 @@ package org.apache.royale.core > { > _minWidth = value; > COMPILE::JS > - { > - this.positioner.style.minWidth = _minWidth.toString() + 'px'; > + { > + this.positioner.style.minWidth = _minWidth.toString() + > 'px'; > } > - } > + } > } > > protected var _minHeight:Number; > + > /** > * the minimun height for this component > - * > + * > * @langversion 3.0 > * @playerversion Flash 10.2 > * @playerversion AIR 2.6 > @@ -461,16 +472,17 @@ package org.apache.royale.core > { > _minHeight = value; > COMPILE::JS > - { > - this.positioner.style.minHeight = _minHeight.toString() + > 'px'; > + { > + this.positioner.style.minHeight = _minHeight.toString() > + 'px'; > } > - } > + } > } > - > + > protected var _maxWidth:Number; > + > /** > * the maximun width for this component > - * > + * > * @langversion 3.0 > * @playerversion Flash 10.2 > * @playerversion AIR 2.6 > @@ -486,16 +498,17 @@ package org.apache.royale.core > { > _maxWidth = value; > COMPILE::JS > - { > - this.positioner.style.maxWidth = _maxWidth.toString() + 'px'; > + { > + this.positioner.style.maxWidth = _maxWidth.toString() + > 'px'; > } > - } > + } > } > - > + > protected var _maxHeight:Number; > + > /** > * the maximun height for this component > - * > + * > * @langversion 3.0 > * @playerversion Flash 10.2 > * @playerversion AIR 2.6 > @@ -511,46 +524,46 @@ package org.apache.royale.core > { > _maxHeight = value; > COMPILE::JS > - { > - this.positioner.style.maxHeight = _maxHeight.toString() + > 'px'; > + { > + this.positioner.style.maxHeight = _maxHeight.toString() > + 'px'; > } > - } > + } > } > > - > /** > - * Make the component get the focus on the element > - * > + * Make the component get the focus on the element > + * > * @langversion 3.0 > * @playerversion Flash 10.2 > * @playerversion AIR 2.6 > * @productversion Royale 0.9.7 > */ > public function setFocus(preventScroll:Boolean = false):void > - { > - COMPILE::JS > - { > - element.focus({preventScroll: preventScroll}); > - } > - } > - > + { > + COMPILE::JS > + { > + element.focus({preventScroll: preventScroll}); > + } > + } > + > /** > - * the tabIndex of the element > - * > + * the tabIndex of the element > + * > * @langversion 3.0 > * @playerversion Flash 10.2 > * @playerversion AIR 2.6 > * @productversion Royale 0.9.7 > */ > COMPILE::JS > - public function get tabIndex():int > - { > - return element.tabIndex; > - } > + public function get tabIndex():int > + { > + return element.tabIndex; > + } > COMPILE::JS > - public function set tabIndex(value:int):void > - { > - element.tabIndex = value; > - } > + > + public function set tabIndex(value:int):void > + { > + element.tabIndex = value; > + } > } > } > \ No newline at end of file > diff --git > a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/StyledUIItemRendererBase.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/StyledUIItemRendererBase.as > similarity index 98% > rename from > frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/StyledUIItemRendererBase.as > rename to > frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/StyledUIItemRendererBase.as > index e249bc47e7..a9e2f6261e 100644 > --- > a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/StyledUIItemRendererBase.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/StyledUIItemRendererBase.as > @@ -16,14 +16,14 @@ > // limitations under the License. > // > //////////////////////////////////////////////////////////////////////////////// > -package org.apache.royale.html.supportClasses > +package org.apache.royale.jewel > { > - import org.apache.royale.core.StyledUIBase; > import org.apache.royale.core.ValuesManager; > import org.apache.royale.events.Event; > import org.apache.royale.utils.MXMLDataInterpreter; > import org.apache.royale.core.ILabelFieldItemRenderer; > import org.apache.royale.core.IHasLabelField; > + import org.apache.royale.jewel.StyledUIBase; > > [DefaultProperty("mxmlContent")] > > diff --git > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/VideoPlayer.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/VideoPlayer.as > index 6759b67433..07a3b716d0 100644 > --- > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/VideoPlayer.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/VideoPlayer.as > @@ -18,14 +18,15 @@ > //////////////////////////////////////////////////////////////////////////////// > package org.apache.royale.jewel > { > - import org.apache.royale.core.StyledUIBase; > > - COMPILE::JS > - { > import org.apache.royale.html5.VideoElement; > - import org.apache.royale.core.WrappedHTMLElement; > - import org.apache.royale.html.util.addElementToWrapper; > - } > + COMPILE::JS > + { > + import org.apache.royale.core.WrappedHTMLElement; > + import org.apache.royale.html.util.addElementToWrapper; > + import org.apache.royale.utils.ClassSelectorList; > + import org.apache.royale.jewel.supportClasses.MediaElement; > + } > > /** > * VideoPlayer let you to play video with segments progressive > download. > @@ -36,11 +37,29 @@ package org.apache.royale.jewel > * @playerversion AIR 0.0 > * @productversion Royale 0.0 > */ > - COMPILE::JS > - public class VideoPlayer extends VideoElement > + COMPILE::JS > + public class VideoPlayer extends MediaElement > { > + /** > + * Dispatched when the VideoElement enters picture-in-picture > mode successfully. > + * > + * @langversion 3.0 > + * @playerversion Flash 0.0 > + * @playerversion AIR 0.0 > + * @productversion Royale 0.0 > + */ > + [Event(name="enterpictureinpicture", > type="org.apache.royale.events.Event")] > + > + /** > + * Dispatched when the VideoElement leaves picture-in-picture > mode successfully. > + * > + * @langversion 3.0 > + * @playerversion Flash 0.0 > + * @playerversion AIR 0.0 > + * @productversion Royale 0.0 > + */ > + [Event(name="leavepictureinpicture", > type="org.apache.royale.events.Event")] > > - > private var _scaleMode:String; > > /** > @@ -54,14 +73,14 @@ package org.apache.royale.jewel > public function VideoPlayer() > { > super(); > - typeNames = "jewel videoplayer"; > + classSelectorList = new ClassSelectorList(this); > + typeNames = "jewel videoplayer"; > } > > - > /** > * The scaleMode method set different ways of sizing the video > content. > * You can set scaleMode to "stretch", "letterbox", or "zoom" > - * > + * > * letterbox : will shrink or enlarge the video to fit in > parent container keeping video aspect ratio > * zoom : will enlarge the video to fit all the parent > container keeping aspect ratio (loosing partial video areas if video ratio is > different from parent ratio) > * stretch : will shrink or enlarge the video to fill all the > parent container (loosing video radio if video ratio is different from parent > ratio) > @@ -71,12 +90,13 @@ package org.apache.royale.jewel > * @playerversion AIR 0.0 > * @productversion Royale 0.0 > */ > - > [Inspectable(category="General",enumeration="letterbox,zoom,strech")] > + [Inspectable(category="General", > enumeration="letterbox,zoom,strech")] > public function set scaleMode(value:String):void > { > - if (_scaleMode == value) return; > + if (_scaleMode == value) > + return; > > - replaceClass(_scaleMode,value); > + replaceClass(_scaleMode, value); > _scaleMode = value; > } > > @@ -85,16 +105,107 @@ package org.apache.royale.jewel > return _scaleMode; > } > > - > - > - > -/* COMPILE::JS > + /* COMPILE::JS > public function showJewelControl(value:Boolean):void > { > } > */ > - > + > + /** > + * @royaleignorecoercion > org.apache.royale.core.WrappedHTMLElement > + */ > + COMPILE::JS > + override protected function createElement():WrappedHTMLElement > + { > + addElementToWrapper(this, 'video'); > + > + element.addEventListener("abort", handleEvent); > + element.addEventListener("canplay", handleEvent); > + element.addEventListener("canplaythrough", handleEvent); > + element.addEventListener("durationchange", handleEvent); > + element.addEventListener("emptied", handleEvent); > + element.addEventListener("ended", handleEvent); > + element.addEventListener("loadeddata", handleEvent); > + element.addEventListener("loadedmetadata", handleEvent); > + element.addEventListener("loadstart", handleEvent); > + element.addEventListener("pause", handleEvent); > + element.addEventListener("play", handleEvent); > + element.addEventListener("playing", handleEvent); > + element.addEventListener("progress", handleEvent); > + element.addEventListener("ratechange", handleEvent); > + element.addEventListener("seeked", handleEvent); > + element.addEventListener("seeking", handleEvent); > + element.addEventListener("stalled", handleEvent); > + element.addEventListener("suspend", handleEvent); > + element.addEventListener("timeupdate", handleEvent); > + element.addEventListener("volumechange", handleEvent); > + element.addEventListener("waiting", handleEvent); > + element.addEventListener("error", handleEvent); > + > + element.addEventListener("enterpictureinpicture", > handleEvent); > + element.addEventListener("leavepictureinpicture", > handleEvent); > + > + return element; > + } > + > + COMPILE::JS > + private function handleEvent(e:Event):void > + { > + dispatchEvent(new Event(e.type)); > + } > + > + COMPILE::JS > + > + public function get videoHeight():uint > + { > + return (element as HTMLVideoElement).videoHeight; > + } > + > + COMPILE::JS > + > + public function get videoWidth():uint > + { > + return (element as HTMLVideoElement).videoWidth; > + } > + > + /*COMPILE::JS > + public function set disablePictureInPicture(value:Boolean):void > + { > + (element as HTMLVideoElement).disablePictureInPicture = > value; > + } > + > + > + COMPILE::JS > + public function get disablePictureInPicture():Boolean > + { > + return(element as > HTMLVideoElement).disablePictureInPicture; > + }*/ > + > + /** > + * request full screen > + * > + * @langversion 3.0 > + * @playerversion Flash 0.0 > + * @playerversion AIR 0.0 > + * @productversion Royale 0.0 > + */ > + public function requestFullscreen():void > + { > + COMPILE::JS > + { > + (element as > HTMLVideoElement).requestFullscreen(); > + } > + } > + > + /*public function requestPictureInPicture():void > + { > + COMPILE::JS{(element as > HTMLVideoElement).requestPictureInPicture();} > + }*/ > + > + } > + COMPILE::SWF > + > + public class VideoPlayer > + { > } > - COMPILE::SWF > - public class VideoPlayer {} > } > diff --git > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ComboBoxController.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ComboBoxController.as > index e888f436a0..c80d595870 100644 > --- > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ComboBoxController.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ComboBoxController.as > @@ -39,7 +39,7 @@ package org.apache.royale.jewel.beads.controllers > import org.apache.royale.events.utils.NavigationKeys; > import org.apache.royale.events.utils.WhitespaceKeys; > import org.apache.royale.html.beads.IListView; > - import org.apache.royale.html.supportClasses.StyledDataItemRenderer; > + import org.apache.royale.jewel.StyledDataItemRenderer; > import org.apache.royale.jewel.List; > import org.apache.royale.jewel.beads.controls.combobox.IComboBoxView; > import org.apache.royale.jewel.beads.models.IJewelSelectionModel; > diff --git > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/TableCellSelectionMouseController.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/TableCellSelectionMouseController.as > index e49437e384..c98fe663a9 100644 > --- > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/TableCellSelectionMouseController.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/TableCellSelectionMouseController.as > @@ -31,7 +31,7 @@ package org.apache.royale.jewel.beads.controllers > import org.apache.royale.events.ItemClickedEvent; > import org.apache.royale.events.ItemRemovedEvent; > import org.apache.royale.html.beads.ITableView; > - import org.apache.royale.html.supportClasses.StyledDataItemRenderer; > + import org.apache.royale.jewel.StyledDataItemRenderer; > import org.apache.royale.jewel.beads.models.IJewelSelectionModel; > import org.apache.royale.html.util.getModelByType; > > diff --git > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Badge.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Badge.as > index d2112f98e9..b15c86cbb2 100644 > --- > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Badge.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Badge.as > @@ -22,7 +22,7 @@ package org.apache.royale.jewel.beads.controls > import org.apache.royale.core.IStrand; > import org.apache.royale.core.UIBase; > import org.apache.royale.jewel.Label; > - import org.apache.royale.utils.IEmphasis; > + import org.apache.royale.jewel.IEmphasis; > > /** > * The Badge class provides a small status descriptors for UI elements. > diff --git > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/ResponsiveSize.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/ResponsiveSize.as > index 83debfec3e..737bdb13f7 100644 > --- > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/ResponsiveSize.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/ResponsiveSize.as > @@ -20,7 +20,7 @@ package org.apache.royale.jewel.beads.controls > { > import org.apache.royale.core.IBead; > import org.apache.royale.core.IStrand; > - import org.apache.royale.core.StyledUIBase; > + import org.apache.royale.jewel.StyledUIBase; > import org.apache.royale.events.IEventDispatcher; > import org.apache.royale.events.Event; > import org.apache.royale.jewel.supportClasses.ResponsiveSizes; > diff --git > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/SizeControl.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/SizeControl.as > index 09b2bd79d3..0858cbd8c9 100644 > --- > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/SizeControl.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/SizeControl.as > @@ -20,7 +20,7 @@ package org.apache.royale.jewel.beads.controls > { > import org.apache.royale.core.IBead; > import org.apache.royale.core.IStrand; > - import org.apache.royale.core.StyledUIBase; > + import org.apache.royale.jewel.StyledUIBase; > > /** > * The SizeControl bead class is a specialty bead that can be used to > size a Jewel control. > diff --git > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/TextInputSubControlTruncateText.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/TextInputSubControlTruncateText.as > index 36a3932d46..787a2f9af0 100644 > --- > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/TextInputSubControlTruncateText.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/TextInputSubControlTruncateText.as > @@ -21,7 +21,7 @@ package org.apache.royale.jewel.beads.controls > import org.apache.royale.core.IBead; > import org.apache.royale.core.IStrand; > import org.apache.royale.core.IUIBase; > - import org.apache.royale.core.StyledUIBase; > + import org.apache.royale.jewel.StyledUIBase; > import org.apache.royale.jewel.beads.controls.textinput.TruncateText; > import org.apache.royale.jewel.beads.views.IViewWithTextInputAndButton; > > diff --git > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/button/InputButtonSize.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/button/InputButtonSize.as > index 1cc728d516..09c4799cd0 100644 > --- > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/button/InputButtonSize.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/button/InputButtonSize.as > @@ -20,7 +20,7 @@ package org.apache.royale.jewel.beads.controls.button > { > import org.apache.royale.core.DispatcherBead; > import org.apache.royale.core.IStrand; > - import org.apache.royale.core.StyledUIBase; > + import org.apache.royale.jewel.StyledUIBase; > import org.apache.royale.events.Event; > import org.apache.royale.events.IEventDispatcher; > import org.apache.royale.jewel.supportClasses.IInputButton; > diff --git > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/image/ClipImage.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/image/ClipImage.as > index 393b82fa00..35a04492ef 100644 > --- > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/image/ClipImage.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/image/ClipImage.as > @@ -20,7 +20,7 @@ package org.apache.royale.jewel.beads.controls.image > { > import org.apache.royale.core.IBead; > import org.apache.royale.core.IStrand; > - import org.apache.royale.core.StyledUIBase; > + import org.apache.royale.jewel.StyledUIBase; > import org.apache.royale.debugging.throwError; > import org.apache.royale.jewel.Group; > import org.apache.royale.utils.css.addDynamicSelector; > diff --git > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/list/ListAlternateRowColor.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/list/ListAlternateRowColor.as > index 9df8827816..cfbb4d2f33 100644 > --- > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/list/ListAlternateRowColor.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/list/ListAlternateRowColor.as > @@ -24,7 +24,7 @@ package org.apache.royale.jewel.beads.controls.list > } > import org.apache.royale.core.IBead; > import org.apache.royale.core.IStrand; > - import org.apache.royale.core.IStyledUIBase; > + import org.apache.royale.jewel.IStyledUIBase; > import org.apache.royale.utils.IClassSelectorListSupport; > import org.apache.royale.utils.css.addDynamicSelector; > > diff --git > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/textinput/TruncateText.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/textinput/TruncateText.as > index b5ad91cdfa..08f7dc5b59 100644 > --- > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/textinput/TruncateText.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/textinput/TruncateText.as > @@ -20,7 +20,7 @@ package org.apache.royale.jewel.beads.controls.textinput > { > import org.apache.royale.core.IBead; > import org.apache.royale.core.IStrand; > - import org.apache.royale.core.IStyledUIBase; > + import org.apache.royale.jewel.IStyledUIBase; > > /** > * The TruncateText class is a specialty bead that can be used with > diff --git > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/ButtonBarItemRendererInitializer.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/ButtonBarItemRendererInitializer.as > index 607e79f607..dc96aeef09 100644 > --- > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/ButtonBarItemRendererInitializer.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/ButtonBarItemRendererInitializer.as > @@ -21,7 +21,7 @@ package org.apache.royale.jewel.beads.itemRenderers > import org.apache.royale.core.IIndexedItemRenderer; > import org.apache.royale.core.IOwnerViewItemRenderer; > import org.apache.royale.core.ISelectable; > - import org.apache.royale.core.StyledUIBase; > + import org.apache.royale.jewel.StyledUIBase; > import org.apache.royale.jewel.Button; > import org.apache.royale.jewel.ButtonBar; > import org.apache.royale.jewel.beads.views.ButtonBarView; > diff --git > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DataContainerItemRendererInitializer.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DataContainerItemRendererInitializer.as > index 4c06980d81..2a1c6136e6 100644 > --- > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DataContainerItemRendererInitializer.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DataContainerItemRendererInitializer.as > @@ -22,7 +22,7 @@ package org.apache.royale.jewel.beads.itemRenderers > import org.apache.royale.core.IItemRendererOwnerView; > import org.apache.royale.core.IStrand; > import org.apache.royale.core.IStrandWithModelView; > - import org.apache.royale.core.StyledMXMLItemRenderer; > + import org.apache.royale.jewel.StyledMXMLItemRenderer; > import org.apache.royale.html.beads.IndexedItemRendererInitializer; > > /** > diff --git > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DataGridColumnListItemRendererInitializer.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DataGridColumnListItemRendererInitializer.as > index 6dc54f3339..74961b151b 100644 > --- > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DataGridColumnListItemRendererInitializer.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DataGridColumnListItemRendererInitializer.as > @@ -19,8 +19,8 @@ > package org.apache.royale.jewel.beads.itemRenderers > { > import org.apache.royale.core.IIndexedItemRenderer; > - import org.apache.royale.core.StyledMXMLItemRenderer; > - import org.apache.royale.core.StyledUIBase; > + import org.apache.royale.jewel.StyledMXMLItemRenderer; > + import org.apache.royale.jewel.StyledUIBase; > > /** > * The DataGridColumnListItemRendererInitializer class initializes > item renderers > diff --git > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/IndexedItemRendererInitializer.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/IndexedItemRendererInitializer.as > index 0137ea75f1..db1cc5972e 100644 > --- > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/IndexedItemRendererInitializer.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/IndexedItemRendererInitializer.as > @@ -20,7 +20,7 @@ package org.apache.royale.jewel.beads.itemRenderers > { > import org.apache.royale.core.IIndexedItemRenderer; > import org.apache.royale.core.IStrand; > - import org.apache.royale.core.StyledUIBase; > + import org.apache.royale.jewel.StyledUIBase; > import org.apache.royale.html.beads.IPaddings; > import org.apache.royale.html.beads.IndexedItemRendererInitializer; > import org.apache.royale.html.beads.layouts.Paddings; > diff --git > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/ListItemRendererInitializer.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/ListItemRendererInitializer.as > index ccb00a0cae..79cb92626c 100644 > --- > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/ListItemRendererInitializer.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/ListItemRendererInitializer.as > @@ -23,8 +23,8 @@ package org.apache.royale.jewel.beads.itemRenderers > import org.apache.royale.core.IListWithPresentationModel; > import org.apache.royale.core.IStrand; > import org.apache.royale.core.IStrandWithModelView; > - import org.apache.royale.core.StyledMXMLItemRenderer; > - import org.apache.royale.core.StyledUIBase; > + import org.apache.royale.jewel.StyledMXMLItemRenderer; > + import org.apache.royale.jewel.StyledUIBase; > import org.apache.royale.jewel.beads.models.ListPresentationModel; > import > org.apache.royale.jewel.supportClasses.list.IListPresentationModel; > > @@ -62,7 +62,7 @@ package org.apache.royale.jewel.beads.itemRenderers > * @playerversion AIR 2.6 > * @productversion Royale 0.9.7 > * @royaleignorecoercion HTMLInputElement > - * @royaleignorecoercion org.apache.royale.core.StyledUIBase; > + * @royaleignorecoercion org.apache.royale.jewel.StyledUIBase; > */ > override public function set strand(value:IStrand):void > { > diff --git > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/TabBarItemRendererInitializer.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/TabBarItemRendererInitializer.as > index 6f94c39bb7..b4f699fd21 100644 > --- > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/TabBarItemRendererInitializer.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/TabBarItemRendererInitializer.as > @@ -22,7 +22,7 @@ package org.apache.royale.jewel.beads.itemRenderers > import org.apache.royale.core.IBeadLayout; > import org.apache.royale.core.IIndexedItemRenderer; > import org.apache.royale.core.IStrand; > - import org.apache.royale.core.IStyledUIBase; > + import org.apache.royale.jewel.IStyledUIBase; > import org.apache.royale.html.beads.IPaddings; > import org.apache.royale.html.beads.layouts.Paddings; > import org.apache.royale.jewel.beads.models.ListPresentationModel; > diff --git > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/TableItemRendererInitializer.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/TableItemRendererInitializer.as > index 1da3c5205c..1f9219dc63 100644 > --- > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/TableItemRendererInitializer.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/TableItemRendererInitializer.as > @@ -19,7 +19,7 @@ > package org.apache.royale.jewel.beads.itemRenderers > { > import org.apache.royale.core.IIndexedItemRenderer; > - import org.apache.royale.core.StyledUIBase; > + import org.apache.royale.jewel.StyledUIBase; > import org.apache.royale.jewel.itemRenderers.TableItemRenderer; > > /** > diff --git > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/StyledLayoutBase.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/StyledLayoutBase.as > index 9afc37fb50..162bdd7b05 100644 > --- > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/StyledLayoutBase.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/layouts/StyledLayoutBase.as > @@ -23,7 +23,7 @@ package org.apache.royale.jewel.beads.layouts > import org.apache.royale.core.IStrand; > import org.apache.royale.core.IUIBase; > import org.apache.royale.core.LayoutBase; > - import org.apache.royale.core.StyledUIBase; > + import org.apache.royale.jewel.StyledUIBase; > import org.apache.royale.core.ValuesManager; > import org.apache.royale.core.layout.ILayoutChildren; > import org.apache.royale.core.layout.ILayoutStyleProperties; > diff --git > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as > index f20677f530..3e81f8ee57 100644 > --- > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as > @@ -39,7 +39,7 @@ package org.apache.royale.jewel.beads.views > import org.apache.royale.core.IAlertModel; > import org.apache.royale.core.IParent; > import org.apache.royale.core.IStrand; > - import org.apache.royale.core.StyledUIBase; > + import org.apache.royale.jewel.StyledUIBase; > import org.apache.royale.core.UIBase; > import org.apache.royale.events.CloseEvent; > import org.apache.royale.events.IEventDispatcher; > diff --git > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ComboBoxView.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ComboBoxView.as > index 0dbd0c9111..70b72b9287 100644 > --- > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ComboBoxView.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ComboBoxView.as > @@ -120,7 +120,7 @@ package org.apache.royale.jewel.beads.views > /** > * @private > * @royaleignorecoercion > org.apache.royale.events.IEventDispatcher > - * @royaleignorecoercion org.apache.royale.core.StyledUIBase > + * @royaleignorecoercion org.apache.royale.jewel.StyledUIBase > */ > override public function set strand(value:IStrand):void > { > diff --git > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DataGridView.as > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DataGridView.as > index 83747cbf0d..3e62739789 100644 > --- > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DataGridView.as > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DataGridView.as > @@ -32,7 +32,7 @@ package org.apache.royale.jewel.beads.views > import org.apache.royale.core.IParent; > import org.apache.royale.core.IStrand; > import org.apache.royale.core.IUIBase; > - import org.apache.royale.core.StyledUIBase; > + import org.apache.royale.jewel.StyledUIBase; > import org.apache.royale.core.UIBase; > import org.apache.royale.core.ValuesManager; > import org.apache.royale.events.CollectionEvent; > @@ -46,7 +46,7 @@ package org.apache.royale.jewel.beads.views > import org.apache.royale.jewel.supportClasses.datagrid.IDataGridColumn; > import > org.apache.royale.jewel.supportClasses.datagrid.IDataGridColumnList; > import > org.apache.royale.jewel.supportClasses.datagrid.IDataGridPresentationModel; > - import org.apache.royale.utils.IEmphasis; > + import org.apache.royale.jewel.IEmphasis; > import org.apache.royale.utils.loadBeadFromValuesManager; > import org.apache.royale.utils.observeElementSize; > > diff --git > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/JewelLabelViewBead.mxml > > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/JewelLabelViewBead.mxml > index 3d9751d23c..7a60aaf622 100644 > --- > a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/JewelLabelViewBead.mxml > +++ > b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/JewelLabelViewBead.mxml > @@ -24,7 +24,7 @@ limitations under the License. > <fx:Script> > <