IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "show current value in dropdown when its not part of list"

Browse Source 
This reverts commit 76275cae37.
This commit is contained in:
Sven Klemm 2018-07-09 13:04:55 +02:00
parent 76275cae37
commit 6a981d39d8
1 changed files with 12 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
public/app/core/components/sql_part/sql_part_editor.ts
View File

@ -15,7 +15,7 @@ var template = `
/** @ngInject */ /** @ngInject */
export function sqlPartEditorDirective($compile, templateSrv) { export function sqlPartEditorDirective($compile, templateSrv) {
var paramTemplate = '<input type="text" class="hide input-medium"></input>'; var paramTemplate = '<input type="text" class="hide input-mini"></input>';
return { return {
restrict: 'E', restrict: 'E',
@ -30,7 +30,6 @@ export function sqlPartEditorDirective($compile, templateSrv) {
var partDef = part.def; var partDef = part.def;
var $paramsContainer = elem.find('.query-part-parameters'); var $paramsContainer = elem.find('.query-part-parameters');
var debounceLookup = $scope.debounce; var debounceLookup = $scope.debounce;
var cancelBlur = null;
$scope.partActions = []; $scope.partActions = [];
@ -54,23 +53,7 @@ export function sqlPartEditorDirective($compile, templateSrv) {
} }
} }
$scope.inputBlur = function(paramIndex) { function inputBlur(paramIndex) {
cancelBlur = setTimeout($scope.switchToLink, 200);
};
$scope.updater = function(value) {
if (value === part.params[paramIndex]) {
clearTimeout(cancelBlur);
$input.focus();
}
return value;
setTimeout(function() {
$scope.inputBlur.call($input[0], paramIndex);
}, 0);
return value;
};
$scope.switchToLink = function(paramIndex) {
/*jshint validthis:true */ /*jshint validthis:true */
var $input = $(this); var $input = $(this);
var $link = $input.prev(); var $link = $input.prev();
@ -87,12 +70,12 @@ export function sqlPartEditorDirective($compile, templateSrv) {
$input.hide(); $input.hide();
$link.show(); $link.show();
}; }
function inputKeyPress(paramIndex, e) { function inputKeyPress(paramIndex, e) {
/*jshint validthis:true */ /*jshint validthis:true */
if (e.which === 13) { if (e.which === 13) {
$scope.inputBlur.call(this, paramIndex); inputBlur.call(this, paramIndex);
} }
} }
@ -122,12 +105,6 @@ export function sqlPartEditorDirective($compile, templateSrv) {
var dynamicOptions = _.map(result, function(op) { var dynamicOptions = _.map(result, function(op) {
return op.value; return op.value;
}); });
// add current value to dropdown if its not in resultset
if (_.indexOf(dynamicOptions, part.params[paramIndex]) === -1) {
dynamicOptions.unshift(part.params[paramIndex]);
}
callback(dynamicOptions); callback(dynamicOptions);
}); });
}); });
@ -139,7 +116,12 @@ export function sqlPartEditorDirective($compile, templateSrv) {
source: typeaheadSource, source: typeaheadSource,
minLength: 0, minLength: 0,
items: 1000, items: 1000,
updater: $scope.updater, updater: function(value) {
setTimeout(function() {
inputBlur.call($input[0], paramIndex);
}, 0);
return value;
},
}); });
var typeahead = $input.data('typeahead'); var typeahead = $input.data('typeahead');
@ -175,13 +157,13 @@ export function sqlPartEditorDirective($compile, templateSrv) {
} }
var paramValue = templateSrv.highlightVariablesAsHtml(part.params[index]); var paramValue = templateSrv.highlightVariablesAsHtml(part.params[index]);
var $paramLink = $('<a class="">' + paramValue + '</a>'); var $paramLink = $('<a class="graphite-func-param-link pointer">' + paramValue + '</a>');
var $input = $(paramTemplate); var $input = $(paramTemplate);
$paramLink.appendTo($paramsContainer); $paramLink.appendTo($paramsContainer);
$input.appendTo($paramsContainer); $input.appendTo($paramsContainer);
$input.blur(_.partial($scope.inputBlur, index)); $input.blur(_.partial(inputBlur, index));
$input.keyup(inputKeyDown); $input.keyup(inputKeyDown);
$input.keypress(_.partial(inputKeyPress, index)); $input.keypress(_.partial(inputKeyPress, index));
$paramLink.click(_.partial(clickFuncParam, index)); $paramLink.click(_.partial(clickFuncParam, index));