diff --git a/README.md b/README.md index 54f47ad34d..efdeeffbe3 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ var HelloMessage = React.createClass({ } }); -React.renderComponent( +React.render( , document.getElementById('container') ); diff --git a/docs/_js/examples/hello.js b/docs/_js/examples/hello.js index 3805db4386..b71430a8f1 100644 --- a/docs/_js/examples/hello.js +++ b/docs/_js/examples/hello.js @@ -5,10 +5,10 @@ var HelloMessage = React.createClass({\n\ }\n\ });\n\ \n\ -React.renderComponent(, mountNode);\ +React.render(, mountNode);\ "; -React.renderComponent( +React.render( , document.getElementById('helloExample') ); diff --git a/docs/_js/examples/markdown.js b/docs/_js/examples/markdown.js index 6be96d5cc0..956d81de38 100644 --- a/docs/_js/examples/markdown.js +++ b/docs/_js/examples/markdown.js @@ -28,10 +28,10 @@ var MarkdownEditor = React.createClass({\n\ }\n\ });\n\ \n\ -React.renderComponent(, mountNode);\ +React.render(, mountNode);\ "; -React.renderComponent( +React.render( , document.getElementById('markdownExample') ); diff --git a/docs/_js/examples/timer.js b/docs/_js/examples/timer.js index 2ca876a2e1..c54e8b4f19 100644 --- a/docs/_js/examples/timer.js +++ b/docs/_js/examples/timer.js @@ -19,10 +19,10 @@ var Timer = React.createClass({\n\ }\n\ });\n\ \n\ -React.renderComponent(, mountNode);\ +React.render(, mountNode);\ "; -React.renderComponent( +React.render( , document.getElementById('timerExample') ); diff --git a/docs/_js/examples/todo.js b/docs/_js/examples/todo.js index 3db2b29af2..6c628ceae1 100644 --- a/docs/_js/examples/todo.js +++ b/docs/_js/examples/todo.js @@ -33,10 +33,10 @@ var TodoApp = React.createClass({\n\ );\n\ }\n\ });\n\ -React.renderComponent(, mountNode);\ +React.render(, mountNode);\ "; -React.renderComponent( +React.render( , document.getElementById('todoExample') ); diff --git a/docs/_js/html-jsx.js b/docs/_js/html-jsx.js index b76d0254a4..d7525a83b8 100644 --- a/docs/_js/html-jsx.js +++ b/docs/_js/html-jsx.js @@ -78,5 +78,5 @@ var HELLO_COMPONENT = "\ } }); - React.renderComponent(, document.getElementById('jsxCompiler')); + React.render(, document.getElementById('jsxCompiler')); }()); diff --git a/docs/_js/jsx-compiler.js b/docs/_js/jsx-compiler.js index 6eb2f1e63a..28364eb88f 100644 --- a/docs/_js/jsx-compiler.js +++ b/docs/_js/jsx-compiler.js @@ -5,7 +5,7 @@ var HelloMessage = React.createClass({\n\ }\n\ });\n\ \n\ -React.renderComponent(, mountNode);\ +React.render(, mountNode);\ "; function transformer(harmony, code) { @@ -39,7 +39,7 @@ var CompilerPlayground = React.createClass({ ); }, }); -React.renderComponent( +React.render( , document.getElementById('jsxCompiler') ); diff --git a/docs/_js/live_editor.js b/docs/_js/live_editor.js index bfd8595d59..4e453a790a 100644 --- a/docs/_js/live_editor.js +++ b/docs/_js/live_editor.js @@ -190,7 +190,7 @@ var ReactPlayground = React.createClass({ try { var compiledCode = this.compileCode(); if (this.props.renderCode) { - React.renderComponent( + React.render( , mountNode ); @@ -199,7 +199,7 @@ var ReactPlayground = React.createClass({ } } catch (err) { this.setTimeout(function() { - React.renderComponent( + React.render(
{err.toString()}
, mountNode ); diff --git a/examples/ballmer-peak/example.js b/examples/ballmer-peak/example.js index 09a384538c..a918ba052d 100644 --- a/examples/ballmer-peak/example.js +++ b/examples/ballmer-peak/example.js @@ -38,7 +38,7 @@ var BallmerPeakCalculator = React.createClass({ } }); -React.renderComponent( +React.render( , document.getElementById('container') ); diff --git a/examples/basic-commonjs/index.js b/examples/basic-commonjs/index.js index 9344c32cdd..839d094145 100644 --- a/examples/basic-commonjs/index.js +++ b/examples/basic-commonjs/index.js @@ -18,7 +18,7 @@ var ExampleApplication = React.createClass({ var start = new Date().getTime(); setInterval(function() { - React.renderComponent( + React.render( , document.getElementById('container') ); diff --git a/examples/basic-jsx-external/example.js b/examples/basic-jsx-external/example.js index 70f67d7090..6da16cf426 100644 --- a/examples/basic-jsx-external/example.js +++ b/examples/basic-jsx-external/example.js @@ -15,7 +15,7 @@ var ExampleApplication = React.createClass({ var start = new Date().getTime(); setInterval(function() { - React.renderComponent( + React.render( , document.getElementById('container') ); diff --git a/examples/basic-jsx-harmony/index.html b/examples/basic-jsx-harmony/index.html index a997643098..b1fd495dfd 100644 --- a/examples/basic-jsx-harmony/index.html +++ b/examples/basic-jsx-harmony/index.html @@ -41,7 +41,7 @@ }); var start = new Date().getTime(); setInterval(() => { - React.renderComponent( + React.render( , document.getElementById('container') ); diff --git a/examples/basic-jsx-precompile/example.js b/examples/basic-jsx-precompile/example.js index 70f67d7090..6da16cf426 100644 --- a/examples/basic-jsx-precompile/example.js +++ b/examples/basic-jsx-precompile/example.js @@ -15,7 +15,7 @@ var ExampleApplication = React.createClass({ var start = new Date().getTime(); setInterval(function() { - React.renderComponent( + React.render( , document.getElementById('container') ); diff --git a/examples/basic-jsx/index.html b/examples/basic-jsx/index.html index c75ba93748..2ed3db1f7b 100644 --- a/examples/basic-jsx/index.html +++ b/examples/basic-jsx/index.html @@ -44,7 +44,7 @@ }); var start = new Date().getTime(); setInterval(function() { - React.renderComponent( + React.render( , document.getElementById('container') ); diff --git a/examples/basic/index.html b/examples/basic/index.html index 0dad9fe1d8..51d50fce5f 100644 --- a/examples/basic/index.html +++ b/examples/basic/index.html @@ -39,12 +39,12 @@ } }); - // Call React.createFactory instead of directly call ExampleApplication({...}) in React.renderComponent + // Call React.createFactory instead of directly call ExampleApplication({...}) in React.render var ExampleApplicationFactory = React.createFactory(ExampleApplication); var start = new Date().getTime(); setInterval(function() { - React.renderComponent( + React.render( ExampleApplicationFactory({elapsed: new Date().getTime() - start}), document.getElementById('container') ); diff --git a/examples/jquery-bootstrap/js/app.js b/examples/jquery-bootstrap/js/app.js index 856e82c282..e00e54ff52 100644 --- a/examples/jquery-bootstrap/js/app.js +++ b/examples/jquery-bootstrap/js/app.js @@ -125,4 +125,4 @@ var Example = React.createClass({ } }); -React.renderComponent(, document.getElementById('jqueryexample')); +React.render(, document.getElementById('jqueryexample')); diff --git a/examples/jquery-mobile/js/app.js b/examples/jquery-mobile/js/app.js index a6a83cc3de..86dbfded0f 100644 --- a/examples/jquery-mobile/js/app.js +++ b/examples/jquery-mobile/js/app.js @@ -175,4 +175,4 @@ var PagePopUpContent = React.createClass({ }); // Render application. -React.renderComponent(App(null), document.getElementById('content')); +React.render(App(null), document.getElementById('content')); diff --git a/examples/transitions/index.html b/examples/transitions/index.html index 17f9f7dc40..17e209ccec 100644 --- a/examples/transitions/index.html +++ b/examples/transitions/index.html @@ -75,7 +75,7 @@ } }); - React.renderComponent( + React.render( , document.getElementById('container') ); diff --git a/perf/index.html b/perf/index.html index 71d99c0a8d..1808c3f15d 100644 --- a/perf/index.html +++ b/perf/index.html @@ -42,7 +42,7 @@ var reactVersions = [ window.onload = function(){ window.isDone = false; - React.renderComponent( + React.render( BrowserPerfRunnerApp({ headless: perfRunner.getQueryParamArrayOrDefault('headless', [false])[0], react: perfRunner.getQueryParamArrayOrDefault('react', reactVersions), diff --git a/perf/lib/BrowserPerfRunnerContext.react.js b/perf/lib/BrowserPerfRunnerContext.react.js index 0fdbca8390..4712ec4c45 100644 --- a/perf/lib/BrowserPerfRunnerContext.react.js +++ b/perf/lib/BrowserPerfRunnerContext.react.js @@ -7,38 +7,38 @@ var BenchmarkQueue = React.createClass({ onCompleteEach: React.PropTypes.func, onError: React.PropTypes.func }, - + getDefaultProps: function(){ return { maxTime: 5 }; }, - + getInitialState: function(){ return { queue: this.props.initialQueue.slice() }; }, - + setItemState: function(state){ state.test = this.state.queue[0].test; state.react = this.state.queue[0].react; this.props.onChange(state); }, - + handleContextReady: function(window){ var benchmark = window.Benchmark(window.exports); benchmark.options.maxTime = this.props.maxTime; //DEBUG var itemState = { testRunnerURL: window.location.href, - + name: window.exports.name, platform: window.Benchmark.platform.description, reactVersion: window.React.version, - + isMinified: (function(){ - var code = window.React.renderComponent.toString(); + var code = window.React.render.toString(); return code.indexOf(',') - code.indexOf('(') <= 2; }()) }; @@ -66,11 +66,11 @@ var BenchmarkQueue = React.createClass({ }); benchmark.run({async:true}); }, - + shouldComponentUpdate: function(nextProps, nextState){ return nextState.queue.length < this.state.queue.length; }, - + render: function(){ if (!(this.state.queue && this.state.queue.length > 0)){ return React.DOM.div({style:{display:'none'}}); @@ -110,11 +110,11 @@ var BrowserPerfRunnerContext = React.createClass({ // _handleFrameError: function(error){ // console.error('BrowserPerfRunnerContext', error); // }, - // + // // _handleFrameLoad: function(event){ // console.log('BrowserPerfRunnerContext', event); // }, - // + // _handleMessage: function(event){ if (location.href.indexOf(event.origin) !== 0) return console.debug('BrowserPerfRunnerContext#_handleMessage ignored message from ' + event.origin); @@ -191,5 +191,5 @@ var BrowserPerfRunnerContext = React.createClass({ right: '100%', bottom: '100%' } - + }); diff --git a/perf/lib/todolist.html b/perf/lib/todolist.html index 7c2de136e0..c2c63ae590 100644 --- a/perf/lib/todolist.html +++ b/perf/lib/todolist.html @@ -10,7 +10,7 @@ diff --git a/perf/tests/basic-unmount.js b/perf/tests/basic-unmount.js index 25be4a1a9f..996a2e8892 100644 --- a/perf/tests/basic-unmount.js +++ b/perf/tests/basic-unmount.js @@ -15,7 +15,7 @@ exports.setup = function(){ /*global*/_rootNode = document.createElement('div'); document.body.appendChild(_rootNode); var _firstChild = React.DOM.div(null, 'lol, perf testing ', this.count); - React.renderComponent(_firstChild, _rootNode); + React.render(_firstChild, _rootNode); }; exports.fn = function(){ if (React.unmountAndReleaseReactRootNode) React.unmountAndReleaseReactRootNode(_rootNode); diff --git a/perf/tests/propTypes.js b/perf/tests/propTypes.js index 6c2a0f8346..32e53b963c 100644 --- a/perf/tests/propTypes.js +++ b/perf/tests/propTypes.js @@ -70,7 +70,7 @@ exports.fn = function(){ })); }; - React.renderComponent(List({ + React.render(List({ array: [11, 12, 13, 14, 15, 16, 17, 18, 19, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10], bool: false, number: Math.random(), diff --git a/perf/tests/renderComponent-basic.js b/perf/tests/renderComponent-basic.js index 36ad367419..182e4c231d 100644 --- a/perf/tests/renderComponent-basic.js +++ b/perf/tests/renderComponent-basic.js @@ -9,14 +9,14 @@ if (typeof exports == 'undefined') exports = {}; /*http://benchmarkjs.com/docs#options*/ -exports.name = 'React.renderComponent single div'; +exports.name = 'React.render single div'; exports.setup = function(){ /*global*/_rootNode = document.createElement('div'); document.body.appendChild(_rootNode); }; exports.fn = function(){ - React.renderComponent(React.DOM.div(null, 'lol, perf testing ', this.count), _rootNode); + React.render(React.DOM.div(null, 'lol, perf testing ', this.count), _rootNode); }; exports.teardown = function(){ if (React.unmountAndReleaseReactRootNode) React.unmountAndReleaseReactRootNode(_rootNode); diff --git a/perf/tests/setState-callback-5.js b/perf/tests/setState-callback-5.js index 5868baaab5..a4cebef9bc 100644 --- a/perf/tests/setState-callback-5.js +++ b/perf/tests/setState-callback-5.js @@ -21,7 +21,7 @@ exports.setup = function(){ } }); - React.renderComponent(AwesomeComponent(null), _rootNode); + React.render(AwesomeComponent(null), _rootNode); }; exports.fn = function(deferred){ setState({random: Date.now() + Math.random()}, function(){ diff --git a/perf/tests/setState-callback.js b/perf/tests/setState-callback.js index c5a66ac174..4eeffac34f 100644 --- a/perf/tests/setState-callback.js +++ b/perf/tests/setState-callback.js @@ -21,7 +21,7 @@ exports.setup = function(){ } }); - React.renderComponent(AwesomeComponent(null), _rootNode); + React.render(AwesomeComponent(null), _rootNode); }; exports.fn = function(deferred){ setState({random: Date.now() + Math.random()}, function(){ diff --git a/perf/tests/shouldComponentUpdate.js b/perf/tests/shouldComponentUpdate.js index 3bdb4e70b2..b791c9aa38 100644 --- a/perf/tests/shouldComponentUpdate.js +++ b/perf/tests/shouldComponentUpdate.js @@ -18,7 +18,7 @@ exports.setup = function(){ document.body.appendChild(_rootNode); }; exports.fn = function(){ - React.renderComponent(AwesomeComponent(null), _rootNode); + React.render(AwesomeComponent(null), _rootNode); }; exports.teardown = function(){ React.unmountComponentAtNode(_rootNode); diff --git a/perf/tests/todolist-add.js b/perf/tests/todolist-add.js index 80346a4820..d129f51481 100644 --- a/perf/tests/todolist-add.js +++ b/perf/tests/todolist-add.js @@ -10,7 +10,7 @@ exports.setup = function(){ /*global*/_rootNode = document.createElement('div'); document.body.appendChild(_rootNode); var appDescriptor = todolist.App({ fakeDataCount: 333 }); - /*global*/_app = React.renderComponent(appDescriptor, _rootNode); + /*global*/_app = React.render(appDescriptor, _rootNode); }; exports.fn = function(deferred){ var liCount = document.getElementsByTagName('li').length; diff --git a/perf/tests/todolist-do-stuff.js b/perf/tests/todolist-do-stuff.js index 8b60844bd6..78aadca883 100644 --- a/perf/tests/todolist-do-stuff.js +++ b/perf/tests/todolist-do-stuff.js @@ -12,7 +12,7 @@ exports.setup = function(){ /*global*/_rootNode = document.createElement('div'); document.body.appendChild(_rootNode); var appDescriptor = todolist.App({ fakeDataCount: 333 }); - /*global*/_app = React.renderComponent(appDescriptor, _rootNode); + /*global*/_app = React.render(appDescriptor, _rootNode); }; exports.fn = function(deferred){ diff --git a/perf/tests/todolist-edit.js b/perf/tests/todolist-edit.js index 06f46aa726..9a8185ac9f 100644 --- a/perf/tests/todolist-edit.js +++ b/perf/tests/todolist-edit.js @@ -10,7 +10,7 @@ exports.setup = function(){ /*global*/_rootNode = document.createElement('div'); document.body.appendChild(_rootNode); var appDescriptor = todolist.App({ fakeDataCount: 333 }); - /*global*/_app = React.renderComponent(appDescriptor, _rootNode); + /*global*/_app = React.render(appDescriptor, _rootNode); /*global*/_todo1 = _app.addItem("Howdy 1!"); /*global*/_todo2 = _app.addItem("Howdy 2!"); /*global*/_todo3 = _app.addItem("Howdy 3!"); diff --git a/perf/tests/todolist-mount.js b/perf/tests/todolist-mount.js index 71bdc91dbe..8ef6c24338 100644 --- a/perf/tests/todolist-mount.js +++ b/perf/tests/todolist-mount.js @@ -13,7 +13,7 @@ exports.setup = function(){ }; exports.fn = function(deferred){ - React.renderComponent(todolist.App({ fakeDataCount: 333 }), _rootNode, function(){ deferred.resolve(); }); + React.render(todolist.App({ fakeDataCount: 333 }), _rootNode, function(){ deferred.resolve(); }); }; exports.teardown = function(){