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

Fix Issue 291: keep tool by default, automatically switch to select mode if clicking on a shape 

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@836 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Jeff Schiller 2009-10-16 18:01:05 +00:00
parent 211c478bf0
commit 9ecaddbd94
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
editor/svgcanvas.js
View File

@ -1467,18 +1467,27 @@ function BatchCommand(text) {
start_x = x; start_x = x;
start_y = y; start_y = y;
var t = evt.target;
// if this element is in a group, go up until we reach the top-level group
// 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;
}
// if we are not in the middle of creating a path, and we've clicked on some shape,
// then go to Select mode.
// WebKit returns <div> when the canvas is clicked, Firefox/Opera return <svg>
if ( (current_mode != "poly" || current_poly_pts.length == 0) &&
t.id != "svgcanvas" && t.id != "svgroot")
{
// switch into "select" mode if we've clicked on an element
canvas.setMode("select");
}
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;
// if this element is in a group, go up until we reach the top-level group
// 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;
}
// WebKit returns <div> when the canvas is clicked, Firefox/Opera return <svg>
var nodeName = t.nodeName.toLowerCase(); var nodeName = t.nodeName.toLowerCase();
if (nodeName != "div" && nodeName != "svg") { 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
@ -2931,7 +2940,8 @@ function BatchCommand(text) {
current_mode = "polyedit"; current_mode = "polyedit";
recalcPolyPoints(); recalcPolyPoints();
addAllPointGripsToPoly(current_poly_pts.length/2 - 1); addAllPointGripsToPoly(current_poly_pts.length/2 - 1);
} else { } else if (current_mode == "text") {
// keep us in the tool we were in unless it was a text element
canvas.addToSelection([element], true); canvas.addToSelection([element], true);
} }
// we create the insert command that is stored on the stack // we create the insert command that is stored on the stack