github/svgedit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure loading... message closes upon completion or error

Browse Source 
git-svn-id: http://svg-edit.googlecode.com/svn/trunk@2865 eee81c28-f429-11dd-99c0-75d572ba1ddd
This commit is contained in:
Brett Zamir
2014-05-22 23:20:43 +00:00
parent bddf4c2324
commit 8bda8fe16d
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
editor/svg-editor.js
View File

@@ -825,7 +825,7 @@ TODOS
if (type !== 'alert') { if (type !== 'alert') {
$('<input type="button" value="' + uiStrings.common.cancel + '">') $('<input type="button" value="' + uiStrings.common.cancel + '">')
.appendTo(btn_holder) .appendTo(btn_holder)
.click(function() { box.hide(); callback(false);}); .click(function() { box.hide(); if (callback) {callback(false);}});
} }
if (type === 'prompt') { if (type === 'prompt') {
@@ -863,8 +863,7 @@ TODOS
} }
ctrl.bind('keydown', 'return', function() {ok.click();}); ctrl.bind('keydown', 'return', function() {ok.click();});
} }
else if (type === 'process') {
if (type === 'process') {
ok.hide(); ok.hide();
} }
@@ -4902,6 +4901,7 @@ TODOS
$('#main_menu').hide(); $('#main_menu').hide();
var file = (e.type == 'drop') ? e.dataTransfer.files[0] : this.files[0]; var file = (e.type == 'drop') ? e.dataTransfer.files[0] : this.files[0];
if (!file) { if (!file) {
$('#dialog_box').hide();
return; return;
} }
/* if (file.type === 'application/pdf') { // Todo: Handle PDF imports /* if (file.type === 'application/pdf') { // Todo: Handle PDF imports
@@ -4921,9 +4921,11 @@ TODOS
svgCanvas.groupSelectedElements(); svgCanvas.groupSelectedElements();
svgCanvas.alignSelectedElements('m', 'page'); svgCanvas.alignSelectedElements('m', 'page');
svgCanvas.alignSelectedElements('c', 'page'); svgCanvas.alignSelectedElements('c', 'page');
$('#dialog_box').hide();
}; };
reader.readAsText(file); reader.readAsText(file);
} else { }
else {
//bitmap handling //bitmap handling
reader = new FileReader(); reader = new FileReader();
reader.onloadend = function(e) { reader.onloadend = function(e) {
@@ -4945,6 +4947,7 @@ TODOS
svgCanvas.alignSelectedElements('m', 'page'); svgCanvas.alignSelectedElements('m', 'page');
svgCanvas.alignSelectedElements('c', 'page'); svgCanvas.alignSelectedElements('c', 'page');
updateContextPanel(); updateContextPanel();
$('#dialog_box').hide();
}; };
// create dummy img so we know the default dimensions // create dummy img so we know the default dimensions
var imgWidth = 100; var imgWidth = 100;