react
Advanced tools
Comparing version 0.13.0-rc2 to 0.13.0
@@ -146,4 +146,4 @@ /** | ||
React.version = '0.13.0-rc2'; | ||
React.version = '0.13.0'; | ||
module.exports = React; |
@@ -82,3 +82,3 @@ /** | ||
* | ||
* This will not invoke `shouldUpdateComponent`, but it will invoke | ||
* This will not invoke `shouldComponentUpdate`, but it will invoke | ||
* `componentWillUpdate` and `componentDidUpdate`. | ||
@@ -106,2 +106,3 @@ * | ||
isMounted: 'isMounted', | ||
replaceProps: 'replaceProps', | ||
replaceState: 'replaceState', | ||
@@ -108,0 +109,0 @@ setProps: 'setProps' |
@@ -136,2 +136,16 @@ /** | ||
var inst = new Component(publicProps, publicContext); | ||
if ("production" !== process.env.NODE_ENV) { | ||
// This will throw later in _renderValidatedComponent, but add an early | ||
// warning now to help debugging | ||
("production" !== process.env.NODE_ENV ? warning( | ||
inst.render != null, | ||
'%s(...): No `render` method found on the returned component ' + | ||
'instance: you may have forgotten to define `render` in your ' + | ||
'component or you may have accidentally tried to render an element ' + | ||
'whose type is a function that isn\'t a React component.', | ||
Component.displayName || Component.name || 'Component' | ||
) : null); | ||
} | ||
// These should be set up in the constructor, but as a convenience for | ||
@@ -138,0 +152,0 @@ // simpler class abstractions, we set them up after the fact. |
@@ -245,13 +245,8 @@ /** | ||
var displayName = null; | ||
if (this._instance.constructor.displayName) { | ||
displayName = this._instance.constructor.displayName; | ||
} else if (this._currentElement.type) { | ||
displayName = this._currentElement.type; | ||
} | ||
entry.displayNames[rootNodeID] = { | ||
current: displayName, | ||
current: typeof this._currentElement.type === 'string' ? | ||
this._currentElement.type : | ||
this.getName(), | ||
owner: this._currentElement._owner ? | ||
this._currentElement._owner._instance.constructor.displayName : | ||
this._currentElement._owner.getName() : | ||
'<root>' | ||
@@ -258,0 +253,0 @@ }; |
@@ -295,2 +295,3 @@ /** | ||
case 'string': | ||
case 'undefined': | ||
return true; | ||
@@ -303,3 +304,3 @@ case 'boolean': | ||
} | ||
if (ReactElement.isValidElement(propValue)) { | ||
if (propValue === null || ReactElement.isValidElement(propValue)) { | ||
return true; | ||
@@ -306,0 +307,0 @@ } |
{ | ||
"name": "react", | ||
"description": "React is a JavaScript library for building user interfaces.", | ||
"version": "0.13.0-rc2", | ||
"version": "0.13.0", | ||
"keywords": [ | ||
@@ -6,0 +6,0 @@ "react" |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
2661796
70032
289