OSSForks/react
1
0
Fork 0
mirror of https://github.com/zebrajr/react.git synced 2026-01-15 12:15:22 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Revert "Warn when multiple instances of React are loaded on the same page"

Browse Source
This commit is contained in:
Ben Alpert
2015-04-10 12:34:04 -07:00
parent b8ba8c83f3
commit 8fa15080b2
2 changed files with 5 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
grunt/tasks/version-check.js
View File

@@ -6,7 +6,7 @@ var grunt = require('grunt');
// Check that the version we're exporting is the same one we expect in the
// package. This is not an ideal way to do this, but makes sure that we keep
// them in sync.
var reactVersionExp = /\bREACT_VERSION\s*=\s*['"]([^'"]+)['"];/;
var reactVersionExp = /\bReact\.version\s*=\s*['"]([^'"]+)['"];/;
module.exports = function() {
var reactVersion = reactVersionExp.exec(

29
src/browser/ui/React.js
View File

@@ -13,30 +13,6 @@
'use strict';
var REACT_VERSION = '0.14.0-alpha';
var ExecutionEnvironment = require('ExecutionEnvironment');
var warning = require('warning');
if (__DEV__) {
// before performing any initialization of React, check that
// only one instance is in use on the current page.
//
// Using multiple instances cause a variety of problems if elements
// from different versions are mixed on the same page.
//
// See issue #2402
if (ExecutionEnvironment.canUseDOM) {
warning(
typeof window.__REACT_VERSION__ === 'undefined',
'Multiple instances of React have been initialized on the same page. ' +
'Currently initializing React v' + REACT_VERSION + ' but another instance of React v' +
window.__REACT_VERSION__ + ' was already initialized'
);
window.__REACT_VERSION__ = REACT_VERSION;
}
}
var ReactChildren = require('ReactChildren');
var ReactComponent = require('ReactComponent');
var ReactClass = require('ReactClass');
@@ -57,6 +33,7 @@ var ReactServerRendering = require('ReactServerRendering');
var assign = require('Object.assign');
var findDOMNode = require('findDOMNode');
var onlyChild = require('onlyChild');
var warning = require('warning');
ReactDefaultInjection.inject();
@@ -73,7 +50,6 @@ if (__DEV__) {
var render = ReactPerf.measure('React', 'render', ReactMount.render);
var React = {
version: REACT_VERSION,
Children: {
map: ReactChildren.map,
forEach: ReactChildren.forEach,
@@ -120,6 +96,7 @@ if (
}
if (__DEV__) {
var ExecutionEnvironment = require('ExecutionEnvironment');
if (ExecutionEnvironment.canUseDOM && window.top === window.self) {
// If we're in Chrome, look for the devtools marker and provide a download
@@ -175,4 +152,6 @@ if (__DEV__) {
}
}
React.version = '0.14.0-alpha';
module.exports = React;