From fa596d4e076b75d36a6c17145737fe71080e8c59 Mon Sep 17 00:00:00 2001
From: Alex Tiehuis <notexist@aareon.nl>
Date: Thu, 15 Nov 2018 13:36:37 +0000
Subject: [PATCH] MNNL#55317 Dialoogscherm bij uploaden werkt niet goed

svn path=/Website/trunk/; revision=39813
---
 APPL/Shared/BijlagenForm.asp | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/APPL/Shared/BijlagenForm.asp b/APPL/Shared/BijlagenForm.asp
index b522d1cca4..398beace75 100644
--- a/APPL/Shared/BijlagenForm.asp
+++ b/APPL/Shared/BijlagenForm.asp
@@ -319,6 +319,7 @@ if (fso.FolderExists(params.AttachPath))
                           },
                           function()
                           {   // confirm=OK
+                            iface.button.disable("closeButton");
                               $("#uploading").show();
                               FcltMgr.resized();
 
@@ -379,16 +380,23 @@ if (fso.FolderExists(params.AttachPath))
 
       function Sluiten()
       {
-        var unUploadedFiles = (looseFiles.length ? looseFiles.length : (document.forms.u2.imgfile ? document.forms.u2.imgfile.files.length : 0));
-        FcltMgr.confirm(L("lcl_shared_unfinished_uploads"),
-                          { autoconfirm: !unUploadedFiles,
-                            fncancel: function() { /* geen actie bij confirm=cancel */ }
-                          },
-                          function()
-                          {
-                            window.return_data.org_data=FcltMgr.dialogArguments();
-                            FcltMgr.closeDetail(window, return_data);
-                          });
+        if ($("#closeButton").hasClass("btn_disabled"))
+        {
+          FcltMgr.alert(L("lcl_busy_upload_file"));
+        }
+        else
+        {
+          var unUploadedFiles = (looseFiles.length ? looseFiles.length : (document.forms.u2.imgfile ? document.forms.u2.imgfile.files.length : 0));
+          FcltMgr.confirm(L("lcl_shared_unfinished_uploads"),
+                            { autoconfirm: !unUploadedFiles,
+                              fncancel: function() { /* geen actie bij confirm=cancel */ }
+                            },
+                            function()
+                            {
+                              window.return_data.org_data=FcltMgr.dialogArguments();
+                              FcltMgr.closeDetail(window, return_data);
+                            });
+        }
       }
 
     </script>
@@ -489,8 +497,9 @@ if (fso.FolderExists(params.AttachPath))
             window.return_data = { cnt: <%=fileArray.length%>, fileName: '<%=safe.jsstring(fileArray.length > 0? fileArray[0].vFileName : "")%>'};
             FcltMgr.setCloseParams(window.return_data); // Zelfs als je kruisje gebruikt
             $(function ()
-            {
-                iface.button.disable("btn_upload_submit")}
+              {
+                iface.button.disable("btn_upload_submit");
+              }
             );
       </script>
 <%    BLOCK_END();