Fixed more bugs related to issue 717

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@1992 eee81c28-f429-11dd-99c0-75d572ba1ddd
This commit is contained in:
Alexis Deveria
2011-02-10 18:10:05 +00:00
parent f69f89659f
commit 32f61b2b3a
3 changed files with 4 additions and 5 deletions

View File

@@ -17,7 +17,6 @@ var svgedit = svgedit || {};
if (!svgedit.browser) { if (!svgedit.browser) {
svgedit.browser = {}; svgedit.browser = {};
} }
var supportsSvg_ = (function() { var supportsSvg_ = (function() {
return !!document.createElementNS && !!document.createElementNS('http://www.w3.org/2000/svg', 'svg').createSVGRect; return !!document.createElementNS && !!document.createElementNS('http://www.w3.org/2000/svg', 'svg').createSVGRect;
})(); })();

View File

@@ -5577,7 +5577,7 @@ var setUseData = this.setUseData = function(parent) {
if(!ref_elem) return; if(!ref_elem) return;
$(this).data('ref', ref_elem); $(this).data('ref', ref_elem);
if(ref_elem.tagName == 'symbol' || ref_elem.tagName == 'svg') { if(ref_elem.tagName == 'symbol' || ref_elem.tagName == 'svg') {
$(this).data('symbol', ref_elem); $(this).data('symbol', ref_elem).data('ref', ref_elem);
} }
}); });
} }
@@ -6062,7 +6062,7 @@ this.importSvgString = function(xmlString) {
use_el.setAttribute("transform", ts); use_el.setAttribute("transform", ts);
recalculateDimensions(use_el); recalculateDimensions(use_el);
$(use_el).data('symbol', symbol); $(use_el).data('symbol', symbol).data('ref', symbol);
addToSelection([use_el]); addToSelection([use_el]);
// TODO: Find way to add this in a recalculateDimensions-parsable way // TODO: Find way to add this in a recalculateDimensions-parsable way
@@ -8287,7 +8287,7 @@ this.ungroupSelectedElement = function() {
} else if(g.tagName === 'use') { } else if(g.tagName === 'use') {
// Somehow doesn't have data set, so retrieve // Somehow doesn't have data set, so retrieve
var symbol = getElem(getHref(g).substr(1)); var symbol = getElem(getHref(g).substr(1));
$(g).data('symbol', symbol); $(g).data('symbol', symbol).data('ref', symbol);
convertToGroup(g); convertToGroup(g);
return; return;
} }

View File

@@ -494,7 +494,7 @@ svgedit.utilities.getBBox = function(elem) {
ret = groupBBFix(selected, true); ret = groupBBFix(selected, true);
} }
if((elname === 'use' && !svgedit.browser.isWebkit()) || elname === 'foreignObject') { if(elname === 'use' || elname === 'foreignObject') {
if(!ret) ret = selected.getBBox(); if(!ret) ret = selected.getBBox();
var bb = {}; var bb = {};
bb.width = ret.width; bb.width = ret.width;