From bb38d02177972abc48b6a98bd461a0ef2d54c60c Mon Sep 17 00:00:00 2001
From: Ivan Sein <ivan@struktur.de>
Date: Mon, 3 Dec 2018 12:16:48 +0100
Subject: [PATCH] Create specific button to show your screen.

Signed-off-by: Ivan Sein <ivan@nextcloud.com>
---
 js/app.js                  | 39 +++++++++++++++++++++-----------------
 js/publicshareauth.js      | 16 ++++++++++++++--
 templates/index-public.php | 14 ++++++++++----
 templates/index.php        | 14 ++++++++++----
 4 files changed, 56 insertions(+), 27 deletions(-)

diff --git a/js/app.js b/js/app.js
index 0c63ca3f8..cf8908015 100644
--- a/js/app.js
+++ b/js/app.js
@@ -265,12 +265,16 @@
 				// The parent CSS of the menu list items is using "display:block !important",
 				// so we need to also hide with "!important".
 				if (webrtc.getLocalScreen()) {
-					$('#show-window-entry').attr('style','display:none !important');
+					$('#share-screen-entry').attr('style','display:none !important');
+					$('#share-window-entry').attr('style','display:none !important');
+					$('#show-screen-entry').show();
 					$('#stop-screen-entry').show();
 					$('#screensharing-menu').toggleClass('open');
 				} else {
 					if (splitShare) {
-						$('#show-window-entry').show();
+						$('#share-screen-entry').show();
+						$('#share-window-entry').show();
+						$('#show-screen-entry').attr('style','display:none !important');
 						$('#stop-screen-entry').attr('style','display:none !important');
 						$('#screensharing-menu').toggleClass('open');
 						return;
@@ -280,27 +284,28 @@
 				}
 			}.bind(this));
 
+			$("#share-screen-button").on('click', function() {
+				var webrtc = OCA.SpreedMe.webrtc;
+				if (!webrtc.getLocalScreen()) {
+					this.startShareScreen('screen');
+				}
+				$('#screensharing-menu').toggleClass('open', false);
+			}.bind(this));
+
+			$("#share-window-button").on('click', function() {
+				var webrtc = OCA.SpreedMe.webrtc;
+				if (!webrtc.getLocalScreen()) {
+					this.startShareScreen('window');
+				}
+				$('#screensharing-menu').toggleClass('open', false);
+			}.bind(this));
+
 			$("#show-screen-button").on('click', function() {
 				var webrtc = OCA.SpreedMe.webrtc;
 				if (webrtc.getLocalScreen()) {
 					var currentUser = OCA.SpreedMe.webrtc.connection.getSessionid();
 					OCA.SpreedMe.sharedScreens.switchScreenToId(currentUser);
-				} else {
-					this.startShareScreen('screen');
 				}
-
-				$('#screensharing-menu').toggleClass('open', false);
-			}.bind(this));
-
-			$("#show-window-button").on('click', function() {
-				var webrtc = OCA.SpreedMe.webrtc;
-				if (webrtc.getLocalScreen()) {
-					var currentUser = OCA.SpreedMe.webrtc.connection.getSessionid();
-					OCA.SpreedMe.sharedScreens.switchScreenToId(currentUser);
-				} else {
-					this.startShareScreen('window');
-				}
-
 				$('#screensharing-menu').toggleClass('open', false);
 			}.bind(this));
 
diff --git a/js/publicshareauth.js b/js/publicshareauth.js
index c1f320258..2f29dc0f4 100644
--- a/js/publicshareauth.js
+++ b/js/publicshareauth.js
@@ -79,13 +79,25 @@
 				'	<button id="screensharing-button" class="app-navigation-entry-utils-menu-button icon-screen-off icon-white icon-shadow screensharing-disabled" data-placement="top" data-toggle="tooltip" data-original-title="' + t('spreed', 'Share screen') + '"></button>' +
 				'	<div id="screensharing-menu" class="app-navigation-entry-menu">' +
 				'		<ul>' +
