diff options
| author | MaZderMind | 2014-12-27 16:19:13 +0100 |
|---|---|---|
| committer | MaZderMind | 2014-12-27 16:19:13 +0100 |
| commit | ab0a2cfbf2b4be1d87376052a02ef2e67557bf0b (patch) | |
| tree | 2e0d0ac51cfc44aac6483669d009c29ca29c96ff /assets/js | |
| parent | 696066a2df58fa12bfbdac427a767efdb4fe00a4 (diff) | |
| parent | 03d3f65e9cdc7100628fb8dde20f97f503e09c57 (diff) | |
Merge branch 'master' into relivew
Conflicts:
31c3/assets/css/lustige-styles.css.map
Diffstat (limited to 'assets/js')
| -rw-r--r-- | assets/js/lustiges-script.js | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/assets/js/lustiges-script.js b/assets/js/lustiges-script.js index 322c69e..de7d137 100644 --- a/assets/js/lustiges-script.js +++ b/assets/js/lustiges-script.js @@ -35,7 +35,7 @@ $.fn.autoScale = function() { // mediaelement subtitles button MediaElementPlayer.prototype.buildsubs = function(player, controls, layers, media) { var - host = 'http://frontend.c3voc.mazdermind.de:33133/', + host = 'http://subtitles.c3voc.de/', room = $('.room.video').data('room'), isLoaded = false, t = 200, @@ -145,6 +145,12 @@ MediaElementPlayer.prototype.buildsubs = function(player, controls, layers, medi // mediaelement-player $(function() { + (function(strings) { + strings['en-US'] = { + 'Download File': 'Open RTMP-Stream in Desktop-Player' + } + })(mejs.i18n.locale.strings); + $('video').mediaelementplayer({ mode: 'auto_plugin', @@ -360,7 +366,7 @@ $(function() { }); - var s = new Date(nextTalk.start*1000); + var s = nextTalk ? new Date(nextTalk.start*1000) : new Date(); $lecture.find('.'+room) .find('.current-talk') .removeClass('hidden') |