dillon1000/react
Commit
Browse files Merge branch 'master' into docs-namespace-in-jsx
* master: (113 commits) Remove esprima-fb and use Syntax from jstransform Update React.renderToString argument type in docs [traverseAllChildren] fix out-of-scope var use. Use double quote for transformed `displayName` and `data-*` Remove unrelated comment Fix typo in If/Else JSX doc. Cleanup a couple unused variables Use dump cache and remove factory from ReactElement-test Update deprecated propTypes Bring in jsfiddle integration script, add harmony Extending period in which click events are ignored React.renderComponent --> React.render Followup fix for React.PropTypes.node Add comma for readability in tutorial Drop internal uses of .type on the class Drop Legacy Factories Around Classes Drop ReactDOM from internal DOM extensions Added comma to increase readability. Add 0.12 starter kit Change the date and the link url to match the proper roundup ... Conflicts: docs/docs/02.1-jsx-in-depth.md
Changed paths392 files
First-parent comparison.jshintrc ModifiedM .mailmap ModifiedM AUTHORS ModifiedM CHANGELOG.md ModifiedM CONTRIBUTING.md ModifiedM Gruntfile.js ModifiedM LICENSE ModifiedA LICENSE-docs AddedA LICENSE-examples AddedA PATENTS AddedM README.md ModifiedM docs/Rakefile ModifiedM docs/_config.yml ModifiedM docs/_data/acknowledgements.yml ModifiedM docs/_data/nav_docs.yml ModifiedM docs/_js/examples/hello.js ModifiedM docs/_js/examples/markdown.js ModifiedM docs/_js/examples/timer.js ModifiedM docs/_js/examples/todo.js ModifiedM docs/_js/html-jsx.js ModifiedA docs/_js/jsfiddle-integration.js AddedM docs/_js/jsx-compiler.js ModifiedM docs/_js/live_editor.js ModifiedM docs/_layouts/default.html ModifiedM docs/_posts/2013-11-05-thinking-in-react.md ModifiedA docs/_posts/2014-09-16-react-v0.11.2.md AddedA docs/_posts/2014-10-14-introducing-react-elements.md AddedA docs/_posts/2014-10-16-react-v0.12-rc1.md AddedA docs/_posts/2014-10-17-community-roundup-23.md AddedA docs/_posts/2014-10-27-react-js-conf.md AddedA docs/_posts/2014-10-28-react-v0.12.md AddedM docs/docs/02-displaying-data.md ModifiedM docs/docs/02-displaying-data.zh-CN.md ModifiedM docs/docs/02.1-jsx-in-depth.md ModifiedA docs/docs/02.2-jsx-spread.md AddedR docs/docs/02.2-jsx-gotchas.md →docs/docs/02.3-jsx-gotchas.md RenamedM docs/docs/03-interactivity-and-dynamic-uis.md ModifiedM docs/docs/04-multiple-components.md ModifiedM docs/docs/05-reusable-components.md ModifiedA docs/docs/06-transferring-props.md AddedR docs/docs/06-forms.md →docs/docs/07-forms.md RenamedR docs/docs/07-working-with-the-browser.md →docs/docs/08-working-with-the-browser.md RenamedR docs/docs/07.1-more-about-refs.md →docs/docs/08.1-more-about-refs.md RenamedR docs/docs/08-tooling-integration.md →docs/docs/09-tooling-integration.md RenamedR docs/docs/09-addons.md →docs/docs/10-addons.md RenamedR docs/docs/09.1-animation.md →docs/docs/10.1-animation.md RenamedR docs/docs/09.2-form-input-binding-sugar.md →docs/docs/10.2-form-input-binding-sugar.md RenamedR docs/docs/09.3-class-name-manipulation.md →docs/docs/10.3-class-name-manipulation.md RenamedR docs/docs/09.4-test-utils.md →docs/docs/10.4-test-utils.md RenamedR docs/docs/09.5-clone-with-props.md →docs/docs/10.5-clone-with-props.md RenamedR docs/docs/09.6-update.md →docs/docs/10.6-update.md RenamedR docs/docs/09.7-pure-render-mixin.md →docs/docs/10.7-pure-render-mixin.md RenamedR docs/docs/09.8-perf.md →docs/docs/10.8-perf.md RenamedM 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/ref-04-tags-and-attributes.md ModifiedM docs/docs/ref-08-reconciliation.md ModifiedA docs/docs/ref-09-glossary.md AddedM docs/docs/thinking-in-react.md ModifiedM docs/docs/tutorial.md ModifiedM docs/downloads.md ModifiedA docs/downloads/react-0.11.2.zip AddedA docs/downloads/react-0.12.0-rc1.zip AddedA docs/downloads/react-0.12.0.zip AddedA docs/img/blog/flux-chart.png AddedA docs/img/blog/reflux-flux.png AddedM 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/ballmer-peak/example.js ModifiedM examples/basic-commonjs/index.js ModifiedM examples/basic-jsx-external/example.js ModifiedM examples/basic-jsx-harmony/index.html ModifiedM examples/basic-jsx-precompile/example.js ModifiedM examples/basic-jsx/index.html ModifiedM examples/basic/index.html ModifiedM examples/jquery-bootstrap/js/app.js ModifiedM examples/jquery-mobile/js/app.js ModifiedM examples/server-rendering/README.md ModifiedM examples/server-rendering/jsapp/package.json ModifiedM examples/server-rendering/jsapp/src/App.js ModifiedM examples/server-rendering/reactserver/package.json ModifiedM examples/server-rendering/reactserver/server.js ModifiedM examples/server-rendering/webapp/index.php ModifiedM examples/transitions/index.html ModifiedM gem-react-source/react-source.gemspec ModifiedM grunt/config/browserify.js ModifiedM grunt/config/jsx.js ModifiedM grunt/tasks/browserify.js ModifiedM jest/environment.js ModifiedM npm-react-tools/README.md ModifiedM npm-react/package.json ModifiedM package.json ModifiedM perf/index.html ModifiedM perf/lib/BrowserPerfRunnerContext.react.js ModifiedM perf/lib/todolist.html ModifiedM perf/tests/basic-unmount.js ModifiedM perf/tests/propTypes.js ModifiedM perf/tests/renderComponent-basic.js ModifiedM perf/tests/setState-callback-5.js ModifiedM perf/tests/setState-callback.js ModifiedM perf/tests/shouldComponentUpdate.js ModifiedM perf/tests/todolist-add.js ModifiedM perf/tests/todolist-do-stuff.js ModifiedM perf/tests/todolist-edit.js ModifiedM perf/tests/todolist-mount.js ModifiedM src/.jshintrc ModifiedM src/addons/ReactComponentWithPureRenderMixin.js ModifiedM src/addons/ReactRAFBatchingStrategy.js ModifiedM src/addons/__tests__/update-test.js ModifiedM src/addons/link/LinkedStateMixin.js ModifiedM src/addons/link/ReactLink.js ModifiedM src/addons/link/__tests__/LinkedStateMixin-test.js ModifiedM src/addons/link/__tests__/ReactLinkPropTypes-test.js ModifiedM src/addons/transitions/ReactCSSTransitionGroup.js ModifiedM src/addons/transitions/ReactCSSTransitionGroupChild.js ModifiedM src/addons/transitions/ReactTransitionChildMapping.js ModifiedM src/addons/transitions/ReactTransitionEvents.js ModifiedM src/addons/transitions/ReactTransitionGroup.js ModifiedM src/addons/transitions/__tests__/ReactCSSTransitionGroup-test.js ModifiedM src/addons/transitions/__tests__/ReactTransitionChildMapping-test.js ModifiedM src/addons/transitions/__tests__/ReactTransitionGroup-test.js ModifiedM src/addons/update.js ModifiedM src/browser/ClientReactRootIndex.js ModifiedM src/browser/ReactBrowserEventEmitter.js ModifiedM src/browser/ReactDOM.js ModifiedM src/browser/ReactPutListenerQueue.js ModifiedM src/browser/ReactReconcileTransaction.js ModifiedM src/browser/ReactTextComponent.js ModifiedM src/browser/ReactWithAddons.js ModifiedM src/browser/__tests__/ReactBrowserEventEmitter-test.js ModifiedM src/browser/__tests__/ReactDOM-test.js ModifiedM src/browser/__tests__/ReactWebWorker-test.js ModifiedM src/browser/eventPlugins/AnalyticsEventPluginFactory.js ModifiedM src/browser/eventPlugins/BeforeInputEventPlugin.js ModifiedM src/browser/eventPlugins/ChangeEventPlugin.js ModifiedM src/browser/eventPlugins/CompositionEventPlugin.js ModifiedM src/browser/eventPlugins/DefaultEventPluginOrder.js ModifiedM src/browser/eventPlugins/EnterLeaveEventPlugin.js ModifiedM src/browser/eventPlugins/MobileSafariClickEventPlugin.js ModifiedM src/browser/eventPlugins/ResponderEventPlugin.js ModifiedM src/browser/eventPlugins/SelectEventPlugin.js ModifiedM src/browser/eventPlugins/SimpleEventPlugin.js ModifiedM src/browser/eventPlugins/TapEventPlugin.js ModifiedM src/browser/eventPlugins/__tests__/AnalyticsEventPlugin-test.js ModifiedM src/browser/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js ModifiedM src/browser/eventPlugins/__tests__/ResponderEventPlugin-test.js ModifiedM src/browser/server/ReactMarkupChecksum.js ModifiedM src/browser/server/ReactServerRendering.js ModifiedM src/browser/server/ReactServerRenderingTransaction.js ModifiedM src/browser/server/ServerReactRootIndex.js ModifiedM src/browser/server/__tests__/ReactServerRendering-test.js ModifiedM src/browser/syntheticEvents/SyntheticClipboardEvent.js ModifiedM src/browser/syntheticEvents/SyntheticCompositionEvent.js ModifiedM src/browser/syntheticEvents/SyntheticDragEvent.js ModifiedM src/browser/syntheticEvents/SyntheticEvent.js ModifiedM src/browser/syntheticEvents/SyntheticFocusEvent.js ModifiedM src/browser/syntheticEvents/SyntheticInputEvent.js ModifiedM src/browser/syntheticEvents/SyntheticKeyboardEvent.js ModifiedM src/browser/syntheticEvents/SyntheticMouseEvent.js ModifiedM src/browser/syntheticEvents/SyntheticTouchEvent.js ModifiedM src/browser/syntheticEvents/SyntheticUIEvent.js ModifiedM src/browser/syntheticEvents/SyntheticWheelEvent.js ModifiedM src/browser/syntheticEvents/__tests__/SyntheticEvent-test.js ModifiedM src/browser/syntheticEvents/__tests__/SyntheticWheelEvent-test.js ModifiedM src/browser/ui/React.js ModifiedM src/browser/ui/ReactBrowserComponentMixin.js ModifiedM src/browser/ui/ReactComponentBrowserEnvironment.js ModifiedM src/browser/ui/ReactDOMComponent.js ModifiedM src/browser/ui/ReactDOMIDOperations.js ModifiedM src/browser/ui/ReactDOMSelection.js ModifiedM src/browser/ui/ReactDefaultInjection.js ModifiedM src/browser/ui/ReactEventListener.js ModifiedM src/browser/ui/ReactInjection.js ModifiedM src/browser/ui/ReactInputSelection.js ModifiedM src/browser/ui/ReactMount.js ModifiedM src/browser/ui/__tests__/ReactDOMComponent-test.js ModifiedM src/browser/ui/__tests__/ReactDOMIDOperations-test.js ModifiedM src/browser/ui/__tests__/ReactEventListener-test.js ModifiedM src/browser/ui/__tests__/ReactMount-test.js ModifiedM src/browser/ui/__tests__/ReactMountDestruction-test.js ModifiedM src/browser/ui/__tests__/ReactRenderDocument-test.js ModifiedM src/browser/ui/dom/CSSProperty.js ModifiedM src/browser/ui/dom/CSSPropertyOperations.js ModifiedM src/browser/ui/dom/DOMChildrenOperations.js ModifiedM src/browser/ui/dom/DOMProperty.js ModifiedM src/browser/ui/dom/DOMPropertyOperations.js ModifiedM src/browser/ui/dom/Danger.js ModifiedM src/browser/ui/dom/HTMLDOMPropertyConfig.js ModifiedM src/browser/ui/dom/SVGDOMPropertyConfig.js ModifiedM src/browser/ui/dom/ViewportMetrics.js ModifiedM src/browser/ui/dom/__tests__/CSSProperty-test.js ModifiedM src/browser/ui/dom/__tests__/CSSPropertyOperations-test.js ModifiedM src/browser/ui/dom/__tests__/DOMPropertyOperations-test.js ModifiedM src/browser/ui/dom/__tests__/Danger-test.js ModifiedM src/browser/ui/dom/__tests__/getNodeForCharacterOffset-test.js ModifiedM src/browser/ui/dom/components/AutoFocusMixin.js ModifiedM src/browser/ui/dom/components/LinkedValueUtils.js ModifiedM src/browser/ui/dom/components/LocalEventTrapMixin.js ModifiedM src/browser/ui/dom/components/ReactDOMButton.js ModifiedM src/browser/ui/dom/components/ReactDOMForm.js ModifiedM src/browser/ui/dom/components/ReactDOMImg.js ModifiedM src/browser/ui/dom/components/ReactDOMInput.js ModifiedM src/browser/ui/dom/components/ReactDOMOption.js ModifiedM src/browser/ui/dom/components/ReactDOMSelect.js ModifiedM src/browser/ui/dom/components/ReactDOMTextarea.js ModifiedM src/browser/ui/dom/components/__tests__/ReactDOMButton-test.js ModifiedM src/browser/ui/dom/components/__tests__/ReactDOMInput-test.js ModifiedM src/browser/ui/dom/components/__tests__/ReactDOMSelect-test.js ModifiedM src/browser/ui/dom/components/__tests__/ReactDOMTextarea-test.js ModifiedM src/browser/ui/dom/components/createFullPageComponent.js ModifiedM src/browser/ui/dom/dangerousStyleValue.js ModifiedM src/browser/ui/dom/getEventCharCode.js ModifiedM src/browser/ui/dom/getEventKey.js ModifiedM src/browser/ui/dom/getEventModifierState.js ModifiedM src/browser/ui/dom/getEventTarget.js ModifiedM src/browser/ui/dom/getNodeForCharacterOffset.js ModifiedM src/browser/ui/dom/getTextContentAccessor.js ModifiedM src/browser/ui/dom/isEventSupported.js ModifiedM src/browser/ui/dom/setInnerHTML.js ModifiedM src/browser/ui/getReactRootElementInContainer.js ModifiedA src/class/ReactClass.js AddedM src/core/ReactComponent.js ModifiedM src/core/ReactCompositeComponent.js ModifiedM src/core/ReactContext.js ModifiedM src/core/ReactCurrentOwner.js ModifiedM src/core/ReactDefaultBatchingStrategy.js ModifiedM src/core/ReactDoNotBindDeprecated.js ModifiedR src/core/ReactDescriptor.js →src/core/ReactElement.js RenamedR src/core/ReactDescriptorValidator.js →src/core/ReactElementValidator.js RenamedM src/core/ReactEmptyComponent.js ModifiedM src/core/ReactEventEmitterMixin.js ModifiedM src/core/ReactInstanceHandles.js ModifiedD src/core/ReactLegacyDescriptor.js DeletedM src/core/ReactMultiChild.js ModifiedM src/core/ReactMultiChildUpdateTypes.js ModifiedM src/core/ReactNativeComponent.js ModifiedM src/core/ReactOwner.js ModifiedM src/core/ReactPropTransferer.js ModifiedM src/core/ReactPropTypeLocationNames.js ModifiedM src/core/ReactPropTypeLocations.js ModifiedM src/core/ReactPropTypes.js ModifiedM src/core/ReactRootIndex.js ModifiedM src/core/ReactStateSetters.js ModifiedM src/core/ReactUpdates.js ModifiedM src/core/__tests__/ReactBind-test.js ModifiedM src/core/__tests__/ReactComponent-test.js ModifiedM src/core/__tests__/ReactComponentLifeCycle-test.js ModifiedM src/core/__tests__/ReactCompositeComponent-test.js ModifiedM src/core/__tests__/ReactCompositeComponentDOMMinimalism-test.js ModifiedM src/core/__tests__/ReactCompositeComponentError-test.js ModifiedM src/core/__tests__/ReactCompositeComponentMixin-test.js ModifiedM src/core/__tests__/ReactCompositeComponentSpec-test.js ModifiedM src/core/__tests__/ReactCompositeComponentState-test.js ModifiedD src/core/__tests__/ReactDescriptor-test.js DeletedA src/core/__tests__/ReactElement-test.js AddedM src/core/__tests__/ReactIdentity-test.js ModifiedM src/core/__tests__/ReactInstanceHandles-test.js ModifiedA src/core/__tests__/ReactMockedComponent-test.js AddedM src/core/__tests__/ReactMultiChild-test.js ModifiedM src/core/__tests__/ReactMultiChildReconcile-test.js ModifiedM src/core/__tests__/ReactMultiChildText-test.js ModifiedM src/core/__tests__/ReactPropTransferer-test.js ModifiedM src/core/__tests__/ReactPropTypes-test.js ModifiedM src/core/__tests__/ReactStateSetters-test.js ModifiedM src/core/__tests__/ReactTextComponent-test.js ModifiedM src/core/__tests__/ReactUpdates-test.js ModifiedM src/core/__tests__/refs-destruction-test.js ModifiedM src/core/__tests__/refs-test.js ModifiedM src/core/instantiateReactComponent.js ModifiedM src/core/shouldUpdateReactComponent.js ModifiedM src/event/EventConstants.js ModifiedM src/event/EventPluginHub.js ModifiedM src/event/EventPluginRegistry.js ModifiedM src/event/EventPluginUtils.js ModifiedM src/event/EventPropagators.js ModifiedM src/event/__tests__/EventPluginHub-test.js ModifiedM src/event/__tests__/EventPluginRegistry-test.js ModifiedA src/stubs/Object.assign.js AddedM src/test/ReactDefaultPerf.js ModifiedM src/test/ReactDefaultPerfAnalysis.js ModifiedM src/test/ReactPerf.js ModifiedM src/test/ReactTestUtils.js ModifiedM src/test/createHierarchyRenderer.js ModifiedM src/test/getTestDocument.js ModifiedM src/test/mock-modules.js ModifiedM src/test/mock-timers.js ModifiedM src/test/mocks.js ModifiedM src/test/reactComponentExpect.js ModifiedM src/utils/CallbackQueue.js ModifiedM src/utils/LegacyImmutableObject.js ModifiedM src/utils/OrderedMap.js ModifiedM src/utils/PooledClass.js ModifiedM src/utils/ReactChildren.js ModifiedM src/utils/Transaction.js ModifiedM src/utils/__tests__/LegacyImmutableObject-test.js ModifiedM src/utils/__tests__/OrderedMap-test.js ModifiedM src/utils/__tests__/PooledClass-test.js ModifiedM src/utils/__tests__/ReactChildren-test.js ModifiedM src/utils/__tests__/Transaction-test.js ModifiedM src/utils/__tests__/accumulateInto-test.js ModifiedM src/utils/__tests__/cloneWithProps-test.js ModifiedM src/utils/__tests__/escapeTextForBrowser-test.js ModifiedM src/utils/__tests__/joinClasses-test.js ModifiedM src/utils/__tests__/keyMirror-test.js ModifiedM src/utils/__tests__/memoizeStringOnly-test.js ModifiedM src/utils/__tests__/onlyChild-test.js ModifiedM src/utils/__tests__/sliceChildren-test.js ModifiedM src/utils/__tests__/traverseAllChildren-test.js ModifiedM src/utils/accumulate.js ModifiedM src/utils/accumulateInto.js ModifiedM src/utils/adler32.js ModifiedM src/utils/cloneWithProps.js ModifiedA src/utils/deprecated.js AddedM src/utils/escapeTextForBrowser.js ModifiedM src/utils/flattenChildren.js ModifiedM src/utils/forEachAccumulated.js ModifiedA src/utils/getIteratorFn.js AddedM src/utils/isTextInputElement.js ModifiedM src/utils/joinClasses.js ModifiedM src/utils/keyMirror.js ModifiedM src/utils/memoizeStringOnly.js ModifiedD src/utils/mixInto.js DeletedM src/utils/onlyChild.js ModifiedM src/utils/shallowEqual.js ModifiedM src/utils/sliceChildren.js ModifiedM src/utils/traverseAllChildren.js ModifiedA src/vendor/README.md AddedM src/vendor/core/CSSCore.js ModifiedM src/vendor/core/ExecutionEnvironment.js ModifiedM src/vendor/core/TouchEventUtils.js ModifiedM src/vendor/core/camelize.js ModifiedM src/vendor/core/camelizeStyleName.js ModifiedM src/vendor/core/createArrayFrom.js ModifiedM src/vendor/core/createNodesFromMarkup.js ModifiedM src/vendor/core/dom/containsNode.js ModifiedM src/vendor/core/dom/focusNode.js ModifiedM src/vendor/core/dom/getActiveElement.js ModifiedM src/vendor/core/dom/getUnboundedScrollPosition.js ModifiedM src/vendor/core/dom/isNode.js ModifiedM src/vendor/core/dom/isTextNode.js ModifiedM src/vendor/core/emptyFunction.js ModifiedM src/vendor/core/emptyObject.js ModifiedM src/vendor/core/getMarkupWrap.js ModifiedM src/vendor/core/hyphenate.js ModifiedM src/vendor/core/hyphenateStyleName.js ModifiedM src/vendor/core/invariant.js ModifiedM src/vendor/core/keyOf.js ModifiedM src/vendor/core/mapObject.js ModifiedD src/vendor/core/merge.js DeletedM src/vendor/core/mergeDeep.js ModifiedM src/vendor/core/mergeDeepInto.js ModifiedM src/vendor/core/mergeHelpers.js ModifiedD src/vendor/core/mergeInto.js DeletedM src/vendor/core/monitorCodeUse.js ModifiedM src/vendor/core/nativeRequestAnimationFrame.js ModifiedM src/vendor/core/requestAnimationFrame.js ModifiedM src/vendor/core/toArray.js ModifiedM src/vendor/core/warning.js ModifiedM src/vendor/immutable/Immutable.js ModifiedM src/vendor/immutable/ImmutableObject.js ModifiedM src/vendor/performance/performance.js ModifiedM src/vendor/performance/performanceNow.js ModifiedD src/vendor/polyfill/Object.es6.js DeletedM src/vendor/stubs/EventListener.js ModifiedM src/vendor/stubs/ReactErrorUtils.js ModifiedM src/vendor/stubs/cx.js ModifiedA src/vendor_deprecated/README.md AddedR src/vendor/core/copyProperties.js →src/vendor_deprecated/core/copyProperties.js RenamedA src/vendor_deprecated/core/merge.js AddedA src/vendor_deprecated/core/mergeInto.js AddedM vendor/browser-transforms.js ModifiedM vendor/constants.js ModifiedM vendor/fbtransform/transforms/__tests__/react-displayName-test.js ModifiedM vendor/fbtransform/transforms/__tests__/react-test.js ModifiedM vendor/fbtransform/transforms/react.js ModifiedM vendor/fbtransform/transforms/reactDisplayName.js ModifiedM vendor/fbtransform/transforms/xjs.js ModifiedM vendor/jasmine/console.js ModifiedM vendor/jasmine/phantom.js ModifiedPatch
Files changed
Rendering syntax-highlighted changes…