Merge branch 'master' into alerting_definitions

This commit is contained in:
bergquist 2016-05-19 08:47:34 +02:00
commit 402499c071
2 changed files with 12 additions and 4 deletions

View File

@ -91,16 +91,24 @@ export class PanelCtrl {
this.editModeInitiated = true;
this.events.emit('init-edit-mode', null);
var route = this.$injector.get('$route');
if (route.current.params.editorTab) {
var routeParams = this.$injector.get('$routeParams');
if (routeParams.editorTab) {
this.editorTabs.forEach((tab, i) => {
if (tab.title === route.current.params.editorTab) {
if (tab.title === routeParams.editorTab) {
this.editorTabIndex = i;
}
});
}
}
changeTab(newIndex) {
this.editorTabIndex = newIndex;
var route = this.$injector.get('$route');
route.current.params.editorTab = this.editorTabs[newIndex].title;
route.updateParams();
}
addEditorTab(title, directiveFn, index?) {
var editorTab = {title, directiveFn};

View File

@ -36,7 +36,7 @@ var panelTemplate = `
<ul class="gf-tabs">
<li class="gf-tabs-item" ng-repeat="tab in ::ctrl.editorTabs">
<a class="gf-tabs-link" ng-click="ctrl.editorTabIndex = $index" ng-class="{active: ctrl.editorTabIndex === $index}">
<a class="gf-tabs-link" ng-click="ctrl.changeTab($index)" ng-class="{active: ctrl.editorTabIndex === $index}">
{{::tab.title}}
</a>
</li>