Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sophiebits merged 1 commit into from
Apr 10, 2015
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion grunt/tasks/version-check.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
29 changes: 4 additions & 25 deletions src/browser/ui/React.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand All @@ -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();

Expand All @@ -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,
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -175,4 +152,6 @@ if (__DEV__) {
}
}

React.version = '0.14.0-alpha';

module.exports = React;