Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

This commit is contained in:
Jacques Distler 2010-03-06 00:18:37 -06:00
commit 75e4310a5b
2 changed files with 4 additions and 4 deletions

View file

@ -75,7 +75,7 @@ $(function() {
$.post(ajaxEndpoint, {'tex': tex, 'display': 'inline'}, function(data){ $.post(ajaxEndpoint, {'tex': tex, 'display': 'inline'}, function(data){
var children = data.documentElement.childNodes; var children = data.documentElement.childNodes;
while (children.length > 0) { while (children.length > 0) {
mrow.appendChild(children[0]); mrow.appendChild(svgdoc.adoptNode(children[0], true));
} }
S.sanitizeSvg(math); S.sanitizeSvg(math);
S.call("changed", [elt]); S.call("changed", [elt]);

View file

@ -989,7 +989,7 @@ function BatchCommand(text) {
"xmlns:se": se_ns, "xmlns:se": se_ns,
"xmlns:xlink": xlinkns "xmlns:xlink": xlinkns
}).appendTo(svgroot); }).appendTo(svgroot);
if (randomize_ids) svgContent.setAttributeNS(se_ns, nonce); if (randomize_ids) svgcontent.setAttributeNS(se_ns, 'se:nonce', nonce);
var convertToNum, convertToUnit, setUnitAttr; var convertToNum, convertToUnit, setUnitAttr;
@ -1190,7 +1190,7 @@ function BatchCommand(text) {
stroke: "#000000", stroke: "#000000",
stroke_paint: null, stroke_paint: null,
stroke_opacity: 1, stroke_opacity: 1,
stroke_width: 5, stroke_width: 2,
stroke_style: 'none', stroke_style: 'none',
opacity: 1 opacity: 1
} }
@ -5628,7 +5628,7 @@ function BatchCommand(text) {
nonce = n; nonce = n;
if (extensions["Arrows"]) call("setarrownonce", n) ; if (extensions["Arrows"]) call("setarrownonce", n) ;
} else if (randomize_ids) { } else if (randomize_ids) {
svgcontent.setAttributeNS(xmlnsns, 'xml:se', se_ns); svgcontent.setAttributeNS(xmlnsns, 'xmlns:se', se_ns);
svgcontent.setAttributeNS(se_ns, 'se:nonce', nonce); svgcontent.setAttributeNS(se_ns, 'se:nonce', nonce);
if (extensions["Arrows"]) call("setarrownonce", nonce) ; if (extensions["Arrows"]) call("setarrownonce", nonce) ;
} }