From 24bff6e04db8a582d46feb5dd8450cc1de09c1ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Mon, 21 Sep 2015 11:29:14 +0200
Subject: [PATCH] ui(dashboard cog icon): minor change to PR #2772 that adds
 tooltip to cog icon

---
 public/app/features/dashboard/dashboardNavCtrl.js        | 9 ++-------
 .../app/features/dashboard/partials/dashboardTopNav.html | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/public/app/features/dashboard/dashboardNavCtrl.js b/public/app/features/dashboard/dashboardNavCtrl.js
index 7aeb095eff7..eef2a8595a7 100644
--- a/public/app/features/dashboard/dashboardNavCtrl.js
+++ b/public/app/features/dashboard/dashboardNavCtrl.js
@@ -46,13 +46,8 @@ function (angular, _) {
       $scope.appEvent('show-dash-search');
     };
 
-    $scope.dashboardTitleAction = function() {
-      $scope.appEvent('hide-dash-editor');
-      $scope.exitFullscreen();
-    };
-
-    $scope.manageButtonClickAction = function() {
-      angular.element('#manageDashboardButton').tooltip('hide');
+    $scope.hideTooltip = function(evt) {
+      angular.element(evt.currentTarget).tooltip('hide');
       $scope.appEvent('hide-dash-search');
     };
 
diff --git a/public/app/features/dashboard/partials/dashboardTopNav.html b/public/app/features/dashboard/partials/dashboardTopNav.html
index f83779ba935..8fa6da1ee2f 100644
--- a/public/app/features/dashboard/partials/dashboardTopNav.html
+++ b/public/app/features/dashboard/partials/dashboardTopNav.html
@@ -30,7 +30,7 @@
 					<a ng-click="saveDashboard()" bs-tooltip="'Save dashboard'" data-placement="bottom"><i class="fa fa-save"></i></a>
 				</li>
 				<li class="dropdown">
-					<a id="manageDashboardButton" class="pointer" ng-click="manageButtonClickAction()" bs-tooltip="'Manage dashboard'" data-placement="bottom" data-toggle="dropdown"><i class="fa fa-cog"></i></a>
+					<a class="pointer" ng-click="hideTooltip($event)" bs-tooltip="'Manage dashboard'" data-placement="bottom" data-toggle="dropdown"><i class="fa fa-cog"></i></a>
 					<ul class="dropdown-menu">
 						<li ng-if="dashboardMeta.canEdit"><a class="pointer" ng-click="openEditView('settings');">Settings</a></li>
 						<li ng-if="dashboardMeta.canEdit"><a class="pointer" ng-click="openEditView('annotations');">Annotations</a></li>