Unverified Commit 0430f27f authored by Kevin Gutiérrez's avatar Kevin Gutiérrez Committed by GitHub
Browse files

Merge branch 'master' into master

parents 16bb4555 cf01a878
...@@ -10,7 +10,7 @@ from setuptools import find_packages, setup # noqa: E4 ...@@ -10,7 +10,7 @@ from setuptools import find_packages, setup # noqa: E4
setup( setup(
name='wagtailvideos', name='wagtailvideos',
version='2.10.1', version='2.10.2',
description="A wagtail module for uploading and displaying videos in various codecs.", description="A wagtail module for uploading and displaying videos in various codecs.",
long_description=readme, long_description=readme,
author='Neon Jungle', author='Neon Jungle',
......
This diff is collapsed.
This diff is collapsed.
...@@ -365,7 +365,7 @@ class AbstractVideoTrack(Orderable): ...@@ -365,7 +365,7 @@ class AbstractVideoTrack(Orderable):
language = models.CharField( language = models.CharField(
max_length=50, max_length=50,
choices=[(v, k) for k, v in bcp47.languages.items()], choices=[(v, k) for k, v in bcp47.languages.items()],
default='en', blank=True, help_text='Required if type is "Subtitle"', unique=True) default='en', blank=True, help_text='Required if type is "Subtitle"')
def track_tag(self): def track_tag(self):
attrs = { attrs = {
......
function createVideoChooser(id) { function createVideoChooser(id) {
var chooserElement = $('#' + id + '-chooser'); var chooserElement = $('#' + id + '-chooser');
var previewVideo = chooserElement.find('.video-thumb img'); var previewVideo = chooserElement.find('.preview-image img');
var input = $('#' + id); var input = $('#' + id);
var editLink = chooserElement.find('.edit-link'); var editLink = chooserElement.find('.edit-link');
$('.action-choose', chooserElement).click(function() { $('.action-choose', chooserElement).click(function () {
ModalWorkflow({ ModalWorkflow({
url: window.chooserUrls.videoChooser, url: window.chooserUrls.videoChooser,
onload: VIDEO_CHOOSER_MODAL_ONLOAD_HANDLERS, onload: VIDEO_CHOOSER_MODAL_ONLOAD_HANDLERS,
responses: { responses: {
videoChosen: function(videoData) { videoChosen: function (videoData) {
input.val(videoData.id); input.val(videoData.id);
previewVideo.attr({ previewVideo.attr({
src: videoData.preview.url, src: videoData.preview.url,
...@@ -22,7 +22,7 @@ function createVideoChooser(id) { ...@@ -22,7 +22,7 @@ function createVideoChooser(id) {
}); });
}); });
$('.action-clear', chooserElement).click(function() { $('.action-clear', chooserElement).click(function () {
input.val(''); input.val('');
chooserElement.addClass('blank'); chooserElement.addClass('blank');
}); });
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment