deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Uniquify IDs in SVG-Edit

Browse source 
Since we can have several SVG-Edit graphics
on a page, SVG-Edit should assign unique IDs
to elements, and do so in a fashion that survives
re-editing.

To do this, we use a nonce, and record its value in
a custom se:nonce attribute on the <svg> element.
(Is there a better way?). 

Also, preserve the custom se:connector attribute for
later editing purposes.
This commit is contained in:
Jacques Distler 2010-02-25 02:25:16 -06:00
parent c4003f79b3
commit aa0a151ba4
4 changed files with 34 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
public/svg-edit/editor/svgcanvas.js
View file

@ -943,6 +943,9 @@ function BatchCommand(text) {
$(svgroot).appendTo(container);
//nonce to uniquify id's
var nonce = Math.floor(Math.random()*100001);
// map namespace URIs to prefixes
var nsMap = {};
nsMap[xlinkns] = 'xlink';
@ -982,6 +985,8 @@ function BatchCommand(text) {
y: 480,
overflow: 'visible',
xmlns: svgns,
"xmlns:se": se_ns,
"se:nonce": nonce,
"xmlns:xlink": xlinkns
}).appendTo(svgroot);
@ -1284,7 +1289,7 @@ function BatchCommand(text) {
// private functions
var getId = function() {
if (events["getid"]) return call("getid", obj_num);
return idprefix + obj_num;
return idprefix + nonce +'_' + obj_num;
};
var getNextId = function() {
@ -5602,6 +5607,15 @@ function BatchCommand(text) {
// set new svg document
svgcontent = svgroot.appendChild(svgdoc.importNode(newDoc.documentElement, true));
// retrieve or set the nonce
n = svgcontent.getAttributeNS(se_ns, 'nonce');
if (n) {
nonce = n;
if (extensions["Arrows"]) call("setarrownonce", n) ;
} else {
svgcontent.setAttributeNS(xmlnsns, 'xml:se', se_ns);
svgcontent.setAttributeNS(se_ns, 'se:nonce', nonce);
}
// change image href vals if possible
$(svgcontent).find('image').each(function() {
var image = this;
@ -8049,6 +8063,7 @@ function BatchCommand(text) {
var ext = ext_func($.extend(canvas.getPrivateMethods(), {
svgroot: svgroot,
svgcontent: svgcontent,
nonce: nonce,
selectorManager: selectorManager
}));
extensions[name] = ext;