From ef86f763e5e1a0bdef960c890f7e2984b63e506d Mon Sep 17 00:00:00 2001
From: asgdf <asgdf@users.noreply.github.com>
Date: Mon, 24 Apr 2017 03:30:16 +0200
Subject: [PATCH] Add option to open new battle rooms on the right (#900)

---
 js/client-battle.js | 10 +++++++++-
 js/client.js        |  9 +++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/js/client-battle.js b/js/client-battle.js
index afb94449f..0c02793b7 100644
--- a/js/client-battle.js
+++ b/js/client-battle.js
@@ -9,6 +9,8 @@
 		initialize: function (data) {
 			this.me = {};
 
+			this.isSideRoom = Tools.prefs('rightpanelbattles');
+
 			this.$el.addClass('ps-room-opaque').html('<div class="battle">Battle is here</div><div class="foehint"></div><div class="battle-log"></div><div class="battle-log-add">Connecting...</div><div class="battle-controls"></div><button class="battle-chat-toggle button" name="showChat"><i class="fa fa-caret-left"></i> Chat</button>');
 
 			this.$battle = this.$el.find('.battle');
@@ -1237,18 +1239,21 @@
 	var BattleOptionsPopup = this.BattleOptionsPopup = Popup.extend({
 		initialize: function (data) {
 			this.battle = data.battle;
+			var rightPanelBattlesPossible = (MainMenuRoom.prototype.bestWidth + BattleRoom.prototype.minWidth < $(window).width());
 			var buf = '<p><strong>In this battle</strong></p>';
 			buf += '<p><label class="optlabel"><input type="checkbox" name="ignorespects"' + (this.battle.ignoreSpects ? ' checked' : '') + '/> Ignore Spectators</label></p>';
 			buf += '<p><label class="optlabel"><input type="checkbox" name="ignoreopp"' + (this.battle.ignoreOpponent ? ' checked' : '') + '/> Ignore Opponent</label></p>';
 			buf += '<p><strong>All battles</strong></p>';
 			buf += '<p><label class="optlabel"><input type="checkbox" name="ignorenicks"' + (Tools.prefs('ignorenicks') ? ' checked' : '') + ' /> Ignore nicknames</label></p>';
+			if (rightPanelBattlesPossible) buf += '<p><label class="optlabel"><input type="checkbox" name="rightpanelbattles"' + (Tools.prefs('rightpanelbattles') ? ' checked' : '') + ' /> Open new battles on the right side</label></p>';
 			buf += '<p><button name="close">Close</button></p>';
 			this.$el.html(buf);
 		},
 		events: {
 			'change input[name=ignorespects]': 'toggleIgnoreSpects',
 			'change input[name=ignorenicks]': 'toggleIgnoreNicks',
-			'change input[name=ignoreopp]': 'toggleIgnoreOpponent'
+			'change input[name=ignoreopp]': 'toggleIgnoreOpponent',
+			'change input[name=rightpanelbattles]': 'toggleRightPanelBattles'
 		},
 		toggleIgnoreSpects: function (e) {
 			this.battle.ignoreSpects = !!e.currentTarget.checked;
@@ -1297,6 +1302,9 @@
 				side.updateStatbar(side.active[i], true, true);
 			}
 			side.updateSidebar();
+		},
+		toggleRightPanelBattles: function (e) {
+			Tools.prefs('rightpanelbattles', !!e.currentTarget.checked);
 		}
 	});
 
diff --git a/js/client.js b/js/client.js
index 60dbbd3a1..df0b00646 100644
--- a/js/client.js
+++ b/js/client.js
@@ -1325,8 +1325,13 @@
 				if (this.curSideRoom === oldRoom) this.curSideRoom = room;
 				if (this.sideRoom === oldRoom) this.sideRoom = room;
 			}
-			if (type === BattleRoom) this.roomList.push(room);
-			if (type === ChatRoom || type === BattlesRoom) this.sideRoomList.push(room);
+			if (['', 'teambuilder', 'ladder', 'rooms'].indexOf(room.id) < 0) {
+				if (room.isSideRoom) {
+					this.sideRoomList.push(room);
+				} else {
+					this.roomList.push(room);
+				}
+			}
 			return room;
 		},
 		focusRoom: function (id) {