Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-10-02 15:53:11 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Support passing room title to addRoom

Browse Source
This commit is contained in:
Guangcong Luo
2015-06-11 18:15:31 -04:00
parent d1db78718e
commit 0eee136c35
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
js/client.js
View File

@@ -1162,12 +1162,12 @@
tryJoinRoom: function(id) {
this.joinRoom(id);
},
addRoom: function(id, type, nojoin) {
this._addRoom(id, type, nojoin);
addRoom: function(id, type, nojoin, title) {
this._addRoom(id, type, nojoin, title);
this.updateSideRoom();
this.updateLayout();
},
_addRoom: function(id, type, nojoin) {
_addRoom: function(id, type, nojoin, title) {
var oldRoom;
if (this.rooms[id]) {
if (type && this.rooms[id].type !== type) {
@@ -1224,7 +1224,8 @@
var room = this.rooms[id] = new type({
id: id,
el: el,
nojoin: nojoin
nojoin: nojoin,
title: title
});
if (oldRoom) {
if (this.curRoom === oldRoom) this.curRoom = room;
@@ -1665,6 +1666,7 @@
Backbone.View.apply(this, arguments);
if (!(options && options.nojoin)) this.join();
if (options && options.title) this.title = options.title;
},
dispatchClickButton: function(e) {
var target = e.currentTarget;