Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .claude/settings.local.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"permissions": {
"allow": [
"Bash(find:*)",
"WebFetch(domain:github.com)",
"Bash(grep:*)",
"Bash(gh pr checkout:*)",
Expand Down
18 changes: 18 additions & 0 deletions app/javascript/packs/video_player.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import videojs from 'video.js'
import 'video.js/dist/video-js.css'

// Make videojs available globally for inline scripts
window.videojs = videojs

// Auto-initialize video.js players on page load
document.addEventListener('DOMContentLoaded', function() {
// Initialize any video elements with video-js class
const videoElements = document.querySelectorAll('video.video-js')
videoElements.forEach(function(element) {
if (!element.hasAttribute('data-vjs-player')) {
videojs(element)
}
})
})

export default videojs
2 changes: 1 addition & 1 deletion app/views/admin/streamings/_preview.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<video
id="my-player"
class="video-js video-js vjs-16-9 vjs-big-play-centered"
data-setup='{"fluid": true, "liveui": true, "enableWorker": true, "lowLatencyMode": true "backBufferLength": 1}'
data-setup='{"fluid": true, "liveui": true, "enableWorker": true, "lowLatencyMode": true, "backBufferLength": 1}'
controls
preload="auto"
>
Expand Down
3 changes: 1 addition & 2 deletions app/views/layouts/application.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,13 @@
<link rel="stylesheet" href="https://use.typekit.net/ntd4lbp.css">
<%= stylesheet_link_tag event_js_path, media: 'all', 'data-turbolinks-track': 'reload' %>
<%= javascript_include_tag event_js_path, 'data-turbolinks-track': 'reload' %>
<%= javascript_include_tag 'video_player', 'data-turbolinks-track': 'reload' %>
<meta name="turbo-cache-control" content="no-cache">

<script src="https://transloadit.edgly.net/releases/uppy/v1.6.0/uppy.min.js"></script>

<link href="https://transloadit.edgly.net/releases/uppy/v1.6.0/uppy.min.css" rel="stylesheet" />
<link href="https://cdnjs.cloudflare.com/ajax/libs/cropperjs/1.5.6/cropper.css" rel="stylesheet" />
<link href="https://cdnjs.cloudflare.com/ajax/libs/video.js/7.10.2/video-js.min.css" rel="stylesheet">
<script src="https://cdnjs.cloudflare.com/ajax/libs/video.js/7.10.2/video.min.js"></script>

<meta property="og:site_name" content="<%= site_name %>" />

Expand Down
3 changes: 1 addition & 2 deletions app/views/layouts/no_headers.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,13 @@
<link rel="stylesheet" href="https://use.typekit.net/ntd4lbp.css">
<%= stylesheet_link_tag event_js_path, media: 'all', 'data-turbolinks-track': 'reload' %>
<%= javascript_include_tag event_js_path, 'data-turbolinks-track': 'reload' %>
<%= javascript_include_tag 'video_player', 'data-turbolinks-track': 'reload' %>
<meta name="turbo-cache-control" content="no-cache">

<script src="https://transloadit.edgly.net/releases/uppy/v1.6.0/uppy.min.js"></script>

<link href="https://transloadit.edgly.net/releases/uppy/v1.6.0/uppy.min.css" rel="stylesheet" />
<link href="https://cdnjs.cloudflare.com/ajax/libs/cropperjs/1.5.6/cropper.css" rel="stylesheet" />
<link href="https://cdnjs.cloudflare.com/ajax/libs/video.js/7.10.2/video-js.min.css" rel="stylesheet">
<script src="https://cdnjs.cloudflare.com/ajax/libs/video.js/7.10.2/video.min.js"></script>

<meta property="og:site_name" content="<%= site_name %>" />

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"sass": "^1.77.6",
"sass-loader": "^16.0.0",
"sortablejs": "^1.15.3",
"video.js": "8.5.2",
"video.js": "8.23.3",
"webpack": "^5.92.1",
"webpack-cli": "^5.1.4",
"webpack-remove-empty-scripts": "^1.0.4"
Expand Down
3 changes: 3 additions & 0 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ module.exports = {
],
'tracks/track_channel': [
"./app/javascript/packs/tracks/track_channel.js",
],
video_player: [
"./app/javascript/packs/video_player.js",
]
},
module: {
Expand Down
Loading
Loading