[backport] PR #7855 to 4.x #7861
Merged
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
--------- **Commit 1:** Bump marked * Original sha: 7cf64c7 * Authored by Jonathan Budzenski <[email protected]> on 2016-07-21T18:44:47Z * Committed by Jonathan Budzenski <[email protected]> on 2016-07-27T13:54:33Z
jbudz
force-pushed
the
jasper/backport/7855/4.x
branch
from
0fd71b1
to
1042d46
Compare
|
Don't we typically register angular services with webpackShims (https://github.com/elastic/kibana/blob/e1b395004cf27e9d4f42dbca53150d2b57cbc82b/webpackShims/elasticsearch.js for example)? Maybe something to fix in master rather than this backport though |
| module.controller('KbnMarkdownVisController', function ($scope, $sce) { | ||
| $scope.$watch('vis.params.markdown', function (html) { | ||
| if (!html) return; | ||
| $scope.html = $sce.trustAsHtml(marked(html)); | ||
| $scope.html = marked(html); |
There was a problem hiding this comment.
I wonder if it would be safer to manually sanitize this here with $sanitize rather than relying on ng-bind-html in the template. I'd be worried that someone might accidentally mis-use $scope.html in the future.
|
Backport LGTM. The couple of things I mentioned above are more appropriate to put in master, if at all. I really just needed a place to write them down so I wouldn't forget. |
This was referenced Jul 27, 2016
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Backport PR #7855
Commit 1:
Bump marked