{"commit":{"shortRevision":"a54ed49eb0","authorEmail":"sebastian@calyptus.eu","authorName":"Sebastian Markbåge","revision":"a54ed49eb05200dcdc2f27ba9437d17e37571547","subject":"Merge pull request #2375 from sebmarkbage\/droplegacyfactories","authoredAt":"2014-10-28T18:00:32-07:00"},"files":[{"status":"M","path":"src\/browser\/ReactDOM.js"},{"status":"M","path":"src\/browser\/__tests__\/ReactDOM-test.js"},{"status":"M","path":"src\/browser\/ui\/React.js"},{"status":"M","path":"src\/browser\/ui\/ReactMount.js"},{"status":"M","path":"src\/browser\/ui\/dom\/components\/ReactDOMButton.js"},{"status":"M","path":"src\/browser\/ui\/dom\/components\/ReactDOMForm.js"},{"status":"M","path":"src\/browser\/ui\/dom\/components\/ReactDOMImg.js"},{"status":"M","path":"src\/browser\/ui\/dom\/components\/ReactDOMInput.js"},{"status":"M","path":"src\/browser\/ui\/dom\/components\/ReactDOMOption.js"},{"status":"M","path":"src\/browser\/ui\/dom\/components\/ReactDOMSelect.js"},{"status":"M","path":"src\/browser\/ui\/dom\/components\/ReactDOMTextarea.js"},{"status":"M","path":"src\/class\/ReactClass.js"},{"status":"M","path":"src\/core\/ReactCompositeComponent.js"},{"status":"M","path":"src\/core\/ReactElement.js"},{"status":"M","path":"src\/core\/ReactElementValidator.js"},{"status":"D","path":"src\/core\/ReactLegacyElement.js"},{"status":"M","path":"src\/core\/ReactNativeComponent.js"},{"status":"M","path":"src\/core\/__tests__\/ReactCompositeComponent-test.js"},{"status":"M","path":"src\/core\/__tests__\/ReactCompositeComponentMixin-test.js"},{"status":"M","path":"src\/core\/__tests__\/ReactCompositeComponentSpec-test.js"},{"status":"M","path":"src\/core\/__tests__\/ReactElement-test.js"},{"status":"A","path":"src\/core\/__tests__\/ReactMockedComponent-test.js"},{"status":"M","path":"src\/core\/instantiateReactComponent.js"},{"status":"M","path":"src\/test\/ReactTestUtils.js"},{"status":"M","path":"src\/test\/reactComponentExpect.js"}],"body":"Drop Legacy Factories","parents":["581085ea1b3201ef9b783dd10273ab4025664d51","9b36b04d75b59a4e0d155735b9ea60ee5fe00afb"],"patch":"diff --git a\/src\/browser\/ReactDOM.js b\/src\/browser\/ReactDOM.js\nindex 3bc9c5c102..d4b1303b44 100644\n--- a\/src\/browser\/ReactDOM.js\n+++ b\/src\/browser\/ReactDOM.js\n@@ -14,7 +14,6 @@\n \n var ReactElement = require('ReactElement');\n var ReactElementValidator = require('ReactElementValidator');\n-var ReactLegacyElement = require('ReactLegacyElement');\n \n var mapObject = require('mapObject');\n \n@@ -26,13 +25,9 @@ var mapObject = require('mapObject');\n *\/\n function createDOMFactory(tag) {\n if (__DEV__) {\n- return ReactLegacyElement.markNonLegacyFactory(\n- ReactElementValidator.createFactory(tag)\n- );\n+ return ReactElementValidator.createFactory(tag);\n }\n- return ReactLegacyElement.markNonLegacyFactory(\n- ReactElement.createFactory(tag)\n- );\n+ return ReactElement.createFactory(tag);\n }\n \n \/**\ndiff --git a\/src\/browser\/__tests__\/ReactDOM-test.js b\/src\/browser\/__tests__\/ReactDOM-test.js\nindex c47ef01f69..b839089d2b 100644\n--- a\/src\/browser\/__tests__\/ReactDOM-test.js\n+++ b\/src\/browser\/__tests__\/ReactDOM-test.js\n@@ -114,24 +114,4 @@ describe('ReactDOM', function() {\n expect(element.type).toBe('div');\n expect(console.warn.argsForCall.length).toBe(0);\n });\n-\n- it('warns but allow dom factories to be used in createFactory', function() {\n- spyOn(console, 'warn');\n- var factory = React.createFactory(React.DOM.div);\n- expect(factory().type).toBe('div');\n- expect(console.warn.argsForCall.length).toBe(1);\n- expect(console.warn.argsForCall[0][0]).toContain(\n- 'Do not pass React.DOM.div'\n- );\n- });\n-\n- it('warns but allow dom factories to be used in createElement', function() {\n- spyOn(console, 'warn');\n- var element = React.createElement(React.DOM.div);\n- expect(element.type).toBe('div');\n- expect(console.warn.argsForCall.length).toBe(1);\n- expect(console.warn.argsForCall[0][0]).toContain(\n- 'Do not pass React.DOM.div'\n- );\n- });\n });\ndiff --git a\/src\/browser\/ui\/React.js b\/src\/browser\/ui\/React.js\nindex 83d15f84d7..19de5a77ea 100644\n--- a\/src\/browser\/ui\/React.js\n+++ b\/src\/browser\/ui\/React.js\n@@ -24,7 +24,6 @@ var ReactDOM = require('ReactDOM');\n var ReactDOMComponent = require('ReactDOMComponent');\n var ReactDefaultInjection = require('ReactDefaultInjection');\n var ReactInstanceHandles = require('ReactInstanceHandles');\n-var ReactLegacyElement = require('ReactLegacyElement');\n var ReactMount = require('ReactMount');\n var ReactMultiChild = require('ReactMultiChild');\n var ReactPerf = require('ReactPerf');\n@@ -46,14 +45,6 @@ if (__DEV__) {\n createFactory = ReactElementValidator.createFactory;\n }\n \n-\/\/ TODO: Drop legacy elements once classes no longer export these factories\n-createElement = ReactLegacyElement.wrapCreateElement(\n- createElement\n-);\n-createFactory = ReactLegacyElement.wrapCreateFactory(\n- createFactory\n-);\n-\n var render = ReactPerf.measure('React', 'render', ReactMount.render);\n \n var React = {\n@@ -77,7 +68,6 @@ var React = {\n renderToString: ReactServerRendering.renderToString,\n renderToStaticMarkup: ReactServerRendering.renderToStaticMarkup,\n unmountComponentAtNode: ReactMount.unmountComponentAtNode,\n- isValidClass: ReactLegacyElement.isValidClass,\n isValidElement: ReactElement.isValidElement,\n withContext: ReactContext.withContext,\n \ndiff --git a\/src\/browser\/ui\/ReactMount.js b\/src\/browser\/ui\/ReactMount.js\nindex 57a20710ff..642fe67e5e 100644\n--- a\/src\/browser\/ui\/ReactMount.js\n+++ b\/src\/browser\/ui\/ReactMount.js\n@@ -15,7 +15,6 @@ var DOMProperty = require('DOMProperty');\n var ReactBrowserEventEmitter = require('ReactBrowserEventEmitter');\n var ReactCurrentOwner = require('ReactCurrentOwner');\n var ReactElement = require('ReactElement');\n-var ReactLegacyElement = require('ReactLegacyElement');\n var ReactInstanceHandles = require('ReactInstanceHandles');\n var ReactPerf = require('ReactPerf');\n \n@@ -27,10 +26,6 @@ var invariant = require('invariant');\n var shouldUpdateReactComponent = require('shouldUpdateReactComponent');\n var warning = require('warning');\n \n-var createElement = ReactLegacyElement.wrapCreateElement(\n- ReactElement.createElement\n-);\n-\n var SEPARATOR = ReactInstanceHandles.SEPARATOR;\n \n var ATTR_NAME = DOMProperty.ID_ATTRIBUTE_NAME;\n@@ -342,7 +337,7 @@ var ReactMount = {\n typeof nextElement === 'string' ?\n ' Instead of passing an element string, make sure to instantiate ' +\n 'it by passing it to React.createElement.' :\n- ReactLegacyElement.isValidFactory(nextElement) ?\n+ typeof nextElement === 'function' ?\n ' Instead of passing a component class, make sure to instantiate ' +\n 'it by passing it to React.createElement.' :\n \/\/ Check if it quacks like a element\n@@ -394,7 +389,7 @@ var ReactMount = {\n * @return {ReactComponent} Component instance rendered in `container`.\n *\/\n constructAndRenderComponent: function(constructor, props, container) {\n- var element = createElement(constructor, props);\n+ var element = ReactElement.createElement(constructor, props);\n return ReactMount.render(element, container);\n },\n \ndiff --git a\/src\/browser\/ui\/dom\/components\/ReactDOMButton.js b\/src\/browser\/ui\/dom\/components\/ReactDOMButton.js\nindex ed23b00289..a5fd34caf6 100644\n--- a\/src\/browser\/ui\/dom\/components\/ReactDOMButton.js\n+++ b\/src\/browser\/ui\/dom\/components\/ReactDOMButton.js\n@@ -15,12 +15,10 @@ var AutoFocusMixin = require('AutoFocusMixin');\n var ReactBrowserComponentMixin = require('ReactBrowserComponentMixin');\n var ReactClass = require('ReactClass');\n var ReactElement = require('ReactElement');\n-var ReactDOM = require('ReactDOM');\n \n var keyMirror = require('keyMirror');\n \n-\/\/ Store a reference to the

dillon1000/react

Files changed