status-im/react-native
2
0
Fork 0
mirror of https://github.com/status-im/react-native.git synced 2025-01-14 03:26:07 +00:00
Code Issues Projects Releases Wiki Activity

Show a redbox when scripts fail to load

Browse Source 
Reviewed By: yungsters

Differential Revision: D3670186

fbshipit-source-id: 1c61b69c74a8f7cc255aa6d7afcdb117205922eb
This commit is contained in:
Andrew Y. Chen 2016-09-07 12:13:34 -07:00 committed by Facebook Github Bot 3
parent e22abd91bf
commit bbd1e455f3
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ReactAndroid/src/main/java/com/facebook/react/devsupport/JSDebuggerWebSocketClient.java
View File

@ -20,6 +20,7 @@ import java.util.concurrent.TimeUnit;
import com.facebook.common.logging.FLog;
import com.facebook.infer.annotation.Assertions;
import com.facebook.react.common.JavascriptException;
import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.JsonGenerator;
@ -212,6 +213,10 @@ public class JSDebuggerWebSocketClient implements WebSocketListener {
} else if ("result".equals(field)) {
parser.nextToken();
result = parser.getText();
} else if ("error".equals(field)) {
parser.nextToken();
String error = parser.getText();
abort(error, new JavascriptException(error));
}
}
if (replyID != null) {

13
local-cli/server/util/debuggerWorker.js
View File

@ -15,16 +15,21 @@ var messageHandlers = {
for (var key in message.inject) {
self[key] = JSON.parse(message.inject[key]);
}
importScripts(message.url);
sendReply();
let error;
try {
importScripts(message.url);
} catch (err) {
error = JSON.stringify(err);
}
sendReply(null /* result */, error);
}
};
onmessage = function(message) {
var object = message.data;
var sendReply = function(result) {
postMessage({replyID: object.id, result: result});
var sendReply = function(result, error) {
postMessage({replyID: object.id, result: result, error: error});
};
var handler = messageHandlers[object.method];