Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-05-05 21:16:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Better battle tooltips

Browse Source 
Battle tooltips now appear on touch for mobile, and disappear when
anything else is tapped.
This commit is contained in:
Guangcong Luo 2015-07-15 00:30:22 -04:00
parent cce2fa5019
commit 83d3d64be7
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/client-battle.js
View File

@ -77,6 +77,7 @@
this.add(data);
},
focus: function () {
this.hideTooltip();
if (this.battle.playbackState === 3) this.battle.play();
ConsoleRoom.prototype.focus.call(this);
},
@ -931,7 +932,7 @@
// tooltips
tooltipAttrs: function (thing, type, ownHeight, isActive) {
return ' onmouseover="room.showTooltip(\'' + Tools.escapeHTML('' + thing, true) + '\',\'' + type + '\', this, ' + (ownHeight ? 'true' : 'false') + ', ' + (isActive ? 'true' : 'false') + ')" onmouseout="room.hideTooltip()" onmouseup="room.hideTooltip()"';
return ' onmouseover="room.showTooltip(\'' + Tools.escapeHTML('' + thing, true) + '\',\'' + type + '\', this, ' + (ownHeight ? 'true' : 'false') + ', ' + (isActive ? 'true' : 'false') + ')" ontouchstart="room.showTooltip(\'' + Tools.escapeHTML('' + thing, true) + '\',\'' + type + '\', this, ' + (ownHeight ? 'true' : 'false') + ', ' + (isActive ? 'true' : 'false') + ')" onmouseout="room.hideTooltip()" onmouseup="room.hideTooltip()"';
},
showTooltip: function (thing, type, elem, ownHeight, isActive) {
var offset = {
@ -949,7 +950,7 @@
if (x > 335) x = 335;
if (y < 140) y = 140;
if (x > $(window).width() - 303) x = Math.max($(window).width() - 303, 0);
if (!$('#tooltipwrapper').length) $(document.body).append('<div id="tooltipwrapper"></div>');
if (!$('#tooltipwrapper').length) $(document.body).append('<div id="tooltipwrapper" onclick="$(\'#tooltipwrapper\').html(\'\');"></div>');
$('#tooltipwrapper').css({
left: x,
top: y