From 84bb118b35f36ec70a07347cebd36b751485b564 Mon Sep 17 00:00:00 2001 From: Adam Gordon Date: Fri, 8 Jan 2016 15:55:19 -0700 Subject: [PATCH] chore(docs): fix popover and tooltip docs * update popover and tooltip docs to indicate that the `uib-*-html` attribute does not get compiled * addresses complaint in #4923 Closes #5184 --- src/popover/docs/readme.md | 4 +--- src/tooltip/docs/readme.md | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/popover/docs/readme.md b/src/popover/docs/readme.md index e25fd697eb..f761f2adcf 100644 --- a/src/popover/docs/readme.md +++ b/src/popover/docs/readme.md @@ -8,10 +8,8 @@ There are three versions of the popover: `uib-popover` and `uib-popover-template * `uib-popover` Takes text only and will escape any HTML provided for the popover body. - * `uib-popover-html` - Takes an expression that evaluates to an html string. *The user is responsible for ensuring the content is safe to put into the DOM!* - + Takes an expression that evaluates to an HTML string. Note that this HTML is not compiled. If compilation is required, please use the `uib-popover-template` attribute option instead. *The user is responsible for ensuring the content is safe to put into the DOM!* * `uib-popover-template` A URL representing the location of a template to use for the popover body. Note that the contents of this template need to be wrapped in a tag, e.g., `
`. diff --git a/src/tooltip/docs/readme.md b/src/tooltip/docs/readme.md index a683f910b1..6f872ab437 100644 --- a/src/tooltip/docs/readme.md +++ b/src/tooltip/docs/readme.md @@ -6,10 +6,10 @@ There are three versions of the tooltip: `uib-tooltip`, `uib-tooltip-template`, * `uib-tooltip` - Takes text only and will escape any HTML provided. +* `uib-tooltip-html` - + Takes an expression that evaluates to an HTML string. Note that this HTML is not compiled. If compilation is required, please use the `uib-tooltip-template` attribute option instead. *The user is responsible for ensuring the content is safe to put into the DOM!* * `uib-tooltip-template` - Takes text that specifies the location of a template to use for the tooltip. Note that this needs to be wrapped in a tag. -* `uib-tooltip-html` - - Takes whatever HTML is provided and displays it in a tooltip; *The user is responsible for ensuring the content is safe to put into the DOM!* ### uib-tooltip-* settings