Ero sivun ”Widget:JwObsCharts” versioiden välillä
Järvi-meriwikistä
Rivi 1 431: | Rivi 1 431: | ||
function wait() { | function wait() { | ||
− | |||
− | |||
var w = memo.chartEl.width(); | var w = memo.chartEl.width(); | ||
var h = memo.chartEl.height(); | var h = memo.chartEl.height(); | ||
− | + | ||
− | if ( w*h != 0 ) { | + | if ( typeof memo.oldW == 'undefined' ) { memo.oldW = 1; } |
+ | if ( typeof memo.oldH == 'undefined' ) { memo.oldH = 1; } | ||
+ | |||
+ | if ( ( w != memo.oldW || h != memo.oldH ) && w*h != 0 ) { | ||
+ | |||
+ | memo.oldW = w; memo.oldH = h; | ||
memo.margins = { top: 10, right: 10, bottom: 80, left: 80 }; | memo.margins = { top: 10, right: 10, bottom: 80, left: 80 }; | ||
Rivi 1 449: | Rivi 1 452: | ||
var b = Math.max( memo.margins.bottom, 0.15*h ); | var b = Math.max( memo.margins.bottom, 0.15*h ); | ||
− | |||
− | |||
− | |||
− | |||
− | |||
− | |||
memo.options.chartArea = { top: t, left: l, width: (w - l - r), height: (h - t - b), backgroundColor: { fill: '#fff', stroke: '#eee', strokeWidth: 4 }}; | memo.options.chartArea = { top: t, left: l, width: (w - l - r), height: (h - t - b), backgroundColor: { fill: '#fff', stroke: '#eee', strokeWidth: 4 }}; | ||
− | |||
− | |||
memo.chart.draw( memo.data, memo.options ); | memo.chart.draw( memo.data, memo.options ); | ||
Rivi 1 478: | Rivi 1 473: | ||
// move current observations to top | // move current observations to top | ||
gEl = jQuery( document.getElementById(memo.id) ).find( 'svg' ).append( 'g' ); | gEl = jQuery( document.getElementById(memo.id) ).find( 'svg' ).append( 'g' ); | ||
− | |||
− | |||
jQuery( document.getElementById(memo.id) ).find( 'path[stroke="#3366cc"]' ).detach().appendTo( gEl ); | jQuery( document.getElementById(memo.id) ).find( 'path[stroke="#3366cc"]' ).detach().appendTo( gEl ); | ||
jQuery( document.getElementById(memo.id) ).find( 'circle[fill="#3366cc"]' ).detach().appendTo( gEl ); | jQuery( document.getElementById(memo.id) ).find( 'circle[fill="#3366cc"]' ).detach().appendTo( gEl ); | ||
− | |||
jQuery( document.getElementById(memo.id) ).find( 'circle[stroke-width="3"]' ).each( function() { jQuery( this ).parent().append( jQuery( this ) ); }); | jQuery( document.getElementById(memo.id) ).find( 'circle[stroke-width="3"]' ).each( function() { jQuery( this ).parent().append( jQuery( this ) ); }); | ||
− | |||
− | |||
− | } | + | } |
} | } | ||
− | + | wait(); | |
− | |||
− | |||
if ( typeof memo.chartEl != 'undefined' ) { | if ( typeof memo.chartEl != 'undefined' ) { | ||
setTimeout( wait, 1 ); | setTimeout( wait, 1 ); |