Merge branch 'master' of github.com:Microsoft/react-native-code-push into report-acquisition-status

This commit is contained in:
Geoffrey Goh
2016-01-21 13:45:24 -08:00
3 changed files with 37 additions and 19 deletions

View File

@@ -283,7 +283,7 @@ static NSString *const PackageIsPendingKey = @"isPending";
// file (since Chrome wouldn't support it). Otherwise, update
// the current bundle URL to point at the latest update
if ([CodePush isUsingTestConfiguration] || ![_bridge.bundleURL.scheme hasPrefix:@"http"]) {
_bridge.bundleURL = [CodePush bundleURL];
[_bridge setValue:[CodePush bundleURL] forKey:@"bundleURL"];
}
[_bridge reload];
@@ -599,4 +599,4 @@ RCT_EXPORT_METHOD(downloadAndReplaceCurrentBundle:(NSString *)remoteBundleUrl)
}
}
@end
@end