You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ac...@apache.org on 2017/08/22 08:26:58 UTC
[6/9] incubator-weex git commit: * [ios] delete animationmodule with
transition
* [ios] delete animationmodule with transition
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/2474c2de
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/2474c2de
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/2474c2de
Branch: refs/heads/0.16-dev
Commit: 2474c2def55d5174bdd80c12e2a9e160d262ab3e
Parents: af8f9cd
Author: doumafang <do...@gmail.com>
Authored: Mon Aug 21 18:12:55 2017 +0800
Committer: doumafang <do...@gmail.com>
Committed: Mon Aug 21 18:12:55 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.h | 4 ----
ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m | 7 -------
ios/sdk/WeexSDK/Sources/Module/WXTransition.h | 2 --
ios/sdk/WeexSDK/Sources/Module/WXTransition.m | 9 ---------
4 files changed, 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2474c2de/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.h b/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.h
index d5a8c43..e5082da 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.h
+++ b/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.h
@@ -21,9 +21,5 @@
#import "WXModuleProtocol.h"
@interface WXAnimationModule : NSObject <WXModuleProtocol>
-
-
- (void)animation:(WXComponent *)targetComponent args:(NSDictionary *)args callback:(WXModuleCallback)callback;
-- (void)animationModuleProcessAnimationWithArgs:(NSDictionary *)args withWeexInstance:(WXSDKInstance *)instance targetComponent:(WXComponent *)target;
-
@end
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2474c2de/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 efec793..824431d 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m
+++ b/ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m
@@ -257,7 +257,6 @@ WX_EXPORT_METHOD(@selector(transition:args:callback:))
newInfo.toValue = @([wxTransform.translateY valueForMaximum:view.bounds.size.height]);
[infos addObject:newInfo];
}
-
target->_transform = wxTransform;
} else if ([property isEqualToString:@"backgroundColor"]) {
info.propertyName = @"backgroundColor";
@@ -301,12 +300,6 @@ WX_EXPORT_METHOD(@selector(transition:args:callback:))
return infos;
}
-- (void)animationModuleProcessAnimationWithArgs:(NSDictionary *)args withWeexInstance:(WXSDKInstance *)instance targetComponent:(WXComponent *)target
-{
- self.weexInstance = instance;
- [self animation:target args:args callback:nil];
-}
-
- (void)animationWithLayoutAnimationTarget:(WXComponent *)target handleProperty:(NSString *)property withDic:(NSDictionary *)args
{
NSDictionary *styles = args[@"styles"];
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2474c2de/ios/sdk/WeexSDK/Sources/Module/WXTransition.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Module/WXTransition.h b/ios/sdk/WeexSDK/Sources/Module/WXTransition.h
index 19870d2..777b5bd 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXTransition.h
+++ b/ios/sdk/WeexSDK/Sources/Module/WXTransition.h
@@ -29,7 +29,6 @@
@property (nonatomic, strong) id toValue;
@property (nonatomic, strong) id perValue;
@property (nonatomic, strong) NSString *propertyName;
-
@end
@interface WXTransition : NSObject
@@ -37,7 +36,6 @@
@property(nonatomic,strong) NSMutableDictionary *addStyles;
@property(nonatomic,strong) NSMutableArray *propertyArray;
- (void)_handleTransitionWithStyles:(NSDictionary *)styles withTarget:(WXComponent *)targetComponent;
-
@end
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2474c2de/ios/sdk/WeexSDK/Sources/Module/WXTransition.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Module/WXTransition.m b/ios/sdk/WeexSDK/Sources/Module/WXTransition.m
index 1b513a5..9bb903b 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXTransition.m
+++ b/ios/sdk/WeexSDK/Sources/Module/WXTransition.m
@@ -21,7 +21,6 @@
#import <QuartzCore/CATransaction.h>
#import <QuartzCore/CADisplayLink.h>
-#import "WXAnimationModule.h"
#import "WXComponentManager.h"
#import "WXSDKInstance.h"
#import "WXComponent+Layout.h"
@@ -421,14 +420,6 @@
_toStyles = nil;
}
-- (void)_animationModuleHandleTransition:(NSDictionary *)args
-{
- WXAnimationModule *animation = [WXAnimationModule new];
- WXPerformBlockOnMainThread(^{
- [animation animationModuleProcessAnimationWithArgs:args withWeexInstance:_targetComponent.weexInstance targetComponent:_targetComponent];
- });
-}
-
- (NSMutableDictionary *)_addStyles
{
return self.addStyles;