You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by cx...@apache.org on 2017/03/15 08:05:32 UTC
[1/5] incubator-weex git commit: * [ios] fix compiler complain
Repository: incubator-weex
Updated Branches:
refs/heads/0.11-dev 01cb49ca2 -> d9907e922
* [ios] fix compiler complain
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/c120eb9f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c120eb9f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c120eb9f
Branch: refs/heads/0.11-dev
Commit: c120eb9f9a5d00538f62891ec78640810786fe28
Parents: bf799b4
Author: acton393 <zh...@gmail.com>
Authored: Mon Mar 13 10:31:29 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Mon Mar 13 10:31:29 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c120eb9f/ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m b/ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m
index b100e20..c23680d 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m
+++ b/ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m
@@ -73,7 +73,7 @@ WX_EXPORT_METHOD(@selector(fetch:callback:progressCallback:))
loader.onFinished = ^(const WXResourceResponse * response, NSData *data) {
if (weakSelf) {
- [weakSelf _loadFinishWithResponse:response data:data callbackRsp:callbackRsp];
+ [weakSelf _loadFinishWithResponse:[response copy] data:data callbackRsp:callbackRsp];
if (callback) {
callback(callbackRsp);
}
[5/5] incubator-weex git commit: Merge branch '0.11-dev' of
https://github.com/acton393/incubator-weex into 0.11-dev
Posted by cx...@apache.org.
Merge branch '0.11-dev' of https://github.com/acton393/incubator-weex into 0.11-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/d9907e92
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d9907e92
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d9907e92
Branch: refs/heads/0.11-dev
Commit: d9907e9226ac80d284c9698df6221e69c6efcc66
Parents: 01cb49c e6004c9
Author: cxfeng <cx...@apache.org>
Authored: Wed Mar 15 16:05:23 2017 +0800
Committer: cxfeng <cx...@apache.org>
Committed: Wed Mar 15 16:05:23 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m | 5 +++++
ios/sdk/WeexSDK/Sources/Module/WXStreamModule.m | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[4/5] incubator-weex git commit: * [ios] add comment
Posted by cx...@apache.org.
* [ios] add comment
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e6004c98
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e6004c98
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e6004c98
Branch: refs/heads/0.11-dev
Commit: e6004c98450f2316ba3705247eaac3ec0aa3bafb
Parents: 8d4407a
Author: acton393 <zh...@gmail.com>
Authored: Wed Mar 15 11:43:41 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Wed Mar 15 11:43:41 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e6004c98/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m b/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m
index 88ad63b..6cd4ad9 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m
+++ b/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m
@@ -85,6 +85,7 @@
} else if ([_animationInfo.propertyName isEqualToString:@"opacity"]) {
_animationInfo.target.view.layer.opacity = [_animationInfo.toValue floatValue];
} else if ([_animationInfo.propertyName isEqualToString:@"bounds"]) {
+ //set the layer bounds
if(strcmp([_animationInfo.toValue objCType], @encode(CGRect)) == 0) {
_animationInfo.target.view.layer.bounds = [_animationInfo.toValue CGRectValue];
}
[2/5] incubator-weex git commit: Merge remote-tracking branch
'upstream/0.11-dev' into 0.11-dev
Posted by cx...@apache.org.
Merge remote-tracking branch 'upstream/0.11-dev' into 0.11-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/15b3a415
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/15b3a415
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/15b3a415
Branch: refs/heads/0.11-dev
Commit: 15b3a415aec62d24eaac4b691503ef0f52cf5e8c
Parents: c120eb9 5484be3
Author: acton393 <zh...@gmail.com>
Authored: Mon Mar 13 10:32:52 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Mon Mar 13 10:32:52 2017 +0800
----------------------------------------------------------------------
android/sdk/assets/main.js | 14 +++----
.../java/com/taobao/weex/common/Constants.java | 1 +
.../main/java/com/taobao/weex/dom/WXStyle.java | 40 ++++++++++----------
.../taobao/weex/ui/component/WXBaseRefresh.java | 10 -----
.../com/taobao/weex/ui/module/WXMetaModule.java | 4 +-
.../java/com/taobao/weex/utils/WXViewUtils.java | 8 ++--
6 files changed, 36 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
[3/5] incubator-weex git commit: * [ios] bugfix animation bounds
Posted by cx...@apache.org.
* [ios] bugfix animation bounds
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8d4407a4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8d4407a4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8d4407a4
Branch: refs/heads/0.11-dev
Commit: 8d4407a4b07e6c7b38a304d5a8e22d73d76f02f6
Parents: 15b3a41
Author: acton393 <zh...@gmail.com>
Authored: Tue Mar 14 20:31:33 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Tue Mar 14 20:31:33 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8d4407a4/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m b/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m
index 4527979..88ad63b 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m
+++ b/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m
@@ -84,6 +84,10 @@
_animationInfo.target.view.layer.backgroundColor = (__bridge CGColorRef _Nullable)(_animationInfo.toValue);
} else if ([_animationInfo.propertyName isEqualToString:@"opacity"]) {
_animationInfo.target.view.layer.opacity = [_animationInfo.toValue floatValue];
+ } else if ([_animationInfo.propertyName isEqualToString:@"bounds"]) {
+ if(strcmp([_animationInfo.toValue objCType], @encode(CGRect)) == 0) {
+ _animationInfo.target.view.layer.bounds = [_animationInfo.toValue CGRectValue];
+ }
}
}