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/07 16:37:08 UTC
[royale-asjs] branch develop updated: mdl coercions
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 4b43c16 mdl coercions
4b43c16 is described below
commit 4b43c16bd8cd5ef2cef0c7007ad2d8f6cf742a1e
Author: Harbs <ha...@in-tools.com>
AuthorDate: Tue Jul 7 19:36:09 2020 +0300
mdl coercions
---
.../main/royale/org/apache/royale/mdl/CheckBox.as | 1 +
.../royale/org/apache/royale/mdl/IconToggle.as | 5 +++
.../apache/royale/mdl/beads/ExpandableSearch.as | 38 ++++++++++++----------
3 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/CheckBox.as b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/CheckBox.as
index e1610bb..df0be23 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/CheckBox.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/CheckBox.as
@@ -165,6 +165,7 @@ package org.apache.royale.mdl
/**
* @private
+ * @royaleignorecoercion Text
*/
override public function set text(value:String):void
{
diff --git a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/IconToggle.as b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/IconToggle.as
index 2507e6c..a0b2231 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/IconToggle.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/IconToggle.as
@@ -122,6 +122,7 @@ package org.apache.royale.mdl
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.8
+ * @royaleignorecoercion org.apache.royale.core.IToggleButtonModel
*/
public function get selected():Boolean
{
@@ -130,6 +131,7 @@ package org.apache.royale.mdl
/**
* @private
+ * @royaleignorecoercion org.apache.royale.core.IToggleButtonModel
*/
public function set selected(value:Boolean):void
{
@@ -211,6 +213,9 @@ package org.apache.royale.mdl
{
return _materialIcon;
}
+ /**
+ * @royaleignorecoercion org.apache.royale.mdl.supportClasses.MaterialIconBase
+ */
public function set materialIcon(value:IMaterialIcon):void
{
_materialIcon = value;
diff --git a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/beads/ExpandableSearch.as b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/beads/ExpandableSearch.as
index 4e892a7..fede042 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/beads/ExpandableSearch.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/beads/ExpandableSearch.as
@@ -22,7 +22,7 @@ package org.apache.royale.mdl.beads
import org.apache.royale.core.IStrand;
import org.apache.royale.core.UIBase;
- import org.apache.royale.mdl.TextField;
+ import org.apache.royale.mdl.TextField;
import org.apache.royale.mdl.materialIcons.MaterialIcon;
/**
@@ -58,7 +58,11 @@ package org.apache.royale.mdl.beads
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.8
- * @royaleignorecoercion org.apache.royale.mdl.TextInput;
+ * @royaleignorecoercion HTMLDivElement
+ * @royaleignorecoercion HTMLLabelElement
+ * @royaleignorecoercion org.apache.royale.core.UIBase
+ * @royaleignorecoercion org.apache.royale.mdl.TextInput
+ * @royaleignorecoercion org.apache.royale.mdl.TextField
*/
public function set strand(value:IStrand):void
{
@@ -66,32 +70,32 @@ package org.apache.royale.mdl.beads
COMPILE::JS
{
- var host:UIBase = value as UIBase;
+ var host:UIBase = value as UIBase;
if (host is TextField)
{
- var searchId:String = '_searchId_' + Math.random();
+ var searchId:String = '_searchId_' + Math.random();
+
+ var label:HTMLLabelElement = document.createElement('label') as HTMLLabelElement;
+ label.className = "mdl-button mdl-js-button mdl-button--icon";
+ label.setAttribute('for', searchId);
- var label:HTMLLabelElement = document.createElement('label') as HTMLLabelElement;
- label.className = "mdl-button mdl-js-button mdl-button--icon";
- label.setAttribute('for', searchId);
-
var i:Element = document.createElement("i");
i.className = "material-icons";
- var textNode:Text = document.createTextNode("search");
- i.appendChild(textNode);
+ var textNode:Text = document.createTextNode("search");
+ i.appendChild(textNode);
label.appendChild(i);
- host.positioner.appendChild(label);
+ host.positioner.appendChild(label);
- var div:HTMLDivElement = document.createElement('div') as HTMLDivElement;
- div.className = "mdl-textfield__expandable-holder";
+ var div:HTMLDivElement = document.createElement('div') as HTMLDivElement;
+ div.className = "mdl-textfield__expandable-holder";
- host.positioner.appendChild(div);
+ host.positioner.appendChild(div);
- div.appendChild(TextField(host).input);
- div.appendChild(TextField(host).label);
+ div.appendChild((host as TextField).input);
+ div.appendChild((host as TextField).label);
- TextField(host).input.setAttribute('id', searchId);
+ (host as TextField).input.setAttribute('id', searchId);
}
else
{