root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 197 Packages Projects Releases Wiki Activity

fix(metric_editors): Fixes clicking timing issue for typeahead auto dropdown option, fixes #3428

This commit is contained in:
Torkel Ödegaard 2015-12-06 10:13:47 +01:00
parent 5aa90eb086
commit 4c5cfd51d7
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -1,4 +1,9 @@
# 2.6.0 (unreleased) # 2.6.0 (2015-12-04)
### Bug Fixes
* **metric editors**: Fix for clicking typeahead auto dropdown option, fixes [#3428](https://github.com/grafana/grafana/issues/3428)
# 2.6.0-Beta1 (2015-12-04)
### New Table Panel ### New Table Panel
* **table**: New powerful and flexible table panel, closes [#215](https://github.com/grafana/grafana/issues/215) * **table**: New powerful and flexible table panel, closes [#215](https://github.com/grafana/grafana/issues/215)

8
public/app/core/directives/metric_segment.js
View File

@ -55,8 +55,8 @@ function (_, $, coreModule) {
}); });
}; };
$scope.switchToLink = function() { $scope.switchToLink = function(fromClick) {
if (linkMode) { return; } if (linkMode && !fromClick) { return; }
clearTimeout(cancelBlur); clearTimeout(cancelBlur);
cancelBlur = null; cancelBlur = null;
@ -69,7 +69,7 @@ function (_, $, coreModule) {
$scope.inputBlur = function() { $scope.inputBlur = function() {
// happens long before the click event on the typeahead options // happens long before the click event on the typeahead options
// need to have long delay because the blur // need to have long delay because the blur
cancelBlur = setTimeout($scope.switchToLink, 100); cancelBlur = setTimeout($scope.switchToLink, 200);
}; };
$scope.source = function(query, callback) { $scope.source = function(query, callback) {
@ -100,7 +100,7 @@ function (_, $, coreModule) {
} }
$input.val(value); $input.val(value);
$scope.switchToLink(); $scope.switchToLink(true);
return value; return value;
}; };