You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ca...@apache.org on 2016/12/10 18:09:15 UTC
git commit: [flex-asjs] [refs/heads/develop] - fix span to avoid
remove text element
Repository: flex-asjs
Updated Branches:
refs/heads/develop 7632be7bf -> 66dd90a58
fix span to avoid remove text element
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/66dd90a5
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/66dd90a5
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/66dd90a5
Branch: refs/heads/develop
Commit: 66dd90a582939ab1641f69cff0f305ea9169fe73
Parents: 7632be7
Author: Carlos Rovira <ca...@apache.org>
Authored: Sat Dec 10 19:09:11 2016 +0100
Committer: Carlos Rovira <ca...@apache.org>
Committed: Sat Dec 10 19:09:11 2016 +0100
----------------------------------------------------------------------
.../AvatarAndActionTwoLineListItemRenderer.mxml | 3 ++-
.../HTML/src/main/flex/org/apache/flex/html/Span.as | 15 ++++++---------
2 files changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/66dd90a5/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionTwoLineListItemRenderer.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionTwoLineListItemRenderer.mxml b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionTwoLineListItemRenderer.mxml
index 43c9aaa..4b4b9fc 100644
--- a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionTwoLineListItemRenderer.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/AvatarAndActionTwoLineListItemRenderer.mxml
@@ -39,11 +39,12 @@ limitations under the License.
<js:ItemRendererDataBinding />
</js:beads>
- <js:Span text="{actor.actorName}">
+ <js:Span>
<mdl:beads>
<mdl:ListItemPrimaryContent/>
<mdl:MaterialIconPerson listItemAvatar="true"/>
</mdl:beads>
+ <js:Span text="{actor.actorName}"/>
<js:Span text="{actor.episodes}">
<mdl:beads>
<mdl:ListItemSubTitle/>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/66dd90a5/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Span.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Span.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Span.as
index 7dbe220..b466824 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Span.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Span.as
@@ -70,16 +70,13 @@ package org.apache.flex.html
COMPILE::JS
{
- if(MXMLDescriptor == null)
+ if(textNode == null)
{
- if(textNode == null)
- {
- textNode = document.createTextNode('') as Text;
- element.appendChild(textNode);
- }
-
- textNode.nodeValue = value;
- }
+ textNode = document.createTextNode('') as Text;
+ element.appendChild(textNode);
+ }
+
+ textNode.nodeValue = value;
}
}