IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-09 23:16:16 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15834 from grafana/revert-15791-fix/leave-playlist

Browse Source 
Revert "Fix for leaving playlist mode"
This commit is contained in:
Torkel Ödegaard 2019-03-07 08:46:14 +01:00 committed by GitHub
commit a826c117e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
public/app/features/dashboard/components/DashNav/DashNav.tsx
View File

@ -8,7 +8,6 @@ import { appEvents } from 'app/core/app_events';
import { PlaylistSrv } from 'app/features/playlist/playlist_srv'; import { PlaylistSrv } from 'app/features/playlist/playlist_srv';
// Components // Components
import { ClickOutsideWrapper } from 'app/core/components/ClickOutsideWrapper/ClickOutsideWrapper';
import { DashNavButton } from './DashNavButton'; import { DashNavButton } from './DashNavButton';
import { Tooltip } from '@grafana/ui'; import { Tooltip } from '@grafana/ui';
@ -174,28 +173,26 @@ export class DashNav extends PureComponent<Props> {
{this.renderDashboardTitleSearchButton()} {this.renderDashboardTitleSearchButton()}
{this.playlistSrv.isPlaying && ( {this.playlistSrv.isPlaying && (
<ClickOutsideWrapper onClick={this.onPlaylistStop}> <div className="navbar-buttons navbar-buttons--playlist">
<div className="navbar-buttons navbar-buttons--playlist"> <DashNavButton
<DashNavButton tooltip="Go to previous dashboard"
tooltip="Go to previous dashboard" classSuffix="tight"
classSuffix="tight" icon="fa fa-step-backward"
icon="fa fa-step-backward" onClick={this.onPlaylistPrev}
onClick={this.onPlaylistPrev} />
/> <DashNavButton
<DashNavButton tooltip="Stop playlist"
tooltip="Stop playlist" classSuffix="tight"
classSuffix="tight" icon="fa fa-stop"
icon="fa fa-stop" onClick={this.onPlaylistStop}
onClick={this.onPlaylistStop} />
/> <DashNavButton
<DashNavButton tooltip="Go to next dashboard"
tooltip="Go to next dashboard" classSuffix="tight"
classSuffix="tight" icon="fa fa-forward"
icon="fa fa-forward" onClick={this.onPlaylistNext}
onClick={this.onPlaylistNext} />
/> </div>
</div>
</ClickOutsideWrapper>
)} )}
<div className="navbar-buttons navbar-buttons--actions"> <div className="navbar-buttons navbar-buttons--actions">