Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-06-02 22:09:20 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Support in-battle chat in low res

Browse Source
This commit is contained in:
Guangcong Luo 2015-07-17 14:41:30 -04:00
parent 852dacc663
commit faf9ec33ce
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/client-battle.js
View File

@ -8,7 +8,7 @@
initialize: function (data) { initialize: function (data) {
this.me = {}; this.me = {};
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>'); 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">Chat</button>');
this.$battle = this.$el.find('.battle'); this.$battle = this.$el.find('.battle');
this.$controls = this.$el.find('.battle-controls'); this.$controls = this.$el.find('.battle-controls');
@ -39,6 +39,14 @@
join: function () { join: function () {
app.send('/join ' + this.id); app.send('/join ' + this.id);
}, },
showChat: function() {
this.$('.battle-chat-toggle').attr('name', 'hideChat').text('Battle');
this.$el.addClass('showing-chat');
},
hideChat: function() {
this.$('.battle-chat-toggle').attr('name', 'showChat').text('Chat');
this.$el.removeClass('showing-chat');
},
leave: function () { leave: function () {
if (!this.expired) app.send('/leave ' + this.id); if (!this.expired) app.send('/leave ' + this.id);
if (this.battle) this.battle.destroy(); if (this.battle) this.battle.destroy();

22
style/client.css
View File

@ -1469,6 +1469,9 @@ div[class^='tournament-message-'], div[class*=' tournament-message-'] {
width: 640px; width: 640px;
background: #EEF2F5; background: #EEF2F5;
} }
.battle-chat-toggle {
display: none;
}
@media (max-width:639px) { @media (max-width:639px) {
.ps-room .battle-controls { .ps-room .battle-controls {
left: 0; left: 0;
@ -1511,6 +1514,25 @@ div[class^='tournament-message-'], div[class*=' tournament-message-'] {
display: none; display: none;
} }
} }
@media (max-width:830px) {
.battle-chat-toggle {
display: block;
position: absolute;
top: 5px;
left: 6px;
font-size: 14px;
padding: 2px 5px;
}
.showing-chat .battle,
.showing-chat .battle-controls {
display: none;
}
.showing-chat .battle-log,
.showing-chat .battle-log-add {
left: 0;
display: block;
}
}
.shiftselect button, .shiftselect button,
.moveselect button, .moveselect button,
.switchselect button { .switchselect button {