aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaZderMind2016-12-22 20:25:18 +0100
committerMaZderMind2016-12-22 20:25:18 +0100
commitefdae0713ec5890aab5358747ffc304d97ab058b (patch)
treed3121ecda9cf76e386bafc5a4efb40621db715b2
parentb45a2c9de7fe4b282274c979baad2df5333fbcf9 (diff)
limit the mediaelement-js ui to the existing players
-rw-r--r--assets/js/lustiges-script.js6
-rw-r--r--template/assemblies/player/audio.phtml1
-rw-r--r--template/assemblies/player/music.phtml1
-rw-r--r--template/assemblies/player/relive.phtml2
-rw-r--r--template/assemblies/player/slides.phtml1
-rw-r--r--template/assemblies/player/video.phtml1
6 files changed, 8 insertions, 4 deletions
diff --git a/assets/js/lustiges-script.js b/assets/js/lustiges-script.js
index 65fc6ef..63227a3 100644
--- a/assets/js/lustiges-script.js
+++ b/assets/js/lustiges-script.js
@@ -10,16 +10,16 @@ $(function() {
if($('.video-wrap').hasClass('has-subtitles'))
feat.push('subtitles');
- $('body.room video, body.embed video').mediaelementplayer({
+ $('body.room video.mejs, body.embed video.mejs').mediaelementplayer({
features: feat,
enableAutosize: true
});
- $('body.room audio, body.embed audio').mediaelementplayer({
+ $('body.room audio.mejs, body.embed audio.mejs').mediaelementplayer({
features: ['playpause', 'volume', 'current']
});
- $('body.relive-player video').mediaelementplayer({
+ $('body.relive-player video.mejs').mediaelementplayer({
mode: 'auto_plugin',
plugins: ['flash'],
flashName: 'flashmediaelement.swf',
diff --git a/template/assemblies/player/audio.phtml b/template/assemblies/player/audio.phtml
index fe2ce32..087b61c 100644
--- a/template/assemblies/player/audio.phtml
+++ b/template/assemblies/player/audio.phtml
@@ -2,6 +2,7 @@
autoplay="autoplay"
preload="auto"
style="width: 300px;"
+ class="mejs"
>
<source
src="<?=h($stream->getAudioUrl('mp3'))?>"
diff --git a/template/assemblies/player/music.phtml b/template/assemblies/player/music.phtml
index b1c804a..c5090a5 100644
--- a/template/assemblies/player/music.phtml
+++ b/template/assemblies/player/music.phtml
@@ -2,6 +2,7 @@
autoplay="autoplay"
preload="auto"
style="width: 230px;"
+ class="mejs"
>
<source
src="<?=h($stream->getMusicUrl('mp3'))?>"
diff --git a/template/assemblies/player/relive.phtml b/template/assemblies/player/relive.phtml
index e9fe89c..ae108b1 100644
--- a/template/assemblies/player/relive.phtml
+++ b/template/assemblies/player/relive.phtml
@@ -5,7 +5,7 @@
width="<?=h($width)?>"
height="<?=h($height)?>"
style="width: 100%; height: 100%;"
- class="relive"
+ class="relive mejs"
>
<source
src="<?=h(forceproto($talk['playlist']))?>"
diff --git a/template/assemblies/player/slides.phtml b/template/assemblies/player/slides.phtml
index 7887aa0..21b140f 100644
--- a/template/assemblies/player/slides.phtml
+++ b/template/assemblies/player/slides.phtml
@@ -5,6 +5,7 @@
width="<?=h($stream->getVideoWidth())?>"
height="<?=h($stream->getVideoHeight())?>"
style="width: 100%; height: 100%;"
+ class="mejs"
>
<source
data-plugin-type="native"
diff --git a/template/assemblies/player/video.phtml b/template/assemblies/player/video.phtml
index cbbf06b..ff5039b 100644
--- a/template/assemblies/player/video.phtml
+++ b/template/assemblies/player/video.phtml
@@ -11,6 +11,7 @@
width="<?=h($stream->getVideoWidth())?>"
height="<?=h($stream->getVideoHeight())?>"
style="width: 100%; height: 100%;"
+ class="mejs"
>
<source
data-plugin-type="native"