pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'mrbeam' into stable-1.2.2

Browse source
This commit is contained in:
make-ing 2016-04-15 16:00:28 +02:00
commit 94c673473b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/octoprint/plugins/svgtogcode/static/js/working_area.js
View file

@ -102,11 +102,11 @@ $(function(){
self.availableWidth($('#workingarea div.span8').innerWidth()); self.availableWidth($('#workingarea div.span8').innerWidth());
}; };
self.move_laser = function(el){ self.move_laser = function(data, evt){
self.abortFreeTransforms(); self.abortFreeTransforms();
if(self.state.isOperational() && !self.state.isPrinting()){ if(self.state.isOperational() && !self.state.isPrinting()){
var x = self.px2mm(event.offsetX); var x = self.px2mm(evt.offsetX);
var y = self.px2mm(event.toElement.ownerSVGElement.offsetHeight - event.offsetY); // hopefully this works across browsers var y = self.px2mm(evt.target.ownerSVGElement.getBoundingClientRect().height - evt.offsetY); // hopefully this works across browsers
x = Math.min(x, self.workingAreaWidthMM()); x = Math.min(x, self.workingAreaWidthMM());
y = Math.min(y, self.workingAreaHeightMM()); y = Math.min(y, self.workingAreaHeightMM());
$.ajax({ $.ajax({