dillon1000/react

Commit

Merge remote-tracking branch 'upstream/master' into fix-gruntfile

Browse files
Changed paths47 files
First-parent comparison
A LICENSE-docs AddedA LICENSE-examples AddedM README.md ModifiedM docs/_layouts/default.html ModifiedM docs/docs/02-displaying-data.md ModifiedM docs/docs/02-displaying-data.zh-CN.md ModifiedM docs/docs/03-interactivity-and-dynamic-uis.md ModifiedM docs/docs/04-multiple-components.md ModifiedM docs/docs/05-reusable-components.md ModifiedM docs/docs/07-working-with-the-browser.md ModifiedM docs/docs/09.5-clone-with-props.md ModifiedM docs/docs/getting-started.md ModifiedM docs/docs/getting-started.zh-CN.md ModifiedM docs/docs/ref-01-top-level-api.md ModifiedM docs/docs/ref-02-component-api.md ModifiedM docs/docs/thinking-in-react.md ModifiedM docs/docs/tutorial.md ModifiedM docs/downloads.md ModifiedM docs/tips/02-inline-styles.md ModifiedM docs/tips/03-if-else-in-JSX.md ModifiedM docs/tips/06-style-props-value-px.md ModifiedM docs/tips/07-children-props-type.md ModifiedM docs/tips/08-controlled-input-null-value.md ModifiedM docs/tips/10-props-in-getInitialState-as-anti-pattern.md ModifiedM docs/tips/11-dom-event-listeners.md ModifiedM docs/tips/12-initial-ajax.md ModifiedM docs/tips/13-false-in-jsx.md ModifiedM docs/tips/14-communicate-between-components.md ModifiedM docs/tips/15-expose-component-functions.md ModifiedM docs/tips/16-references-to-components.md ModifiedM docs/tips/17-children-undefined.md ModifiedM examples/server-rendering/jsapp/package.json ModifiedM examples/server-rendering/reactserver/package.json ModifiedM npm-react/package.json ModifiedM package.json ModifiedM src/browser/ReactTextComponent.js ModifiedM src/browser/ui/React.js ModifiedM src/browser/ui/ReactDOMComponent.js ModifiedM src/browser/ui/dom/components/__tests__/ReactDOMTextarea-test.js ModifiedM src/core/ReactComponent.js ModifiedM src/core/ReactCompositeComponent.js ModifiedM src/core/ReactElementValidator.js ModifiedM src/core/__tests__/ReactCompositeComponent-test.js ModifiedM src/core/__tests__/ReactElement-test.js ModifiedM src/utils/__tests__/traverseAllChildren-test.js ModifiedA src/utils/getIteratorFn.js AddedM src/utils/traverseAllChildren.js Modified
Patch

Files changed

Rendering syntax-highlighted changes…