From 3128ac776593d1063410927ae7bfc797c851c853 Mon Sep 17 00:00:00 2001 From: make-ing Date: Fri, 27 May 2016 18:17:39 +0200 Subject: [PATCH] bux fixing issue #67: Chrome now treats the event target attributes like Firefox, so no need for distinction anymore. --- .../plugins/svgtogcode/static/js/working_area.js | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/octoprint/plugins/svgtogcode/static/js/working_area.js b/src/octoprint/plugins/svgtogcode/static/js/working_area.js index 8c320b95..032b1897 100644 --- a/src/octoprint/plugins/svgtogcode/static/js/working_area.js +++ b/src/octoprint/plugins/svgtogcode/static/js/working_area.js @@ -132,14 +132,9 @@ $(function(){ }; self.getXYCoord = function(evt){ - if(isFirefox) { - 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(evt.target.ownerSVGElement.getBoundingClientRect().height - evt.offsetY); // hopefully this works across browsers - } + 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; x = Math.min(x, self.workingAreaWidthMM()); y = Math.min(y, self.workingAreaHeightMM()); return {x:x, y:y};