Merge pull request #86 from Saurbaum/return

Images drawn using an extension always spawn the URL dialog
master
Jeff Schiller 2016-03-14 09:19:31 -07:00
commit 2a062f6b01
1 changed files with 2 additions and 2 deletions

View File

@ -1563,7 +1563,7 @@ TODOS
$('#blur_slider').slider('option', 'value', blurval); $('#blur_slider').slider('option', 'value', blurval);
if (svgCanvas.addedNew) { if (svgCanvas.addedNew) {
if (elname === 'image') { if (elname === 'image' && svgCanvas.getMode() === 'image') {
// Prompt for URL if not a data URL // Prompt for URL if not a data URL
if (svgCanvas.getHref(elem).indexOf('data:') !== 0) { if (svgCanvas.getHref(elem).indexOf('data:') !== 0) {
promptImgURL(); promptImgURL();
@ -1709,7 +1709,7 @@ TODOS
}, 100); }, 100);
} }
} // text } // text
else if (el_name == 'image') { else if (el_name == 'image' && svgCanvas.getMode() == 'image') {
setImageURL(svgCanvas.getHref(elem)); setImageURL(svgCanvas.getHref(elem));
} // image } // image
else if (el_name === 'g' || el_name === 'use') { else if (el_name === 'g' || el_name === 'use') {