diff --git a/index.bs b/index.bs index 18f2078..5a82158 100644 --- a/index.bs +++ b/index.bs @@ -102,18 +102,22 @@ configuration. The methods come in two by two flavours: ## Sanitizer API ## {#sanitizer-api} The {{Element}} interface defines two methods, {{Element/setHTML()}} and -{{Element/setHTMLUnsafe()}}. Both of these take a {{DOMString}} with HTML +{{Element/setHTMLUnsafe__TO_BE_MERGED()}}. Both of these take a {{DOMString}} with HTML markup, and an optional configuration.
 partial interface Element {
-  [CEReactions] undefined setHTMLUnsafe(DOMString html, optional SanitizerConfig config = {});
+  [CEReactions] undefined setHTMLUnsafe__TO_BE_MERGED(DOMString html, optional SanitizerConfig config = {});
   [CEReactions] undefined setHTML(DOMString html, optional SanitizerConfig config = {});
 };
 
-
-{{Element}}'s setHTMLUnsafe(|html|, |options|) method steps are: +Note: The `setHTMLUnsafe` method is meant to be merged with [[HTML]]'s +setHTMLUnsafe. To prevent tooling errors about overloaded methods +we'll rename them here by appending `__TO_BE_MERGED` to those names. + +
+{{Element}}'s setHTMLUnsafe__TO_BE_MERGED(|html|, |options|) method steps are: 1. Let |target| be |this|'s [=template contents=] if [=this=] is {{HTMLTemplateElement|template}} element; otherwise |this|. 1. [=Set and filter HTML=] given |target|, [=this=], |html|, |options|, and false. @@ -131,15 +135,15 @@ partial interface Element {
 partial interface ShadowRoot {
-  [CEReactions] undefined setHTMLUnsafe(DOMString html, optional SanitizerConfig config = {});
+  [CEReactions] undefined setHTMLUnsafe__TO_BE_MERGED(DOMString html, optional SanitizerConfig config = {});
   [CEReactions] undefined setHTML(DOMString html, optional SanitizerConfig config = {});
 };
 
These methods are mirrored on the {{ShadowRoot}}: -
-{{ShadowRoot}}'s setHTMLUnsafe(|html|, |options|) method steps are: +
+{{ShadowRoot}}'s setHTMLUnsafe__TO_BE_MERGED(|html|, |options|) method steps are: 1. [=Set and filter HTML=] using [=this=], [=this=]'s [=shadow host=] (as context element), @@ -159,13 +163,13 @@ The {{Document}} interface gains two new methods which parse an entire {{Documen
 partial interface Document {
-  static Document parseHTMLUnsafe(DOMString html, optional SanitizerConfig config = {});
+  static Document parseHTMLUnsafe__TO_BE_MERGED(DOMString html, optional SanitizerConfig config = {});
   static Document parseHTML(DOMString html, optional SanitizerConfig config = {});
 };
 
-
-The parseHTMLUnsafe(|html|, |options|) method steps are: +
+The parseHTMLUnsafe__TO_BE_MERGED(|html|, |options|) method steps are: 1. Let |document| be a new {{Document}}, whose [=Document/content type=] is "text/html".