From 293ac31d1042b81cf8daeabbb6de4ad973d067a3 Mon Sep 17 00:00:00 2001 From: Andreas Svensson Date: Tue, 14 Oct 2014 23:52:53 +0200 Subject: [PATCH] Rename updateInnerHTMLByID to dangerouslyUpdateInnerHTMLByID --- src/browser/ui/ReactDOMComponent.js | 2 +- src/browser/ui/ReactDOMIDOperations.js | 7 ++++--- src/browser/ui/__tests__/ReactDOMIDOperations-test.js | 2 +- src/test/ReactDefaultPerfAnalysis.js | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/browser/ui/ReactDOMComponent.js b/src/browser/ui/ReactDOMComponent.js index a7536c71c72..ee69383881c 100644 --- a/src/browser/ui/ReactDOMComponent.js +++ b/src/browser/ui/ReactDOMComponent.js @@ -439,7 +439,7 @@ ReactDOMComponent.Mixin = { } } else if (nextHtml != null) { if (lastHtml !== nextHtml) { - ReactComponent.BackendIDOperations.updateInnerHTMLByID( + ReactComponent.BackendIDOperations.dangerouslyUpdateInnerHTMLByID( this._rootNodeID, nextHtml ); diff --git a/src/browser/ui/ReactDOMIDOperations.js b/src/browser/ui/ReactDOMIDOperations.js index ea206cd065b..af503ddb147 100644 --- a/src/browser/ui/ReactDOMIDOperations.js +++ b/src/browser/ui/ReactDOMIDOperations.js @@ -38,7 +38,8 @@ var setInnerHTML = require('setInnerHTML'); */ var INVALID_PROPERTY_ERRORS = { dangerouslySetInnerHTML: - '`dangerouslySetInnerHTML` must be set using `updateInnerHTMLByID()`.', + '`dangerouslySetInnerHTML` must be set using ' + + '`dangerouslyUpdateInnerHTMLByID()`.', style: '`style` must be set using `updateStylesByID()`.' }; @@ -125,9 +126,9 @@ var ReactDOMIDOperations = { * @param {string} html An HTML string. * @internal */ - updateInnerHTMLByID: ReactPerf.measure( + dangerouslyUpdateInnerHTMLByID: ReactPerf.measure( 'ReactDOMIDOperations', - 'updateInnerHTMLByID', + 'dangerouslyUpdateInnerHTMLByID', function(id, html) { var node = ReactMount.getNode(id); setInnerHTML(node, html); diff --git a/src/browser/ui/__tests__/ReactDOMIDOperations-test.js b/src/browser/ui/__tests__/ReactDOMIDOperations-test.js index a1b93f04ec3..cc5f60d9dc4 100644 --- a/src/browser/ui/__tests__/ReactDOMIDOperations-test.js +++ b/src/browser/ui/__tests__/ReactDOMIDOperations-test.js @@ -53,7 +53,7 @@ describe('ReactDOMIDOperations', function() { var html = '\n \t \n testContent \t \n \t'; - ReactDOMIDOperations.updateInnerHTMLByID( + ReactDOMIDOperations.dangerouslyUpdateInnerHTMLByID( 'testID', html ); diff --git a/src/test/ReactDefaultPerfAnalysis.js b/src/test/ReactDefaultPerfAnalysis.js index b86a17dfbec..fc25ff5e669 100644 --- a/src/test/ReactDefaultPerfAnalysis.js +++ b/src/test/ReactDefaultPerfAnalysis.js @@ -27,7 +27,7 @@ var DOM_OPERATION_TYPES = { 'updatePropertyByID': 'update attribute', 'deletePropertyByID': 'delete attribute', 'updateStylesByID': 'update styles', - 'updateInnerHTMLByID': 'set innerHTML', + 'dangerouslyUpdateInnerHTMLByID': 'set innerHTML', 'dangerouslyReplaceNodeWithMarkupByID': 'replace' };