From 5896eee693ebe9351f108d8c5d0bbb890e000fe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Wed, 13 Aug 2014 19:11:46 +0200
Subject: [PATCH] Dashboard: tooltip fixes for flickering tooltips that
 sometimes do now want to show on hover, and for tooltips that get stuck after
 exiting modal, Closes #691

---
 CHANGELOG.md                       | 3 +++
 src/app/app.js                     | 3 +++
 src/app/directives/configModal.js  | 2 +-
 src/app/directives/grafanaPanel.js | 4 +++-
 src/vendor/bootstrap/bootstrap.js  | 2 +-
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9cb9b360590..25472176ed8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,9 @@
 - [Issue #578](https://github.com/grafana/grafana/issues/578). Dashboard: Row option to display row title even when the row is visible
 - [Issue #672](https://github.com/grafana/grafana/issues/672). Dashboard: panel fullscreen & edit state is present in url, can now link to graph in edit & fullscreen mode.
 
+**Fixes**
+- [Issue #691](https://github.com/grafana/grafana/issues/691). Dashboard: tooltip fixes, sometimes they would not show, and sometimes they would get stuck.
+
 **Tech**
 - Upgraded from angularjs 1.1.5 to 1.3 beta 17;
 - Switch from underscore to lodash
diff --git a/src/app/app.js b/src/app/app.js
index 973a74ab9e0..9acb4d03f02 100644
--- a/src/app/app.js
+++ b/src/app/app.js
@@ -87,6 +87,9 @@ function (angular, $, _, appLevelRequire, config) {
       'routes/all',
     ], function () {
 
+      // disable tool tip animation
+      $.fn.tooltip.defaults.animation = false;
+
       // bootstrap the app
       angular
         .element(document)
diff --git a/src/app/directives/configModal.js b/src/app/directives/configModal.js
index e3d21253260..b7e579e7026 100644
--- a/src/app/directives/configModal.js
+++ b/src/app/directives/configModal.js
@@ -45,4 +45,4 @@ function (angular, _, $) {
         }
       };
     });
-});
\ No newline at end of file
+});
diff --git a/src/app/directives/grafanaPanel.js b/src/app/directives/grafanaPanel.js
index 32817c9b161..bba6d10e6da 100644
--- a/src/app/directives/grafanaPanel.js
+++ b/src/app/directives/grafanaPanel.js
@@ -18,8 +18,10 @@ function (angular, $) {
        '<div class="row-fluid panel-extra">' +
           '<div class="panel-extra-container">' +
             '<span class="alert-error panel-error small pointer"' +
-                  'config-modal="app/partials/inspector.html" ng-show="panel.error" data-placement="right" bs-tooltip="panel.error">' +
+                  'config-modal="app/partials/inspector.html" ng-show="panel.error">' +
+              '<span data-placement="right" bs-tooltip="panel.error">' +
               '<i class="icon-exclamation-sign"></i><span class="panel-error-arrow"></span>' +
+              '</span>' +
             '</span>' +
 
             '<span class="panel-loading" ng-show="panelMeta.loading == true">' +
diff --git a/src/vendor/bootstrap/bootstrap.js b/src/vendor/bootstrap/bootstrap.js
index 83feb464216..4bb9bc60b70 100644
--- a/src/vendor/bootstrap/bootstrap.js
+++ b/src/vendor/bootstrap/bootstrap.js
@@ -2319,4 +2319,4 @@
   })
 
 
-}(window.jQuery);
\ No newline at end of file
+}(window.jQuery);