public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #14089 from grafana/fixed-alert-tab-location

Browse Source 
fixed alert tab order and fixed some console logging issues
This commit is contained in:
Marcus Efraimsson
2018-11-16 03:58:13 -08:00
committed by GitHub
parent 907c84f7d8 905ef22075
commit f528142655
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/core/services/dynamic_directive_srv.ts
-1
View File
@@ -21,7 +21,6 @@ class DynamicDirectiveSrv {
}
if (!directiveInfo.fn.registered) {
console.log('register panel tab');
coreModule.directive(attrs.$normalize(directiveInfo.name), directiveInfo.fn);
directiveInfo.fn.registered = true;
}
public/app/core/services/keybindingSrv.ts
+2 -2
View File
@@ -32,8 +32,8 @@ export class KeybindingSrv {
this.setupGlobal();
appEvents.on('show-modal', () => (this.modalOpen = true));
$rootScope.onAppEvent('timepickerOpen', () => (this.timepickerOpen = true));
$rootScope.onAppEvent('timepickerClosed', () => (this.timepickerOpen = false));
appEvents.on('timepickerOpen', () => (this.timepickerOpen = true));
appEvents.on('timepickerClosed', () => (this.timepickerOpen = false));
}
setupGlobal() {
public/app/plugins/panel/graph/module.ts
+1 -1
View File
@@ -135,9 +135,9 @@ class GraphCtrl extends MetricsPanelCtrl {
}
onInitEditMode() {
this.addEditorTab('Display', 'public/app/plugins/panel/graph/tab_display.html', 4);
this.addEditorTab('Axes', axesEditorComponent, 2);
this.addEditorTab('Legend', 'public/app/plugins/panel/graph/tab_legend.html', 3);
this.addEditorTab('Display', 'public/app/plugins/panel/graph/tab_display.html', 4);
if (config.alertingEnabled) {
this.addEditorTab('Alert', alertTab, 5);