root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 83 Packages Projects Releases Wiki Activity

Merge pull request #3779 from bergquist/playlist_stop_playing 

feat(playlist): clicks outside control stops playlist
This commit is contained in:
Carl Bergquist 2016-01-18 17:23:20 +01:00
parent 1d4803cff0 4a54edd8bb
commit 389dd12ab4
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/core/components/grafana_app.ts
View File

@ -139,7 +139,7 @@ export class GrafanaCtrl {
} }
} }
export function grafanaAppDirective() { export function grafanaAppDirective(playlistSrv) {
return { return {
restrict: 'E', restrict: 'E',
controller: GrafanaCtrl, controller: GrafanaCtrl,
@ -170,6 +170,10 @@ export function grafanaAppDirective() {
return; return;
} }
if (target.parents('.dash-playlist-actions').length === 0) {
playlistSrv.stop();
}
// hide search // hide search
if (elem.find('.search-container').length > 0) { if (elem.find('.search-container').length > 0) {
if (target.parents('.search-container').length === 0) { if (target.parents('.search-container').length === 0) {