dillon1000/react
Commit
Browse files Merge pull request #2303 from sebmarkbage/dropmerge
Use Object.assign instead of merge, mergeInto, mixInto and copyPropertie...
Changed paths34 files
First-parent comparisonsrc/addons/transitions/ReactCSSTransitionGroup.js ModifiedM src/addons/transitions/ReactTransitionGroup.js ModifiedM src/addons/update.js ModifiedM src/browser/ReactBrowserEventEmitter.js ModifiedM src/browser/ReactPutListenerQueue.js ModifiedM src/browser/ReactReconcileTransaction.js ModifiedM src/browser/ReactTextComponent.js ModifiedM src/browser/server/ReactServerRenderingTransaction.js ModifiedM src/browser/syntheticEvents/SyntheticEvent.js ModifiedM src/browser/ui/ReactDOMComponent.js ModifiedM src/browser/ui/ReactEventListener.js ModifiedM src/browser/ui/__tests__/ReactDOMComponent-test.js ModifiedM src/browser/ui/dom/components/ReactDOMInput.js ModifiedM src/browser/ui/dom/components/ReactDOMSelect.js ModifiedM src/browser/ui/dom/components/ReactDOMTextarea.js ModifiedM src/core/ReactComponent.js ModifiedM src/core/ReactCompositeComponent.js ModifiedM src/core/ReactContext.js ModifiedM src/core/ReactDefaultBatchingStrategy.js ModifiedM src/core/ReactLegacyElement.js ModifiedM src/core/ReactNativeComponent.js ModifiedM src/core/ReactPropTransferer.js ModifiedM src/core/ReactUpdates.js ModifiedM src/event/__tests__/EventPluginRegistry-test.js ModifiedM src/test/ReactDefaultPerfAnalysis.js ModifiedM src/test/ReactTestUtils.js ModifiedM src/test/reactComponentExpect.js ModifiedM src/utils/CallbackQueue.js ModifiedM src/utils/LegacyImmutableObject.js ModifiedM src/utils/OrderedMap.js ModifiedM src/utils/__tests__/Transaction-test.js ModifiedD src/utils/mixInto.js DeletedM src/vendor/core/emptyFunction.js ModifiedM src/vendor/immutable/Immutable.js ModifiedPatch
Files changed
Rendering syntax-highlighted changes…