From 63f7fc3056434a6e2e1ee5a8dae8b71d46fb49ed Mon Sep 17 00:00:00 2001 From: Travis Hegner Date: Mon, 29 Jun 2015 14:05:20 -0400 Subject: [PATCH] testing without lazy on overlib --- html/includes/functions.inc.php | 2 +- html/includes/print-graphrow.inc.php | 4 ++-- html/js/lazyload.js | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/html/includes/functions.inc.php b/html/includes/functions.inc.php index 0e83a1b698..d5c4c5308f 100644 --- a/html/includes/functions.inc.php +++ b/html/includes/functions.inc.php @@ -191,7 +191,7 @@ function overlib_link($url, $text, $contents, $class) if ($config['web_mouseover'] === FALSE) { $output .= ">"; } else { - $output .= " onmouseover=\"return get_overlib('".$contents."'".$config['overlib_defaults']."); \" onmouseout=\"return nd();\">"; + $output .= " onmouseover=\"return overlib('".$contents."'".$config['overlib_defaults'].",WRAP,HAUTO,VAUTO); \" onmouseout=\"return nd();\">"; } $output .= $text.""; diff --git a/html/includes/print-graphrow.inc.php b/html/includes/print-graphrow.inc.php index c550910443..c502c61cd4 100644 --- a/html/includes/print-graphrow.inc.php +++ b/html/includes/print-graphrow.inc.php @@ -29,9 +29,9 @@ foreach ($periods as $period) $link = generate_url($link_array); if ($return_data === TRUE) { - $graph_data[] = overlib_link($link, generate_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), NULL); + $graph_data[] = overlib_link($link, generate_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), 'lazy'); } else { - echo(overlib_link($link, generate_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), NULL)); + echo(overlib_link($link, generate_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), 'lazy')); } } diff --git a/html/js/lazyload.js b/html/js/lazyload.js index 5272809ba9..c6c0d4b3ad 100644 --- a/html/js/lazyload.js +++ b/html/js/lazyload.js @@ -1,12 +1,12 @@ $(document).ready(function(){ $("img.lazy").lazyload({ - //effect: "fadeIn" + effect: "fadeIn" }).removeClass("lazy"); $(document).ajaxStop(function() { $("img.lazy").lazyload({ - //effect: "fadeIn" + effect: "fadeIn" }).removeClass("lazy"); }); @@ -16,7 +16,6 @@ function get_overlib(content) { var ret = overlib(content, WRAP,HAUTO,VAUTO); jQuery.event.trigger("ajaxStop"); - console.log('test'); - + return ret; } \ No newline at end of file