stv0g/vzlogger
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixed automatic refresh and options saving (broken by scope issues)

Browse source
This commit is contained in:
Steffen Vogel 2011-03-16 12:13:27 +01:00
parent 79db3f6c19
commit 55b54b0dcf
2 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
htdocs/frontend/javascripts/options.js
View file

@ -27,9 +27,9 @@
// default time interval to show
vz.options = {
language: 'de',
backendUrl: '../backend.php',
backendUrl: '../backend.php', // TODO default backend, store backend urls in cookies
tuples: 300,
precission: 2, // gets updated via backend
precission: 2, // TODO update from backend capabilities?
render: 'lines',
refresh: false,
defaultInterval: 24*60*60*1000, // 1 day
@ -76,13 +76,13 @@ vz.options.plot = {
}
vz.options.save = function() {
for (var key in this) {
if (this.hasOwnProperty(key) &&
typeof this[key] != 'function' &&
typeof this[key] != 'object' &&
typeof this[key] != 'undefined')
{
$.setCookie('vz_' + key, this[key]);
for (var key in vz.options) {
if (vz.options.hasOwnProperty(key) &&
typeof vz.options[key] != 'function' &&
typeof vz.options[key] != 'object' &&
typeof vz.options[key] != 'undefined'
) {
$.setCookie('vz_' + key, vz.options[key]);
}
}
};

30
htdocs/frontend/javascripts/wui.js
View file

@ -81,15 +81,20 @@ vz.wui.init = function() {
// auto refresh
if (vz.options.refresh) {
$('#refresh').attr('checked', true);
this.timeout = window.setTimeout(this.refresh, 3000);
var delta = vz.options.plot.xaxis.max - vz.options.plot.xaxis.min;
this.timeout = window.setTimeout(
this.refresh,
(delta / 100 < 3000) ? 3000 : delta / 100
);
}
$('#refresh').change(function() {
if ($(this).attr('checked')) {
vz.options.refresh = true;
this.timeout = window.setTimeout(this.refresh, 3000);
vz.options.refresh = $(this).attr('checked');
if (vz.options.refresh) {
vz.wui.timeout = window.setTimeout(vz.wui.refresh, 3000);
}
else {
vz.options.refresh = false;
window.clearTimeout(this.timeout);
}
});
@ -245,9 +250,13 @@ vz.wui.refresh = function() {
vz.options.plot.xaxis.max = new Date().getTime(); // move plot
vz.options.plot.xaxis.min = vz.options.plot.xaxis.max - delta; // move plot
vz.entities.loadData().done(vz.wui.drawPlot);
this.timeout = window.setTimeout(this.refresh, (delta / 100 < 3000) ? 3000 : delta / 100); // TODO update timeout after zooming
vz.entities.loadData().done(function() {
vz.wui.drawPlot();
vz.wui.timeout = window.setTimeout( // restart refresh timeout
vz.wui.refresh, // self
(delta / 100 < 3000) ? 3000 : delta / 100
);
});
};
/**
@ -423,16 +432,13 @@ vz.entities.showTable = function() {
'Verschieben': function() {
try {
var queue = new Array;
console.log('moving...');
queue.push(to.addChild(child)); // add to new aggregator
if (from !== undefined) {
console.log('remove from aggre');
queue.push(from.removeChild(child)); // remove from aggregator
}
else {
console.log('remove from cookies');
queue.push(vz.uuids.remove(child.uuid)); // remove from cookies
vz.uuids.remove(child.uuid); // remove from cookies
vz.uuids.save();
}
} catch (e) {