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

fix: fixed playlist controls and view state, fixes #9639

Browse Source
This commit is contained in:
Patrick O'Carroll
2017-10-24 10:43:48 +02:00
parent e91b00c355
commit 8afb84a5e5
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/core/directives/dash_class.js
View File

@@ -31,8 +31,8 @@ function (_, $, coreModule) {
} }
}); });
$scope.$watch('playlistSrv', function(newValue) { $scope.$watch('playlistSrv.isPlaying', function(newValue) {
elem.toggleClass('playlist-active', _.isObject(newValue)); elem.toggleClass('playlist-active', newValue);
}); });
} }
}; };

2
public/app/features/dashboard/dashboard_ctrl.ts
View File

@@ -20,10 +20,12 @@ export class DashboardCtrl {
dynamicDashboardSrv, dynamicDashboardSrv,
dashboardViewStateSrv, dashboardViewStateSrv,
contextSrv, contextSrv,
playlistSrv,
alertSrv, alertSrv,
$timeout) { $timeout) {
$scope.editor = { index: 0 }; $scope.editor = { index: 0 };
$scope.playlistSrv = playlistSrv;
var resizeEventTimeout; var resizeEventTimeout;

1
public/app/features/dashboard/dashnav/dashnav.ts
View File

@@ -19,6 +19,7 @@ export class DashNavCtrl {
private $location, private $location,
private backendSrv, private backendSrv,
private contextSrv, private contextSrv,
public playlistSrv,
navModelSrv) { navModelSrv) {
this.navModel = navModelSrv.getDashboardNav(this.dashboard, this); this.navModel = navModelSrv.getDashboardNav(this.dashboard, this);