You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2015/08/27 22:55:52 UTC

[5/5] git commit: [flex-asjs] [refs/heads/develop] - oops

oops


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/6212a6fe
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/6212a6fe
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/6212a6fe

Branch: refs/heads/develop
Commit: 6212a6fe696ad8a2195d39f9db60ba1dc523738b
Parents: ff40a5b
Author: Alex Harui <ah...@apache.org>
Authored: Thu Aug 27 13:54:32 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Aug 27 13:54:32 2015 -0700

----------------------------------------------------------------------
 .../HTML/js/src/org/apache/flex/html/beads/ContainerView.js        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6212a6fe/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ContainerView.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ContainerView.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ContainerView.js
index 836d826..91a7e51 100644
--- a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ContainerView.js
+++ b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ContainerView.js
@@ -266,7 +266,7 @@ org.apache.flex.html.beads.ContainerView.
 
   if (host.isWidthSizedToContent())
     this.viewportModel_.contentWidth = this.contentView.width;
-  if (host.isWidthSizedToContent())
+  if (host.isHeightSizedToContent())
     this.viewportModel_.contentHeight = this.contentView.height;
 
   if (host.isWidthSizedToContent() && host.isHeightSizedToContent()) {