Merge branch 'cw/texteditor-reusability'

FriendsOfFlarum · Oct 14, 2023 · e379d76 · e379d76
2 parents f66c696 + 12bcbc7
commit e379d76
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/js/src/forum/addUploadButton.js b/js/src/forum/addUploadButton.js
@@ -62,14 +62,26 @@ export default function () {
       }
     });
 
-    this.dragAndDrop = new DragAndDrop((files) => this.uploader.upload(files), this.$().parents('.Composer')[0]);
+    // Gracefully fail if the TextEditor was used in a non-Composer context
+    // Using a custom method to retrieve the target allows other extensions to still use this feature by returning an alternate container
+    const dragAndDropTarget = this.fofUploadDragAndDropTarget();
+
+    if (dragAndDropTarget) {
+      this.dragAndDrop = new DragAndDrop((files) => this.uploader.upload(files), dragAndDropTarget);
+    }
 
     new PasteClipboard((files) => this.uploader.upload(files), this.$('.TextEditor-editor')[0]);
   });
 
   extend(TextEditor.prototype, 'onremove', function (f_, vnode) {
     if (!app.forum.attribute('fof-upload.canUpload')) return;
 
-    this.dragAndDrop.unload();
+    if (this.dragAndDrop) {
+      this.dragAndDrop.unload();
+    }
   });
+
+  TextEditor.prototype.fofUploadDragAndDropTarget = function () {
+    return this.$().parents('.Composer')[0];
+  };
 }