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

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

Browse source
This commit is contained in:
Jacques Distler 2010-02-18 21:04:30 -06:00
parent fa662e8f51 dab8e5daa1
commit de50902968
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
public/svg-edit/editor/svg-editor.js
View file

@ -1823,7 +1823,7 @@ function svg_edit_setup() {
var cancelOverlays = function() { var cancelOverlays = function() {
$('#dialog_box').hide(); $('#dialog_box').hide();
if (!editingsource && !docprops) return; if (!editingsource && !editingforeign && !docprops) return;
if (editingsource) { if (editingsource) {
var oldString = svgCanvas.getSvgString(); var oldString = svgCanvas.getSvgString();
@ -2924,13 +2924,13 @@ function svg_edit_setup() {
// Load source if given // Load source if given
var loc = document.location.href; var loc = document.location.href;
if(loc.indexOf('?source=') != -1) { if(loc.indexOf('source=data') != -1) {
var pre = '?source=data:image/svg+xml;base64,'; var pre = 'source=data:image/svg+xml;base64,';
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,