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

Don't focus already-open PM windows on message

Browse Source
This commit is contained in:
Guangcong Luo
2013-05-02 23:40:21 -07:00
parent 7631c73558
commit c5626f44da
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
js/client-mainmenu.js
View File

@@ -42,7 +42,7 @@
oName = target;
}
var $pmWindow = this.openPM(oName);
var $pmWindow = this.openPM(oName, true);
var $chatFrame = $pmWindow.find('.pm-log');
var $chat = $pmWindow.find('.inner');
@@ -60,7 +60,7 @@
$chatFrame.scrollTop($chat.height());
}
},
openPM: function(name) {
openPM: function(name, dontFocus) {
var userid = toId(name);
var $pmWindow = this.$pmBox.find('.pm-window-'+userid);
if (!$pmWindow.length) {
@@ -79,11 +79,13 @@
});
} else {
$pmWindow.show();
var $chatFrame = $pmWindow.find('.pm-log');
var $chat = $pmWindow.find('.inner');
$chatFrame.scrollTop($chat.height());
if (!dontFocus) {
var $chatFrame = $pmWindow.find('.pm-log');
var $chat = $pmWindow.find('.inner');
$chatFrame.scrollTop($chat.height());
}
}
this.$el.scrollTop(0);
if (!dontFocus) this.$el.scrollTop(0);
return $pmWindow;
},
closePM: function(e) {