Repository: flex-tlf Updated Branches: refs/heads/develop bf87ae813 -> 580bccf87
update inlinegraphicelement.as for for bug #2931005 TLF cannot show Flex SWF after loading it as an ILG was incomplete. images added with htmlconverter used the fix, which broke them. it now checks to make sure contenttype is a swf Project: http://git-wip-us.apache.org/repos/asf/flex-tlf/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-tlf/commit/ac069474 Tree: http://git-wip-us.apache.org/repos/asf/flex-tlf/tree/ac069474 Diff: http://git-wip-us.apache.org/repos/asf/flex-tlf/diff/ac069474 Branch: refs/heads/develop Commit: ac069474bac7f023c2d4050c543cd132eb843477 Parents: bf87ae8 Author: typhoid <[email protected]> Authored: Thu May 7 19:53:37 2015 -0400 Committer: typhoid <[email protected]> Committed: Thu May 7 19:53:37 2015 -0400 ---------------------------------------------------------------------- textLayout/src/flashx/textLayout/elements/InlineGraphicElement.as | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-tlf/blob/ac069474/textLayout/src/flashx/textLayout/elements/InlineGraphicElement.as ---------------------------------------------------------------------- diff --git a/textLayout/src/flashx/textLayout/elements/InlineGraphicElement.as b/textLayout/src/flashx/textLayout/elements/InlineGraphicElement.as index c36eb4f..fcf39cb 100644 --- a/textLayout/src/flashx/textLayout/elements/InlineGraphicElement.as +++ b/textLayout/src/flashx/textLayout/elements/InlineGraphicElement.as @@ -700,7 +700,7 @@ package flashx.textLayout.elements _measuredHeight = g.height; //bug #2931005 TLF cannot show Flex SWF after loading it as an ILG - if(graphic is Loader && Loader(graphic).content != null && Loader(graphic).content.hasOwnProperty("setActualSize") && (!widthIsComputed() || !heightIsComputed()) ) + if(graphic is Loader && Loader(graphic).contentLoaderInfo.contentType == "application/x-shockwave-flash" && Loader(graphic).content != null && Loader(graphic).content.hasOwnProperty("setActualSize") && (!widthIsComputed() || !heightIsComputed()) ) Object(Loader(graphic).content).setActualSize(elementWidth, elementHeight); else {
