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

Fixed bug where selection box of group was incorrect in Webkit 

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@1746 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Alexis Deveria 2010-09-23 16:28:08 +00:00
parent b9cd59c8ed
commit 748c3a4057
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
editor/svgcanvas.js
View File

@ -184,6 +184,7 @@ var isOpera = !!window.opera,
// Much faster than running getBBox() every time // Much faster than running getBBox() every time
var visElems = 'a,circle,ellipse,foreignObject,g,image,line,path,polygon,polyline,rect,svg,text,tspan,use'; var visElems = 'a,circle,ellipse,foreignObject,g,image,line,path,polygon,polyline,rect,svg,text,tspan,use';
var visElems_arr = visElems.split(',');
// var hidElems = 'clipPath,defs,desc,feGaussianBlur,filter,linearGradient,marker,mask,metadata,pattern,radialGradient,stop,switch,symbol,title,textPath'; // var hidElems = 'clipPath,defs,desc,feGaussianBlur,filter,linearGradient,marker,mask,metadata,pattern,radialGradient,stop,switch,symbol,title,textPath';
@ -2620,13 +2621,15 @@ var getBBox = this.getBBox = function(elem) {
var selected = elem || selectedElements[0]; var selected = elem || selectedElements[0];
if (elem.nodeType != 1) return null; if (elem.nodeType != 1) return null;
var ret = null; var ret = null;
if(elem.nodeName == 'text' && selected.textContent == '') { var elname = selected.nodeName;
if(elname === 'text' && selected.textContent === '') {
selected.textContent = 'a'; // Some character needed for the selector to use. selected.textContent = 'a'; // Some character needed for the selector to use.
ret = selected.getBBox(); ret = selected.getBBox();
selected.textContent = ''; selected.textContent = '';
} else if(elem.nodeName == 'path' && isWebkit) { } else if(elname === 'path' && isWebkit) {
ret = getPathBBox(selected); ret = getPathBBox(selected);
} else if(elem.nodeName == 'use' && !isWebkit || elem.nodeName == 'foreignObject') { } else if(elname === 'use' && !isWebkit || elname === 'foreignObject') {
ret = selected.getBBox(); ret = selected.getBBox();
var bb = {}; var bb = {};
bb.width = ret.width; bb.width = ret.width;
@ -2634,8 +2637,8 @@ var getBBox = this.getBBox = function(elem) {
bb.x = ret.x + parseFloat(selected.getAttribute('x')||0); bb.x = ret.x + parseFloat(selected.getAttribute('x')||0);
bb.y = ret.y + parseFloat(selected.getAttribute('y')||0); bb.y = ret.y + parseFloat(selected.getAttribute('y')||0);
ret = bb; ret = bb;
} else { } else if(~$.inArray(elname, visElems_arr)) {
try { ret = selected.getBBox(); } try { ret = selected.getBBox();}
catch(e) { catch(e) {
// Check if element is child of a foreignObject // Check if element is child of a foreignObject
var fo = $(selected).closest("foreignObject"); var fo = $(selected).closest("foreignObject");