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

Fix Issue 374: Workaround Opera group bbox bug

Browse Source 
git-svn-id: http://svg-edit.googlecode.com/svn/trunk@1095 eee81c28-f429-11dd-99c0-75d572ba1ddd
This commit is contained in:
Jeff Schiller
2009-12-23 05:00:37 +00:00
parent 2668d9f49a
commit 7302aee305
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
editor/svgcanvas.js
View File

@@ -16,13 +16,14 @@
* ensure undo/redo works perfectly * ensure undo/redo works perfectly
*/ */
var isOpera = !!window.opera;
var isWebkit = navigator.userAgent.indexOf("AppleWebKit") != -1; var isWebkit = navigator.userAgent.indexOf("AppleWebKit") != -1;
if(!window.console) { if(!window.console) {
window.console = {}; window.console = {};
window.console.log = function(str) {}; window.console.log = function(str) {};
window.console.dir = function(str) {}; window.console.dir = function(str) {};
} }
if( window.opera ) { if( isOpera ) {
window.console.log = function(str) {opera.postError(str);} window.console.log = function(str) {opera.postError(str);}
} }
@@ -2643,8 +2644,6 @@ function BatchCommand(text) {
break; break;
case "rotate": case "rotate":
started = true; started = true;
// append a dummy transform that will be used as the rotate
// tlist.appendItem(svgroot.createSVGTransform());
// we are starting an undoable change (a drag-rotation) // we are starting an undoable change (a drag-rotation)
canvas.beginUndoableChange("transform", selectedElements); canvas.beginUndoableChange("transform", selectedElements);
break; break;
@@ -5384,6 +5383,22 @@ function BatchCommand(text) {
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 == 'g' && isOpera) {
// deal with an opera bug here
// the bbox on a 'g' is not correct if the elements inside have been moved
// so we create a new g, add all the children to it, add it to the DOM, get its bbox
// then put all the children back on the old g and remove the new g
// (this means we make no changes to the DOM, which saves us a lot of headache at
// the cost of performance)
ret = selected.getBBox();
var newg = document.createElementNS(svgns, "g");
while (selected.firstChild) { newg.appendChild(selected.firstChild); }
var i = selected.attributes.length;
while(i--) { newg.setAttributeNode(selected.attributes.item(i).cloneNode(true)); }
selected.parentNode.appendChild(newg);
ret = newg.getBBox();
while (newg.firstChild) { selected.appendChild(newg.firstChild); }
selected.parentNode.removeChild(newg);
} else { } else {
try { ret = selected.getBBox(); } try { ret = selected.getBBox(); }
catch(e) { ret = null; } catch(e) { ret = null; }
@@ -5416,7 +5431,7 @@ function BatchCommand(text) {
val = parseFloat(val); val = parseFloat(val);
var elem = selectedElements[0]; var elem = selectedElements[0];
var oldTransform = elem.getAttribute("transform"); var oldTransform = elem.getAttribute("transform");
var bbox = elem.getBBox(); var bbox = canvas.getBBox(elem);
var cx = bbox.x+bbox.width/2, cy = bbox.y+bbox.height/2; var cx = bbox.x+bbox.width/2, cy = bbox.y+bbox.height/2;
var tlist = canvas.getTransformList(elem); var tlist = canvas.getTransformList(elem);