From 93ec54436ca95b9c6a6abd9c815e421cbcfbfa54 Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Fri, 20 Jul 2018 09:51:50 +0000 Subject: [PATCH] svg.js: fix clicking on the plot for plotEmbed=0 (Forum #89460) git-svn-id: https://svn.fhem.de/fhem/trunk@17006 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/www/pgm2/f18.js | 4 ++-- fhem/www/pgm2/svg.js | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/fhem/www/pgm2/f18.js b/fhem/www/pgm2/f18.js index b7bf35fa0..985f0305c 100644 --- a/fhem/www/pgm2/f18.js +++ b/fhem/www/pgm2/f18.js @@ -448,7 +448,7 @@ f18_compEl(el) function f18_addDragger(el) { - if(f18_small) + if(f18_small || FW_urlParams.detail) return; if($(el).find(".dragger").length) return; @@ -597,7 +597,7 @@ f18_convertToAbs() function f18_setPos(el) { - if(f18_small) + if(f18_small || FW_urlParams.detail) return; var comp = f18_compEl(el); if($(comp).length == 0) diff --git a/fhem/www/pgm2/svg.js b/fhem/www/pgm2/svg.js index 2cb69f805..cf6bf2190 100644 --- a/fhem/www/pgm2/svg.js +++ b/fhem/www/pgm2/svg.js @@ -65,14 +65,13 @@ svg_click(evt) var t = evt.target; var o = svg_prepareHash(t); - var y_org = (((o.y_h-evt.clientY)/o.y_mul)+o.y_min).toFixed(o.decimals); + var y_org = (((o.y_h-evt.offsetY)/o.y_mul)+o.y_min).toFixed(o.decimals); var d = new Date((((evt.clientX-o.x_min)/o.t_mul)+o.x_off) * 1000); var ts = (d.getHours() < 10 ? '0' : '') + d.getHours() + ":"+ (d.getMinutes() < 10 ? '0' : '') + d.getMinutes(); - - var tl = t.ownerDocument.getElementById('svg_title'); - tl.firstChild.nodeValue = t.getAttribute("title")+": "+y_org+" ("+ts+")"; + var tl = $(t).closest("svg").find("#svg_title"); + $(tl).html($(t).attr("title")+": "+y_org+" ("+ts+")"); } function