[svg-edit] r2865 committed - Ensure loading... message closes upon completion or error

[svg-...@googlecode.com]

Revision: 2865
Author: brettz9
Date: Thu May 22 23:20:43 2014 UTC
Log: Ensure loading... message closes upon completion or error
http://code.google.com/p/svg-edit/source/detail?r=2865

Modified:
/trunk/editor/svg-editor.js

=======================================
--- /trunk/editor/svg-editor.js Thu May 22 11:01:11 2014 UTC
+++ /trunk/editor/svg-editor.js Thu May 22 23:20:43 2014 UTC
@@ -825,7 +825,7 @@
if (type !== 'alert') {
$('<input type="button" value="' + uiStrings.common.cancel + '">')
.appendTo(btn_holder)
- .click(function() { box.hide(); callback(false);});
+ .click(function() { box.hide(); if (callback) {callback(false);}});
}

if (type === 'prompt') {
@@ -863,8 +863,7 @@
}
ctrl.bind('keydown', 'return', function() {ok.click();});
}
-
- if (type === 'process') {
+ else if (type === 'process') {
ok.hide();
}

@@ -4902,6 +4901,7 @@
$('#main_menu').hide();
var file = (e.type == 'drop') ? e.dataTransfer.files[0] :
this.files[0];
if (!file) {
+ $('#dialog_box').hide();
return;
}
/* if (file.type === 'application/pdf') { // Todo: Handle PDF imports
@@ -4921,9 +4921,11 @@
svgCanvas.groupSelectedElements();
svgCanvas.alignSelectedElements('m', 'page');
svgCanvas.alignSelectedElements('c', 'page');
+ $('#dialog_box').hide();
};
reader.readAsText(file);
- } else {
+ }
+ else {
//bitmap handling
reader = new FileReader();
reader.onloadend = function(e) {
@@ -4945,6 +4947,7 @@
svgCanvas.alignSelectedElements('m', 'page');
svgCanvas.alignSelectedElements('c', 'page');
updateContextPanel();
+ $('#dialog_box').hide();
};
// create dummy img so we know the default dimensions
var imgWidth = 100;