Skip to content

Performance #186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mehdigmira merged 2 commits into from
Sep 29, 2017
Merged

Performance #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3fb7d0b
do not send multiple queries to backend
mehdigmira Sep 29, 2017
aac2ef0
rm from .gitignore
mehdigmira Sep 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,3 @@ dump.rdb
supervisord.pid
memory_traces
mrq/dashboard/static/node_modules/
mrq/dashboard/static/bin/
9 changes: 5 additions & 4 deletions mrq/dashboard/static/js/views/generic/datatablepage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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);
}

},

Expand Down
80 changes: 40 additions & 40 deletions mrq/dashboard/static/js/views/root.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
//
// })();
},

/**
Expand Down
4 changes: 2 additions & 2 deletions mrq/dashboard/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,12 @@
<option value="1">1s</option>
<option value="3">3s</option>
<option value="5">5s</option>
<option selected="selected" value="10">10s</option>
<option value="10">10s</option>
<option value="20">20s</option>
<option value="60">1m</option>
<option value="300">5m</option>
<option value="600">10m</option>
<option value="-1">Disabled</option>
<option selected="selected" value="-1">Disabled</option>
</select></a>
</li>

Expand Down