fix webview listener issue and added new test case for webview height auto

Jeff Haynie · Jeff Haynie · commit 5404f3b281e7 · 2010-07-26T11:35:45.000-07:00
diff --git a/demos/KitchenSink/Resources/examples/web_views.js b/demos/KitchenSink/Resources/examples/web_views.js
@@ -29,6 +29,7 @@ if (Titanium.Platform.name == 'iPhone OS')
 	// The result for this is going to be centered, because that's where layout puts it.
 	// But users can make sure that embedded webviews are anchored in the usual way.
 	data.push({title:'Auto Size', auto:true, hasChild:true, innerHTML:'<html><body style="height:200px;width:100px;border:1px solid #ccc;padding:10px">200 px height, 100 px width.</body></html>'});
+	data.push({title:'Partial Auto', hasChild:true, partial:true, innerHTML:'<html><body><div>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</div><hr/><div>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</div></body></html>'});
 	
 	// this should work on android too, right?
 	data.push({title:'HTML5 Video', auto:true, hasChild:true, url:'html5video.html'});
@@ -196,7 +197,13 @@ tableview.addEventListener('click', function(e)
 				}
 			});
 		}
-
+		
+		if (rowdata.partial)
+		{
+			webview.top = 100;
+			webview.bottom = 0;
+		}
+		
 		w.add(webview);
 		
 
diff --git a/iphone/Classes/AppModule.m b/iphone/Classes/AppModule.m
@@ -35,14 +35,26 @@ -(void)dealloc
 -(void)addEventListener:(NSArray*)args
 {
 	NSString *type = [args objectAtIndex:0];
-	KrollCallback* listener = [args objectAtIndex:1];
+	id listener = [args objectAtIndex:1];
 	
 	if (appListeners==nil)
 	{
 		appListeners = [[NSMutableDictionary alloc] init];
 	}
 	
-	listener.type = type;
+	id<TiEvaluator> context = [self executionContext]==nil ? [self pageContext] : [self executionContext];
+	ListenerEntry *entry = [[ListenerEntry alloc] initWithListener:listener context:context proxy:self];
+
+	
+	if ([listener isKindOfClass:[KrollCallback class]])
+	{
+		((KrollCallback*)listener).type = type;
+	}
+	else 
+	{
+		entry.type = type;
+	}
+
 	
 	NSMutableArray *l = [appListeners objectForKey:type];
 	if (l==nil)
@@ -51,8 +63,6 @@ -(void)addEventListener:(NSArray*)args
 		[appListeners setObject:l forKey:type];
 		[l release];
 	}
-	id<TiEvaluator> context = [self executionContext]==nil ? [self pageContext] : [self executionContext];
-	ListenerEntry *entry = [[ListenerEntry alloc] initWithListener:listener context:context proxy:self];
 	[l addObject:entry];
 	[entry release];
 }
@@ -227,15 +237,16 @@ -(void)willShutdownContext:(NSNotification*)note
 			{
 				if ([entry context] == context)
 				{
-					[found addObject:[entry listener]];
+					[found addObject:[NSArray
+									   arrayWithObjects:[entry type],[entry listener],nil]];
 				}
 			}
 		}
 		if ([found count]>0)
 		{
-			for (KrollCallback *callback in found)
+			for (NSArray *a in found)
 			{
-				[self removeEventListener:[NSArray arrayWithObjects:callback.type,callback,nil]];
+				[self removeEventListener:a];
 			}
 		}
 	}
diff --git a/iphone/Classes/ListenerEntry.h b/iphone/Classes/ListenerEntry.h
@@ -13,7 +13,10 @@
 	id listener;
 	TiProxy *proxy;
 	BOOL removed;
+	NSString *type;
 }
+@property(nonatomic,readwrite,retain) NSString *type;
+
 -(id)initWithListener:(id)listener_ context:(id<TiEvaluator>)context_ proxy:(TiProxy*)proxy;
 -(id<TiEvaluator>)context;
 -(id)listener;
diff --git a/iphone/Classes/ListenerEntry.m b/iphone/Classes/ListenerEntry.m
@@ -9,6 +9,8 @@
 
 @implementation ListenerEntry
 
