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 2018/04/07 05:42:45 UTC
incubator-weex git commit: fix WXTouchGestureRecognizer's category
conflict's bug
Repository: incubator-weex
Updated Branches:
refs/heads/master c7a2db2a8 -> bb290775d
fix WXTouchGestureRecognizer's category conflict's bug
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/bb290775
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/bb290775
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/bb290775
Branch: refs/heads/master
Commit: bb290775d1b4cde867b12c0c6aacc2b8afa35ec8
Parents: c7a2db2
Author: doumafang <do...@gmail.com>
Authored: Sat Apr 7 13:23:17 2018 +0800
Committer: doumafang <do...@gmail.com>
Committed: Sat Apr 7 13:23:17 2018 +0800
----------------------------------------------------------------------
.../WeexSDK/Sources/Events/WXComponent+Events.h | 32 --------------------
.../WeexSDK/Sources/Events/WXComponent+Events.m | 31 ++++++++++++++++---
2 files changed, 27 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bb290775/ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.h b/ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.h
index 522d871..bd6f31b 100644
--- a/ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.h
+++ b/ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.h
@@ -20,38 +20,6 @@
#import "WXComponent.h"
#import <objc/runtime.h>
-@interface UITouch (WXTouchGestureRecognizer)
-
-@property (nonatomic, strong) NSNumber *wx_identifier;
-@property (nonatomic, strong) NSNumber *wx_stopPropagation;
-
-@end
-
-@implementation UITouch (WXTouchGestureRecognizer)
-
-- (NSNumber *)wx_identifier
-{
- return objc_getAssociatedObject(self, _cmd);
-}
-
-- (void)setWx_identifier:(NSNumber *)wx_identifier
-{
- objc_setAssociatedObject(self, @selector(wx_identifier), wx_identifier, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-}
-
-- (NSNumber *)wx_stopPropagation
-{
- return objc_getAssociatedObject(self, _cmd);
-}
-
-- (void)setWx_stopPropagation:(NSNumber *)wx_stopPropagation
-{
- objc_setAssociatedObject(self, @selector(wx_stopPropagation), wx_stopPropagation, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-}
-
-@end
-
-
@interface WXComponent (Events) <UIGestureRecognizerDelegate>
- (BOOL)gestureShouldStopPropagation:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch;
@end
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/bb290775/ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m b/ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m
index 2ad7503..7769e3a 100644
--- a/ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m
+++ b/ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m
@@ -35,14 +35,38 @@
#pragma clang diagnostic ignored "-Wobjc-protocol-method-implementation"
-@interface UIGestureRecognizer (WXGesture)
-
+@interface UITouch (WXTouchGestureRecognizer)
@property (nonatomic, strong) NSNumber *wx_identifier;
+@property (nonatomic, strong) NSNumber *wx_stopPropagation;
+@end
+
+@implementation UITouch (WXTouchGestureRecognizer)
+- (NSNumber *)wx_identifier
+{
+ return objc_getAssociatedObject(self, _cmd);
+}
+
+- (void)setWx_identifier:(NSNumber *)wx_identifier
+{
+ objc_setAssociatedObject(self, @selector(wx_identifier), wx_identifier, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+}
+- (NSNumber *)wx_stopPropagation
+{
+ return objc_getAssociatedObject(self, _cmd);
+}
+
+- (void)setWx_stopPropagation:(NSNumber *)wx_stopPropagation
+{
+ objc_setAssociatedObject(self, @selector(wx_stopPropagation), wx_stopPropagation, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+}
@end
-@implementation UIGestureRecognizer (WXGesture)
+@interface UIGestureRecognizer (WXGesture)
+@property (nonatomic, strong) NSNumber *wx_identifier;
+@end
+@implementation UIGestureRecognizer (WXGesture)
- (NSNumber *)wx_identifier
{
NSNumber *identifier = objc_getAssociatedObject(self, _cmd);
@@ -59,7 +83,6 @@
{
objc_setAssociatedObject(self, @selector(wx_identifier), wx_identifier, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
}
-
@end
@interface WXTouchGestureRecognizer : UIGestureRecognizer