From e39a3c5a1f46a0a9a8ba64a7de33e0e7a25d2efa Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Fri, 26 Dec 2014 01:50:17 +0100
Subject: fix script-errors after closing

---
 assets/js/lustiges-script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'assets/js')

diff --git a/assets/js/lustiges-script.js b/assets/js/lustiges-script.js
index 322c69e..48d85ef 100644
--- a/assets/js/lustiges-script.js
+++ b/assets/js/lustiges-script.js
@@ -360,7 +360,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')
-- 
cgit v1.2.3


From 9bf0a3c8d277447a3dc54a8938b3e4b92d58890e Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Fri, 26 Dec 2014 13:30:57 +0100
Subject: point to local subtitles system

---
 assets/js/lustiges-script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'assets/js')

diff --git a/assets/js/lustiges-script.js b/assets/js/lustiges-script.js
index 48d85ef..3318629 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,
-- 
cgit v1.2.3


From a0b7031f99992662243cf50de23c0338f0896361 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sat, 27 Dec 2014 09:48:06 +0100
Subject: change stream notification

---
 assets/js/lustiges-script.js | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'assets/js')

diff --git a/assets/js/lustiges-script.js b/assets/js/lustiges-script.js
index 3318629..de7d137 100644
--- a/assets/js/lustiges-script.js
+++ b/assets/js/lustiges-script.js
@@ -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',
 
-- 
cgit v1.2.3