From ca4a2c682e6f7d5e9ab9073f6fde208e1791ced4 Mon Sep 17 00:00:00 2001 From: Mark MacKay Date: Wed, 22 Apr 2015 12:50:46 -0500 Subject: [PATCH] fixes for the latest version of Firefox --- editor/src/svgcanvas.js | 22 +++++++++++----------- method-draw/src/svgcanvas.js | 1 + 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/editor/src/svgcanvas.js b/editor/src/svgcanvas.js index 5d9d1a7..9a917af 100644 --- a/editor/src/svgcanvas.js +++ b/editor/src/svgcanvas.js @@ -2368,13 +2368,14 @@ var getMouseTarget = this.getMouseTarget = function(evt) { { if (canvas.spaceKey) return; var right_click = evt.button === 2; - - root_sctm = svgcontent.getScreenCTM().inverse(); - isBotchedZoom = svgedit.browser.isGecko(); + + root_sctm = svgcontent.querySelector("g").getScreenCTM().inverse(); + var pt = transformPoint( evt.pageX, evt.pageY, root_sctm ), - mouse_x = pt.x * (isBotchedZoom ? 1 : current_zoom), - mouse_y = pt.y * (isBotchedZoom ? 1 : current_zoom); + mouse_x = pt.x * current_zoom, + mouse_y = pt.y * current_zoom; + evt.preventDefault(); if(right_click) { @@ -2724,13 +2725,13 @@ var getMouseTarget = this.getMouseTarget = function(evt) { // in this function we do not record any state changes yet (but we do update // any elements that are still being created, moved or resized on the canvas) var mouseMove = function(evt) { - if (evt.originalEvent.touches && evt.originalEvent.touches.length > 1) return; + if (evt.originalEvent.touches && evt.originalEvent.touches.length > 1) return; if (!started) return; if(evt.button === 1 || canvas.spaceKey) return; var selected = selectedElements[0], pt = transformPoint( evt.pageX, evt.pageY, root_sctm ), - mouse_x = pt.x * (isBotchedZoom ? 1 : current_zoom), - mouse_y = pt.y * (isBotchedZoom ? 1 : current_zoom), + mouse_x = pt.x * current_zoom, + mouse_y = pt.y * current_zoom, shape = getElem(getId()); var real_x = x = mouse_x / current_zoom; @@ -3273,9 +3274,8 @@ var getMouseTarget = this.getMouseTarget = function(evt) { recalculateAllSelectedDimensions(); // if it was being dragged/resized - var isBotchedZoom = svgedit.browser.isGecko(); - r_start_x = isBotchedZoom ? r_start_x * current_zoom : r_start_x; - r_start_y = isBotchedZoom ? r_start_y * current_zoom : r_start_y; + r_start_x = r_start_x; + r_start_y = r_start_y; var difference_x = Math.abs(real_x-r_start_x); var difference_y = Math.abs(real_y-r_start_y); diff --git a/method-draw/src/svgcanvas.js b/method-draw/src/svgcanvas.js index a732bd6..bf56aa2 100644 --- a/method-draw/src/svgcanvas.js +++ b/method-draw/src/svgcanvas.js @@ -3274,6 +3274,7 @@ var getMouseTarget = this.getMouseTarget = function(evt) { // if it was being dragged/resized var isBotchedZoom = svgedit.browser.isGecko(); + console.log(current_zoom) r_start_x = isBotchedZoom ? r_start_x * current_zoom : r_start_x; r_start_y = isBotchedZoom ? r_start_y * current_zoom : r_start_y; var difference_x = Math.abs(real_x-r_start_x);