This repository has been archived by the owner on Sep 5, 2024. It is now read-only.
fix(dialog): enable support for html content in dialogs #4148
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ThomasBurleson
added
the
needs: review
|
@jelbourn, @robertmesserle - ready for review. |
| @@ -6,7 +6,6 @@ angular.module('material.components.dialog', [ | |||
| 'material.core', | |||
| 'material.components.backdrop' | |||
| ]) | |||
| .directive('mdDialog', MdDialogDirective) | |||
|
@ThomasBurleson any reason for the <md-dialog-content >
<h2 class="md-title"></h2>
<div class="md-dialog-content-body" ></div>,
</md-dialog-content> |
| @@ -436,7 +435,7 @@ function MdDialogProvider($$interimElementProvider) { | |||
| } | |||
|
|
|||
| /* @ngInject */ | |||
| function dialogDefaultOptions($mdDialog, $mdAria, $mdUtil, $mdConstant, $animate, $document, $window, $rootElement) { | |||
| function dialogDefaultOptions($mdDialog, $mdAria, $mdUtil, $mdConstant, $animate, $document, $window, $rootElement ) { | |||
There was a problem hiding this comment.
Soon, clang will clean up that trailing space! Otherwise, I would complain.
ThomasBurleson
added a commit
that referenced
this pull request
Aug 14, 2015
…alogs
* dialog`::onShow( )` now uses `wrapSimpleContent( )` to wrap simple strings in `<p>` tags
* dialog basic demo `showConfirm( )` uses HTML span tag to illustrate use of HMTL content
* implemented generic `md-template` to safely inject HTML content into an element
BREAKING CHANGE: dialog content text is now injected into **div.md-dialog-content-body**
Before the template used was:
```html
<md-dialog-content>
<h2></h2>
<p></p>
</md-dialog-content>
```
Now uses:
```html
<md-dialog-content>
<h2></h2>
<div class="md-dialog-content-body">
<p></p>
</div>
</md-dialog-content>
```
Fixes #1495. Closes #4148.
|
We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for the commit author(s). If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google. |
…alogs
* dialog`::onShow( )` now uses `wrapSimpleContent( )` to wrap simple strings in `<p>` tags
* dialog basic demo `showConfirm( )` uses HTML span tag to illustrate use of HMTL content
* implemented generic `md-template` to safely inject HTML content into an element
BREAKING CHANGE: dialog content text is now injected into **div.md-dialog-content-body**
Before the template used was:
```html
<md-dialog-content>
<h2></h2>
<p></p>
</md-dialog-content>
```
Now uses:
```html
<md-dialog-content>
<h2></h2>
<div class="md-dialog-content-body">
<p></p>
</div>
</md-dialog-content>
```
Fixes #1495.
ThomasBurleson
force-pushed
the
wip/dialog_html_content
branch
from
07b4a12
to
67ba621
Compare
|
CLAs look good, thanks! |
ThomasBurleson
removed
the
needs: review
|
Closed with SHA 81e94b4 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Enable support to specify HTML content for alert and confirm dialogs.
::onShow( )now useswrapSimpleContent( )to wrap simple strings in<p>tagsshowConfirm( )uses HTML span tag to illustrate use of HMTL contentmd-templateto safely inject HTML content into an elementBREAKING CHANGE: dialog content text is now injected into div.md-dialog-content-body
Before the template used was:
Now uses:
Fixes #1495.