kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-04-23 20:01:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove code for testing without JS bundle

Browse Source 
Reviewed By: mmmulani

Differential Revision: D3542347

fbshipit-source-id: d0dcfb65645faf515e6e48e6ff733646e1bcf907
This commit is contained in:
Pieter De Baets
2016-07-11 13:16:09 -07:00
committed by Facebook Github Bot 8
parent 2ae23d9f36
commit 81f59dfdc2
8 changed files with 49 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
React/Base/RCTBatchedBridge.m
View File

@@ -171,7 +171,9 @@ RCT_EXTERN NSArray<Class> *RCTGetModuleClasses(void);
if ([self.delegate respondsToSelector:@selector(loadSourceForBridge:withBlock:)]) {
[self.delegate loadSourceForBridge:_parentBridge withBlock:onSourceLoad];
} else if (self.bundleURL) {
} else {
RCTAssert(self.bundleURL, @"bundleURL must be non-nil when not implementing loadSourceForBridge");
[RCTJavaScriptLoader loadBundleAtURL:self.bundleURL onComplete:^(NSError *error, NSData *source, int64_t sourceLength) {
if (error && [self.delegate respondsToSelector:@selector(fallbackSourceURLForBridge:)]) {
NSURL *fallbackURL = [self.delegate fallbackSourceURLForBridge:self->_parentBridge];
@@ -184,17 +186,6 @@ RCT_EXTERN NSArray<Class> *RCTGetModuleClasses(void);
}
onSourceLoad(error, source, sourceLength);
}];
} else {
// Allow testing without a script
dispatch_async(dispatch_get_main_queue(), ^{
[[NSNotificationCenter defaultCenter]
postNotificationName:RCTJavaScriptDidLoadNotification
object:self->_parentBridge userInfo:@{@"bridge": self}];
});
[self flushPendingCalls];
onSourceLoad(nil, nil, 0);
}
}
@@ -487,11 +478,10 @@ RCT_EXTERN NSArray<Class> *RCTGetModuleClasses(void);
object:self->_parentBridge userInfo:@{@"bridge": self}];
});
[self flushPendingCalls];
[self _flushPendingCalls];
}];
#if RCT_DEV
if ([RCTGetURLQueryParam(self.bundleURL, @"hot") boolValue]) {
NSString *path = [self.bundleURL.path substringFromIndex:1]; // strip initial slash
NSString *host = self.bundleURL.host;
@@ -501,18 +491,15 @@ RCT_EXTERN NSArray<Class> *RCTGetModuleClasses(void);
#endif
}
- (void)flushPendingCalls
- (void)_flushPendingCalls
{
RCTAssertJSThread();
[_performanceLogger markStopForTag:RCTPLBridgeStartup];
[_javaScriptExecutor executeBlockOnJavaScriptQueue:^{
for (dispatch_block_t call in self->_pendingCalls) {
_loading = NO;
for (dispatch_block_t call in _pendingCalls) {
call();
}
}];
_loading = NO;
for (dispatch_block_t call in self->_pendingCalls) {
call();
}
}
- (void)stopLoadingWithError:(NSError *)error