Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki
This commit is contained in:
commit
c26faabf2d
|
@ -305,7 +305,7 @@ $(function() {
|
||||||
"id": getNextId(),
|
"id": getNextId(),
|
||||||
"points": (x+','+y+' '+x+','+y+' '+start_x+','+start_y),
|
"points": (x+','+y+' '+x+','+y+' '+start_x+','+start_y),
|
||||||
"stroke": '#000',
|
"stroke": '#000',
|
||||||
"stroke-width": 3,
|
"stroke-width": 2,
|
||||||
"fill": "none",
|
"fill": "none",
|
||||||
"opacity": .5,
|
"opacity": .5,
|
||||||
"style": "pointer-events:none"
|
"style": "pointer-events:none"
|
||||||
|
|
|
@ -60,9 +60,7 @@ $(function() {
|
||||||
function setItexString(tex) {
|
function setItexString(tex) {
|
||||||
var elt = selElems[0];
|
var elt = selElems[0];
|
||||||
try {
|
try {
|
||||||
math = svgdoc.createElementNS(mathns, 'math');
|
var math = svgdoc.createElementNS(mathns, 'math');
|
||||||
// make an AJAX request to the server, to get the MathML
|
|
||||||
$.post(ajaxEndpoint, {'tex': tex, 'display': 'inline'}, function(data){
|
|
||||||
math.setAttributeNS(xmlnsns, 'xmlns', mathns);
|
math.setAttributeNS(xmlnsns, 'xmlns', mathns);
|
||||||
math.setAttribute('display', 'inline');
|
math.setAttribute('display', 'inline');
|
||||||
var semantics = document.createElementNS(mathns, 'semantics');
|
var semantics = document.createElementNS(mathns, 'semantics');
|
||||||
|
@ -70,14 +68,19 @@ $(function() {
|
||||||
annotation.setAttribute('encoding', 'application/x-tex');
|
annotation.setAttribute('encoding', 'application/x-tex');
|
||||||
annotation.textContent = tex;
|
annotation.textContent = tex;
|
||||||
var mrow = document.createElementNS(mathns, 'mrow');
|
var mrow = document.createElementNS(mathns, 'mrow');
|
||||||
|
semantics.appendChild(mrow);
|
||||||
|
semantics.appendChild(annotation);
|
||||||
|
math.appendChild(semantics);
|
||||||
|
// make an AJAX request to the server, to get the MathML
|
||||||
|
$.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(children[0]);
|
||||||
}
|
}
|
||||||
semantics.appendChild(mrow);
|
|
||||||
semantics.appendChild(annotation);
|
|
||||||
math.appendChild(semantics);
|
|
||||||
S.sanitizeSvg(math);
|
S.sanitizeSvg(math);
|
||||||
|
//elt.setAttribute('width', math.clientWidth+5);
|
||||||
|
//elt.setAttribute('height', math.clientHeight+5);
|
||||||
|
S.call("changed", [elt]);
|
||||||
});
|
});
|
||||||
elt.replaceChild(math, elt.firstChild);
|
elt.replaceChild(math, elt.firstChild);
|
||||||
S.call("changed", [elt]);
|
S.call("changed", [elt]);
|
||||||
|
|
Loading…
Reference in a new issue