From 8bc828aa7c90fe13f4957792a50ddbbe99077173 Mon Sep 17 00:00:00 2001
From: Austin Wright <aaa@bzfx.net>
Date: Mon, 12 Jan 2015 11:45:28 -0700
Subject: [PATCH 1/6] Generate XML-compatible tags and boolean attributes

---
 src/browser/ui/ReactDOMComponent.js         | 16 ++++++++--------
 src/browser/ui/dom/DOMPropertyOperations.js |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/browser/ui/ReactDOMComponent.js b/src/browser/ui/ReactDOMComponent.js
index cf93f29b86d..b73403f49ad 100644
--- a/src/browser/ui/ReactDOMComponent.js
+++ b/src/browser/ui/ReactDOMComponent.js
@@ -208,12 +208,12 @@ ReactDOMComponent.Mixin = {
   mountComponent: function(rootID, transaction, context) {
     this._rootNodeID = rootID;
     assertValidProps(this, this._currentElement.props);
-    var closeTag = omittedCloseTags[this._tag] ? '' : '</' + this._tag + '>';
-    return (
-      this._createOpenTagMarkupAndPutListeners(transaction) +
-      this._createContentMarkup(transaction, context) +
-      closeTag
-    );
+    var tagOpen = this._createOpenTagMarkupAndPutListeners(transaction);
+    var tagContent = this._createContentMarkup(transaction, context);
+    if(!tagContent && omittedCloseTags[this._tag]){
+      return tagOpen + '/>';
+    }
+    return tagOpen + '>' + tagContent + '</' + this._tag + '>';
   },
 
   /**
@@ -260,11 +260,11 @@ ReactDOMComponent.Mixin = {
     // For static pages, no need to put React ID and checksum. Saves lots of
     // bytes.
     if (transaction.renderToStaticMarkup) {
-      return ret + '>';
+      return ret;
     }
 
     var markupForID = DOMPropertyOperations.createMarkupForID(this._rootNodeID);
-    return ret + ' ' + markupForID + '>';
+    return ret + ' ' + markupForID;
   },
 
   /**
diff --git a/src/browser/ui/dom/DOMPropertyOperations.js b/src/browser/ui/dom/DOMPropertyOperations.js
index 192aee14279..f049403184c 100644
--- a/src/browser/ui/dom/DOMPropertyOperations.js
+++ b/src/browser/ui/dom/DOMPropertyOperations.js
@@ -96,7 +96,7 @@ var DOMPropertyOperations = {
       var attributeName = DOMProperty.getAttributeName[name];
       if (DOMProperty.hasBooleanValue[name] ||
           (DOMProperty.hasOverloadedBooleanValue[name] && value === true)) {
-        return attributeName;
+        return attributeName + '=""';
       }
       return attributeName + '=' + quoteAttributeValueForBrowser(value);
     } else if (DOMProperty.isCustomAttribute(name)) {

From e913e85e1ad82c5251492602afbc8186c1389f13 Mon Sep 17 00:00:00 2001
From: Austin Wright <aaa@bzfx.net>
Date: Mon, 12 Jan 2015 18:10:45 -0700
Subject: [PATCH 2/6] Use a Polyglot HTML-safe method of escaping leading
 newline in rawtext elements

---
 src/browser/ui/ReactDOMComponent.js | 35 +++++++++++++++++------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/browser/ui/ReactDOMComponent.js b/src/browser/ui/ReactDOMComponent.js
index b73403f49ad..d596315a39b 100644
--- a/src/browser/ui/ReactDOMComponent.js
+++ b/src/browser/ui/ReactDOMComponent.js
@@ -276,40 +276,47 @@ ReactDOMComponent.Mixin = {
    * @return {string} Content markup.
    */
   _createContentMarkup: function(transaction, context) {
-    var prefix = '';
-    if (this._tag === 'listing' ||
-        this._tag === 'pre' ||
-        this._tag === 'textarea') {
-      // Add an initial newline because browsers ignore the first newline in
-      // a <listing>, <pre>, or <textarea> as an "authoring convenience" -- see
-      // https://html.spec.whatwg.org/multipage/syntax.html#parsing-main-inbody.
-      prefix = '\n';
-    }
-
+    var ret = '';
     var props = this._currentElement.props;
 
     // Intentional use of != to avoid catching zero/false.
     var innerHTML = props.dangerouslySetInnerHTML;
     if (innerHTML != null) {
       if (innerHTML.__html != null) {
-        return prefix + innerHTML.__html;
+        ret = innerHTML.__html;
       }
     } else {
       var contentToUse =
         CONTENT_TYPES[typeof props.children] ? props.children : null;
       var childrenToUse = contentToUse != null ? null : props.children;
       if (contentToUse != null) {
-        return prefix + escapeTextContentForBrowser(contentToUse);
+        ret = escapeTextContentForBrowser(contentToUse);
       } else if (childrenToUse != null) {
         var mountImages = this.mountChildren(
           childrenToUse,
           transaction,
           context
         );
-        return prefix + mountImages.join('');
+        ret = mountImages.join('');
       }
     }
-    return prefix;
+    if (
+      (this._tag === 'listing'
+       || this._tag === 'pre'
+       || this._tag === 'textarea')
+      && ret.charAt(0) === '\n'
+    ) {
+      // Add an invisible node that's not a newline, because the HTML syntax
+      // ignores the first character in these tags if it's a newline
+      // See: <http://www.w3.org/TR/html-polyglot/#newlines-in-textarea-and-pre>
+      // See: <http://www.w3.org/TR/html5/syntax.html#element-restrictions>
+      // See: <http://www.w3.org/TR/html5/syntax.html#newlines>
+      // See: Parsing of "textarea" "listing" and "pre" elements
+      //  from <http://www.w3.org/TR/html5/syntax.html#parsing-main-inbody>
+      return '<!---->' + ret;
+    } else {
+      return ret;
+    }
   },
 
   receiveComponent: function(nextElement, transaction, context) {

From 8e714f9898e77adc1001f1cbdb0e878dfd55fe81 Mon Sep 17 00:00:00 2001
From: Austin Wright <aaa@bzfx.net>
Date: Mon, 12 Jan 2015 18:15:20 -0700
Subject: [PATCH 3/6] Update tests to use Polyglot profile of HTML

---
 src/browser/ui/dom/__tests__/DOMPropertyOperations-test.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/browser/ui/dom/__tests__/DOMPropertyOperations-test.js b/src/browser/ui/dom/__tests__/DOMPropertyOperations-test.js
index 8ff6c1aaaf0..7a6a681ff26 100644
--- a/src/browser/ui/dom/__tests__/DOMPropertyOperations-test.js
+++ b/src/browser/ui/dom/__tests__/DOMPropertyOperations-test.js
@@ -78,12 +78,12 @@ describe('DOMPropertyOperations', function() {
       expect(DOMPropertyOperations.createMarkupForProperty(
         'checked',
         'simple'
-      )).toBe('checked');
+      )).toBe('checked=""');
 
       expect(DOMPropertyOperations.createMarkupForProperty(
         'checked',
         true
-      )).toBe('checked');
+      )).toBe('checked=""');
 
       expect(DOMPropertyOperations.createMarkupForProperty(
         'checked',
@@ -100,7 +100,7 @@ describe('DOMPropertyOperations', function() {
       expect(DOMPropertyOperations.createMarkupForProperty(
         'download',
         true
-      )).toBe('download');
+      )).toBe('download=""');
 
       expect(DOMPropertyOperations.createMarkupForProperty(
         'download',

From 030a7b34c7ee3a92fad8113249d399db5c41ea71 Mon Sep 17 00:00:00 2001
From: Austin Wright <aaa@bzfx.net>
Date: Mon, 23 Feb 2015 13:58:40 -0700
Subject: [PATCH 4/6] Add back \n-to-be-eaten for the plain-text elements

The comment hack to enable polyglot HTML isn't cross-browser, or simply doesn't work.
---
 src/browser/ui/ReactDOMComponent.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/browser/ui/ReactDOMComponent.js b/src/browser/ui/ReactDOMComponent.js
index d596315a39b..aa8a181b56a 100644
--- a/src/browser/ui/ReactDOMComponent.js
+++ b/src/browser/ui/ReactDOMComponent.js
@@ -306,14 +306,17 @@ ReactDOMComponent.Mixin = {
        || this._tag === 'textarea')
       && ret.charAt(0) === '\n'
     ) {
-      // Add an invisible node that's not a newline, because the HTML syntax
-      // ignores the first character in these tags if it's a newline
+      // text/html ignores the first character in these tags if it's a newline
+      // Prefer to break application/xml over text/html (for now) by adding
+      // a newline specifically to get eaten by the parser.
+      // (Alternately for textareas, replacing "^\n" with "\r\n" doesn't get eaten,
+      // and the first \r is normalized out by HTMLTextAreaElement#value.)
       // See: <http://www.w3.org/TR/html-polyglot/#newlines-in-textarea-and-pre>
       // See: <http://www.w3.org/TR/html5/syntax.html#element-restrictions>
       // See: <http://www.w3.org/TR/html5/syntax.html#newlines>
       // See: Parsing of "textarea" "listing" and "pre" elements
       //  from <http://www.w3.org/TR/html5/syntax.html#parsing-main-inbody>
-      return '<!---->' + ret;
+      return '\n' + ret;
     } else {
       return ret;
     }

From b52bb2234231c417d9535d765bf2ddd585f79027 Mon Sep 17 00:00:00 2001
From: Austin Wright <aaa@bzfx.net>
Date: Sat, 14 Mar 2015 13:57:15 -0700
Subject: [PATCH 5/6] Move list of newline-eating tags to variable

---
 src/browser/ui/ReactDOMComponent.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/browser/ui/ReactDOMComponent.js b/src/browser/ui/ReactDOMComponent.js
index aa8a181b56a..92dea836cdd 100644
--- a/src/browser/ui/ReactDOMComponent.js
+++ b/src/browser/ui/ReactDOMComponent.js
@@ -144,6 +144,12 @@ var omittedCloseTags = {
   // NOTE: menuitem's close tag should be omitted, but that causes problems.
 };
 
+var newlineEatingTags = {
+  'listing': true,
+  'pre': true,
+  'textarea': true
+};
+
 // For HTML, certain tags cannot have children. This has the same purpose as
 // `omittedCloseTags` except that `menuitem` should still have its closing tag.
 
@@ -300,12 +306,7 @@ ReactDOMComponent.Mixin = {
         ret = mountImages.join('');
       }
     }
-    if (
-      (this._tag === 'listing'
-       || this._tag === 'pre'
-       || this._tag === 'textarea')
-      && ret.charAt(0) === '\n'
-    ) {
+    if (newlineEatingTags[this._tag] && ret.charAt(0) === '\n') {
       // text/html ignores the first character in these tags if it's a newline
       // Prefer to break application/xml over text/html (for now) by adding
       // a newline specifically to get eaten by the parser.

From 29416f422e0c16e362db25b710704564bfd3ddd4 Mon Sep 17 00:00:00 2001
From: Austin Wright <aaa@bzfx.net>
Date: Sat, 14 Mar 2015 13:57:15 -0700
Subject: [PATCH 6/6] Appease eslint

---
 src/browser/ui/ReactDOMComponent.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/browser/ui/ReactDOMComponent.js b/src/browser/ui/ReactDOMComponent.js
index 92dea836cdd..b52fd5dcfdb 100644
--- a/src/browser/ui/ReactDOMComponent.js
+++ b/src/browser/ui/ReactDOMComponent.js
@@ -216,7 +216,7 @@ ReactDOMComponent.Mixin = {
     assertValidProps(this, this._currentElement.props);
     var tagOpen = this._createOpenTagMarkupAndPutListeners(transaction);
     var tagContent = this._createContentMarkup(transaction, context);
-    if(!tagContent && omittedCloseTags[this._tag]){
+    if (!tagContent && omittedCloseTags[this._tag]) {
       return tagOpen + '/>';
     }
     return tagOpen + '>' + tagContent + '</' + this._tag + '>';