Merge pull request adobe#535 from humphd/issue530

Fix adobe#530 - Figure out why DnD using the Upload Files dialog is broken
gideonthomas · Mar 1, 2016 · 1117120 · 1117120
2 parents c63b352 + 69c5c7a
commit 1117120
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/src/utils/DragAndDrop.js b/src/utils/DragAndDrop.js
@@ -70,7 +70,7 @@ define(function (require, exports, module) {
         return false;
     }
 
-    function _showErrorDialog(errorFiles) {
+    function _showErrorDialog(errorFiles, callback) {
         function errorToString(err) {
             return FileUtils.getFileErrorString(err);
         }
@@ -90,11 +90,15 @@ define(function (require, exports, module) {
         });
         message += "</ul>";
 
-        Dialogs.showModalDialog(
+        var dlg = Dialogs.showModalDialog(
             DefaultDialogs.DIALOG_ID_ERROR,
             Strings.ERROR_OPENING_FILE_TITLE,
             message
         );
+
+        if(callback) {
+            dlg.done(callback);
+        }
     }
 
     /**
@@ -386,10 +390,8 @@ define(function (require, exports, module) {
             // Check whether we want to import this file at all before we start.
             var wasRejected = rejectImport(item);
             if (wasRejected) {
-                setTimeout(function(){
-                    errorList.push({path: item.name, error: wasRejected.message});
-                    deferred.reject(wasRejected);
-                }, 5);
+                errorList.push({path: item.name, error: wasRejected.message});
+                deferred.reject(wasRejected);
                 return deferred.promise();
             }
 
@@ -438,8 +440,9 @@ define(function (require, exports, module) {
                 callback(null, pathList);
             })
             .fail(function() {
-                _showErrorDialog(errorList);
-                callback(errorList);
+                _showErrorDialog(errorList, function() {
+                    callback(errorList);
+                });
             });
     }