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

Import and typescript fixups

Browse Source
This commit is contained in:
David Kaltschmidt 2018-04-27 11:49:11 +02:00
parent 1e6e89121c
commit d338b7ea7b
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/containers/Explore/ElapsedTime.tsx
View File

@ -4,7 +4,7 @@ const INTERVAL = 150;
export default class ElapsedTime extends PureComponent<any, any> {
offset: number;
timer: NodeJS.Timer;
timer: number;
state = {
elapsed: 0,
@ -12,7 +12,7 @@ export default class ElapsedTime extends PureComponent<any, any> {
start() {
this.offset = Date.now();
this.timer = setInterval(this.tick, INTERVAL);
this.timer = window.setInterval(this.tick, INTERVAL);
}
tick = () => {

8
public/app/routes/ReactContainer.tsx
View File

@ -21,8 +21,12 @@ export function reactContainer($route, $location, backendSrv: BackendSrv, dataso
restrict: 'E',
template: '',
link(scope, elem) {
let component = $route.current.locals.component.default;
let props = {
let component = $route.current.locals.component;
// Dynamic imports return whole module, need to extract default export
if (component.default) {
component = component.default;
}
const props = {
backendSrv: backendSrv,
datasourceSrv: datasourceSrv,
};