From 0930a584113275a073122c482773b419562f8680 Mon Sep 17 00:00:00 2001 From: Alexis Deveria Date: Fri, 13 Aug 2010 15:30:00 +0000 Subject: [PATCH] Added some 2.5.1 fixes to the trunk git-svn-id: http://svg-edit.googlecode.com/svn/trunk@1659 eee81c28-f429-11dd-99c0-75d572ba1ddd --- editor/svg-editor.js | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/editor/svg-editor.js b/editor/svg-editor.js index fead569c..1b1e7abe 100644 --- a/editor/svg-editor.js +++ b/editor/svg-editor.js @@ -151,6 +151,7 @@ Editor.setCustomHandlers = function(opts) { Editor.ready(function() { if(opts.open) { + $('#tool_open > input[type="file"]').remove(); $('#tool_open').show(); svgCanvas.open = opts.open; } @@ -579,15 +580,21 @@ var datauri = c.toDataURL('image/png'); exportWindow.location.href = datauri; - var note = uiStrings.saveFromBrowser.replace('%s', 'PNG'); - - // Check if there's issues - - if(issues.length) { - var pre = "\n \u2022 "; - note += ("\n\n" + uiStrings.noteTheseIssues + pre + issues.join(pre)); - } - exportWindow.alert(note); + var done = $.pref('export_notice_done'); + if(done !== "all") { + var note = uiStrings.saveFromBrowser.replace('%s', 'PNG'); + + // Check if there's issues + if(issues.length) { + var pre = "\n \u2022 "; + note += ("\n\n" + uiStrings.noteTheseIssues + pre + issues.join(pre)); + } + + // Note that this will also prevent the notice even though new issues may appear later. + // May want to find a way to deal with that without annoying the user + $.pref('export_notice_done', 'all'); + exportWindow.alert(note); + } }; // called when we've selected a different element