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/05/24 08:45:57 UTC
[1/2] git commit: [flex-asjs] [refs/heads/develop] - switch this back
to && so we only go down this path when sized to content
Repository: flex-asjs
Updated Branches:
refs/heads/develop 53955f9fa -> 5bc08dcf2
switch this back to && so we only go down this path when sized to content
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/77590875
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/77590875
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/77590875
Branch: refs/heads/develop
Commit: 775908759ff9547892980080b2f126652452c573
Parents: 53955f9
Author: Alex Harui <ah...@apache.org>
Authored: Sat May 23 23:44:01 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sat May 23 23:44:01 2015 -0700
----------------------------------------------------------------------
.../HTML/as/src/org/apache/flex/html/beads/ContainerView.as | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/77590875/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ContainerView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ContainerView.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ContainerView.as
index ba3968d..b9f302c 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ContainerView.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ContainerView.as
@@ -98,7 +98,7 @@ package org.apache.flex.html.beads
var host:UIBase = value as UIBase;
- if (host.isWidthSizedToContent() || host.isHeightSizedToContent())
+ if (host.isWidthSizedToContent() && host.isHeightSizedToContent())
{
// if both dimensions are sized to content, then only draw the
// borders, etc, after a child is added. The children in an MXML
[2/2] git commit: [flex-asjs] [refs/heads/develop] - forgot 'this'
Posted by ah...@apache.org.
forgot 'this'
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/5bc08dcf
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/5bc08dcf
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/5bc08dcf
Branch: refs/heads/develop
Commit: 5bc08dcf2af13303886f2d67eaa0e49851bc9209
Parents: 7759087
Author: Alex Harui <ah...@apache.org>
Authored: Sat May 23 23:45:48 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sat May 23 23:45:48 2015 -0700
----------------------------------------------------------------------
.../projects/Network/js/src/org/apache/flex/net/HTTPService.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5bc08dcf/frameworks/projects/Network/js/src/org/apache/flex/net/HTTPService.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/Network/js/src/org/apache/flex/net/HTTPService.js b/frameworks/projects/Network/js/src/org/apache/flex/net/HTTPService.js
index e9be92d..8ac9ca5 100644
--- a/frameworks/projects/Network/js/src/org/apache/flex/net/HTTPService.js
+++ b/frameworks/projects/Network/js/src/org/apache/flex/net/HTTPService.js
@@ -200,8 +200,8 @@ Object.defineProperties(org_apache_flex_net_HTTPService.prototype, {
/** @this {org_apache_flex_net_HTTPService} */
get: function() {
if (!this._json)
- _json = JSON.parse(this.data);
- return _json;
+ this._json = JSON.parse(this.data);
+ return this._json;
}
},
/** @expose */