Permalink
Comparing changes
Open a pull request
- 3 commits
- 3 files changed
- 0 commit comments
- 2 contributors
Unified
Split
Showing
with
19 additions
and 17 deletions.
- +1 −1 docs/content/guide/directive.ngdoc
- +3 −3 docs/content/guide/interpolation.ngdoc
- +15 −13 src/ng/sce.js
| @@ -401,7 +401,7 @@ This is clearly not a great solution. | ||
|
|
||
| What we want to be able to do is separate the scope inside a directive from the scope | ||
| outside, and then map the outer scope to a directive's inner scope. We can do this by creating what | ||
| we call an **isolate scope**. To do this, we can use a directive's `scope` option: | ||
| we call an **isolate scope**. To do this, we can use a {@link $compile#-scope- directive's `scope`} option: | ||
|
|
||
| <example module="docsIsolateScopeDirective"> | ||
| <file name="script.js"> | ||
| @@ -5,7 +5,7 @@ | ||
|
|
||
| # Interpolation and data-binding | ||
|
|
||
| Interpolation markup with embedded @link {guide/expressions expressions} is used by Angular to | ||
| Interpolation markup with embedded {@link guide/expression expressions} is used by Angular to | ||
| provide data-binding to text nodes and attribute values. | ||
|
|
||
| An example of interpolation is shown below: | ||
| @@ -43,8 +43,8 @@ interpret the attribute as present, meaning that the button would always be disa | ||
| ``` | ||
|
|
||
| For this reason, Angular provides special `ng`-prefixed directives for the following boolean attributes: | ||
| {@link ngDisabled `disabled`}, [@link ngRequired `required`}, [@link ngSelected `selected`}, | ||
| {@link ngChecked `checked`}, {@link ngReadonly `readOnly`} , and [@link ngOpen `open`}. | ||
| {@link ngDisabled `disabled`}, {@link ngRequired `required`}, {@link ngSelected `selected`}, | ||
| {@link ngChecked `checked`}, {@link ngReadonly `readOnly`} , and {@link ngOpen `open`}. | ||
|
|
||
| These directives take an expression inside the attribute, and set the corresponding boolean attribute | ||
| to true when the expression evaluates to truthy. | ||
| @@ -144,13 +144,15 @@ function $SceDelegateProvider() { | ||
| * @kind function | ||
| * | ||
| * @param {Array=} whitelist When provided, replaces the resourceUrlWhitelist with the value | ||
| * provided. This must be an array or null. A snapshot of this array is used so further | ||
| * changes to the array are ignored. | ||
| * provided. This must be an array or null. A snapshot of this array is used so further | ||
| * changes to the array are ignored. | ||
| * | ||
| * Follow {@link ng.$sce#resourceUrlPatternItem this link} for a description of the items | ||
| * allowed in this array. | ||
| * Follow {@link ng.$sce#resourceUrlPatternItem this link} for a description of the items | ||
| * allowed in this array. | ||
| * | ||
| * Note: **an empty whitelist array will block all URLs**! | ||
| * <div class="alert alert-warning"> | ||
| * **Note:** an empty whitelist array will block all URLs! | ||
| * </div> | ||
| * | ||
| * @return {Array} the currently set whitelist array. | ||
| * | ||
| @@ -173,17 +175,17 @@ function $SceDelegateProvider() { | ||
| * @kind function | ||
| * | ||
| * @param {Array=} blacklist When provided, replaces the resourceUrlBlacklist with the value | ||
| * provided. This must be an array or null. A snapshot of this array is used so further | ||
| * changes to the array are ignored. | ||
| * provided. This must be an array or null. A snapshot of this array is used so further | ||
| * changes to the array are ignored. | ||
| * | ||
| * Follow {@link ng.$sce#resourceUrlPatternItem this link} for a description of the items | ||
| * allowed in this array. | ||
| * Follow {@link ng.$sce#resourceUrlPatternItem this link} for a description of the items | ||
| * allowed in this array. | ||
| * | ||
| * The typical usage for the blacklist is to **block | ||
| * [open redirects](http://cwe.mitre.org/data/definitions/601.html)** served by your domain as | ||
| * these would otherwise be trusted but actually return content from the redirected domain. | ||
| * The typical usage for the blacklist is to **block | ||
| * [open redirects](http://cwe.mitre.org/data/definitions/601.html)** served by your domain as | ||
| * these would otherwise be trusted but actually return content from the redirected domain. | ||
| * | ||
| * Finally, **the blacklist overrides the whitelist** and has the final say. | ||
| * Finally, **the blacklist overrides the whitelist** and has the final say. | ||
| * | ||
| * @return {Array} the currently set blacklist array. | ||
| * | ||