From bd5475e07b726d2833daf807b9fc8ffa2b20a116 Mon Sep 17 00:00:00 2001
From: Artur Bergen <artur.bergen@struktur.de>
Date: Thu, 30 Nov 2017 10:55:35 +0100
Subject: [PATCH] Rebase and fix conflicts

Signed-off-by: Artur Bergen <artur.bergen@struktur.de>
---
 css/style.css | 9 +++++++++
 js/app.js     | 8 +++++---
 js/webrtc.js  | 8 ++++++++
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/css/style.css b/css/style.css
index 4325c03575..9007618fb9 100644
--- a/css/style.css
+++ b/css/style.css
@@ -420,6 +420,15 @@ video {
 	opacity: .7;
 }
 
+.nameIndicator button.video-available {
+	opacity: .7;
+	cursor: not-allowed;
+ }
+
+.nameIndicator button.video-available:active {
+	background-color: transparent;
+}
+
 .mediaIndicator {
 	position: absolute;
 	width: 100%;
diff --git a/js/app.js b/js/app.js
index d229c88d70..c58d9d8f48 100644
--- a/js/app.js
+++ b/js/app.js
@@ -629,9 +629,11 @@
 			var avatarContainer = $hideVideoButton.closest('.videoView').find('.avatar-container');
 			var localVideo = $hideVideoButton.closest('.videoView').find('#localVideo');
 
-			$hideVideoButton.attr('data-original-title', t('spreed', 'Enable video'))
-				.addClass('video-disabled icon-video-off-white')
-				.removeClass('icon-video-white');
+			if (!$hideVideoButton.hasClass('video-available')) {
+				$hideVideoButton.attr('data-original-title', t('spreed', 'Enable video'))
+				 .addClass('video-disabled icon-video-off-white')
+				 .removeClass('icon-video-white');
+			}
 
 			var avatar = avatarContainer.find('.avatar');
 			var guestName = localStorage.getItem("nick");
diff --git a/js/webrtc.js b/js/webrtc.js
index 94aa98ee58..caffd84d55 100644
--- a/js/webrtc.js
+++ b/js/webrtc.js
@@ -954,6 +954,14 @@ var spreedPeerConnectionTable = [];
 			if (!OCA.SpreedMe.app.videoDisabled) {
 				OCA.SpreedMe.app.enableVideo();
 			}
+
+			var availableStream = $(OCA.SpreedMe.webrtc.webrtc.localStream.getVideoTracks());
+			var $hideVideoButton = $('#hideVideo');
+			if(availableStream.length < 1 || availableStream.length == undefined) {
+				$hideVideoButton.removeClass('video-disabled icon-video-off-white')
+				.addClass('video-available icon-video-off-white')
+				.attr('data-original-title', t('spreed', 'No Camera'));
+			}
 		});
 	}