From 39c8f7886a855ed8e003cd4c2bf8cbe738e4bf7b Mon Sep 17 00:00:00 2001 From: make-ing Date: Tue, 4 Oct 2016 13:03:35 +0200 Subject: [PATCH] chrome vs. firefox bugfix... Maybe needs further check to see if it can be simplyfied. Maybe use other values etc... --- .../plugins/svgtogcode/static/js/working_area.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/octoprint/plugins/svgtogcode/static/js/working_area.js b/src/octoprint/plugins/svgtogcode/static/js/working_area.js index 79cc1685..3f22ae3e 100644 --- a/src/octoprint/plugins/svgtogcode/static/js/working_area.js +++ b/src/octoprint/plugins/svgtogcode/static/js/working_area.js @@ -133,9 +133,15 @@ $(function(){ }; self.getXYCoord = function(evt){ - var scale = evt.target.parentElement.transform.baseVal[0].matrix.a; - var x = self.px2mm(evt.offsetX) * scale; - var y = self.px2mm(parseFloat(evt.target.attributes.height.value) - evt.offsetY) * scale; + if(/firefox/.test(navigator.userAgent.toLowerCase())) { + var scale = evt.target.parentElement.transform.baseVal[0].matrix.a; + var x = self.px2mm(evt.offsetX) * scale; + var y = self.px2mm(parseFloat(evt.target.attributes.height.value) - evt.offsetY) * scale; + } else + { + var x = self.px2mm(evt.offsetX); + var y = self.px2mm(parseFloat(evt.target.farthestViewportElement.clientHeight) - evt.offsetY); + } x = Math.min(x, self.workingAreaWidthMM()); y = Math.min(y, self.workingAreaHeightMM()); return {x:x, y:y};