From 29634595376dc6fa914c286871ccffd48b5b19c0 Mon Sep 17 00:00:00 2001
From: rudolfkoenig <>
Date: Fri, 27 Jul 2018 13:42:42 +0000
Subject: [PATCH] svg.js: fix time when clicking (Forum #89693) and Position of
 Value box in f18 fixed mode

git-svn-id: https://svn.fhem.de/fhem/trunk@17037 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/www/pgm2/svg.js | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/fhem/www/pgm2/svg.js b/fhem/www/pgm2/svg.js
index cf6bf2190..0c7b389c2 100644
--- a/fhem/www/pgm2/svg.js
+++ b/fhem/www/pgm2/svg.js
@@ -54,8 +54,11 @@ svg_prepareHash(el)
 {
   var obj = { y_mul:0,y_h:0,y_min:0, decimals:0,
               t_mul:0,x_off:0,x_min:0, x_mul:0, log_scale:undefined };
-  for(var name in obj)
-    obj[name] = parseFloat($(el).attr(name));
+  for(var name in obj) {
+    var n = $(el).attr(name);
+    if(n)
+      obj[name] = parseFloat(n);
+  }
   return obj;
 }
 
@@ -65,8 +68,15 @@ svg_click(evt)
   var t = evt.target;
   var o = svg_prepareHash(t);
 
-  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 svg=$(t).closest("svg"), x=evt.clientX, y=evt.clientY;
+  if($(svg).parent().length) { // isEmbed=0
+    var off = $(svg).offset();
+    x -= off.left;
+    y -= off.top;
+  }
+
+  var y_org = (((o.y_h-y)/o.y_mul)+o.y_min).toFixed(o.decimals);
+  var d = new Date((((x-o.x_min)/o.t_mul)+o.x_off) * 1000);
   var ts = (d.getHours() < 10 ? '0' : '') + d.getHours() + ":"+
            (d.getMinutes() < 10 ? '0' : '') + d.getMinutes();
 
@@ -224,7 +234,8 @@ sv_menu(evt, embed)
 
           par.div = $('<div id="svgmarker">');
           par.divoffY = $(embed ? embed : svg).offset().top -
-                       $("#content").offset().top-50;
+                       $("#content").offset().top-50 +
+                       $("#content").scrollTop();
           $("#content").append(par.div);
 
           var pl = selNode[arrName];