Merge pull request #118 from flant/fix_for_7_1_0

fix: Grafana 7.1.0 compatibility
flant · Jul 21, 2020 · 3e37a0c · 3e37a0c
2 parents b96d205 + a4d48eb
commit 3e37a0c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 14 deletions.
diff --git a/dist/module.js b/dist/module.js
diff --git a/dist/module.js.map b/dist/module.js.map
diff --git a/dist/partials/options_editor.html b/dist/partials/options_editor.html
@@ -81,9 +81,7 @@ <h5 class="section-heading">Colors</h5>
           </div>
           <div class="gf-form">
             <label class="gf-form-label">
-              <a class="pointer" tabindex="1" ng-click="editor.onRemoveThreshold($index)">
-                <i class="fa fa-trash"/>
-              </a>
+              <i class="fa fa-trash pointer" ng-click="editor.onRemoveThreshold($index)"></i>
             </label>
           </div>
         </div>

diff --git a/src/module.ts b/src/module.ts
@@ -144,7 +144,7 @@ class StatusHeatmapCtrl extends MetricsPanelCtrl {
   };
 
   /** @ngInject */
-  constructor($scope: any, $injector: auto.IInjectorService, timeSrv, private annotationsSrv: AnnotationsSrv, $window, datasourceSrv, public variableSrv: any, templateSrv) {
+  constructor($scope: any, $injector: auto.IInjectorService, private annotationsSrv: AnnotationsSrv) {
     super($scope, $injector);
 
     if(!Polygrafill.hasAppEventCompatibleEmitter(this.events)){
@@ -197,8 +197,6 @@ class StatusHeatmapCtrl extends MetricsPanelCtrl {
     this.annotations = [];
     this.annotationsSrv = annotationsSrv;
 
-    this.timeSrv = timeSrv;
-
     this.events.on(PanelEvents.render, this.onRender.bind(this));
     this.events.on(PanelEvents.dataReceived, this.onDataReceived.bind(this));
     this.events.on(PanelEvents.dataError, this.onDataError.bind(this));

diff --git a/src/partials/options_editor.html b/src/partials/options_editor.html
@@ -81,9 +81,7 @@ <h5 class="section-heading">Colors</h5>
           </div>
           <div class="gf-form">
             <label class="gf-form-label">
-              <a class="pointer" tabindex="1" ng-click="editor.onRemoveThreshold($index)">
-                <i class="fa fa-trash"/>
-              </a>
+              <i class="fa fa-trash pointer" ng-click="editor.onRemoveThreshold($index)"></i>
             </label>
           </div>
         </div>