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
This commit is contained in:
@@ -151,6 +151,7 @@
|
|||||||
Editor.setCustomHandlers = function(opts) {
|
Editor.setCustomHandlers = function(opts) {
|
||||||
Editor.ready(function() {
|
Editor.ready(function() {
|
||||||
if(opts.open) {
|
if(opts.open) {
|
||||||
|
$('#tool_open > input[type="file"]').remove();
|
||||||
$('#tool_open').show();
|
$('#tool_open').show();
|
||||||
svgCanvas.open = opts.open;
|
svgCanvas.open = opts.open;
|
||||||
}
|
}
|
||||||
@@ -579,15 +580,21 @@
|
|||||||
var datauri = c.toDataURL('image/png');
|
var datauri = c.toDataURL('image/png');
|
||||||
exportWindow.location.href = datauri;
|
exportWindow.location.href = datauri;
|
||||||
|
|
||||||
var note = uiStrings.saveFromBrowser.replace('%s', 'PNG');
|
var done = $.pref('export_notice_done');
|
||||||
|
if(done !== "all") {
|
||||||
// Check if there's issues
|
var note = uiStrings.saveFromBrowser.replace('%s', 'PNG');
|
||||||
|
|
||||||
if(issues.length) {
|
// Check if there's issues
|
||||||
var pre = "\n \u2022 ";
|
if(issues.length) {
|
||||||
note += ("\n\n" + uiStrings.noteTheseIssues + pre + issues.join(pre));
|
var pre = "\n \u2022 ";
|
||||||
}
|
note += ("\n\n" + uiStrings.noteTheseIssues + pre + issues.join(pre));
|
||||||
exportWindow.alert(note);
|
}
|
||||||
|
|
||||||
|
// 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
|
// called when we've selected a different element
|
||||||
|
|||||||
Reference in New Issue
Block a user