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

This commit is contained in:
Jacques Distler 2010-02-12 17:43:15 -06:00
commit 443a2cee5f
2 changed files with 6 additions and 6 deletions

View file

@ -318,10 +318,10 @@
<path d="M209.1,157.9c-0.8,0.7-1.7,1.5-2.7,2.6v17.4c0,4,0.4,5.3,2.7,5.9"/> <path d="M209.1,157.9c-0.8,0.7-1.7,1.5-2.7,2.6v17.4c0,4,0.4,5.3,2.7,5.9"/>
</g> </g>
<g> <g>
<polyline fill="none" stroke="#231F20" stroke-width="10" points="152.2,19.5 118.2,85.3 120.7,181.2 186.6,120.3 209.1,70.3 "/> <path fill="#FFD761" d="M121.6,88.7l0.8,87.5l62.3-56.7c0,0-15.3-25.8-24.8-30C151.1,85.6,121.6,88.7,121.6,88.7z"/>
<path fill="#FFD761" d="M121.6,88.7l0.8,87.5l62.3-56.7c0,0-15.3-25.8-24.8-30C151.1,85.6,121.6,88.7,121.6,88.7z"/> <path fill="#FEA01E" d="M209.1,19.5h-54l-33.5,69.2c0,0,29.7-3.4,38.3,0.8c8.9,4.4,25,30.8,25,30.8l24.2-50V19.5z"/>
<path fill="#FEA01E" d="M208.1,20.2L154.9,21l-33.3,67.7c0,0,29.7-3.4,38.3,0.8c8.9,4.4,25,30.8,25,30.8l23.5-49.8L208.1,20.2z"/> <path d="M120.4,153.7l-0.6,25l23.8-16.9c0,0-8-7-11.2-8.1C129.4,152.8,120.4,153.7,120.4,153.7z"/>
<path d="M118.2,154.9l-0.6,25l23.8-16.9c0,0-8-7-11.2-8.1C127.3,154,118.2,154.9,118.2,154.9z"/> <polyline fill="none" stroke="#231F20" stroke-width="5" points="153.9,19.5 121.6,88.7 120.7,181.2 186.6,120.3 209.1,70.3 "/>
</g> </g>
</svg> </svg>
</g> </g>

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 50 KiB

View file

@ -2955,8 +2955,8 @@ function svg_edit_setup() {
var src = loc.substring(loc.indexOf(pre) + pre.length); var src = loc.substring(loc.indexOf(pre) + pre.length);
svgCanvas.setSvgString(Utils.decode64(src)); svgCanvas.setSvgString(Utils.decode64(src));
} }
else if(loc.indexOf('?url=') != -1) { else if(loc.indexOf('url=') != -1) {
var pre = '?url='; var pre = 'url=';
var url = loc.substring(loc.indexOf(pre) + pre.length); var url = loc.substring(loc.indexOf(pre) + pre.length);
$.ajax({ $.ajax({
'url': url, 'url': url,