You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by kf...@apache.org on 2017/07/10 04:05:48 UTC
[1/4] incubator-weex git commit: + [ios] fix bug if duration is 0 or
negative, animation time is given 0.25
Repository: incubator-weex
Updated Branches:
refs/heads/0.15-dev 1b4438829 -> 7f247fc4e
+ [ios] fix bug if duration is 0 or negative, animation time is given 0.25
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/08313fee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/08313fee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/08313fee
Branch: refs/heads/0.15-dev
Commit: 08313feeee6b5b4ed1837d9e6982680ae7909606
Parents: 1b44388
Author: 齐山 <su...@163.com>
Authored: Wed Jul 5 22:38:01 2017 +0800
Committer: 齐山 <su...@163.com>
Committed: Wed Jul 5 22:38:01 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/08313fee/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 76a9d6a..fc12769 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m
+++ b/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m
@@ -356,6 +356,9 @@ WX_EXPORT_METHOD(@selector(transition:args:callback:))
layer.frame = originFrame;
}
[layer addAnimation:animation forKey:info.propertyName];
+ if(WXFloatEqual(animation.duration, 0) || WXFloatLessThan(animation.duration, 0)){
+ [layer removeAllAnimations];
+ }
}
@end
[4/4] incubator-weex git commit: + [ios] update logic for animation
Posted by kf...@apache.org.
+ [ios] update logic for animation
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7f247fc4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7f247fc4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7f247fc4
Branch: refs/heads/0.15-dev
Commit: 7f247fc4e51e754302dd001d38aa785ede7b7207
Parents: 72b1845
Author: 齐山 <su...@163.com>
Authored: Mon Jul 10 11:55:56 2017 +0800
Committer: 齐山 <su...@163.com>
Committed: Mon Jul 10 11:55:56 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7f247fc4/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 3f81c37..502cb31 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m
+++ b/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m
@@ -361,7 +361,7 @@ WX_EXPORT_METHOD(@selector(transition:args:callback:))
layer.frame = originFrame;
}
- if(WXFloatEqual(animation.duration, 0) || WXFloatLessThan(animation.duration, 0)){
+ if(!WXFloatGreaterThan(animation.duration, 0)){
if([delegate respondsToSelector:@selector(applyTransform)]) {
[delegate applyTransform];
}
[2/4] incubator-weex git commit: + [ios] update animation logic
Posted by kf...@apache.org.
+ [ios] update animation logic
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/68d647b6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/68d647b6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/68d647b6
Branch: refs/heads/0.15-dev
Commit: 68d647b6bd8679bf930a76b5dd528125a6a86465
Parents: 08313fe
Author: 齐山 <su...@163.com>
Authored: Thu Jul 6 11:58:07 2017 +0800
Committer: 齐山 <su...@163.com>
Committed: Thu Jul 6 11:58:07 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/68d647b6/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 fc12769..3f81c37 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m
+++ b/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m
@@ -89,6 +89,11 @@
return;
}
+ [self applyTransform];
+}
+
+-(void)applyTransform
+{
if ([_animationInfo.propertyName hasPrefix:@"transform"]) {
WXTransform *transform = _animationInfo.target->_transform;
[transform applyTransformForView:_animationInfo.target.view];
@@ -355,9 +360,13 @@ WX_EXPORT_METHOD(@selector(transition:args:callback:))
layer.anchorPoint = CGPointZero;
layer.frame = originFrame;
}
- [layer addAnimation:animation forKey:info.propertyName];
+
if(WXFloatEqual(animation.duration, 0) || WXFloatLessThan(animation.duration, 0)){
- [layer removeAllAnimations];
+ if([delegate respondsToSelector:@selector(applyTransform)]) {
+ [delegate applyTransform];
+ }
+ } else {
+ [layer addAnimation:animation forKey:info.propertyName];
}
}
[3/4] incubator-weex git commit: + [ios] set cycle slider default
Posted by kf...@apache.org.
+ [ios] set cycle slider default
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/72b18453
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/72b18453
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/72b18453
Branch: refs/heads/0.15-dev
Commit: 72b184535c115031cb2d55236ed17db37f869ead
Parents: 68d647b
Author: 齐山 <su...@163.com>
Authored: Thu Jul 6 15:54:22 2017 +0800
Committer: 齐山 <su...@163.com>
Committed: Thu Jul 6 15:54:22 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/72b18453/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
index d401a66..016e11f 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
+++ b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
@@ -213,10 +213,10 @@ typedef enum : NSUInteger {
if(sliderClassName.length>0){
[WXSDKEngine registerComponent:@"slider" withClass:NSClassFromString(sliderClassName)];
}else{
- [WXSDKEngine registerComponent:@"slider" withClass:NSClassFromString(@"WXSliderComponent")];
+ [WXSDKEngine registerComponent:@"slider" withClass:NSClassFromString(@"WXCycleSliderComponent")];
}
}else{
- [WXSDKEngine registerComponent:@"slider" withClass:NSClassFromString(@"WXSliderComponent")];
+ [WXSDKEngine registerComponent:@"slider" withClass:NSClassFromString(@"WXCycleSliderComponent")];
}
}
}