Browse Source

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

Revert "Fix for leaving playlist mode"
Torkel Ödegaard 6 years ago
parent
commit
a826c117e2
1 changed files with 20 additions and 23 deletions
  1. 20 23
      public/app/features/dashboard/components/DashNav/DashNav.tsx

+ 20 - 23
public/app/features/dashboard/components/DashNav/DashNav.tsx

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