few fixes

wizpanda · Jun 25, 2015 · 8fd1126 · 8fd1126
1 parent cfc03bc
commit 8fd1126
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/ios/OverAppBrowser.h b/src/ios/OverAppBrowser.h
@@ -13,6 +13,7 @@
 	NSString* callbackId;
 	UIWebView* overWebView;
     NSURL* currentUrl;
+    BOOL isAutoFadeIn;
     BOOL _injectedIframeBridge;
 }
 

diff --git a/src/ios/OverAppBrowser.m b/src/ios/OverAppBrowser.m
@@ -50,6 +50,7 @@ - (void) open:(CDVInvokedUrlCommand *)command
     originx = [[arguments objectAtIndex:1] floatValue];
     originy = [[arguments objectAtIndex:2] floatValue];
     width = [[arguments objectAtIndex:3] floatValue];
+    isAutoFadeIn = false;
     if (argc > 3) {
         height = [[arguments objectAtIndex:4] floatValue];
     }
@@ -260,7 +261,8 @@ - (void)injectDeferredObject:(NSString*)source withWrapper:(NSString*)jsWrapper
     }
 
     if (jsWrapper != nil) {
-        NSString* sourceArrayString = [@[source] JSONString];
+        NSData* jsonData = [NSJSONSerialization dataWithJSONObject:@[source] options:0 error:nil];
+        NSString* sourceArrayString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
         if (sourceArrayString) {
             NSString* sourceString = [sourceArrayString substringWithRange:NSMakeRange(1, [sourceArrayString length] - 2)];
             NSString* jsToInject = [NSString stringWithFormat:jsWrapper, sourceString];

diff --git a/www/OverAppBrowser.js b/www/OverAppBrowser.js
@@ -72,7 +72,7 @@ OverAppBrowser.prototype = {
 };
 
 module.exports = function(strUrl, originx,originy,width,height, isAutoFadeIn) {
-    isAutoFadeIn = isAutoFadeIn || false;
+    isAutoFadeIn = isAutoFadeIn || true;
     strUrl = urlutil.makeAbsolute(strUrl);
     var oab = new OverAppBrowser();
     var cb = function(eventname) {