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/03/16 07:31:35 UTC
[royale-asjs] branch develop updated: Removed uses of innerHTML
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 a4f6b4b Removed uses of innerHTML
a4f6b4b is described below
commit a4f6b4b22878c57d8fa1589787dbd848f778bea9
Author: Harbs <ha...@in-tools.com>
AuthorDate: Mon Mar 16 09:31:18 2020 +0200
Removed uses of innerHTML
---
.../src/main/royale/org/apache/royale/html/CloseButton.as | 5 ++++-
.../src/main/royale/org/apache/royale/html/ImageButton.as | 13 +++++++++----
.../Jewel/src/main/royale/org/apache/royale/jewel/Button.as | 4 ++--
3 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/CloseButton.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/CloseButton.as
index 92ade63..b23e75e 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/CloseButton.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/CloseButton.as
@@ -57,7 +57,10 @@ package org.apache.royale.html
element.style.lineHeight = "0";
element.style.padding = "0";
var data:String = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA2MCA2MCI+PHBvbHlnb24gcG9pbnRzPSI2MCA2LjIyIDUzLjc4IDAgMzAgMjMuNzcgNi4yMiAwIDAgNi4yMiAyMy43OCAzMCAwIDUzLjc4IDYuMjIgNjAgMzAgMzYuMjMgNTMuNzggNjAgNjAgNTMuNzggMzYuMjIgMzAgNjAgNi4yMiIvPjwvc3ZnPg==';
- element.innerHTML = "<img style='height:60%;width:60%' src='" + data + "'/>";
+ var img:HTMLImageElement = new HTMLImageElement();
+ image.style.cssText = 'height:60%;width:60%';
+ image.src = data;
+ element.appendChild(img);
return element;
}
}
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/ImageButton.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/ImageButton.as
index d34130d..5f2e2f8 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/ImageButton.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/ImageButton.as
@@ -90,13 +90,18 @@ package org.apache.royale.html
COMPILE::JS
{
- var inner:String = '';
- if (url)
- inner = "<img src='" + url + "'/>";
- element.innerHTML = inner;
+ if(!_imageElement)
+ {
+ _imageElement = new HTMLImageElement();
+ element.appendChild(_imageElement);
+ }
+ _imageElement.src = url;
}
dispatchEvent(new Event("srcChanged"));
}
+
+ COMPILE::JS
+ private var _imageElement:HTMLImageElement;
}
}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Button.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Button.as
index afa5328..a53ad84 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Button.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Button.as
@@ -80,7 +80,7 @@ package org.apache.royale.jewel
}
COMPILE::JS
{
- return (element as HTMLButtonElement).innerHTML;
+ return (element as HTMLButtonElement).textContent;
}
}
/**
@@ -94,7 +94,7 @@ package org.apache.royale.jewel
}
COMPILE::JS
{
- (element as HTMLButtonElement).innerHTML = value;
+ (element as HTMLButtonElement).textContent = value;
dispatchEvent(new Event('textChange'));
}
}