diff --git a/.gitignore b/.gitignore
index 34748839..b8b1ba82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,4 +46,3 @@ dump.rdb
supervisord.pid
memory_traces
mrq/dashboard/static/node_modules/
-mrq/dashboard/static/bin/
diff --git a/mrq/dashboard/static/js/views/generic/datatablepage.js b/mrq/dashboard/static/js/views/generic/datatablepage.js
index 23ea7cf2..9268398c 100644
--- a/mrq/dashboard/static/js/views/generic/datatablepage.js
+++ b/mrq/dashboard/static/js/views/generic/datatablepage.js
@@ -136,7 +136,6 @@ define(["views/generic/page", "underscore", "jquery"],function(Page, _, $) {
},
getRefreshInterval:function() {
-
var interval = parseInt($(".js-autorefresh").val(), 10) * 1000;
if (!this.app.rootView.isTabVisible) {
@@ -156,9 +155,11 @@ define(["views/generic/page", "underscore", "jquery"],function(Page, _, $) {
if (!interval) return console.log("cancel queue");
clearTimeout(self.refreshDataTableTimeout);
- self.refreshDataTableTimeout = setTimeout(function() {
- self.refreshDataTable();
- }, interval);
+ if (interval > 0) {
+ self.refreshDataTableTimeout = setTimeout(function() {
+ self.refreshDataTable();
+ }, interval);
+ }
},
diff --git a/mrq/dashboard/static/js/views/root.js b/mrq/dashboard/static/js/views/root.js
index 17831ff8..43bcca4a 100644
--- a/mrq/dashboard/static/js/views/root.js
+++ b/mrq/dashboard/static/js/views/root.js
@@ -29,46 +29,46 @@ define(["views/generic/page", "jquery",
// http://stackoverflow.com/questions/1060008/is-there-a-way-to-detect-if-a-browser-window-is-not-currently-active
- (function() {
-
- var onchange = function(evt) {
-
- var prevVisible = self.isTabVisible;
- var v = true, h = false,
- evtMap = {
- focus:v, focusin:v, pageshow:v, blur:h, focusout:h, pagehide:h
- };
-
- evt = evt || window.event;
- if (evt.type in evtMap)
- self.isTabVisible = evtMap[evt.type];
- else
- self.isTabVisible = this[hidden] ? false : true;
-
- if (prevVisible != self.isTabVisible) {
- self.trigger("visibilitychange");
- }
- };
-
- var hidden = "hidden";
-
- // Standards:
- if (hidden in document)
- document.addEventListener("visibilitychange", onchange);
- else if ((hidden = "mozHidden") in document)
- document.addEventListener("mozvisibilitychange", onchange);
- else if ((hidden = "webkitHidden") in document)
- document.addEventListener("webkitvisibilitychange", onchange);
- else if ((hidden = "msHidden") in document)
- document.addEventListener("msvisibilitychange", onchange);
- // IE 9 and lower:
- else if ('onfocusin' in document)
- document.onfocusin = document.onfocusout = onchange;
- // All others:
- else
- window.onpageshow = window.onpagehide = window.onfocus = window.onblur = onchange;
-
- })();
+ // (function() {
+ //
+ // var onchange = function(evt) {
+ //
+ // var prevVisible = self.isTabVisible;
+ // var v = true, h = false,
+ // evtMap = {
+ // focus:v, focusin:v, pageshow:v, blur:h, focusout:h, pagehide:h
+ // };
+ //
+ // evt = evt || window.event;
+ // if (evt.type in evtMap)
+ // self.isTabVisible = evtMap[evt.type];
+ // else
+ // self.isTabVisible = this[hidden] ? false : true;
+ //
+ // if (prevVisible != self.isTabVisible) {
+ // self.trigger("visibilitychange");
+ // }
+ // };
+ //
+ // var hidden = "hidden";
+ //
+ // // Standards:
+ // if (hidden in document)
+ // document.addEventListener("visibilitychange", onchange);
+ // else if ((hidden = "mozHidden") in document)
+ // document.addEventListener("mozvisibilitychange", onchange);
+ // else if ((hidden = "webkitHidden") in document)
+ // document.addEventListener("webkitvisibilitychange", onchange);
+ // else if ((hidden = "msHidden") in document)
+ // document.addEventListener("msvisibilitychange", onchange);
+ // // IE 9 and lower:
+ // else if ('onfocusin' in document)
+ // document.onfocusin = document.onfocusout = onchange;
+ // // All others:
+ // else
+ // window.onpageshow = window.onpagehide = window.onfocus = window.onblur = onchange;
+ //
+ // })();
},
/**
diff --git a/mrq/dashboard/templates/index.html b/mrq/dashboard/templates/index.html
index 990af8eb..408059f4 100644
--- a/mrq/dashboard/templates/index.html
+++ b/mrq/dashboard/templates/index.html
@@ -75,12 +75,12 @@
-
+
-
+