... Actually, THIS is the commit with the changes for TARGET_IPHONE_S…

…IMULATOR. Whoops.
marcoschierhorn · Aug 25, 2010 · 512fe99 · 512fe99
1 parent 912d76b
commit 512fe99
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/iphone/Classes/FilesystemModule.m b/iphone/Classes/FilesystemModule.m
@@ -10,7 +10,7 @@
 #import "TiFilesystemFileProxy.h"
 #import "TiFilesystemBlobProxy.h"
 
-#ifdef TARGET_IPHONE_SIMULATOR 
+#if TARGET_IPHONE_SIMULATOR 
 extern NSString * TI_APPLICATION_RESOURCE_DIR;
 #endif
 
@@ -49,7 +49,7 @@ -(id)isExteralStoragePresent
 
 -(NSString*)resourcesDirectory
 {
-#ifdef TARGET_IPHONE_SIMULATOR 
+#if TARGET_IPHONE_SIMULATOR 
 	if (TI_APPLICATION_RESOURCE_DIR!=nil && [TI_APPLICATION_RESOURCE_DIR isEqualToString:@""]==NO)
 	{
 		// if the .local file exists and we're in the simulator, then force load from resources bundle

diff --git a/iphone/Classes/TiHost.m b/iphone/Classes/TiHost.m
@@ -14,7 +14,7 @@
 #define DEBUG_EVENTS 0
 #endif
 
-#ifdef TARGET_IPHONE_SIMULATOR
+#if TARGET_IPHONE_SIMULATOR
 extern NSString * const TI_APPLICATION_RESOURCE_DIR;
 #endif
 
@@ -26,7 +26,7 @@ @implementation TiHost
 +(NSURL*)resourceBasedURL:(NSString*)fn baseURL:(NSString**)base
 {
 	NSString *path = [[NSBundle mainBundle] bundlePath];
-#ifdef TARGET_IPHONE_SIMULATOR
+#if TARGET_IPHONE_SIMULATOR
 	if (TI_APPLICATION_RESOURCE_DIR!=nil && [TI_APPLICATION_RESOURCE_DIR isEqualToString:@""]==NO)
 	{
 		// if the .local file exists and we're in the simulator, then force load from resources bundle

diff --git a/iphone/Classes/TiProxy.m b/iphone/Classes/TiProxy.m
@@ -87,7 +87,7 @@ void DoProxyDelegateChangedValuesWithProxy(UIView<TiProxyDelegate> * target, NSS
 		}
 		else
 		{
-			[target performSelectorOnMainThread:sel withObject:newValue waitUntilDone:YES modes:[NSArray arrayWithObject:NSRunLoopCommonModes]];
+			[target performSelectorOnMainThread:sel withObject:newValue waitUntilDone:NO modes:[NSArray arrayWithObject:NSRunLoopCommonModes]];
 		}
 	}
 }

diff --git a/iphone/Classes/TiUtils.m b/iphone/Classes/TiUtils.m
@@ -26,7 +26,7 @@
 
 #import "UIImage+Resize.h"
 
-#ifdef TARGET_IPHONE_SIMULATOR
+#if TARGET_IPHONE_SIMULATOR
 extern NSString * const TI_APPLICATION_RESOURCE_DIR;
 #endif
 
@@ -1052,7 +1052,7 @@ +(NSData *)loadAppResource:(NSURL*)url
 			had_splash_removed = YES;
 			appurlstr = [appurlstr substringFromIndex:1];
 		}
-#ifdef TARGET_IPHONE_SIMULATOR
+#if TARGET_IPHONE_SIMULATOR
 		if (app==YES && had_splash_removed)
 		{
 			// on simulator we want to keep slash since it's coming from file
-Original file line number
+Diff line change
@@ Expand Up @@
     		}
     		else
     		{
-    			[target performSelectorOnMainThread:sel withObject:newValue waitUntilDone:YES modes:[NSArray arrayWithObject:NSRunLoopCommonModes]];
+    			[target performSelectorOnMainThread:sel withObject:newValue waitUntilDone:NO modes:[NSArray arrayWithObject:NSRunLoopCommonModes]];
     		}
     	}
     }
@@ Expand Down @@