Fixed issue #16194: file upload disables other clicks.

After loading the upload frame inside the modal, 'relevance:on' event handlers are lost. Calling triggerEmRelevance() when closing the modal fixes the issue. Contains also fix for #16549: Error message is shown while trying to delete and reupload file using File upload
LimeSurvey · Aug 17, 2020 · 09da665 · 09da665
1 parent 6673343
commit 09da665
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/assets/packages/questions/upload/build/uploadquestion.js b/assets/packages/questions/upload/build/uploadquestion.js
@@ -703,6 +703,7 @@
           toDeleteFlag = true; // Fix IE mixed content issue
 
           iframe.src = "javascript:'<html></html>';";
+          removeNode(iframe);
         });
       },
 
@@ -726,7 +727,10 @@
         } // sending request
 
 
-        var iframe = this._createIframe();
+        var iframe = this._createIframe(); // Get response from iframe and fire onComplete event when ready
+
+
+        this._getResponse(iframe, file);
 
         var form = this._createForm(iframe); // assuming following structure
         // div -> input type='file'
@@ -741,10 +745,7 @@
         removeNode(form);
         form = null;
         removeNode(this._input);
-        this._input = null; // Get response from iframe and fire onComplete event when ready
-
-        this._getResponse(iframe, file); // get ready for next request
-
+        this._input = null; // get ready for next request
 
         this._createInput();
       }

diff --git a/assets/packages/questions/upload/build/uploadquestion.min.js b/assets/packages/questions/upload/build/uploadquestion.min.js
diff --git a/assets/packages/questions/upload/build/uploadquestion.min.js.map b/assets/packages/questions/upload/build/uploadquestion.min.js.map
diff --git a/assets/packages/questions/upload/src/ajaxupload.js b/assets/packages/questions/upload/src/ajaxupload.js
@@ -636,6 +636,7 @@
 
                 // Fix IE mixed content issue
                 iframe.src = "javascript:'<html></html>';";
+                removeNode(iframe);
             });
         },
         /**
@@ -658,6 +659,10 @@
 
             // sending request
             var iframe = this._createIframe();
+
+            // Get response from iframe and fire onComplete event when ready
+            this._getResponse(iframe, file);
+
             var form = this._createForm(iframe);
 
             // assuming following structure
@@ -674,9 +679,6 @@
             removeNode(form); form = null;
             removeNode(this._input); this._input = null;
 
-            // Get response from iframe and fire onComplete event when ready
-            this._getResponse(iframe, file);
-
             // get ready for next request
             this._createInput();
         }