Commit a4f8d4d8 by Rashid Khan

Fixed path to pie and some double quote escaping issues

parent f42de5f4
<div ng-controller='pie' ng-init="init()"> <div ng-controller='pie' ng-init="init()">
<div ng-show="panel.legend == 'above'" ng-repeat="query in legend" style="float:left;padding-left: 10px;"> <div ng-show="panel.legend == 'above'" ng-repeat="query in legend" style="float:left;padding-left: 10px;">
<span ng-show='panel.chart != "none"'><i class="icon-circle" ng-style="{color:query.color}"></i></span><span class="small"> {{query.label}} ({{query.data[0][1]}}) </span></span> <span ng-show="panel.chart != 'none'"><i class="icon-circle" ng-style="{color:query.color}"></i></span><span class="small"> {{query.label}} ({{query.data[0][1]}}) </span></span>
</div><br> </div><br>
<div style="clear:both"></div> <div style="clear:both"></div>
<div pie class="pointer" params="{{panel}}" style="position:relative"></div> <div pie class="pointer" params="{{panel}}" style="position:relative"></div>
<div ng-show="panel.legend == 'below'" ng-repeat="query in legend" style="float:left;padding-left: 10px;"> <div ng-show="panel.legend == 'below'" ng-repeat="query in legend" style="float:left;padding-left: 10px;">
<span ng-show='panel.chart != "none"'><i class="icon-circle" ng-style="{color:query.color}"></i></span><span class="small"> {{query.label}} ({{query.data[0][1]}}) </span></span> <span ng-show="panel.chart != 'none'"><i class="icon-circle" ng-style="{color:query.color}"></i></span><span class="small"> {{query.label}} ({{query.data[0][1]}}) </span></span>
</div> </div>
</div> </div>
\ No newline at end of file
...@@ -254,7 +254,7 @@ define([ ...@@ -254,7 +254,7 @@ define([
// Populate legend // Populate legend
if(elem.is(":visible")){ if(elem.is(":visible")){
require(['vendor/jquery/jquery.flot.pie.js'], function(){ require(['jquery.flot.pie'], function(){
scope.legend = $.plot(elem, scope.data, pie).getData(); scope.legend = $.plot(elem, scope.data, pie).getData();
if(!scope.$$phase) { if(!scope.$$phase) {
scope.$apply(); scope.$apply();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment