瀏覽代碼

Merge branch 'master' of github.com:grafana/grafana

Torkel Ödegaard 9 年之前
父節點
當前提交
821876a85b
共有 2 個文件被更改,包括 8 次插入2 次删除
  1. 4 0
      public/app/core/services/context_srv.ts
  2. 4 2
      public/app/features/dashboard/timeSrv.js

+ 4 - 0
public/app/core/services/context_srv.ts

@@ -57,6 +57,10 @@ export class ContextSrv {
     store.set('grafana.sidemenu.pinned', val);
   }
 
+  isGrafanaVisible() {
+    return !!(document.visibilityState === undefined || document.visibilityState === 'visible');
+  }
+
   toggleSideMenu() {
     this.sidemenu = !this.sidemenu;
     if (!this.sidemenu) {

+ 4 - 2
public/app/features/dashboard/timeSrv.js

@@ -10,7 +10,7 @@ define([
 
   var module = angular.module('grafana.services');
 
-  module.service('timeSrv', function($rootScope, $timeout, $routeParams, timer) {
+  module.service('timeSrv', function($rootScope, $timeout, $routeParams, timer, contextSrv) {
     var self = this;
 
     // default time
@@ -95,7 +95,9 @@ define([
       self.cancel_scheduled_refresh();
       self.refresh_timer = timer.register($timeout(function () {
         self.start_scheduled_refresh(after_ms);
-        self.refreshDashboard();
+        if (contextSrv.isGrafanaVisible()) {
+          self.refreshDashboard();
+        }
       }, after_ms));
     };