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

Focus text area by clicking anywhere in the chat area

Browse Source
This commit is contained in:
Guangcong Luo
2013-04-30 13:03:02 -07:00
parent 0dce61aa38
commit 0c7c2db875
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
js/client-chat.js
View File

@@ -7,7 +7,8 @@
events: {
'keypress textarea': 'keyPress',
'submit form': 'submit',
'click .username': 'clickUsername'
'click .username': 'clickUsername',
'click': 'clickBackground'
},
initialize: function() {
var buf = '<ul class="userlist" style="display:none"></ul><div class="chat-log"><div class="inner"></div></div></div><div class="chat-log-add">Connecting...</div>';
@@ -74,9 +75,19 @@
},
clickUsername: function(e) {
e.stopPropagation();
e.preventDefault();
var name = $(e.currentTarget).data('name');
app.addPopup('user', UserPopup, {name: name, sourceEl: e.currentTarget});
},
clickBackground: function(e) {
if (!e.shiftKey && !e.cmdKey && !e.ctrlKey) {
if (window.getSelection && !window.getSelection().isCollapsed) {
return;
}
app.dismissPopups();
this.$chatbox.focus();
}
},
updateUser: function() {
var name = app.user.get('name');
var userid = app.user.get('userid');

16
js/client-mainmenu.js
View File

@@ -7,7 +7,8 @@
'click .button': 'clickButton',
'keydown textarea': 'keyPress',
'click .username': 'clickUsername',
'click .closebutton': 'closePM'
'click .closebutton': 'closePM',
'click .pm-window': 'clickPMBackground'
},
initialize: function() {
// left menu
@@ -54,7 +55,7 @@
var $pmWindow = this.$pmBox.find('.pm-window-'+userid);
if (!$pmWindow.length) {
var buf = '<div class="pm-window pm-window-'+userid+'" data-userid="'+userid+'"><h3><button class="closebutton" href="'+app.root+'teambuilder"><i class="icon-remove-sign"></i></button>'+Tools.escapeHTML(name)+'</h3><div class="pm-log"><div class="inner"></div></div>';
buf += '<div class="pm-log-add"><form class="chatbox nolabel"><textarea class="textbox" type="text" size="70" autocomplete="off"></textarea></form></div></div>';
buf += '<div class="pm-log-add"><form class="chatbox nolabel"><textarea class="textbox" type="text" size="70" autocomplete="off" name="message"></textarea></form></div></div>';
$pmWindow = $(buf).prependTo(this.$pmBox);
$pmWindow.find('textarea').autoResize({
animateDuration: 100,
@@ -77,7 +78,7 @@
this.$pmBox.find('.pm-window-'+userid).hide();
},
focusPM: function(name) {
this.openPM(name).find('textarea').focus();
this.openPM(name).find('textarea[name=message]').focus();
},
keyPress: function(e) {
if (e.keyCode === 13 && !e.shiftKey) { // Enter
@@ -102,6 +103,15 @@
var name = $(e.currentTarget).data('name');
app.addPopup('user', UserPopup, {name: name, sourceEl: e.currentTarget});
},
clickPMBackground: function(e) {
if (!e.shiftKey && !e.cmdKey && !e.ctrlKey) {
if (window.getSelection && !window.getSelection().isCollapsed) {
return;
}
app.dismissPopups();
$(e.currentTarget).find('textarea[name=message]').focus();
}
},
updateSearch: function() {
if (window.BattleFormats) {
this.$('.mainmenu button.big').html('<strong>Look for a battle</strong>').removeClass('disabled');