Преглед на файлове

Fixed path to pie and some double quote escaping issues

Rashid Khan преди 12 години
родител
ревизия
a4f8d4d864
променени са 2 файла, в които са добавени 3 реда и са изтрити 3 реда
  1. 2 2
      src/app/panels/pie/module.html
  2. 1 1
      src/app/panels/pie/module.js

+ 2 - 2
src/app/panels/pie/module.html

@@ -1,12 +1,12 @@
 <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>

+ 1 - 1
src/app/panels/pie/module.js

@@ -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();