diff --git a/src/browser/server/ReactServerRendering.js b/src/browser/server/ReactServerRendering.js index 1504a7be21..c5e291e9e6 100644 --- a/src/browser/server/ReactServerRendering.js +++ b/src/browser/server/ReactServerRendering.js @@ -38,7 +38,8 @@ function renderToString(element) { return transaction.perform(function() { var componentInstance = instantiateReactComponent(element, null); - var markup = componentInstance.mountComponent(id, transaction, emptyObject); + var markup = + componentInstance.mountComponent(id, transaction, emptyObject); return ReactMarkupChecksum.addChecksumToMarkup(markup); }, null); } finally { diff --git a/src/browser/ui/dom/HTMLDOMPropertyConfig.js b/src/browser/ui/dom/HTMLDOMPropertyConfig.js index 0a5eb61f3c..468a8a8c8f 100644 --- a/src/browser/ui/dom/HTMLDOMPropertyConfig.js +++ b/src/browser/ui/dom/HTMLDOMPropertyConfig.js @@ -160,12 +160,17 @@ var HTMLDOMPropertyConfig = { /** * Non-standard Properties */ - autoCapitalize: null, // Supported in Mobile Safari for keyboard hints - autoCorrect: null, // Supported in Mobile Safari for keyboard hints - itemProp: MUST_USE_ATTRIBUTE, // Microdata: http://schema.org/docs/gs.html - itemScope: MUST_USE_ATTRIBUTE | HAS_BOOLEAN_VALUE, // Microdata: http://schema.org/docs/gs.html - itemType: MUST_USE_ATTRIBUTE, // Microdata: http://schema.org/docs/gs.html - property: null // Supports OG in meta tags + // autoCapitalize and autoCorrect are supported in Mobile Safari for + // keyboard hints. + autoCapitalize: null, + autoCorrect: null, + // itemProp, itemScope, itemType are for Microdata support. See + // http://schema.org/docs/gs.html + itemProp: MUST_USE_ATTRIBUTE, + itemScope: MUST_USE_ATTRIBUTE | HAS_BOOLEAN_VALUE, + itemType: MUST_USE_ATTRIBUTE, + // property is supported for OpenGraph in meta tags. + property: null }, DOMAttributeNames: { acceptCharset: 'accept-charset', diff --git a/src/core/ReactCompositeComponent.js b/src/core/ReactCompositeComponent.js index 1c5112a439..5f818729c6 100644 --- a/src/core/ReactCompositeComponent.js +++ b/src/core/ReactCompositeComponent.js @@ -935,7 +935,7 @@ var ReactCompositeComponentMixin = assign({}, var refs = this.getPublicInstance().refs; delete refs[ref]; }, - + /** * Get a text description of the component that can be used to identify it * in error messages. diff --git a/src/core/shouldUpdateReactComponent.js b/src/core/shouldUpdateReactComponent.js index 4538d56d68..0bfd40ef21 100644 --- a/src/core/shouldUpdateReactComponent.js +++ b/src/core/shouldUpdateReactComponent.js @@ -44,14 +44,17 @@ function shouldUpdateReactComponent(prevElement, nextElement) { if (prevElement._owner != null && prevElement._owner.getPublicInstance() != null && prevElement._owner.getPublicInstance().constructor != null) { - prevName = prevElement._owner.getPublicInstance().constructor.displayName; + prevName = + prevElement._owner.getPublicInstance().constructor.displayName; } if (nextElement._owner != null && nextElement._owner.getPublicInstance() != null && nextElement._owner.getPublicInstance().constructor != null) { - nextName = nextElement._owner.getPublicInstance().constructor.displayName; + nextName = + nextElement._owner.getPublicInstance().constructor.displayName; } - if (nextElement.type != null && nextElement.type.displayName != null) { + if (nextElement.type != null && + nextElement.type.displayName != null) { nextDisplayName = nextElement.type.displayName; } monitorCodeUse(