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

fixed alert tab order and fixed some console logging issues

Browse Source
This commit is contained in:
Torkel Ödegaard
2018-11-15 17:33:55 +01:00
parent 36ff94668c
commit 8ce1cc2d52
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/app/core/services/dynamic_directive_srv.ts
View File

@@ -21,7 +21,6 @@ class DynamicDirectiveSrv {
} }
if (!directiveInfo.fn.registered) { if (!directiveInfo.fn.registered) {
console.log('register panel tab');
coreModule.directive(attrs.$normalize(directiveInfo.name), directiveInfo.fn); coreModule.directive(attrs.$normalize(directiveInfo.name), directiveInfo.fn);
directiveInfo.fn.registered = true; directiveInfo.fn.registered = true;
} }

4
public/app/core/services/keybindingSrv.ts
View File

@@ -32,8 +32,8 @@ export class KeybindingSrv {
this.setupGlobal(); this.setupGlobal();
appEvents.on('show-modal', () => (this.modalOpen = true)); appEvents.on('show-modal', () => (this.modalOpen = true));
$rootScope.onAppEvent('timepickerOpen', () => (this.timepickerOpen = true)); appEvents.on('timepickerOpen', () => (this.timepickerOpen = true));
$rootScope.onAppEvent('timepickerClosed', () => (this.timepickerOpen = false)); appEvents.on('timepickerClosed', () => (this.timepickerOpen = false));
} }
setupGlobal() { setupGlobal() {

2
public/app/plugins/panel/graph/module.ts
View File

@@ -138,7 +138,7 @@ class GraphCtrl extends MetricsPanelCtrl {
this.addEditorTab('Legend', 'public/app/plugins/panel/graph/tab_legend.html', 3); this.addEditorTab('Legend', 'public/app/plugins/panel/graph/tab_legend.html', 3);
if (config.alertingEnabled) { if (config.alertingEnabled) {
this.addEditorTab('Alert', alertTab, 5); this.addEditorTab('Alert', alertTab, 6);
} }
this.subTabIndex = 0; this.subTabIndex = 0;