From 5e446908ea962ca25ebdd7b15efed0804a0ad7c7 Mon Sep 17 00:00:00 2001 From: MaZderMind Date: Thu, 13 Aug 2015 18:18:08 +0200 Subject: Allow Disabling Embed-Autoplay --- assets/js/lustiges-script.js | 22 +++++++++++++++++----- index.php | 3 ++- template/assemblies/embed-form.phtml | 10 ++++++++-- template/assemblies/player/video.phtml | 4 +++- view/embed.php | 2 ++ 5 files changed, 32 insertions(+), 9 deletions(-) diff --git a/assets/js/lustiges-script.js b/assets/js/lustiges-script.js index 0aa87ff..fff3896 100644 --- a/assets/js/lustiges-script.js +++ b/assets/js/lustiges-script.js @@ -524,16 +524,28 @@ $(function() { // embed-form $(function() { - $('.embed-form #size').on('click', function() { + var originalsrc; + $('.embed-form #size, .embed-form #autoplay').on('click', function() { var - $size = $(this), + $size = $('.embed-form #size'), selected = $size.val().split(','), - $codefield = $('#embed-code') + $size = $('.embed-form #size'), + $codefield = $('#embed-code'), + $urlfield = $('#embed-url'), $iframe = $( $codefield.val() ), - $iframe.attr({width: selected[0], height: selected[1]}); + autoplay = $('.embed-form #autoplay').prop('checked'); + + if(!originalsrc) + originalsrc = $iframe.attr('src'); + + var src = originalsrc + (autoplay ? '' : 'no-autoplay/'); + + $iframe.attr({width: selected[0], height: selected[1]}); + $iframe.attr({src: src}); $codefield.val( $iframe.prop('outerHTML') ); - }).trigger('click'); + $urlfield.val( src ); + }) $('.embed-form').on('click', 'input[type=text]', function() { $(this).select(); diff --git a/index.php b/index.php index 11495df..4d2bfc7 100644 --- a/index.php +++ b/index.php @@ -143,12 +143,13 @@ try { require('view/room.php'); } - else if(preg_match('@^embed/([^/]+)/(hd|sd|audio|slides)/(native|translated|stereo)$@', $route, $m)) + else if(preg_match('@^embed/([^/]+)/(hd|sd|audio|slides)/(native|translated|stereo)(/no-autoplay)?$@', $route, $m)) { $_GET = array( 'room' => $m[1], 'selection' => $m[2], 'language' => $m[3], + 'autoplay' => !isset($m[4]), ); require('view/embed.php'); } diff --git a/template/assemblies/embed-form.phtml b/template/assemblies/embed-form.phtml index 7e545f8..617f477 100644 --- a/template/assemblies/embed-form.phtml +++ b/template/assemblies/embed-form.phtml @@ -17,6 +17,12 @@ + +
+ +
@@ -30,8 +36,8 @@
- - + +
diff --git a/template/assemblies/player/video.phtml b/template/assemblies/player/video.phtml index 3ffc333..9149a4f 100644 --- a/template/assemblies/player/video.phtml +++ b/template/assemblies/player/video.phtml @@ -1,6 +1,8 @@