Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed RCTWebSocketDebugger contains SockeRocket Source code，causing dupl... #1173

Closed
wants to merge 2 commits into from
Closed

Fixed RCTWebSocketDebugger contains SockeRocket Source code，causing dupl... #1173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9264a27
Fixed RCTWebSocketDebugger contains SockeRocket Source code，causing d…
May 6, 2015
976b2f2
When the script download is complete, a notification is sent to the o…
May 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions React.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,10 @@ Pod::Spec.new do |s|

s.subspec 'RCTWebSocketDebugger' do |ss|
ss.dependency 'React/Core'
ss.dependency 'SocketRocket'
ss.libraries = 'icucore'
ss.source_files = "Libraries/RCTWebSocketDebugger/*.{h,m}"
ss.exclude_files = "Libraries/RCTWebSocketDebugger/SRWebSocket.*"
end

s.subspec 'RCTText' do |ss|
Expand Down
3 changes: 3 additions & 0 deletions React/Base/RCTJavaScriptLoader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,11 @@

#import "RCTJavaScriptExecutor.h"

NSString *const RCTJavaScriptDidDownLoadedNotification = @"RCTJavaScriptDidDownLoadedNotification";

@class RCTBridge;


/**
* Class that allows easy embedding, loading, life-cycle management of a
* JavaScript application inside of a native application.
Expand Down
6 changes: 6 additions & 0 deletions React/Base/RCTJavaScriptLoader.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ - (void)loadBundleAtURL:(NSURL *)scriptURL onComplete:(void (^)(NSError *))onCom
onComplete(error);
return;
}




// Parse response as text
NSStringEncoding encoding = NSUTF8StringEncoding;
Expand Down Expand Up @@ -103,6 +106,9 @@ - (void)loadBundleAtURL:(NSURL *)scriptURL onComplete:(void (^)(NSError *))onCom
sourceCodeModule.scriptURL = scriptURL;
sourceCodeModule.scriptText = rawText;

[[NSNotificationCenter defaultCenter] postNotificationName:RCTJavaScriptDidDownLoadedNotification
object:self];

[_bridge enqueueApplicationScript:rawText url:scriptURL onComplete:^(NSError *scriptError) {
dispatch_async(dispatch_get_main_queue(), ^{
onComplete(scriptError);
Expand Down