diff --git a/src/renderers/dom/server/ReactServerRendering.js b/src/renderers/dom/server/ReactServerRendering.js index ff08fe8ff09f..ea4d8d9db452 100644 --- a/src/renderers/dom/server/ReactServerRendering.js +++ b/src/renderers/dom/server/ReactServerRendering.js @@ -12,7 +12,6 @@ var React = require('React'); var ReactDOMContainerInfo = require('ReactDOMContainerInfo'); -var ReactDefaultBatchingStrategy = require('ReactDefaultBatchingStrategy'); var ReactInstrumentation = require('ReactInstrumentation'); var ReactMarkupChecksum = require('ReactMarkupChecksum'); var ReactReconciler = require('ReactReconciler'); @@ -33,7 +32,9 @@ var pendingTransactions = 0; */ function renderToStringImpl(element, makeStaticMarkup) { var transaction; + var previousBatchingStrategy; try { + previousBatchingStrategy = ReactUpdates.injection.getBatchingStrategy(); ReactUpdates.injection.injectBatchingStrategy(ReactServerBatchingStrategy); transaction = ReactServerRenderingTransaction.getPooled(makeStaticMarkup); @@ -67,7 +68,7 @@ function renderToStringImpl(element, makeStaticMarkup) { // currently share these stateful modules. if (!pendingTransactions) { ReactUpdates.injection.injectBatchingStrategy( - ReactDefaultBatchingStrategy + previousBatchingStrategy ); } } diff --git a/src/renderers/shared/stack/reconciler/ReactUpdates.js b/src/renderers/shared/stack/reconciler/ReactUpdates.js index d605c5881e2e..643b4ea426c5 100644 --- a/src/renderers/shared/stack/reconciler/ReactUpdates.js +++ b/src/renderers/shared/stack/reconciler/ReactUpdates.js @@ -272,6 +272,10 @@ var ReactUpdatesInjection = { ); batchingStrategy = _batchingStrategy; }, + + getBatchingStrategy: function() { + return batchingStrategy; + }, }; var ReactUpdates = {