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

fix for the chrome 50 changes where they removed the SVGElement.offset* attributes.

Browse source
This commit is contained in:
make-ing 2016-04-15 15:42:04 +02:00
parent e54364a45c
commit dc23dac20c
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -102,11 +102,11 @@ $(function(){
self.availableWidth($('#workingarea div.span8').innerWidth());
};
self.move_laser = function(el){
self.move_laser = function(data, evt){
self.abortFreeTransforms();
if(self.state.isOperational() && !self.state.isPrinting()){
var x = self.px2mm(event.offsetX);
var y = self.px2mm(event.toElement.ownerSVGElement.offsetHeight - event.offsetY); // hopefully this works across browsers
var x = self.px2mm(evt.offsetX);
var y = self.px2mm(evt.toElement.ownerSVGElement.getBoundingClientRect().height - evt.offsetY); // hopefully this works across browsers
x = Math.min(x, self.workingAreaWidthMM());
y = Math.min(y, self.workingAreaHeightMM());
$.ajax({
@ -390,7 +390,7 @@ $(function(){
});
};
self.placeIMG = function (file) {
var url = self._getIMGserveUrl(file);
var img = new Image();
@ -632,13 +632,13 @@ $(function(){
var userContent = snap.select("#userContent").clone();
compSvg.append(userContent);
self.renderInfill(compSvg, fillAreas, wMM, hMM, 10, function(svgWithRenderedInfill){
callback( self._wrapInSvgAndScale(svgWithRenderedInfill));
$('#compSvg').remove();
});
};
self._wrapInSvgAndScale = function(content){
var svgStr = content.innerSVG();
if(svgStr !== ''){
@ -721,7 +721,7 @@ $(function(){
self.clear_gcode = function(){
snap.select('#gCodePreview').clear();
};
self.onStartup = function(){
self.state.workingArea = self;
self.files.workingArea = self;
@ -754,9 +754,9 @@ $(function(){
}
});
};
self._embedAllImages = function(svg, callback){
var allImages = svg.selectAll('image');
var linkedImages = allImages.items.filter(function(i){
if(i.attr('xlink:href') != null) {
@ -795,7 +795,7 @@ $(function(){
var fillings = userContent.removeUnfilled(fillAreas);
for (var i = 0; i < fillings.length; i++) {
var item = fillings[i];
if (item.type === 'image') {
// remove filter effects on images for proper rendering
var style = item.attr('style');