This is an automated email from the ASF dual-hosted git repository.
yishayw pushed a commit to branch feature/revert-refactor
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/feature/revert-refactor by
this push:
new c75b362 Disambiguate filter element
c75b362 is described below
commit c75b36268b5cdfdd456818ad3a76f985487ecefb
Author: DESKTOP-RH4S838\Yishay <[email protected]>
AuthorDate: Tue Jul 3 09:29:33 2018 +0300
Disambiguate filter element
---
.../org/apache/royale/svg/BlendFilterElement.as | 2 +-
.../org/apache/royale/svg/BlurFilterElement.as | 2 +-
.../main/royale/org/apache/royale/svg/Filter.as | 24 +++++++++++-----------
.../org/apache/royale/svg/OffsetFilterElement.as | 2 +-
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git
a/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/BlendFilterElement.as
b/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/BlendFilterElement.as
index 5d44242..9e46592 100644
---
a/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/BlendFilterElement.as
+++
b/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/BlendFilterElement.as
@@ -66,7 +66,7 @@ package org.apache.royale.svg
{
COMPILE::JS
{
- var filter:Element =
(_strand.getBeadByType(Filter) as Filter).filterElement;
+ var filter:Element =
(_strand.getBeadByType(Filter) as Filter).filterElementWrapper;
var blend:Element =
addSvgElementToElement(filter, "feBlend") as Element;
blend.setAttribute("in", "SourceGraphic");
blend.setAttribute("in2", in2);
diff --git
a/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/BlurFilterElement.as
b/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/BlurFilterElement.as
index 836e6c3..d69f264 100644
---
a/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/BlurFilterElement.as
+++
b/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/BlurFilterElement.as
@@ -68,7 +68,7 @@ package org.apache.royale.svg
{
COMPILE::JS
{
- var filter:Element =
(_strand.getBeadByType(Filter) as Filter).filterElement;
+ var filter:Element =
(_strand.getBeadByType(Filter) as Filter).filterElementWrapper;
var offset:Element =
addSvgElementToElement(filter, "feGaussianBlur") as Element;
offset.setAttribute("stdDeviation",
stdDeviation);
offset.setAttribute("result", blurResult);
diff --git
a/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/Filter.as
b/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/Filter.as
index 9bd4ea5..3aa30b2 100644
---
a/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/Filter.as
+++
b/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/Filter.as
@@ -45,7 +45,7 @@ package org.apache.royale.svg
// private var floodColor:uint;
COMPILE::JS
{
- private var _filterElement:Element;
+ private var _filterElementWrapper:Element;
}
public function Filter()
@@ -80,25 +80,25 @@ package org.apache.royale.svg
{
var svgElement:Node = host.element as Element;
var defs:Element = getChildNode(svgElement, "defs") as
Element;
- _filterElement = getChildNode(defs, "filter") as
Element;
- filterElement.id = "myDropShadow" + UIDUtil.createUID();
- filterElement.setAttribute("width", _width);
- filterElement.setAttribute("height", _height);
+ _filterElementWrapper = getChildNode(defs, "filter") as
Element;
+ filterElementWrapper.id = "myDropShadow" +
UIDUtil.createUID();
+ filterElementWrapper.setAttribute("width", _width);
+ filterElementWrapper.setAttribute("height", _height);
// clean up existing filter
- if (filterElement.hasChildNodes())
+ if (filterElementWrapper.hasChildNodes())
{
- var childNodes:Object =
filterElement.childNodes;
+ var childNodes:Object =
filterElementWrapper.childNodes;
for (var i:int = 0; i < childNodes.length; i++)
{
-
filterElement.removeChild(childNodes[i]);
+
filterElementWrapper.removeChild(childNodes[i]);
}
}
-// var flood:Element =
addSvgElementToWrapper(filterElement, "feFlood") as Element;
+// var flood:Element =
addSvgElementToWrapper(filterElementWrapper, "feFlood") as Element;
// flood.setAttribute("flood-color", floodColor);
// flood.setAttribute("flood-alpha", floodAlpha);
// create blend
// apply filter
- host.element.style["filter"] = "url(#" +
filterElement.id + ")";
+ host.element.style["filter"] = "url(#" +
filterElementWrapper.id + ")";
}
COMPILE::JS
@@ -135,9 +135,9 @@ package org.apache.royale.svg
* @playerversion AIR 2.6
* @productversion Royale 0.9.3
*/
- public function get filterElement():Element
+ public function get filterElementWrapper():Element
{
- return _filterElement;
+ return _filterElementWrapper;
}
}
}
diff --git
a/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/OffsetFilterElement.as
b/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/OffsetFilterElement.as
index 35e1fcf..f2a57a7 100644
---
a/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/OffsetFilterElement.as
+++
b/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/OffsetFilterElement.as
@@ -69,7 +69,7 @@ package org.apache.royale.svg
{
COMPILE::JS
{
- var filter:Element =
(_strand.getBeadByType(Filter) as Filter).filterElement;
+ var filter:Element =
(_strand.getBeadByType(Filter) as Filter).filterElementWrapper;
var offset:Element =
addSvgElementToElement(filter, "feOffset") as Element;
offset.setAttribute("dx", dx);
offset.setAttribute("dy", dy);
