From df574c658c8070d7b0d9765c3f0a10ffe3295496 Mon Sep 17 00:00:00 2001 From: rylon Date: Wed, 8 Apr 2015 21:11:34 +0200 Subject: [PATCH] fixed a small bug in system.js now the hashchange function is called correctly --- files/sys/system.js | 5 ++++- sai/modules/saimod_sys_log/js/saimod_sys_log.js | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/files/sys/system.js b/files/sys/system.js index fb021bb..f4db95f 100644 --- a/files/sys/system.js +++ b/files/sys/system.js @@ -14,12 +14,15 @@ function SYSTEM(endpoint, group,start_state,hashchange){ this.state = {}; this.state_info = {}; this.start_state = start_state; + this.hashchange = hashchange; + this.go_state(start_state); + this.hashchange(this.cur_state()); $(window).bind('hashchange', function( event ) { system.go_state(); //user callback - if(hashchange){ + if(system.hashchange){ hashchange(system.cur_state());} }); } diff --git a/sai/modules/saimod_sys_log/js/saimod_sys_log.js b/sai/modules/saimod_sys_log/js/saimod_sys_log.js index dd1ddd8..39ba129 100644 --- a/sai/modules/saimod_sys_log/js/saimod_sys_log.js +++ b/sai/modules/saimod_sys_log/js/saimod_sys_log.js @@ -89,7 +89,7 @@ function load_visualisation(){ data.addColumn('number',key); } }); - $.each(json, function(key, value){first = true; data.addRow($.map(value, function(v) { if(first){first=false;return [new Date(v)];}else{return [(v == null || parseFloat(v) <= 0) ? 0.1 : parseFloat(v)];}}));}); + $.each(json, function(key, value){first = true; data.addRow($.map(value, function(v) { if(first){first=false;return [new Date(v)];}else{return [(v == null || parseFloat(v) <= 0) ? parseFloat(0.00001) : parseFloat(v)];}}));}); var options = {title: name, aggregationTarget: 'category', selectionMode: 'multiple', curveType: 'function', /*focusTarget: 'category',*/ chartArea:{left:100,top:40}, vAxis:{logScale: true}, interpolateNulls: false, width: "1200", height: "500"}; new google.visualization.LineChart(document.getElementById('vis')).draw(data, options);