Merge upstream changes by newyankeecodeshop

Matt-ExpeData · Matt-ExpeData · commit 14d1735ad163 · 2013-07-12T14:14:43.000-04:00
diff --git a/Classes/GAScriptEngine.m b/Classes/GAScriptEngine.m
@@ -29,6 +29,7 @@ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
 #import "GAScriptEngine.h"
 #import "GAScriptObject.h"
 #import "GAScriptBlockObject.h"
+#import "GADebugMacros.h"
 #import "NSObject+GAJavaScript.h"
 
 static NSNumberFormatter* kNumFormatter = nil;
@@ -335,12 +336,14 @@ - (void)makeLotsaCalls
             //
             GAScriptBlock theBlock = [m_blocks objectForKey:invName];
             
-            if (theBlock)
-            {
-                theBlock(arguments);
+            if (!theBlock) {
+                GADebugStr(@"No GAScriptBlock found for %@", invName);
+                continue;
             }
+            
+            theBlock(arguments);
         }
-    }    
+    }
 }
 
 - (void)callReceiversForSelector:(SEL)theSelector withArguments:(NSArray *)arguments
diff --git a/Classes/GAScriptObject.m b/Classes/GAScriptObject.m
@@ -139,14 +139,24 @@ - (id)callFunction:(NSString *)functionName
 }
 
 - (id)callFunction:(NSString *)functionName withObject:(id)argument
-{	
-	return [m_engine evalWithFormat:@"GAJavaScript.callFunction(%@.%@, %@, [%@])", 
+{
+    if ([argument isKindOfClass:[GAScriptBlockObject class]]) {
+        [m_engine addBlockCallback:argument];
+    }
+
+	return [m_engine evalWithFormat:@"GAJavaScript.callFunction(%@.%@, %@, [%@])",
                         m_objReference, functionName, m_objReference, [argument stringForJavaScript]];
 }
 
 - (id)callFunction:(NSString *)functionName withArguments:(NSArray *)arguments
-{	
-	return [m_engine evalWithFormat:@"GAJavaScript.callFunction(%@.%@, %@, %@)", 
+{
+    for (id arg in arguments) {
+        if ([arg isKindOfClass:[GAScriptBlockObject class]]) {
+            [m_engine addBlockCallback:arg];
+        }
+    }
+
+	return [m_engine evalWithFormat:@"GAJavaScript.callFunction(%@.%@, %@, %@)",
                         m_objReference, functionName, m_objReference, [arguments stringForJavaScript]];	
 }
 
