From e049ab0a0860334d69b6cae4fe7c2a573671db7d Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Thu, 2 Feb 2017 17:40:04 +0100 Subject: [PATCH] Fire videojs via js --- src/styles/_project.sass | 2 +- src/templates/nodes/custom/asset/video/view_embed.jade | 5 ++++- src/templates/projects/view.jade | 2 ++ src/templates/projects/view_embed.jade | 4 +++- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/styles/_project.sass b/src/styles/_project.sass index 30644ce8..ce2b14ec 100644 --- a/src/styles/_project.sass +++ b/src/styles/_project.sass @@ -1031,9 +1031,9 @@ section.node-preview &.video background-color: black + min-height: 350px .video-dummy - min-height: 250px img display: block margin: 0 auto diff --git a/src/templates/nodes/custom/asset/video/view_embed.jade b/src/templates/nodes/custom/asset/video/view_embed.jade index de05d4b1..b1143415 100644 --- a/src/templates/nodes/custom/asset/video/view_embed.jade +++ b/src/templates/nodes/custom/asset/video/view_embed.jade @@ -5,7 +5,7 @@ section.node-preview.video | {% if node.video_sources %} - video.video-js.vjs-fluid( + video#videoplayer.video-js.vjs-fluid( controls, data-setup="{}", preload="auto", @@ -133,6 +133,9 @@ #comments-list-items-loading i.pi-spin +script(type="text/javascript"). + videojs(document.getElementById('videoplayer'), { fluid: true }); + include ../../_scripts | {% endblock %} diff --git a/src/templates/projects/view.jade b/src/templates/projects/view.jade index 18ada9dd..63d6bfc6 100644 --- a/src/templates/projects/view.jade +++ b/src/templates/projects/view.jade @@ -41,6 +41,8 @@ link(href="//cdnjs.cloudflare.com/ajax/libs/jstree/3.3.1/themes/default/style.mi | {% if node %} link(rel="amphtml", href="{{ url_for('nodes.view', node_id=node._id, _external=True, format='amp') }}") | {% endif %} + +script(src="{{ url_for('static_pillar', filename='assets/js/vendor/videojs-5.8.8.min.js', v=2220171) }}") | {% endblock %} | {% block css %} diff --git a/src/templates/projects/view_embed.jade b/src/templates/projects/view_embed.jade index dab4e8a1..0670bcbf 100644 --- a/src/templates/projects/view_embed.jade +++ b/src/templates/projects/view_embed.jade @@ -9,7 +9,7 @@ script(src="//vjs.zencdn.net/5.8.8/video.js") #node-container section.node-preview.project | {% if header_video_file %} - video.video-js.vjs-fluid( + video#videoplayer.video-js.vjs-fluid( controls, data-setup="{}", preload="auto", @@ -104,6 +104,8 @@ include _scripts script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery.montage.min.js') }}") script. + videojs(document.getElementById('videoplayer'), { fluid: true }); + function montage(){ var $container = $('#featured-list'), $imgs = $container.find('img').hide(),