Replace setInnerHTML with Danger.dangerouslyUpdateInnerHTML, uses createNodesFromMarkup

src/browser/ui/ReactDOMIDOperations.js

@@ -21,7 +21,6 @@ var ReactMount = require('ReactMount');
 var ReactPerf = require('ReactPerf');
 
 var invariant = require('invariant');
-var setInnerHTML = require('setInnerHTML');
 
 /**
  * Errors for properties that should not be updated with `updatePropertyById()`.
@@ -108,7 +107,7 @@ var ReactDOMIDOperations = {
    */
   updateInnerHTMLByID: function(id, html) {
     var node = ReactMount.getNode(id);
-    setInnerHTML(node, html);
+    DOMChildrenOperations.dangerouslyUpdateInnerHTML(node, html);
   },
 
   /**

src/browser/ui/ReactMount.js

@@ -11,6 +11,7 @@
 
 'use strict';
 
+var Danger = require('Danger');
 var DOMProperty = require('DOMProperty');
 var ReactBrowserEventEmitter = require('ReactBrowserEventEmitter');
 var ReactCurrentOwner = require('ReactCurrentOwner');
@@ -30,7 +31,6 @@ var containsNode = require('containsNode');
 var getReactRootElementInContainer = require('getReactRootElementInContainer');
 var instantiateReactComponent = require('instantiateReactComponent');
 var invariant = require('invariant');
-var setInnerHTML = require('setInnerHTML');
 var shouldUpdateReactComponent = require('shouldUpdateReactComponent');
 var warning = require('warning');
 
@@ -854,7 +854,7 @@ var ReactMount = {
         'See React.renderToString() for server rendering.'
     );
 
-    setInnerHTML(container, markup);
+    Danger.dangerouslyUpdateInnerHTML(container, markup);
   },
 
   /**

src/browser/ui/dom/DOMChildrenOperations.js

@@ -44,6 +44,8 @@ var DOMChildrenOperations = {
 
   dangerouslyReplaceNodeWithMarkup: Danger.dangerouslyReplaceNodeWithMarkup,
 
+  dangerouslyUpdateInnerHTML: Danger.dangerouslyUpdateInnerHTML,
+
   updateTextContent: setTextContent,
 
   /**

src/browser/ui/dom/Danger.js

@@ -176,6 +176,24 @@ var Danger = {
 
     var newChild = createNodesFromMarkup(markup, emptyFunction)[0];
     oldChild.parentNode.replaceChild(newChild, oldChild);
+  },
+
+  /**
+   * Replaces the content of a container with a string of html.
+   *
+   * @param {DOMElement} container Container to update innerHTML for.
+   * @param {string} html An HTML string.
+   * @internal
+   */
+  dangerouslyUpdateInnerHTML: function(container, html) {
+    while (container.lastChild) {
+      container.removeChild(container.lastChild);
+    }
+
+    var newChildren = createNodesFromMarkup(html, emptyFunction);
+    for (var i = 0; i < newChildren.length; i++) {
+      container.appendChild(newChildren[i]);
+    }
   }
 
 };

src/browser/ui/dom/setTextContent.js

@@ -11,9 +11,9 @@
 
 'use strict';
 
+var Danger = require('Danger');
 var ExecutionEnvironment = require('ExecutionEnvironment');
 var escapeTextContentForBrowser = require('escapeTextContentForBrowser');
-var setInnerHTML = require('setInnerHTML');
 
 /**
  * Set the textContent property of a node, ensuring that whitespace is preserved
@@ -32,7 +32,8 @@ var setTextContent = function(node, text) {
 if (ExecutionEnvironment.canUseDOM) {
   if (!('textContent' in document.documentElement)) {
     setTextContent = function(node, text) {
-      setInnerHTML(node, escapeTextContentForBrowser(text));
+      var html = escapeTextContentForBrowser(text);
+      Danger.dangerouslyUpdateInnerHTML(node, html);
     };
   }
 }