-				'			<li>' +
+				'			<li id="share-screen-entry">' +
+				'				<button id="share-screen-button">' +
+				'					<span class="icon-screen"></span>' +
+				'					<span>' + t('spreed', 'Share your screen') + '</span>' +
+				'				</button>' +
+				'			</li>' +
+				'			<li id="share-window-entry">' +
+				'				<button id="share-window-button">' +
+				'					<span class="icon-share-window"></span>' +
+				'					<span>' + t('spreed', 'Share a single window') + '</span>' +
+				'				</button>' +
+				'			</li>' +
+				'			<li id="show-screen-entry">' +
 				'				<button id="show-screen-button">' +
 				'					<span class="icon-screen"></span>' +
 				'					<span>' + t('spreed', 'Show your screen') + '</span>' +
 				'				</button>' +
 				'			</li>' +
-				'			<li>' +
+				'			<li id="stop-screen-entry">' +
 				'				<button id="stop-screen-button">' +
 				'					<span class="icon-screen-off"></span>' +
 				'					<span>' + t('spreed', 'Stop screensharing') + '</span>' +
diff --git a/templates/index-public.php b/templates/index-public.php
index 9971881a4..46f0afe84 100644
--- a/templates/index-public.php
+++ b/templates/index-public.php
@@ -72,18 +72,24 @@ script(
 					<button id="screensharing-button" class="app-navigation-entry-utils-menu-button icon-screen-off icon-white icon-shadow screensharing-disabled" data-placement="top" data-toggle="tooltip" data-original-title="<?php p($l->t('Share screen')) ?>"></button>
 					<div id="screensharing-menu" class="app-navigation-entry-menu">
 						<ul>
-							<li>
-								<button id="show-screen-button">
+							<li id="share-screen-entry">
+								<button id="share-screen-button">
 									<span class="icon-screen"></span>
 									<span><?php p($l->t('Share your screen'));?></span>
 								</button>
 							</li>
-							<li id="show-window-entry">
-								<button id="show-window-button">
+							<li id="share-window-entry">
+								<button id="share-window-button">
 									<span class="icon-share-window"></span>
 									<span><?php p($l->t('Share a single window'));?></span>
 								</button>
 							</li>
+							<li id="show-screen-entry">
+								<button id="show-screen-button">
+									<span class="icon-screen"></span>
+									<span><?php p($l->t('Show your screen'));?></span>
+								</button>
+							</li>
 							<li id="stop-screen-entry">
 								<button id="stop-screen-button">
 									<span class="icon-screen-off"></span>
diff --git a/templates/index.php b/templates/index.php
index cedd41fb6..f4aea8994 100644
--- a/templates/index.php
+++ b/templates/index.php
@@ -79,18 +79,24 @@ script(
 				<button id="screensharing-button" class="app-navigation-entry-utils-menu-button icon-screen-off icon-white icon-shadow screensharing-disabled" data-placement="top" data-toggle="tooltip" data-original-title="<?php p($l->t('Share screen')) ?>"></button>
 				<div id="screensharing-menu" class="app-navigation-entry-menu">
 					<ul>
-						<li>
-							<button id="show-screen-button">
+						<li id="share-screen-entry">
+							<button id="share-screen-button">
 								<span class="icon-screen"></span>
 								<span><?php p($l->t('Share your screen'));?></span>
 							</button>
 						</li>
-						<li id="show-window-entry">
-							<button id="show-window-button">
+						<li id="share-window-entry">
+							<button id="share-window-button">
 								<span class="icon-share-window"></span>
 								<span><?php p($l->t('Share a single window'));?></span>
 							</button>
 						</li>
+						<li id="show-screen-entry">
+							<button id="show-screen-button">
+								<span class="icon-screen"></span>
+								<span><?php p($l->t('Show your screen'));?></span>
+							</button>
+						</li>
 						<li id="stop-screen-entry">
 							<button id="stop-screen-button">
 								<span class="icon-screen-off"></span>