Skip to content

Commit b838d97

Browse files
mehdigmiramehdigmira
authored
Merge pull request #186 from pricingassistant/performance
Performance
2 parents 4c773ad + aac2ef0 commit b838d97

4 files changed

Lines changed: 47 additions & 47 deletions

File tree

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,3 @@ dump.rdb
4646
supervisord.pid
4747
memory_traces
4848
mrq/dashboard/static/node_modules/
49-
mrq/dashboard/static/bin/

‎mrq/dashboard/static/js/views/generic/datatablepage.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ define(["views/generic/page", "underscore", "jquery"],function(Page, _, $) {
136136
},
137137

138138
getRefreshInterval:function() {
139-
140139
var interval = parseInt($(".js-autorefresh").val(), 10) * 1000;
141140

142141
if (!this.app.rootView.isTabVisible) {
@@ -156,9 +155,11 @@ define(["views/generic/page", "underscore", "jquery"],function(Page, _, $) {
156155
if (!interval) return console.log("cancel queue");
157156

158157
clearTimeout(self.refreshDataTableTimeout);
159-
self.refreshDataTableTimeout = setTimeout(function() {
160-
self.refreshDataTable();
161-
}, interval);
158+
if (interval > 0) {
159+
self.refreshDataTableTimeout = setTimeout(function() {
160+
self.refreshDataTable();
161+
}, interval);
162+
}
162163

163164
},
164165

‎mrq/dashboard/static/js/views/root.js‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -29,46 +29,46 @@ define(["views/generic/page", "jquery",
2929

3030

3131
// http://stackoverflow.com/questions/1060008/is-there-a-way-to-detect-if-a-browser-window-is-not-currently-active
32-
(function() {
33-
34-
var onchange = function(evt) {
35-
36-
var prevVisible = self.isTabVisible;
37-
var v = true, h = false,
38-
evtMap = {
39-
focus:v, focusin:v, pageshow:v, blur:h, focusout:h, pagehide:h
40-
};
41-
42-
evt = evt || window.event;
43-
if (evt.type in evtMap)
44-
self.isTabVisible = evtMap[evt.type];
45-
else
46-
self.isTabVisible = this[hidden] ? false : true;
47-
48-
if (prevVisible != self.isTabVisible) {
49-
self.trigger("visibilitychange");
50-
}
51-
};
52-
53-
var hidden = "hidden";
54-
55-
// Standards:
56-
if (hidden in document)
57-
document.addEventListener("visibilitychange", onchange);
58-
else if ((hidden = "mozHidden") in document)
59-
document.addEventListener("mozvisibilitychange", onchange);
60-
else if ((hidden = "webkitHidden") in document)
61-
document.addEventListener("webkitvisibilitychange", onchange);
62-
else if ((hidden = "msHidden") in document)
63-
document.addEventListener("msvisibilitychange", onchange);
64-
// IE 9 and lower:
65-
else if ('onfocusin' in document)
66-
document.onfocusin = document.onfocusout = onchange;
67-
// All others:
68-
else
69-
window.onpageshow = window.onpagehide = window.onfocus = window.onblur = onchange;
70-
71-
})();
32+
// (function() {
33+
//
34+
// var onchange = function(evt) {
35+
//
36+
// var prevVisible = self.isTabVisible;
37+
// var v = true, h = false,
38+
// evtMap = {
39+
// focus:v, focusin:v, pageshow:v, blur:h, focusout:h, pagehide:h
40+
// };
41+
//
42+
// evt = evt || window.event;
43+
// if (evt.type in evtMap)
44+
// self.isTabVisible = evtMap[evt.type];
45+
// else
46+
// self.isTabVisible = this[hidden] ? false : true;
47+
//
48+
// if (prevVisible != self.isTabVisible) {
49+
// self.trigger("visibilitychange");
50+
// }
51+
// };
52+
//
53+
// var hidden = "hidden";
54+
//
55+
// // Standards:
56+
// if (hidden in document)
57+
// document.addEventListener("visibilitychange", onchange);
58+
// else if ((hidden = "mozHidden") in document)
59+
// document.addEventListener("mozvisibilitychange", onchange);
60+
// else if ((hidden = "webkitHidden") in document)
61+
// document.addEventListener("webkitvisibilitychange", onchange);
62+
// else if ((hidden = "msHidden") in document)
63+
// document.addEventListener("msvisibilitychange", onchange);
64+
// // IE 9 and lower:
65+
// else if ('onfocusin' in document)
66+
// document.onfocusin = document.onfocusout = onchange;
67+
// // All others:
68+
// else
69+
// window.onpageshow = window.onpagehide = window.onfocus = window.onblur = onchange;
70+
//
71+
// })();
7272
},
7373

7474
/**

‎mrq/dashboard/templates/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@
7575
<option value="1">1s</option>
7676
<option value="3">3s</option>
7777
<option value="5">5s</option>
78-
<option selected="selected" value="10">10s</option>
78+
<option value="10">10s</option>
7979
<option value="20">20s</option>
8080
<option value="60">1m</option>
8181
<option value="300">5m</option>
8282
<option value="600">10m</option>
83-
<option value="-1">Disabled</option>
83+
<option selected="selected" value="-1">Disabled</option>
8484
</select></a>
8585
</li>
8686

0 commit comments

Comments
 (0)