Explorar o código

1, fix modal background still shows after file/text drag-drop to window
2, hide dialog when drag-drop file/text
3, fix drag-drop file/text not effective immediately

MaysWind %!s(int64=3) %!d(string=hai) anos
pai
achega
dd853134ee
Modificáronse 1 ficheiros con 7 adicións e 2 borrados
  1. 7 2
      app/scripts/core/root.js

+ 7 - 2
app/scripts/core/root.js

@@ -145,7 +145,7 @@
                 if (e.dataTransfer.items && e.dataTransfer.items[0] && e.dataTransfer.items[0].kind === 'file') {
                     return e.dataTransfer.items[0].getAsFile();
                 } else if (e.dataTransfer.files && e.dataTransfer.files[0]) {
-                    return  e.dataTransfer.files[0];
+                    return e.dataTransfer.files[0];
                 } else {
                     return null;
                 }
@@ -163,6 +163,7 @@
             var dropzoneFileZone = angular.element('#dropzone-filezone');
 
             angular.element($window).on('dragenter', function (e) {
+                ariaNgCommonService.closeAllDialogs();
                 dropzone.show();
                 e.preventDefault();
             });
@@ -577,7 +578,11 @@
         });
 
         ariaNgNativeElectronService.onMainProcessNavigateTo(function (event, routeUrl) {
-            $location.path(routeUrl);
+            angular.element('.modal.in:visible').modal('hide');
+            angular.element('.modal-backdrop').remove();
+            $rootScope.$apply(function () {
+                $location.path(routeUrl);
+            });
         });
 
         ariaNgNativeElectronService.onMainProcessShowError(function (event, message) {