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 'master' of github.com:grafana/grafana

Browse Source
This commit is contained in:
Torkel Ödegaard 2018-07-18 13:20:56 +02:00
commit 29291f88b1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/containers/Explore/QueryField.tsx
View File

@ -17,6 +17,7 @@ import { processLabels, RATE_RANGES, cleanText } from './utils/prometheus';
import Typeahead from './Typeahead'; import Typeahead from './Typeahead';
const EMPTY_METRIC = ''; const EMPTY_METRIC = '';
const METRIC_MARK = 'metric';
export const TYPEAHEAD_DEBOUNCE = 300; export const TYPEAHEAD_DEBOUNCE = 300;
function flattenSuggestions(s) { function flattenSuggestions(s) {
@ -135,7 +136,7 @@ class QueryField extends React.Component<any, any> {
if (!this.state.metrics) { if (!this.state.metrics) {
return; return;
} }
setPrismTokens(this.props.prismLanguage, 'metrics', this.state.metrics); setPrismTokens(this.props.prismLanguage, METRIC_MARK, this.state.metrics);
// Trigger re-render // Trigger re-render
window.requestAnimationFrame(() => { window.requestAnimationFrame(() => {
@ -184,7 +185,7 @@ class QueryField extends React.Component<any, any> {
let typeaheadContext = null; let typeaheadContext = null;
// Take first metric as lucky guess // Take first metric as lucky guess
const metricNode = editorNode.querySelector('.metric'); const metricNode = editorNode.querySelector(`.${METRIC_MARK}`);
if (wrapperClasses.contains('context-range')) { if (wrapperClasses.contains('context-range')) {
// Rate ranges // Rate ranges