You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by sh...@apache.org on 2015/05/05 21:54:06 UTC

[1/2] ios commit: CB-8785 - add try/catch for evalJS: (closes #134)

Repository: cordova-ios
Updated Branches:
  refs/heads/master 8c1676ea4 -> d86f9b6f9


CB-8785 - add try/catch for evalJS: (closes #134)


Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/4c3e95cc
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/4c3e95cc
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/4c3e95cc

Branch: refs/heads/master
Commit: 4c3e95cc014af6e8a5645e5098079c4efbc0e50c
Parents: 8c1676e
Author: SangChan Lee <sa...@gmail.com>
Authored: Thu Apr 2 13:28:13 2015 +0900
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Tue May 5 12:50:18 2015 -0700

----------------------------------------------------------------------
 CordovaLib/Classes/CDVCommandDelegateImpl.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/4c3e95cc/CordovaLib/Classes/CDVCommandDelegateImpl.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVCommandDelegateImpl.m b/CordovaLib/Classes/CDVCommandDelegateImpl.m
index 9407e0a..be7eb63 100644
--- a/CordovaLib/Classes/CDVCommandDelegateImpl.m
+++ b/CordovaLib/Classes/CDVCommandDelegateImpl.m
@@ -143,7 +143,7 @@
 
 - (void)evalJs:(NSString*)js scheduledOnRunLoop:(BOOL)scheduledOnRunLoop
 {
-    js = [NSString stringWithFormat:@"cordova.require('cordova/exec').nativeEvalAndFetch(function(){%@})", js];
+    js = [NSString stringWithFormat:@"try{cordova.require('cordova/exec').nativeEvalAndFetch(function(){%@})}catch(e){console.log('exeption nativeEvalAndFetch : '+e);};", js];
     if (scheduledOnRunLoop) {
         [self evalJsHelper:js];
     } else {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org

[2/2] ios commit: CB-8710 - cordova-ios jasmine tests do not clean up build products, tests can only be run once

Posted by sh...@apache.org.
CB-8710 - cordova-ios jasmine tests do not clean up build products, tests can only be run once


Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/d86f9b6f
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/d86f9b6f
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/d86f9b6f

Branch: refs/heads/master
Commit: d86f9b6f950b53dfb67bd614ecc0550ea8a5b85c
Parents: 4c3e95c
Author: Shazron Abdullah <sh...@apache.org>
Authored: Wed Mar 18 17:20:46 2015 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Tue May 5 12:53:48 2015 -0700

----------------------------------------------------------------------
 tests/spec/cordovalib.spec.js | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/d86f9b6f/tests/spec/cordovalib.spec.js
----------------------------------------------------------------------
diff --git a/tests/spec/cordovalib.spec.js b/tests/spec/cordovalib.spec.js
index 10cd696..9657717 100644
--- a/tests/spec/cordovalib.spec.js
+++ b/tests/spec/cordovalib.spec.js
@@ -48,4 +48,9 @@ describe('cordova-lib', function() {
         return_code = shell.exec(command).code;
         expect(return_code).toBe(0);
     });
+    
+    // clean-up last
+    it('cleanup artifacts folder', function() {
+        shell.rm('-rf', artifacts_dir);
+    });
 });
\ No newline at end of file


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org