fix(text panel): fixed escaping issue with markdown in text panel, fixes #4409

This commit is contained in:
Torkel Ödegaard
2016-03-19 11:25:19 +01:00
parent 662dbaf8b2
commit 6d36641080
+6 -11
View File
@@ -12,7 +12,7 @@ var panelDefaults = {
export class TextPanelCtrl extends PanelCtrl {
static templateUrl = `public/app/plugins/panel/text/module.html`;
converter: any;
remarkable: any;
content: string;
/** @ngInject */
@@ -54,21 +54,16 @@ export class TextPanelCtrl extends PanelCtrl {
}
renderMarkdown(content) {
var text = content
.replace(/&/g, '&')
.replace(/>/g, '>')
.replace(/</g, '&lt;');
if (this.converter) {
this.updateContent(this.converter.makeHtml(text));
} else {
if (!this.remarkable) {
return System.import('remarkable').then(Remarkable => {
var md = new Remarkable();
this.remarkable = new Remarkable();
this.$scope.$apply(() => {
this.updateContent(md.render(text));
this.updateContent(this.remarkable.render(content));
});
});
}
this.updateContent(this.remarkable.render(content));
}
updateContent(html) {