Merge pull request #291 from Astagor/browse_passive_users

Browse passive participants

app/src/RoomClient.js

@@ -302,6 +302,16 @@ export default class RoomClient
 
 				switch (key)
 				{
+					case String.fromCharCode(37):
+					{
+						this._spotlights.setPrevAsSelected();
+						break;
+					}
+					case String.fromCharCode(39):
+					{
+						this._spotlights.setNextAsSelected();
+						break;
+					}
 					case 'A': // Activate advanced mode
 					{
 						store.dispatch(settingsActions.toggleAdvancedMode());

app/src/Spotlights.js

@@ -12,6 +12,7 @@ export default class Spotlights extends EventEmitter
 		this._signalingSocket = signalingSocket;
 		this._maxSpotlights = maxSpotlights;
 		this._peerList = [];
+		this._unmutablePeerList = [];
 		this._selectedSpotlights = [];
 		this._currentSpotlights = [];
 		this._started = false;
@@ -45,6 +46,66 @@ export default class Spotlights extends EventEmitter
 		}
 	}
 
+	setNextAsSelected()
+	{
+		let peerId = null;
+		if (this._selectedSpotlights.length > 0) {
+			peerId = this._selectedSpotlights[0];
+		} else if (this._unmutablePeerList.length > 0) {
+			peerId = this._unmutablePeerList[0];
+		}
+
+		if (peerId != null && this._currentSpotlights.length < this._unmutablePeerList.length) {
+			let oldIndex = this._unmutablePeerList.indexOf(peerId);
+			let index = oldIndex;
+			index++;
+			do {
+				if (index >= this._unmutablePeerList.length) {
+					index = 0;
+				}
+				let newSelectedPeer = this._unmutablePeerList[index];
+				if (!this._currentSpotlights.includes(newSelectedPeer)) {
+					this.setPeerSpotlight(newSelectedPeer);
+					break;
+				}
+				index++;
+				if (index === oldIndex) {
+					break;
+				}
+			} while (true);
+		}
+	}
+
+	setPrevAsSelected()
+	{
+		let peerId = null;
+		if (this._selectedSpotlights.length > 0) {
+			peerId = this._selectedSpotlights[0];
+		} else if (this._unmutablePeerList.length > 0) {
+			peerId = this._unmutablePeerList[0];
+		}
+
+		if (peerId != null && this._currentSpotlights.length < this._unmutablePeerList.length) {
+			let oldIndex = this._unmutablePeerList.indexOf(peerId);
+			let index = oldIndex;
+			index--;
+			do {
+				if (index < 0) {
+					index = this._unmutablePeerList.length - 1;
+				}
+				let newSelectedPeer = this._unmutablePeerList[index];
+				if (!this._currentSpotlights.includes(newSelectedPeer)) {
+					this.setPeerSpotlight(newSelectedPeer);
+					break;
+				}
+				index--;
+				if (index === oldIndex) {
+					break;
+				}
+			} while (true);
+		}
+	}
+
 	setPeerSpotlight(peerId)
 	{
 		logger.debug('setPeerSpotlight() [peerId:"%s"]', peerId);
@@ -114,6 +175,7 @@ export default class Spotlights extends EventEmitter
 			logger.debug('_handlePeer() | adding peer [peerId: "%s"]', id);
 
 			this._peerList.push(id);
+			this._unmutablePeerList.push(id);
 
 			if (this._started)
 				this._spotlightsUpdated();
@@ -126,6 +188,7 @@ export default class Spotlights extends EventEmitter
 			'room "peerClosed" event [peerId:%o]', id);
 
 		this._peerList = this._peerList.filter((peer) => peer !== id);
+		this._unmutablePeerList = this._unmutablePeerList.filter((peer) => peer !== id);
 
 		this._selectedSpotlights = this._selectedSpotlights.filter((peer) => peer !== id);
 

app/src/components/Controls/Help.js

