511c511
< $pycont=str_replace("shape=circle", "shape=" . $shape . "", $pycont);
---
> $pycont=str_replace("shape = circle", "shape = " . $shape . "", $pycont);
644d643
< var myax=0, myay=0;
653,672d651
< case 'area':
< if (inoh.indexOf(' coords=\"') != -1) {
< myax=inoh.split(' coords=\"')[1].split(',')[0];
< myay=inoh.split(' coords=\"')[1].split(',')[1];
< lastoh+=',' + myax + ',' + myay;
< if (szero.outerHTML.indexOf(inoh) != -1) {
< lastoh+=',' + szero.outerHTML.split(inoh).split(' var sdf=prompt(inoh + ' not in ' + szero.outerHTML, inoh + ' not in ' + szero.outerHTML);
707c686
< if (szero.outerHTML.indexOf(outoh.split(' x=')[1].split('/>')[0].split('')[0].split('>')[0]) == -1) {
---
> if (szero.outerHTML.indexOf(outoh.split(' fill=')[1].split('/>')[0].split('')[0].split('>')[0]) == -1) {
714,715c693,694
< } else if (szero.outerHTML.indexOf(outoh.split(' x=')[1].split('/>')[0].split('')[0].split('>')[0]) != -1) {
< lastoh+=',0000' + eval(-1 + eval('' + szero.outerHTML.split(outoh.split(' x=')[1].split('/>')[0].split('')[0].split('>')[0])[0].split(' } else if (szero.outerHTML.indexOf(outoh.split(' fill=')[1].split('/>')[0].split('')[0].split('>')[0]) != -1) {
> lastoh+=',0000' + eval(-1 + eval('' + szero.outerHTML.split(outoh.split(' fill=')[1].split('/>')[0].split('')[0].split('>')[0])[0].split(' var mxpts=0, mypts=0, mx=0, my=0, mxnew=0, mynew=0, wasfrom=null, wasto=null, szeroouterHTML='', newr=0, svgindexofinterest=0, ynft='youllneverfindthis', ynftw='youllneverfindthis';
760d722
< var precursor='[height=';
766c728
< svgindexofinterest=eval('' + ('' + hashcs[6].replace(/^0000/g, '').replace('-','')));
---
> svgindexofinterest=eval('' + ('' + hashcs[6].replace(/^0000/g, '')));
768,789c730,731
< if (eval('' + partsof.length) > eval('' + svgindexofinterest)) {
< //alert(xprevlastoh);
< if (eval('' + svgindexofinterest) == 0) {
< relrec=partsof[svgindexofinterest];
< if (xprevlastoh.indexOf(' 1) {
< if (relrec.indexOf(' xlp=\"') == -1 && relrec.indexOf(' pos=\"') == -1) {
< relrec+=precursor + partsof[1].split(']')[0]
< }
< } else {
< if ((partsof[eval(-1 + eval('' + svgindexofinterest))] + '~').indexOf(' ' + svgconto.document.getElementById(xprevlastoh.split(',')[eval(-1 + xprevlastoh.split(',').length)]).outerHTML.split('>')[1].split('<')[0] + ' ~') != -1) {
< precursor=' ' + svgconto.document.getElementById(xprevlastoh.split(',')[eval(-1 + xprevlastoh.split(',').length)]).outerHTML.split('>')[1].split('<')[0] + ' [height=';
< }
< relrec=precursor + partsof[svgindexofinterest].split(']')[0];
< }
< } else {
< if (xprevlastoh.indexOf('')[1].split('<')[0] + ' ~') != -1) {
< precursor=' ' + svgconto.document.getElementById(xprevlastoh.split(',')[eval(-1 + xprevlastoh.split(',').length)]).outerHTML.split('>')[1].split('<')[0] + ' [height=';
< }
< }
< relrec=precursor + partsof[svgindexofinterest].split(']')[0];
< }
---
> if (eval('' + partsof.length) > svgindexofinterest) {
> relrec='[height=' + partsof[svgindexofinterest].split(']')[0];
827,828c769,770
< wasto=prompt('If you want the circle diameter not be as suggested (in inches), enter different diameter (in inches) now, where for any non-initial circles a value of 0 makes them invisible. Prefix + to your answer means an independent new circle is created. Cancel withdraws proposed changes that are positionally shown below.', wasfrom);
< //wasto=prompt('If you want the circle diameter not be as suggested (in inches), enter different diameter (in inches) now. Cancel withdraws proposed changes that are positionally shown below.', wasfrom);
---
> //wasto=prompt('If you want the circle diameter not be as suggested (in inches), enter different diameter (in inches) now. Prefix + to your answer means an independent new circle is created. Cancel withdraws proposed changes that are positionally shown below.', wasfrom);
> wasto=prompt('If you want the circle diameter not be as suggested (in inches), enter different diameter (in inches) now. Cancel withdraws proposed changes that are positionally shown below.', wasfrom);
846,853c788,790
< //alert('ynftw=' + ynftw + ' ... ' + document.getElementById('one').value.replace(relrec, relrec.replace('' + relrec.substring(0).split(' ')[0] + ' ', '[height=' + wasto.replace(/^\+/g,'') + ' ').replace(ynft, ynftw)));
< }
< if ((wasto + ' ').substring(0,1) != '+') {
< document.getElementById('one').value=document.getElementById('one').value.replace(relrec, relrec.replace('' + relrec.substring(0).split(' ')[0] + ' ', '[height=' + wasto.replace(/^\+/g,'') + ' ').replace(ynft, ynftw));
< } else {
< partsof=document.getElementById('one').value.split('[height=');
< document.getElementById('one').value=document.getElementById('one').value.replace('[height=' + partsof[eval(-1 + partsof.length)].split(']')[0] + ']', '[height=' + partsof[eval(-1 + partsof.length)].split(']')[0] + ']' + String.fromCharCode(10) + ' ' + clickcnt + ' [height=' + wasto.replace(/^\+/g,'') + ' fillcolor=\"#90806090\" style=\"filled\" pos=\"' + Math.round(dotx) + ',' + Math.round(doty) + '\" label=\"\" xlabel=\"\"]');
< }
---
> //alert('ynftw=' + ynftw + ' ... ' + document.getElementById('one').value.replace(relrec, relrec.replace('' + relrec.substring(0).split(' ')[0] + ' ', '[height=' + wasto + ' ').replace(ynft, ynftw)));
> }
> document.getElementById('one').value=document.getElementById('one').value.replace(relrec, relrec.replace('' + relrec.substring(0).split(' ')[0] + ' ', '[height=' + wasto + ' ').replace(ynft, ynftw));
860,861c797
< //alert('here ' + (xprevlastoh.split(' id=')[0].split(' ID=')[0].split('/>')[0].split('>')[0] + ' id=newel' + clickcnt + '>').replace('>' + wasfrom + '<', '>' + wasto.substring(1) + '<').replace('\"' + svgconto.document.getElementById(xprevlastoh.split(',')[eval(-1 + xprevlastoh.split(',').length)]).getAttribute('cx') + '\"', '\"' + mxnew + '\"').replace('\"' + svgconto.document.getElementById(xprevlastoh.split(',')[eval(-1 + xprevlastoh.split(',').length)]).getAttribute('cy') + '\"', '\"' + mynew + '\"').replace('\"' + svgconto.document.getElementById(xprevlastoh.split(',')[eval(-1 + xprevlastoh.split(',').length)]).getAttribute('rx') + '\"', '\"' + newr + '\"').replace('\"' + svgconto.document.getElementById(xprevlastoh.split(',')[eval(-1 + xprevlastoh.split(',').length)]).getAttribute('ry') + '\"', '\"' + newr + '\"'));
< gzero.innerHTML+=(xprevlastoh.split(' id=')[0].split(' ID=')[0].split('/>')[0].split('>')[0] + ' id=\"newel' + clickcnt + '\">').replace('>' + wasfrom + '<', '>' + wasto.substring(1) + '<').replace('\"' + svgconto.document.getElementById(xprevlastoh.split(',')[eval(-1 + xprevlastoh.split(',').length)]).getAttribute('cx') + '\"', '\"' + mxnew + '\"').replace('\"' + svgconto.document.getElementById(xprevlastoh.split(',')[eval(-1 + xprevlastoh.split(',').length)]).getAttribute('cy') + '\"', '\"' + mynew + '\"').replace('\"' + svgconto.document.getElementById(xprevlastoh.split(',')[eval(-1 + xprevlastoh.split(',').length)]).getAttribute('rx') + '\"', '\"' + newr + '\"').replace('\"' + svgconto.document.getElementById(xprevlastoh.split(',')[eval(-1 + xprevlastoh.split(',').length)]).getAttribute('ry') + '\"', '\"' + newr + '\"');
---
> gzero.innerHTML+=(xprevlastoh.split(' id=')[0].split(' ID=')[0].split('/>')[0].split('>')[0] + ' id=newel' + clickcnt + '>').replace('>' + wasfrom + '<', '>' + wasto.substring(1) + '<').replace('\"' + svgconto.document.getElementById(xprevlastoh.split(',')[eval(-1 + xprevlastoh.split(',').length)]).getAttribute('cx') + '\"', '\"' + mxnew + '\"').replace('\"' + svgconto.document.getElementById(xprevlastoh.split(',')[eval(-1 + xprevlastoh.split(',').length)]).getAttribute('cy') + '\"', '\"' + mynew + '\"').replace('\"' + svgconto.document.getElementById(xprevlastoh.split(',')[eval(-1 + xprevlastoh.split(',').length)]).getAttribute('rx') + '\"', '\"' + newr + '\"').replace('\"' + svgconto.document.getElementById(xprevlastoh.split(',')[eval(-1 + xprevlastoh.split(',').length)]).getAttribute('ry') + '\"', '\"' + newr + '\"');
863,864c799
< //alert('There ' + (xprevlastoh.split(' id=')[0].split(' ID=')[0].split('/>')[0].split('>')[0] + ' id=newel' + clickcnt + '>').replace('>' + wasfrom + '<', '>' + wasto.substring(1) + '<').replace('\"' + svgconto.document.getElementById(xprevlastoh.split(',')[eval(-1 + xprevlastoh.split(',').length)]).getAttribute('cx') + '\"', '\"' + mxnew + '\"').replace('\"' + svgconto.document.getElementById(xprevlastoh.split(',')[eval(-1 + xprevlastoh.split(',').length)]).getAttribute('cy') + '\"', '\"' + mynew + '\"'));
< gzero.innerHTML+=(xprevlastoh.split(' id=')[0].split(' ID=')[0].split('/>')[0].split('>')[0] + ' id=\"newel' + clickcnt + '\">').replace('>' + wasfrom + '<', '>' + wasto.substring(1) + '<').replace('\"' + svgconto.document.getElementById(xprevlastoh.split(',')[eval(-1 + xprevlastoh.split(',').length)]).getAttribute('cx') + '\"', '\"' + mxnew + '\"').replace('\"' + svgconto.document.getElementById(xprevlastoh.split(',')[eval(-1 + xprevlastoh.split(',').length)]).getAttribute('cy') + '\"', '\"' + mynew + '\"');
---
> gzero.innerHTML+=(xprevlastoh.split(' id=')[0].split(' ID=')[0].split('/>')[0].split('>')[0] + ' id=newel' + clickcnt + '>').replace('>' + wasfrom + '<', '>' + wasto.substring(1) + '<').replace('\"' + svgconto.document.getElementById(xprevlastoh.split(',')[eval(-1 + xprevlastoh.split(',').length)]).getAttribute('cx') + '\"', '\"' + mxnew + '\"').replace('\"' + svgconto.document.getElementById(xprevlastoh.split(',')[eval(-1 + xprevlastoh.split(',').length)]).getAttribute('cy') + '\"', '\"' + mynew + '\"');
872d806
< if ((wasto + ' ').substring(0,1) != '+') {
875d808
< }
910,911c843,844
< document.getElementById(xprevlastoh.split(',')[eval(-1 + xprevlastoh.split(',').length)]).setAttribute('x', '' + mxnew);
< document.getElementById(xprevlastoh.split(',')[eval(-1 + xprevlastoh.split(',').length)]).setAttribute('y', '' + mynew);
---
> document.getElementById(xprevlastoh.split(',')[eval(-1 + xprevlastoh.split(',').length)]).setAttribute('cx', '' + mxnew);
> document.getElementById(xprevlastoh.split(',')[eval(-1 + xprevlastoh.split(',').length)]).setAttribute('cy', '' + mynew);
919,920c852,853
< wasto=prompt('If you want the words not to be as suggested, enter different wording now. Prefix + to your answer means an independent new text (without the prefixing text showing) is created. Cancel withdraws proposed changes that are positionally shown below.', wasfrom);
< //wasto=prompt('If you want the words not to be as suggested, enter different wording now. Cancel withdraws proposed changes that are positionally shown below.', wasfrom);
---
> //wasto=prompt('If you want the words not to be as suggested, enter different wording now. Prefix + to your answer means an independent new text (without the prefixing text showing) is created. Cancel withdraws proposed changes that are positionally shown below.', wasfrom);
> wasto=prompt('If you want the words not to be as suggested, enter different wording now. Cancel withdraws proposed changes that are positionally shown below.', wasfrom);
925,961d857
< if (relrec != '') {
< //alert('relrec=' + relrec + ' ' + xprevlastoh);
< if (relrec.indexOf(' xlp=') != -1 || relrec.indexOf(' pos=') != -1) {
< //alert('RelRec=' + relrec + ' and xprevlastoh=' + xprevlastoh);
< if (relrec.indexOf(' xlp=\"') == -1 && relrec.indexOf(' pos=\"') != -1) { // label= xlabel=W xlp=144,144
< ynft=' pos=\"' + relrec.split(' pos=\"')[1].split('\"')[0] + '\"';
< dotx=eval('' + relrec.split(' pos=\"')[1].split('\"')[0].split(',')[0]);
< doty=eval('' + relrec.split(' pos=\"')[1].split('\"')[0].split(',')[1]);
< //alert('Ynft=' + ynft + ' and dotxy=' + dotx + ',' + doty + ' and dotdxy=' + dotdx + ',' + dotdy);
< dotx+=dotdx;
< doty+=dotdy;
< ynftw=' pos=\"' + Math.round(dotx) + ',' + Math.round(doty) + '\"';
< //ynftw=' pos=\"' + Math.round(xptx) + ',' + Math.round(xpty) + '\"';
< //alert('with=' + (relrec + ' label=\"\" xlabel=\"' + wasto.replace(/^\+/g,'') + '\" xlp=\"' + dotx + ',' + doty + '\"'));
< if ((wasto + ' ').substring(0,1) != '+') {
< document.getElementById('one').value=document.getElementById('one').value.replace(relrec, (relrec + ' label=\"\" xlabel=\"' + wasto.replace(/^\+/g,'') + '\" xlp=\"' + Math.round(dotx) + ',' + Math.round(doty) + '\"').replace(' ' + wasfrom + ' [height=', ' ' + wasto.replace(/^\+/g,'') + ' [height=').replace(' xlabel=\"' + wasfrom + '\"', ' xlabel=\"' + wasto.replace(/^\+/g,'') + '\"').replace(' xlabel=\"\"', ' xlabel=\"' + wasto.replace(/^\+/g,'') + '\"'));
< } else {
< document.getElementById('one').value=document.getElementById('one').value.replace('}', ' ' + wasto.replace(/^\+/g,'') + ' [shape=plaintext pos=\"0,0\" label=\"\" xlabel=\"' + wasto.replace(/^\+/g,'') + '\" xlp=\"' + Math.round(dotx) + ',' + Math.round(doty) + '\"]' + String.fromCharCode(10) + '}');
< }
< } else if (relrec.indexOf(' xlp=\"') != -1) {
< ynft=' xlp=\"' + relrec.split(' xlp=\"')[1].split('\"')[0] + '\"';
< dotx=eval('' + relrec.split(' xlp=\"')[1].split('\"')[0].split(',')[0]);
< doty=eval('' + relrec.split(' xlp=\"')[1].split('\"')[0].split(',')[1]);
< //alert('ynft=' + ynft + ' and dotxy=' + dotx + ',' + doty + ' and dotdxy=' + dotdx + ',' + dotdy);
< dotx+=dotdx;
< doty+=dotdy;
< ynftw=' xlp=\"' + Math.round(dotx) + ',' + Math.round(doty) + '\"';
< //ynftw=' pos=\"' + Math.round(xptx) + ',' + Math.round(xpty) + '\"';
< //alert('ynftw=' + ynftw + ' ... ' + document.getElementById('one').value.replace(relrec, relrec.replace('' + relrec.substring(0).split(' ')[0] + ' ', '[height=' + wasto.replace(/^\+/g,'') + ' ').replace(ynft, ynftw).replace(' xlabel=\"' + wasfrom + '\"', ' xlabel=\"' + wasto.replace(/^\+/g,'') + '\"').replace(' xlabel=\"\"', ' xlabel=\"' + wasto.replace(/^\+/g,'') + '\"')));
< if ((wasto + ' ').substring(0,1) != '+') {
< document.getElementById('one').value=document.getElementById('one').value.replace(relrec, relrec.replace(' ' + wasfrom + ' [height=', ' ' + wasto.replace(/^\+/g,'') + ' [height=').replace(ynft, ynftw).replace(' xlabel=\"' + wasfrom + '\"', ' xlabel=\"' + wasto.replace(/^\+/g,'') + '\"').replace(' xlabel=\"\"', ' xlabel=\"' + wasto.replace(/^\+/g,'') + '\"'));
< } else {
< document.getElementById('one').value=document.getElementById('one').value.replace('}', ' ' + wasto.replace(/^\+/g,'') + ' [shape=plaintext pos=\"0,0\" label=\"\" xlabel=\"' + wasto.replace(/^\+/g,'') + '\" xlp=\"' + Math.round(dotx) + ',' + Math.round(doty) + '\"]' + String.fromCharCode(10) + '}');
< }
< }
< }
< }
964,965c860
< //alert('adding ' + (xprevlastoh.split(' id=')[0].split(' ID=')[0].split('/>')[0].split('>')[0] + '>' + wasto.replace(/^\+/g,'') + '').replace('>' + wasfrom + '<', '>' + wasto.substring(1) + '<').replace('\"' + svgconto.document.getElementById(xprevlastoh.split(',')[eval(-1 + xprevlastoh.split(',').length)]).getAttribute('x') + '\"', '\"' + mxnew + '\"').replace('\"' + svgconto.document.getElementById(xprevlastoh.split(',')[eval(-1 + xprevlastoh.split(',').length)]).getAttribute('y') + '\"', '\"' + mynew + '\"'));
< gzero.innerHTML+=(xprevlastoh.split(' id=')[0].split(' ID=')[0].split('/>')[0].split('>')[0] + ' id=\"newel' + clickcnt + '\">' + wasto.replace(/^\+/g,'') + '').replace('>' + wasfrom + '<', '>' + wasto.substring(1) + '<').replace('\"' + svgconto.document.getElementById(xprevlastoh.split(',')[eval(-1 + xprevlastoh.split(',').length)]).getAttribute('x') + '\"', '\"' + mxnew + '\"').replace('\"' + svgconto.document.getElementById(xprevlastoh.split(',')[eval(-1 + xprevlastoh.split(',').length)]).getAttribute('y') + '\"', '\"' + mynew + '\"');
---
> gzero.innerHTML+=(xprevlastoh.split(' id=')[0].split(' ID=')[0].split('/>')[0].split('>')[0] + '>').replace('>' + wasfrom + '<', '>' + wasto.substring(1) + '<').replace('\"' + svgconto.document.getElementById(xprevlastoh.split(',')[eval(-1 + xprevlastoh.split(',').length)]).getAttribute('x') + '\"', '\"' + mxnew + '\"').replace('\"' + svgconto.document.getElementById(xprevlastoh.split(',')[eval(-1 + xprevlastoh.split(',').length)]).getAttribute('y') + '\"', '\"' + mynew + '\"');
971d865
< if ((wasto + ' ').substring(0,1) != '+') {
974d867
< }
992,993d884
< //alert(evt.target.outerHTML);
<
1108,1110c999,1001
< //if (outgs[iop].split(dlm)[0] != outgs[iop].split(dlm)[0].replace(/\ /g,'+').replace(/\%20/g,'+')) {
< // alert('Found');
< //}
---
> if (outgs[iop].split(dlm)[0] != outgs[iop].split(dlm)[0].replace(/\ /g,'+').replace(/\%20/g,'+')) {
> alert('Found');
> }
1734,1753c1625
< if (5 == 7) {
< szero=aconto.body;
< szero.addEventListener('mousedown', function(event){ parent.clickreg(event); });
< szero.addEventListener('touchdown', function(event){ parent.clickreg(event); });
< gs=aconto.getElementsByTagName('img');
< gs[0].addEventListener('mousedown', function(event){ parent.clickreg(event); });
< gs[0].addEventListener('touchdown', function(event){ parent.clickreg(event); });
< gzero=gs[0];
< if (bigoh == '') { bigoh=gs[0].outerHTML; }
< gs=aconto.getElementsByTagName('area');
< for (var iqw=0; iqw';
< if (bigoh == '') { bigoh=aconto.getElementById('defarea').outerHTML; }
< }
<
---
>
1811c1683
<
---
>
1820c1692
<
---
>
2011,2024d1882
< function fixshape(osel) {
< var vone=document.getElementById('one').value;
< if (vone.indexOf('shape=') != '' && osel.value != '') {
< document.getElementById('one').value=vone.replace('shape=' + document.getElementById('one').value.split('shape=')[1].split(' ')[0].split(']')[0], 'shape=' + osel.value);
< }
< }
<
< function fixfont(oin) {
< var vone=document.getElementById('one').value;
< if (vone.indexOf('fontsize=') != '' && oin.value != '') {
< document.getElementById('one').value=vone.replace('fontsize=' + document.getElementById('one').value.split('fontsize=')[1].split(' ')[0].split(']')[0], 'fontsize=' + oin.value);
< }
< }
<
2031d1888
<
2820c2677
<
---
>
2829c2686
<
---
>