Fixed 'imports' to resolve merge conflict
Jim committed
Nov 17, 2014 at 17:14 UTC
46bff98a3fbe1be3c5cc815be4c2ebab4d81dcf4
1 file changed
+3
src/core/ReactContext.js
+3
@@ -13,6 +13,7 @@
13
14
var assign = require('Object.assign');
15
var emptyObject = require('emptyObject');
16
+var monitorCodeUse = require('monitorCodeUse');
17
18
/**
19
* Keeps track of the current context.
@@ -45,6 +46,8 @@ var ReactContext = {
46
* @return {ReactComponent|array<ReactComponent>}
47
*/
48
withContext: function(newContext, scopedCallback) {
49
+ monitorCodeUse('react_with_context', {newContext: newContext});
50
+
51
var result;
52
var previousContext = ReactContext.current;
53
ReactContext.current = assign({}, previousContext, newContext);