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

Merge branch 'prom_give_focus' of https://github.com/mtanda/grafana into mtanda-prom_give_focus

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-09-08 10:55:50 +02:00
commit 4b851de648
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
public/app/core/components/code_editor/code_editor.ts
View File

@ -110,6 +110,16 @@ function link(scope, elem, attrs) {
elem.addClass("gf-code-editor");
let textarea = elem.find("textarea");
textarea.addClass('gf-form-input');
if (scope.focus) {
setTimeout(function () {
textarea.focus();
var domEl = textarea[0];
if (domEl.setSelectionRange) {
var pos = textarea.val().length * 2;
domEl.setSelectionRange(pos, pos);
}
}, 200);
}
// Event handlers
editorSession.on('change', (e) => {
@ -199,6 +209,7 @@ export function codeEditorDirective() {
template: editorTemplate,
scope: {
content: "=",
focus: "=",
onChange: "&",
getCompleter: "&"
},

2
public/app/plugins/datasource/prometheus/partials/query.editor.html
View File

@ -2,7 +2,7 @@
<div class="gf-form-inline">
<div class="gf-form gf-form--grow">
<code-editor content="ctrl.target.expr" on-change="ctrl.refreshMetricData()"
get-completer="ctrl.getCompleter()" data-mode="prometheus">
get-completer="ctrl.getCompleter()" data-mode="prometheus" focus="ctrl.target.refId == 'A'">
</code-editor>
</div>
</div>