diff --git a/Libraries/JavaScriptAppEngine/Initialization/InitializeJavaScriptAppEngine.js b/Libraries/JavaScriptAppEngine/Initialization/InitializeJavaScriptAppEngine.js index 93e97e60b..b3de8921e 100644 --- a/Libraries/JavaScriptAppEngine/Initialization/InitializeJavaScriptAppEngine.js +++ b/Libraries/JavaScriptAppEngine/Initialization/InitializeJavaScriptAppEngine.js @@ -178,6 +178,14 @@ function setUpNumber() { Number.MIN_SAFE_INTEGER = Number.MIN_SAFE_INTEGER || -(Math.pow(2, 53) - 1); } +function setUpDevTools() { + // not when debugging in chrome + if (__DEV__ && !window.document && require('Platform').OS === 'ios') { + var setupDevtools = require('setupDevtools'); + setupDevtools(); + } +} + setUpProcessEnv(); setUpRedBoxErrorHandler(); setUpTimers(); @@ -190,6 +198,7 @@ setUpWebSockets(); setUpProfile(); setUpFlowChecker(); setUpNumber(); +setUpDevTools(); // Just to make sure the JS gets packaged up. Wait until the JS environment has // been initialized before requiring them. diff --git a/Libraries/ReactIOS/renderApplication.ios.js b/Libraries/ReactIOS/renderApplication.ios.js index 0bf7fba0e..aca645324 100644 --- a/Libraries/ReactIOS/renderApplication.ios.js +++ b/Libraries/ReactIOS/renderApplication.ios.js @@ -69,10 +69,6 @@ function renderApplication<D, P, S>( rootTag, 'Expect to have a valid rootTag, instead got ', rootTag ); - if (__DEV__ && !window.document) { - var setupDevtools = require('setupDevtools'); - setupDevtools(); - } React.render( <AppContainer rootTag={rootTag}> <RootComponent