IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

ensure text panel content is hidden until showdown.js is available

Browse Source
This commit is contained in:
Rashid Khan
2013-03-05 15:46:09 -07:00
parent 3eb9c5ded0
commit 34d0c0838f
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
panels/text/module.html
View File

@@ -1,6 +1,6 @@
<kibana-panel ng-controller='text' ng-init="init()"> <kibana-panel ng-controller='text' ng-init="init()">
<!--<p ng-style="panel.style" ng-bind-html-unsafe="panel.content | striphtml | newlines"></p>--> <!--<p ng-style="panel.style" ng-bind-html-unsafe="panel.content | striphtml | newlines"></p>-->
<markdown> <markdown ng-show="ready">
{{panel.content}} {{panel.content}}
</markdown> </markdown>
</kibana-panel> </kibana-panel>

2
panels/text/module.js
View File

@@ -10,6 +10,7 @@ angular.module('kibana.text', [])
_.defaults($scope.panel,_d); _.defaults($scope.panel,_d);
$scope.init = function() { $scope.init = function() {
$scope.ready = false;
} }
}).directive('markdown', function() { }).directive('markdown', function() {
@@ -23,6 +24,7 @@ angular.module('kibana.text', [])
function render_panel() { function render_panel() {
var scripts = $LAB.script("panels/text/lib/showdown.js") var scripts = $LAB.script("panels/text/lib/showdown.js")
scripts.wait(function(){ scripts.wait(function(){
scope.ready = true;
var converter = new Showdown.converter(); var converter = new Showdown.converter();
var text = scope.panel.content.replace(/&/g, '&amp;') var text = scope.panel.content.replace(/&/g, '&amp;')
.replace(/>/g, '&gt;') .replace(/>/g, '&gt;')