]> BookStack Code Mirror - bookstack/commitdiff
Attachments: Drag and drop video support
authorDan Brown <redacted>
Mon, 15 Jan 2024 11:50:05 +0000 (11:50 +0000)
committerDan Brown <redacted>
Mon, 15 Jan 2024 11:57:20 +0000 (11:57 +0000)
Supports dragging and dropping video attahchments to embed them in the
editor as HTML video tags.

app/Uploads/Attachment.php
resources/views/attachments/manager-list.blade.php

index 4fd6d4cdcb7d6c34ba82baeaca8ef6d04fad6cd8..57d7cb3346c9f9b202725f7233ece08cdc919bf8 100644 (file)
@@ -77,7 +77,22 @@ class Attachment extends Model
     }
 
     /**
-     * Generate a HTML link to this attachment.
+     * Get the representation of this attachment in a format suitable for the page editors.
+     * Detects and adapts video content to use an inline video embed.
+     */
+    public function editorContent(): array
+    {
+        $videoExtensions = ['mp4', 'webm', 'mkv', 'ogg', 'avi'];
+        if (in_array(strtolower($this->extension), $videoExtensions)) {
+            $html = '<video src="' . e($this->getUrl(true)) . '" controls width="480" height="270"></video>';
+            return ['text/html' => $html, 'text/plain' => $html];
+        }
+
+        return ['text/html' => $this->htmlLink(), 'text/plain' => $this->markdownLink()];
+    }
+
+    /**
+     * Generate the HTML link to this attachment.
      */
     public function htmlLink(): string
     {
@@ -85,7 +100,7 @@ class Attachment extends Model
     }
 
     /**
-     * Generate a markdown link to this attachment.
+     * Generate a MarkDown link to this attachment.
      */
     public function markdownLink(): string
     {
index 342b46dcad72609732bf51966f899d66e1c81bce..0e841a042f7ef6cd0ed0b08b2edeba79c96e0f50 100644 (file)
@@ -4,7 +4,7 @@
         <div component="ajax-delete-row"
              option:ajax-delete-row:url="{{ url('/attachments/' . $attachment->id) }}"
              data-id="{{ $attachment->id }}"
-             data-drag-content="{{ json_encode(['text/html' => $attachment->htmlLink(), 'text/plain' => $attachment->markdownLink()]) }}"
+             data-drag-content="{{ json_encode($attachment->editorContent()) }}"
              class="card drag-card">
             <div class="handle">@icon('grip')</div>
             <div class="py-s">