You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by pi...@apache.org on 2015/05/08 09:13:05 UTC
[1/2] git commit: [flex-tlf] [refs/heads/develop] - update
inlinegraphicelement.as
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 <ty...@californiacolleges.edu>
Authored: Thu May 7 19:53:37 2015 -0400
Committer: typhoid <ty...@californiacolleges.edu>
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
{
[2/2] git commit: [flex-tlf] [refs/heads/develop] - Merge pull
request #1 from typhoid/typhoid-patch-1
Posted by pi...@apache.org.
Merge pull request #1 from typhoid/typhoid-patch-1
update inlinegraphicelement.as
Project: http://git-wip-us.apache.org/repos/asf/flex-tlf/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-tlf/commit/580bccf8
Tree: http://git-wip-us.apache.org/repos/asf/flex-tlf/tree/580bccf8
Diff: http://git-wip-us.apache.org/repos/asf/flex-tlf/diff/580bccf8
Branch: refs/heads/develop
Commit: 580bccf87039159191fb854d3e514c336f9194f2
Parents: bf87ae8 ac06947
Author: typhoid <ty...@californiacolleges.edu>
Authored: Thu May 7 19:54:36 2015 -0400
Committer: typhoid <ty...@californiacolleges.edu>
Committed: Thu May 7 19:54:36 2015 -0400
----------------------------------------------------------------------
textLayout/src/flashx/textLayout/elements/InlineGraphicElement.as | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------