Backport epic fullscreenbackport-epic-fullscreen

2 files changed, 10 insertions, 2 deletions

diff --git a/app/assets/javascripts/dropzone_input.js b/app/assets/javascripts/dropzone_input.js
index b7747ee3f83..c84be42649a 100644
--- a/app/assets/javascripts/dropzone_input.js
+++ b/app/assets/javascripts/dropzone_input.js
@@ -36,7 +36,10 @@ export default function dropzoneInput(form) {
   $formDropzone.append(divHover);
   $formDropzone.find('.div-dropzone-hover').append(iconPaperclip);
 
-  if (!uploadsPath) return;
+  if (!uploadsPath) {
+    $formDropzone.addClass('js-invalid-dropzone');
+    return;
+  }
 
   const dropzone = $formDropzone.dropzone({
     url: uploadsPath,
diff --git a/app/assets/javascripts/zen_mode.js b/app/assets/javascripts/zen_mode.js
index cba7b9227cd..3217744860a 100644
--- a/app/assets/javascripts/zen_mode.js
+++ b/app/assets/javascripts/zen_mode.js
@@ -81,7 +81,12 @@ export default class ZenMode {
       this.scrollTo(this.active_textarea);
       this.active_textarea = null;
       this.active_backdrop = null;
-      return Dropzone.forElement('.div-dropzone').enable();
+
+      const $dropzone = $('.div-dropzone');
+      const hasDropzone = $dropzone && !$dropzone.hasClass('js-invalid-dropzone');
+      if (hasDropzone) {
+        Dropzone.forElement('.div-dropzone').enable();
+      }
     }
   }