Merge pull request #4237 from vishalduggal/timob-13560

[TIMOB-13560] iOS: bubbleParent property does not work properly
tidev · May 9, 2013 · 9d91a12 · 9d91a12
2 parents 0a20a96 + 3641438
commit 9d91a12
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 8 deletions.
diff --git a/iphone/Classes/KrollObject.m b/iphone/Classes/KrollObject.m
@@ -894,7 +894,7 @@ -(void)setValue:(id)value forKey:(NSString *)key
 			return;
 		}
 		selector = NSSelectorFromString([NSString stringWithFormat:@"set%@:",name]);
-		if ([target respondsToSelector:selector] && ![name isEqualToString:@"ZIndex"] && ![name isEqualToString:@"BubbleParent"])//TODO: Quick hack is quick.
+		if ([target respondsToSelector:selector] && ![name isEqualToString:@"ZIndex"])//TODO: Quick hack is quick.
 		{
 			[target performSelector:selector withObject:value];
 		}

diff --git a/iphone/Classes/TiBindingEvent.m b/iphone/Classes/TiBindingEvent.m
@@ -115,7 +115,7 @@ void TiBindingEventSetBubbles(TiBindingEvent event, bool bubbles)
 {
 	while (![currentTarget _hasListeners:event->eventString] || parentOnly)
 	{
-		if (![currentTarget bubbleParent] || !event->bubbles || event->cancelBubble)
+		if (!currentTarget->_bubbleParent || !event->bubbles || event->cancelBubble)
 		{ //If currentTarget is nil, this triggers as well.
 			return nil;
 		}

diff --git a/iphone/Classes/TiProxy.h b/iphone/Classes/TiProxy.h
@@ -100,7 +100,7 @@ void DoProxyDelegateReadValuesWithKeysFromProxy(UIView<TiProxyDelegate> * target
  */
 @interface TiProxy : NSObject<KrollTargetable> {
 @public
-	BOOL bubbleParent;
+	BOOL _bubbleParent;
 
 @private
 	NSMutableDictionary *listeners;
@@ -225,7 +225,8 @@ void DoProxyDelegateReadValuesWithKeysFromProxy(UIView<TiProxyDelegate> * target
  is the type that has a parent to bubble to (This is primairly views, but may
  have some exceptions).
  */
-@property(nonatomic,readwrite,assign) BOOL bubbleParent;
+-(NSNumber*)bubbleParent;
+-(void)setBubbleParent:(id)arg;
 
 #pragma mark Utility
 -(KrollObject *)krollObjectForContext:(KrollContext *)context;

diff --git a/iphone/Classes/TiProxy.m b/iphone/Classes/TiProxy.m
@@ -199,7 +199,7 @@ -(id)init
 {
 	if (self = [super init])
 	{
-		bubbleParent = YES;
+		_bubbleParent = YES;
 #if PROXY_MEMORY_TRACK == 1
 		NSLog(@"[DEBUG] INIT: %@ (%d)",self,[self hash]);
 #endif
@@ -563,8 +563,6 @@ -(id)_proxy:(TiProxyBridgeType)type
 
 #pragma mark Public
 
-@synthesize bubbleParent;
-
 -(id<NSFastEnumeration>)allKeys
 {
 	pthread_rwlock_rdlock(&dynpropsLock);
@@ -574,6 +572,16 @@ -(id)_proxy:(TiProxyBridgeType)type
 	return keys;
 }
 
+-(NSNumber*)bubbleParent
+{
+    return NUMBOOL(_bubbleParent);
+}
+
+-(void)setBubbleParent:(id)arg
+{
+    _bubbleParent = [TiUtils boolValue:arg def:YES];
+}
+
 /*
  *	In views where the order in which keys are applied matter (I'm looking at you, TableView), this should be
  *  an array of which keys go first, and in what order. Otherwise, this is nil.

diff --git a/iphone/Classes/TiViewProxy.m b/iphone/Classes/TiViewProxy.m
@@ -1349,7 +1349,7 @@ -(id)init
 	{
 		destroyLock = [[NSRecursiveLock alloc] init];
 		pthread_rwlock_init(&childrenLock, NULL);
-		bubbleParent = YES;
+		_bubbleParent = YES;
 	}
 	return self;
 }