@@ -23,7 +23,8 @@ const shortcuts=[
 	{ key: '1', label: 'label.democratic', defaultMessage: 'Democratic View' },
 	{ key: '2', label: 'label.filmstrip', defaultMessage: 'Filmstrip View' },
 	{ key: 'space', label: 'me.mutedPTT', defaultMessage: 'Push SPACE to talk' },
-	{ key: 'a', label: 'label.advanced', defaultMessage: 'Show advanced information' }
+	{ key: 'a', label: 'label.advanced', defaultMessage: 'Show advanced information' },
+	{ key: String.fromCharCode(8592)+' '+String.fromCharCode(8594), label: 'room.browsePeersSpotlight', defaultMessage: 'Browse participants into Spotlight' }
 ];
 const styles = (theme) =>
 	({

app/src/translations/cn.json

@@ -63,6 +63,7 @@
 	"room.help": null,
 	"room.about": null,
 	"room.shortcutKeys": null,
+	"room.browsePeersSpotlight": null,
 	
 	"me.mutedPTT": null,
 

app/src/translations/cs.json

@@ -62,6 +62,7 @@
 	"room.help": null,
 	"room.about": null,
 	"room.shortcutKeys": null,
+	"room.browsePeersSpotlight": null,
 
 	"me.mutedPTT": null,
 

app/src/translations/de.json

@@ -63,6 +63,7 @@
 	"room.help": "Hilfe",
 	"room.about": "Über",
 	"room.shortcutKeys": "Tastaturkürzel",
+	"room.browsePeersSpotlight": null,
 
 	"me.mutedPTT": "Du bist stummgeschaltet. Halte die SPACE-Taste um zu sprechen",
 

app/src/translations/dk.json

@@ -63,6 +63,7 @@
 	"room.help": null,
 	"room.about": null,
 	"room.shortcutKeys": null,
+	"room.browsePeersSpotlight": null,
 
 	"me.mutedPTT": null,
 

app/src/translations/el.json

@@ -63,6 +63,7 @@
 	"room.help": null,
 	"room.about": null,
 	"room.shortcutKeys": null,
+	"room.browsePeersSpotlight": null,
 
 	"me.mutedPTT": null,
 

app/src/translations/en.json

@@ -63,6 +63,7 @@
 	"room.help": "Help",
 	"room.about": "About",
 	"room.shortcutKeys": "Shortcut Keys",
+	"room.browsePeersSpotlight": null,
 
 	"me.mutedPTT": "You are muted, hold down SPACE-BAR to talk",
 

app/src/translations/es.json

@@ -63,6 +63,7 @@
 	"room.help": null,
 	"room.about": null,
 	"room.shortcutKeys": null,
+	"room.browsePeersSpotlight": null,
 
 	"me.mutedPTT": null,
 

app/src/translations/fr.json

@@ -63,6 +63,7 @@
 	"room.help": null,
 	"room.about": null,
 	"room.shortcutKeys": null,
+	"room.browsePeersSpotlight": null,
 
 	"me.mutedPTT": null,
 

app/src/translations/hr.json

@@ -63,6 +63,7 @@
 	"room.help": null,
 	"room.about": null,
 	"room.shortcutKeys": null,
+	"room.browsePeersSpotlight": null,
 
 	"me.mutedPTT": "Utišani ste, pritisnite i držite SPACE tipku za razgovor",
 

app/src/translations/hu.json

@@ -63,6 +63,7 @@
 	"room.help": "Segítség",
 	"room.about": "Névjegy",
 	"room.shortcutKeys": "Billentyűparancsok",
+	"room.browsePeersSpotlight": null,
 
 	"me.mutedPTT": "Némítva vagy, ha beszélnél nyomd le a szóköz billentyűt",
 

app/src/translations/it.json

@@ -63,6 +63,7 @@
 	"room.help": "Aiuto",
 	"room.about": "Informazioni su",
 	"room.shortcutKeys": "Scorciatoie da tastiera",
+	"room.browsePeersSpotlight": null,
 
 	"me.mutedPTT": "Sei mutato, tieni premuto SPAZIO per parlare",
 

app/src/translations/lv.json

@@ -62,6 +62,7 @@
 	"room.help": null,
 	"room.about": null,
 	"room.shortcutKeys": null,
+	"room.browsePeersSpotlight": null,
 
 	"me.mutedPTT": "Jūs esat noklusināts. Turiet taustiņu SPACE-BAR, lai runātu",
 

app/src/translations/nb.json

@@ -63,6 +63,7 @@
 	"room.help": null,
 	"room.about": null,
 	"room.shortcutKeys": null,
+	"room.browsePeersSpotlight": null,
 
 	"me.mutedPTT": "Du er dempet, hold nede SPACE for å snakke",
 

app/src/translations/pl.json

@@ -63,6 +63,7 @@
 	"room.help": "Pomoc",
 	"room.about": "O pogramie",
 	"room.shortcutKeys": "Skróty klawiaturowe",
+	"room.browsePeersSpotlight": null,
 
 	"me.mutedPTT": "Masz wyciszony mikrofon, przytrzymaj spację aby mówić",
 

app/src/translations/pt.json

@@ -63,6 +63,7 @@
 	"room.help": null,
 	"room.about": null,
 	"room.shortcutKeys": null,
+	"room.browsePeersSpotlight": null,
 
 	"me.mutedPTT": null,
 

app/src/translations/ro.json

@@ -63,6 +63,7 @@
 	"room.help": null,
 	"room.about": null,
 	"room.shortcutKeys": null,
+	"room.browsePeersSpotlight": null,
 
 	"me.mutedPTT": null,
 

app/src/translations/tr.json

@@ -63,6 +63,7 @@
 	"room.help": null,
 	"room.about": null,
 	"room.shortcutKeys": null,
+	"room.browsePeersSpotlight": null,
 
 	"me.mutedPTT": null,
 

app/src/translations/uk.json

@@ -63,6 +63,7 @@
 	"room.help": null,
 	"room.about": null,
 	"room.shortcutKeys": null,
+	"room.browsePeersSpotlight": null,
 
 	"me.mutedPTT": null,