{"commit":{"authoredAt":"2014-10-23T12:50:17-07:00","authorName":"Sebastian Markbåge","subject":"Merge pull request #2396 from sebmarkbage\/classmodule","revision":"b7cd3e7d1de31108594a6698215bfa7bf8619b34","shortRevision":"b7cd3e7d1d","authorEmail":"sebastian@calyptus.eu"},"files":[{"path":"src\/browser\/ui\/React.js","status":"M"},{"path":"src\/browser\/ui\/ReactDefaultInjection.js","status":"M"},{"path":"src\/browser\/ui\/ReactInjection.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\/browser\/ui\/dom\/components\/createFullPageComponent.js","status":"M"},{"path":"src\/class\/ReactClass.js","status":"A"},{"path":"src\/core\/ReactCompositeComponent.js","status":"M"},{"path":"src\/core\/__tests__\/ReactCompositeComponent-test.js","status":"M"}],"patch":"diff --git a\/src\/browser\/ui\/React.js b\/src\/browser\/ui\/React.js\nindex 171c2de180..83d15f84d7 100644\n--- a\/src\/browser\/ui\/React.js\n+++ b\/src\/browser\/ui\/React.js\n@@ -15,7 +15,7 @@ var DOMPropertyOperations = require('DOMPropertyOperations');\n var EventPluginUtils = require('EventPluginUtils');\n var ReactChildren = require('ReactChildren');\n var ReactComponent = require('ReactComponent');\n-var ReactCompositeComponent = require('ReactCompositeComponent');\n+var ReactClass = require('ReactClass');\n var ReactContext = require('ReactContext');\n var ReactCurrentOwner = require('ReactCurrentOwner');\n var ReactElement = require('ReactElement');\n@@ -68,7 +68,7 @@ var React = {\n initializeTouchEvents: function(shouldUseTouch) {\n EventPluginUtils.useTouchEvents = shouldUseTouch;\n },\n- createClass: ReactCompositeComponent.createClass,\n+ createClass: ReactClass.createClass,\n createElement: createElement,\n createFactory: createFactory,\n constructAndRenderComponent: ReactMount.constructAndRenderComponent,\ndiff --git a\/src\/browser\/ui\/ReactDefaultInjection.js b\/src\/browser\/ui\/ReactDefaultInjection.js\nindex ab81742123..46c9710102 100644\n--- a\/src\/browser\/ui\/ReactDefaultInjection.js\n+++ b\/src\/browser\/ui\/ReactDefaultInjection.js\n@@ -89,7 +89,7 @@ function inject() {\n \n \/\/ This needs to happen after createFullPageComponent() otherwise the mixin\n \/\/ gets double injected.\n- ReactInjection.CompositeComponent.injectMixin(ReactBrowserComponentMixin);\n+ ReactInjection.Class.injectMixin(ReactBrowserComponentMixin);\n \n ReactInjection.DOMProperty.injectDOMPropertyConfig(HTMLDOMPropertyConfig);\n ReactInjection.DOMProperty.injectDOMPropertyConfig(SVGDOMPropertyConfig);\ndiff --git a\/src\/browser\/ui\/ReactInjection.js b\/src\/browser\/ui\/ReactInjection.js\nindex a49af9d723..8800c7de4d 100644\n--- a\/src\/browser\/ui\/ReactInjection.js\n+++ b\/src\/browser\/ui\/ReactInjection.js\n@@ -14,7 +14,7 @@\n var DOMProperty = require('DOMProperty');\n var EventPluginHub = require('EventPluginHub');\n var ReactComponent = require('ReactComponent');\n-var ReactCompositeComponent = require('ReactCompositeComponent');\n+var ReactClass = require('ReactClass');\n var ReactEmptyComponent = require('ReactEmptyComponent');\n var ReactBrowserEventEmitter = require('ReactBrowserEventEmitter');\n var ReactNativeComponent = require('ReactNativeComponent');\n@@ -24,7 +24,7 @@ var ReactUpdates = require('ReactUpdates');\n \n var ReactInjection = {\n Component: ReactComponent.injection,\n- CompositeComponent: ReactCompositeComponent.injection,\n+ Class: ReactClass.injection,\n DOMProperty: DOMProperty.injection,\n EmptyComponent: ReactEmptyComponent.injection,\n EventPluginHub: EventPluginHub.injection,\ndiff --git a\/src\/browser\/ui\/dom\/components\/ReactDOMButton.js b\/src\/browser\/ui\/dom\/components\/ReactDOMButton.js\nindex f8cf5644eb..ed23b00289 100644\n--- a\/src\/browser\/ui\/dom\/components\/ReactDOMButton.js\n+++ b\/src\/browser\/ui\/dom\/components\/ReactDOMButton.js\n@@ -13,7 +13,7 @@\n \n var AutoFocusMixin = require('AutoFocusMixin');\n var ReactBrowserComponentMixin = require('ReactBrowserComponentMixin');\n-var ReactCompositeComponent = require('ReactCompositeComponent');\n+var ReactClass = require('ReactClass');\n var ReactElement = require('ReactElement');\n var ReactDOM = require('ReactDOM');\n \n@@ -39,7 +39,7 @@ var mouseListenerNames = keyMirror({\n * Implements a

dillon1000/react

Files changed