code cleanup

WeaveTeam · Aug 4, 2014 · c37a58c · c37a58c
1 parent 5d71f46
commit c37a58c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 32 deletions.
diff --git a/WeaveMobileClient/src/MobileConsole.mxml b/WeaveMobileClient/src/MobileConsole.mxml
@@ -159,21 +159,9 @@
 				switch (String(name))
 				{
 					case 'exec': return JavaScript.exec as Function;
-					case 'call': return function(...args):*
-					{
-						var prev:Boolean = ExternalInterface.marshallExceptions;
-						try
-						{
-							ExternalInterface.marshallExceptions = true;
-							ExternalInterface.call.apply(this, args);
-						}
-						catch (e:*)
-						{
-							ExternalInterface.marshallExceptions = prev;
-							throw e;
-						}
-						// we can't put this in a finally{} block because it prevents catch() from happening if set to false.
-						ExternalInterface.marshallExceptions = prev;
+					case 'call': return function(...args):* {
+						ExternalInterface.marshallExceptions = true;
+						return ExternalInterface.call.apply(ExternalInterface, args);
 					};
 					case 'application': return FlexGlobals.topLevelApplication;
 					case 'print': return ObjectUtil.toString as Function;

diff --git a/WeaveUI/src/weave/ui/Console.mxml b/WeaveUI/src/weave/ui/Console.mxml
@@ -146,23 +146,9 @@
 			
 			private const symbolTable:Object = [{
 				'exec': JavaScript.exec,
-				'call': function(...args):*
-				{
-					var prev:Boolean = ExternalInterface.marshallExceptions;
-					var result:*;
-					try
-					{
-						ExternalInterface.marshallExceptions = true;
-						result = ExternalInterface.call.apply(this, args);
-					}
-					catch (e:Error)
-					{
-						ExternalInterface.marshallExceptions = prev;
-						throw e;
-					}
-					// we can't put this in a finally{} block because it prevents catch() from happening if set to false.
-					ExternalInterface.marshallExceptions = prev;
-					return result;
+				'call': function(...args):* {
+					ExternalInterface.marshallExceptions = true;
+					return ExternalInterface.call.apply(ExternalInterface, args);
 				},
 				'application': WeaveAPI.topLevelApplication,
 				'visApp': getVisApp(),