You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ha...@apache.org on 2020/07/06 08:22:27 UTC
[royale-asjs] branch develop updated: and more
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 24f1adf and more
24f1adf is described below
commit 24f1adf45b42d3636e8a4259e93362a01330b807
Author: Harbs <ha...@in-tools.com>
AuthorDate: Mon Jul 6 11:22:13 2020 +0300
and more
---
.../src/main/royale/org/apache/royale/html/List.as | 5 +++-
.../main/royale/org/apache/royale/html/TextArea.as | 2 ++
.../royale/org/apache/royale/html/WebBrowser.as | 8 ++++---
.../royale/html/accessories/AdaptiveToolTipBead.as | 3 ++-
.../apache/royale/html/accessories/ToolTipBead.as | 11 +++++----
.../apache/royale/html/beads/BinaryImageLoader.as | 1 +
.../org/apache/royale/html/beads/ContainerView.as | 27 ++++++++++++----------
.../apache/royale/html/beads/DataContainerView.as | 1 +
.../beads/DataItemRendererFactoryForArrayList.as | 3 +--
.../html/beads/DataProviderChangeNotifier.as | 12 +++++++---
.../apache/royale/html/beads/DateChooserView.as | 6 ++++-
.../org/apache/royale/html/beads/DisableBead.as | 15 ++++++------
.../royale/html/beads/DisableChildrenBead.as | 8 +++++--
.../apache/royale/html/beads/DisabledAlphaBead.as | 3 +++
.../royale/html/beads/DispatchInputFinishedBead.as | 3 +++
...DynamicRemoveAllItemRendererForArrayListData.as | 3 ++-
16 files changed, 73 insertions(+), 38 deletions(-)
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/List.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/List.as
index 71f7b6f..8088c91 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/List.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/List.as
@@ -131,12 +131,15 @@ package org.apache.royale.html
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.0
- * @royaleignorecoercion org.apache.royale.core.IListPresentationModel
+ * @royaleignorecoercion org.apache.royale.html.IListPresentationModel
*/
public function get rowHeight():Number
{
return (presentationModel as IListPresentationModel).rowHeight;
}
+ /**
+ * @royaleignorecoercion org.apache.royale.html.IListPresentationModel
+ */
public function set rowHeight(value:Number):void
{
(presentationModel as IListPresentationModel).rowHeight = value;
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/TextArea.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/TextArea.as
index 7e3eca8..4a0e5ff 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/TextArea.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/TextArea.as
@@ -117,6 +117,7 @@ package org.apache.royale.html
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.0
+ * @royaleignorecoercion HTMLTextAreaElement
*/
[Bindable(event="change")]
public function get html():String
@@ -133,6 +134,7 @@ package org.apache.royale.html
/**
* @private
+ * @royaleignorecoercion HTMLTextAreaElement
*/
public function set html(value:String):void
{
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/WebBrowser.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/WebBrowser.as
index 506a5a8..f7d90c5 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/WebBrowser.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/WebBrowser.as
@@ -107,8 +107,7 @@ package org.apache.royale.html
}
/**
- * @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement
- * @royaleignorecoercion org.apache.royale.core.HTMLIFrameElement
+ * @royaleignorecoercion HTMLIFrameElement
*/
override protected function createElement():WrappedHTMLElement
{
@@ -127,12 +126,15 @@ package org.apache.royale.html
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.0
+ * @royaleignorecoercion org.apache.royale.html.beads.models.WebBrowserModel
*/
public function get url():String
{
return (model as WebBrowserModel).url;
}
-
+ /**
+ * @royaleignorecoercion org.apache.royale.html.beads.models.WebBrowserModel
+ */
public function set url(value:String):void
{
(model as WebBrowserModel).url = value;
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/accessories/AdaptiveToolTipBead.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/accessories/AdaptiveToolTipBead.as
index c61d6eb..3307452 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/accessories/AdaptiveToolTipBead.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/accessories/AdaptiveToolTipBead.as
@@ -73,7 +73,7 @@ package org.apache.royale.html.accessories
if (!toolTip || tt)
return;
- IEventDispatcher(_strand).addEventListener(MouseEvent.MOUSE_OUT, rollOutHandler, false);
+ (_strand as IEventDispatcher).addEventListener(MouseEvent.MOUSE_OUT, rollOutHandler, false);
var comp:IUIBase = _strand as IUIBase
host = UIUtils.findPopUpHost(comp);
@@ -93,6 +93,7 @@ package org.apache.royale.html.accessories
* @private
* Determines the position of the toolTip.
* @royaleignorecoercion org.apache.royale.core.IUIBase
+ * @royaleignorecoercion org.apache.royale.core.IParentIUIBase
*/
override protected function determinePosition(event:MouseEvent, base:Object):Point
{
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/accessories/ToolTipBead.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/accessories/ToolTipBead.as
index 44d1d4c..52cb0bf 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/accessories/ToolTipBead.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/accessories/ToolTipBead.as
@@ -207,10 +207,11 @@ package org.apache.royale.html.accessories
* @playerversion AIR 2.6
* @productversion Royale 0.9.7
* @royaleignorecoercion org.apache.royale.events.IEventDispatcher
+ * @royaleignorecoercion org.apache.royale.core.IUIBase
*/
public function removeTip():void
{
- IEventDispatcher(_strand).removeEventListener(MouseEvent.MOUSE_OUT, rollOutHandler, false);
+ (_strand as IEventDispatcher).removeEventListener(MouseEvent.MOUSE_OUT, rollOutHandler, false);
var comp:IUIBase = _strand as IUIBase;
if (tt) {
@@ -222,10 +223,10 @@ package org.apache.royale.html.accessories
/**
* @private
*/
- public function rollOutHandler(event:MouseEvent):void
- {
- removeTip();
- }
+ public function rollOutHandler(event:MouseEvent):void
+ {
+ removeTip();
+ }
}
}
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/BinaryImageLoader.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/BinaryImageLoader.as
index a93aef2..f34c651 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/BinaryImageLoader.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/BinaryImageLoader.as
@@ -90,6 +90,7 @@ package org.apache.royale.html.beads
/**
* @private
+ * @royaleignorecoercion org.apache.royale.core.IBinaryImage
* @royaleignorecoercion org.apache.royale.core.IBinaryImageModel
* @royaleignorecoercion org.apache.royale.core.IImageView
*/
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ContainerView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ContainerView.as
index 4520587..057b787 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ContainerView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ContainerView.as
@@ -375,19 +375,22 @@ package org.apache.royale.html.beads
_viewport = loadBeadFromValuesManager(IViewport, "iViewport", _strand) as IViewport;
if (_viewport) {
- addViewport();
+ addViewport();
+ }
+ }
+
+ /**
+ * @royaleignorecoercion org.apache.royale.core.IContainer
+ */
+ protected function addViewport():void
+ {
+ var chost:IContainer = host as IContainer;
+ // add the viewport's contentView to this host ONLY if
+ // the contentView is not the host itself, which is likely
+ // most situations.
+ if (chost != null && chost != _viewport.contentView) {
+ chost.addElement(_viewport.contentView);
}
}
-
- protected function addViewport():void
- {
- var chost:IContainer = host as IContainer;
- // add the viewport's contentView to this host ONLY if
- // the contentView is not the host itself, which is likely
- // most situations.
- if (chost != null && chost != _viewport.contentView) {
- chost.addElement(_viewport.contentView);
- }
- }
}
}
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataContainerView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataContainerView.as
index 3f7cb40..f320769 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataContainerView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataContainerView.as
@@ -238,6 +238,7 @@ package org.apache.royale.html.beads
* @playerversion AIR 2.6
* @productversion Royale 0.8
* @royaleignorecoercion org.apache.royale.core.IItemRenderer
+ * @royaleignorecoercion org.apache.royale.core.IParent
*/
public function getItemRendererForIndex(index:int):IItemRenderer
{
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForArrayList.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForArrayList.as
index 42a2632..a93da23 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForArrayList.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForArrayList.as
@@ -72,8 +72,7 @@ package org.apache.royale.html.beads
/**
* @private
- * @royaleignorecoercion org.apache.royale.core.IStrandWithModelView
- * @royaleignorecoercion org.apache.royale.html.beads.IListView
+ * @royaleignorecoercion org.apache.royale.collections.IArrayList
*/
override protected function dataProviderChangeHandler(event:Event):void
{
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataProviderChangeNotifier.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataProviderChangeNotifier.as
index 407cfff..f30f90a 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataProviderChangeNotifier.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataProviderChangeNotifier.as
@@ -47,6 +47,10 @@ package org.apache.royale.html.beads
{
}
+ /**
+ * @royaleignorecoercion org.apache.royale.collections.ArrayList
+ *
+ */
override protected function destinationChangedHandler(event:Event):void
{
var object:Object = document[sourceID];
@@ -59,11 +63,13 @@ package org.apache.royale.html.beads
dataProvider = object[propertyName] as ArrayList;
attachEventListeners();
}
-
+ /**
+ * @royaleignorecoercion org.apache.royale.core.ISelectionModel
+ */
private function handleDataProviderChanges(event:Event):void
{
- var selectionModel:ISelectionModel = _strand.getBeadByType(ISelectionModel) as ISelectionModel;
- selectionModel.dispatchEvent(new Event("dataProviderChanged"));
+ var selectionModel:ISelectionModel = _strand.getBeadByType(ISelectionModel) as ISelectionModel;
+ selectionModel.dispatchEvent(new Event("dataProviderChanged"));
}
protected function attachEventListeners():void
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DateChooserView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DateChooserView.as
index e8cd4ea..a16e256 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DateChooserView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DateChooserView.as
@@ -64,6 +64,9 @@ package org.apache.royale.html.beads
super();
}
+ /**
+ * @royaleignorecoercion org.apache.royale.html.beads.models.DateChooserModel
+ */
override public function set strand(value:IStrand):void
{
super.strand = value;
@@ -129,6 +132,7 @@ package org.apache.royale.html.beads
/**
* @private
+ * @royaleignorecoercion org.apache.royale.events.IEventDispatcher
*/
private function createChildren():void
{
@@ -214,7 +218,7 @@ package org.apache.royale.html.beads
getHost().addElement(daysContainer, false);
- IEventDispatcher(daysContainer).dispatchEvent( new Event("itemsCreated") );
+ (daysContainer as IEventDispatcher).dispatchEvent( new Event("itemsCreated") );
model.addEventListener("selectedDateChanged", selectionChangeHandler);
}
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DisableBead.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DisableBead.as
index 97cdc16..038b35d 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DisableBead.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DisableBead.as
@@ -66,16 +66,15 @@ package org.apache.royale.html.beads
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.0
- * @royaleignorecoercion HTMLInputElement
- * @royaleignorecoercion org.apache.royale.core.UIBase;
+ * @royaleignorecoercion org.apache.royale.core.HTMLElementWrapper
*/
override public function set strand(value:IStrand):void
{
_strand = value;
- COMPILE::JS
- {
- _lastTabVal = (_strand as HTMLElementWrapper).element.getAttribute("tabindex");
- }
+ COMPILE::JS
+ {
+ _lastTabVal = (_strand as HTMLElementWrapper).element.getAttribute("tabindex");
+ }
updateHost();
}
@@ -107,7 +106,9 @@ package org.apache.royale.html.beads
{
updateHost();
}
-
+ /**
+ * @royaleignorecoercion org.apache.royale.core.IUIBase
+ */
private function get host():IUIBase
{
return _strand as IUIBase;
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DisableChildrenBead.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DisableChildrenBead.as
index c3cd7ed..f5dd452 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DisableChildrenBead.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DisableChildrenBead.as
@@ -101,7 +101,9 @@ package org.apache.royale.html.beads
{
updateHost();
}
-
+ /**
+ * @royaleignorecoercion org.apache.royale.core.IUIBase
+ */
private function get host():IUIBase
{
return _strand as IUIBase;
@@ -127,7 +129,9 @@ package org.apache.royale.html.beads
}
}
-
+ /**
+ * @royaleignorecoercion HTMLElement
+ */
COMPILE::JS
private function setDecendants(elem:HTMLElement):void
{
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DisabledAlphaBead.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DisabledAlphaBead.as
index 2c7ad6f..8cda613 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DisabledAlphaBead.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DisabledAlphaBead.as
@@ -125,6 +125,9 @@ package org.apache.royale.html.beads
{
return _strand as IUIBase;
}
+ /**
+ * @royaleignorecoercion org.apache.royale.html.beads.DisableBead
+ */
private function updateHost(value:Object):void
{
if(!_strand)//bail out
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DispatchInputFinishedBead.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DispatchInputFinishedBead.as
index e2c73b7..2cc47dd 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DispatchInputFinishedBead.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DispatchInputFinishedBead.as
@@ -76,6 +76,7 @@ package org.apache.royale.html.beads
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.0
+ * @royaleignorecoercion org.apache.royale.core.IRenderedObject
*/
public function set strand(value:IStrand):void
{
@@ -119,6 +120,7 @@ package org.apache.royale.html.beads
/**
* @private
+ * @royaleignorecoercion org.apache.royale.events.IEventDispatcher
*/
COMPILE::JS
private function keydownHandler( event:KeyboardEvent ) : void
@@ -132,6 +134,7 @@ package org.apache.royale.html.beads
/**
* @private
+ * @royaleignorecoercion org.apache.royale.events.IEventDispatcher
*/
COMPILE::JS
private function focusoutHandler( event:Object ) : void
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DynamicRemoveAllItemRendererForArrayListData.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DynamicRemoveAllItemRendererForArrayListData.as
index b4eb23b..ad2bd2b 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DynamicRemoveAllItemRendererForArrayListData.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DynamicRemoveAllItemRendererForArrayListData.as
@@ -61,11 +61,12 @@ package org.apache.royale.html.beads
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9.0
+ * @royaleignorecoercion org.apache.royale.events.IEventDispatcher
*/
public function set strand(value:IStrand):void
{
_strand = value;
- IEventDispatcher(value).addEventListener("initComplete", initComplete);
+ (value as IEventDispatcher).addEventListener("initComplete", initComplete);
}
/**