+@synthesize type;
+
 -(id)initWithListener:(id)listener_ context:(id<TiEvaluator>)context_ proxy:(TiProxy*)proxy_
 {
 	if (self = [super init])
@@ -24,6 +26,7 @@ -(id)initWithListener:(id)listener_ context:(id<TiEvaluator>)context_ proxy:(TiP
 -(void)dealloc
 {
 	RELEASE_TO_NIL(listener);
+	RELEASE_TO_NIL(type);
 	[super dealloc];
 }
 

Original file line number	Diff line number	Diff line change
`@@ -35,14 +35,26 @@ -(void)dealloc`
`35`	`35`	`-(void)addEventListener:(NSArray*)args`
`36`	`36`	`{`
`37`	`37`	`NSString *type = [args objectAtIndex:0];`
`38`		`- KrollCallback* listener = [args objectAtIndex:1];`
	`38`	`+ id listener = [args objectAtIndex:1];`
`39`	`39`
`40`	`40`	`if (appListeners==nil)`
`41`	`41`	`{`
`42`	`42`	`appListeners = [[NSMutableDictionary alloc] init];`
`43`	`43`	`}`
`44`	`44`
`45`		`- listener.type = type;`
	`45`	`+ id<TiEvaluator> context = [self executionContext]==nil ? [self pageContext] : [self executionContext];`
	`46`	`+ ListenerEntry *entry = [[ListenerEntry alloc] initWithListener:listener context:context proxy:self];`
	`47`	`+`
	`48`	`+`
	`49`	`+ if ([listener isKindOfClass:[KrollCallback class]])`
	`50`	`+ {`
	`51`	`+ ((KrollCallback*)listener).type = type;`
	`52`	`+ }`
	`53`	`+ else`
	`54`	`+ {`
	`55`	`+ entry.type = type;`
	`56`	`+ }`
	`57`	`+`
`46`	`58`
`47`	`59`	`NSMutableArray *l = [appListeners objectForKey:type];`
`48`	`60`	`if (l==nil)`
`@@ -51,8 +63,6 @@ -(void)addEventListener:(NSArray*)args`
`51`	`63`	`[appListeners setObject:l forKey:type];`
`52`	`64`	`[l release];`
`53`	`65`	`}`
`54`		`- id<TiEvaluator> context = [self executionContext]==nil ? [self pageContext] : [self executionContext];`
`55`		`- ListenerEntry *entry = [[ListenerEntry alloc] initWithListener:listener context:context proxy:self];`
`56`	`66`	`[l addObject:entry];`
`57`	`67`	`[entry release];`
`58`	`68`	`}`
`@@ -227,15 +237,16 @@ -(void)willShutdownContext:(NSNotification*)note`
`227`	`237`	`{`
`228`	`238`	`if ([entry context] == context)`
`229`	`239`	`{`
`230`		`- [found addObject:[entry listener]];`
	`240`	`+ [found addObject:[NSArray`
	`241`	`+ arrayWithObjects:[entry type],[entry listener],nil]];`
`231`	`242`	`}`
`232`	`243`	`}`
`233`	`244`	`}`
`234`	`245`	`if ([found count]>0)`
`235`	`246`	`{`
`236`		`- for (KrollCallback *callback in found)`
	`247`	`+ for (NSArray *a in found)`
`237`	`248`	`{`
`238`		`- [self removeEventListener:[NSArray arrayWithObjects:callback.type,callback,nil]];`
	`249`	`+ [self removeEventListener:a];`
`239`	`250`	`}`
`240`	`251`	`}`
`241`	`252`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@`
`9`	`9`
`10`	`10`	`@implementation ListenerEntry`
`11`	`11`
	`12`	`+@synthesize type;`
	`13`	`+`
`12`	`14`	`-(id)initWithListener:(id)listener_ context:(id<TiEvaluator>)context_ proxy:(TiProxy*)proxy_`
`13`	`15`	`{`
`14`	`16`	`if (self = [super init])`
`@@ -24,6 +26,7 @@ -(id)initWithListener:(id)listener_ context:(id<TiEvaluator>)context_ proxy:(TiP`
`24`	`26`	`-(void)dealloc`
`25`	`27`	`{`
`26`	`28`	`RELEASE_TO_NIL(listener);`
	`29`	`+ RELEASE_TO_NIL(type);`
`27`	`30`	`[super dealloc];`
`28`	`31`	`}`
`29`	`32`