github/svgedit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commonize the discovery of the mouse target in the mousedown function

Browse Source 
git-svn-id: http://svg-edit.googlecode.com/svn/trunk@867 eee81c28-f429-11dd-99c0-75d572ba1ddd
This commit is contained in:
Jeff Schiller
2009-10-22 03:29:49 +00:00
parent a39af2b6d7
commit 04269414a9
1 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
editor/svgcanvas.js
View File

@@ -1534,6 +1534,7 @@ function BatchCommand(text) {
// Some global variables that we may need to refactor // Some global variables that we may need to refactor
var root_sctm = null; var root_sctm = null;
var mouse_target = null;
// A (hopefully) quicker function to transform a point by a matrix // A (hopefully) quicker function to transform a point by a matrix
// (this function avoids any DOM calls and just does the math) // (this function avoids any DOM calls and just does the math)
@@ -1553,7 +1554,6 @@ function BatchCommand(text) {
var pt = transformPoint( evt.pageX, evt.pageY, root_sctm ); var pt = transformPoint( evt.pageX, evt.pageY, root_sctm );
var mouse_x = pt.x; var mouse_x = pt.x;
var mouse_y = pt.y; var mouse_y = pt.y;
evt.preventDefault(); evt.preventDefault();
if($.inArray(current_mode, ['select', 'resize']) == -1) { if($.inArray(current_mode, ['select', 'resize']) == -1) {
@@ -1566,28 +1566,38 @@ function BatchCommand(text) {
start_x = x; start_x = x;
start_y = y; start_y = y;
// find mouse target
mouse_target = evt.target;
// go up until we hit a child of a layer
while (mouse_target.parentNode.parentNode.tagName == "g") {
mouse_target = mouse_target.parentNode;
}
// Webkit bubbles the mouse event all the way up to the div, so we
// set the mouse_target to the svgroot like the other browsers
if (mouse_target.nodeName.toLowerCase() == "div") {
mouse_target = document.getElementById("svgroot");
}
// if it is a selector grip, then it must be a single element selected,
// set the mouse_target to that
if (mouse_target.id.substr(0,13) == "selectorGroup" && selectedElements[0] != null) {
mouse_target = selectedElements[0];
}
switch (current_mode) { switch (current_mode) {
case "select": case "select":
started = true; started = true;
current_resize_mode = "none"; current_resize_mode = "none";
var t = evt.target; var nodeName = mouse_target.nodeName.toLowerCase();
// if this element is in a group, go up until we reach the top-level group if (nodeName != "svg") {
// just below the layer groups
// TODO: once we implement links, we also would have to check for <a> elements
while (t.parentNode.parentNode.tagName == "g") {
t = t.parentNode;
}
var nodeName = t.nodeName.toLowerCase();
if (nodeName != "div" && nodeName != "svg") {
// if this element is not yet selected, clear selection and select it // if this element is not yet selected, clear selection and select it
if (selectedElements.indexOf(t) == -1) { if (selectedElements.indexOf(mouse_target) == -1) {
// only clear selection if shift is not pressed (otherwise, add // only clear selection if shift is not pressed (otherwise, add
// element to selection) // element to selection)
if (!evt.shiftKey) { if (!evt.shiftKey) {
canvas.clearSelection(); canvas.clearSelection();
} }
canvas.addToSelection([t]); canvas.addToSelection([mouse_target]);
justSelected = t; justSelected = mouse_target;
current_path = null; current_path = null;
} }
// else if it's a path, go into pathedit mode in mouseup // else if it's a path, go into pathedit mode in mouseup
@@ -1809,14 +1819,10 @@ function BatchCommand(text) {
if(current_path_pt_drag == -1 && current_ctrl_pt_drag == -1) { if(current_path_pt_drag == -1 && current_ctrl_pt_drag == -1) {
// if we haven't moused down on a shape, then go into multiselect mode // if we haven't moused down on a shape, then go into multiselect mode
// otherwise, select it // otherwise, select it
var t = evt.target;
canvas.clearSelection(); canvas.clearSelection();
while (t.parentNode.parentNode.tagName == "g") { if (mouse_target.id != "svgroot") {
t = t.parentNode;
}
if (t.id != "svgcanvas" && t.id != "svgroot") {
current_path = null; current_path = null;
canvas.addToSelection([t], true); canvas.addToSelection([mouse_target], true);
canvas.setMode("select"); canvas.setMode("select");
} }
else { else {