Просмотр исходного кода

fix(singlestat): fixed issue with singlestat and drilldown link introduced in recent commit, fixes #3777

Torkel Ödegaard 10 лет назад
Родитель
Сommit
1d4803cff0
1 измененных файлов с 32 добавлено и 28 удалено
  1. 32 28
      public/app/plugins/panel/singlestat/module.js

+ 32 - 28
public/app/plugins/panel/singlestat/module.js

@@ -23,6 +23,7 @@ function (SingleStatCtrl, _, $) {
               elem = inner;
               $panelContainer = elem.parents('.panel-container');
               firstRender = false;
+              hookupDrilldownLinkTooltip();
             }
           }
 
@@ -186,41 +187,44 @@ function (SingleStatCtrl, _, $) {
           }
         }
 
-        // drilldown link tooltip
-        var drilldownTooltip = $('<div id="tooltip" class="">hello</div>"');
+        function hookupDrilldownLinkTooltip() {
+          // drilldown link tooltip
+          var drilldownTooltip = $('<div id="tooltip" class="">hello</div>"');
 
-        elem.mouseleave(function() {
-          if (panel.links.length === 0) { return;}
-          drilldownTooltip.detach();
-        });
-
-        elem.click(function() {
-          if (!linkInfo) { return; }
+          elem.mouseleave(function() {
+            if (panel.links.length === 0) { return;}
+            drilldownTooltip.detach();
+          });
 
-          if (linkInfo.target === '_blank') {
-            var redirectWindow = window.open(linkInfo.href, '_blank');
-            redirectWindow.location;
-            return;
-          }
+          elem.click(function(evt) {
+            if (!linkInfo) { return; }
+            // ignore title clicks in title
+            if ($(evt).parents('.panel-header').length > 0) { return; }
 
-          if (linkInfo.href.indexOf('http') === 0) {
-            window.location.href = linkInfo.href;
-          } else {
-            $timeout(function() {
-              $location.url(linkInfo.href);
-            });
-          }
+            if (linkInfo.target === '_blank') {
+              var redirectWindow = window.open(linkInfo.href, '_blank');
+              redirectWindow.location;
+              return;
+            }
 
-          drilldownTooltip.detach();
-        });
+            if (linkInfo.href.indexOf('http') === 0) {
+              window.location.href = linkInfo.href;
+            } else {
+              $timeout(function() {
+                $location.url(linkInfo.href);
+              });
+            }
 
-        elem.mousemove(function(e) {
-          if (!linkInfo) { return;}
+            drilldownTooltip.detach();
+          });
 
-          drilldownTooltip.text('click to go to: ' + linkInfo.title);
+          elem.mousemove(function(e) {
+            if (!linkInfo) { return;}
 
-          drilldownTooltip.place_tt(e.pageX+20, e.pageY-15);
-        });
+            drilldownTooltip.text('click to go to: ' + linkInfo.title);
+            drilldownTooltip.place_tt(e.pageX+20, e.pageY-15);
+          });
+        }
       }
     };
   }