oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-09-15 17:46:55 +00:00
Code Wiki Activity

3.5.196. Write dark theme for new-style search dialog. Fix the height limit for SRL race info popups.

Browse source
This commit is contained in:
SirStendec 2016-06-03 14:15:17 -04:00
parent ee21ab28c3
commit 04a8f5dae7
4 changed files with 47 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main.js
View file

@ -37,7 +37,7 @@ FFZ.msg_commands = {};
// Version
var VER = FFZ.version_info = {
major: 3, minor: 5, revision: 194,
major: 3, minor: 5, revision: 196,
toString: function() {
return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || "");
}

12
src/ui/races.js
View file

@ -210,7 +210,7 @@ FFZ.prototype._build_race_popup = function(container, channel_id) {
}
}
var height = document.querySelector('.app-main.theatre') ? document.body.clientHeight - 300 : container.parentElement.offsetTop - 175,
var height = document.querySelector('.app-main.theatre') ? document.body.clientHeight - 300 : container.parentElement.parentElement.offsetTop - 175,
controller = utils.ember_lookup('controller:channel'),
display_name = controller && controller.get('content.id') === channel_id ? controller.get('content.display_name') : FFZ.get_capitalization(channel_id),
tweet = encodeURIComponent("I'm watching " + display_name + " race " + race.goal + " in " + race.game + " on SpeedRunsLive!");
@ -268,6 +268,11 @@ FFZ.prototype._update_race = function(container, not_timer) {
timer = popup.querySelector('.heading > span'),
info = popup.querySelector('.heading div');
// Make sure we don't leave any tooltips lying around when we update.
// Of course, we should just rewrite logic to not constantly mutilate
// rows.
jQuery('.tooltip', tbody).trigger('mouseout');
tbody.innerHTML = '';
var entrants = [], done = true;
for(var ent in race.entrants) {
@ -327,8 +332,9 @@ FFZ.prototype._update_race = function(container, not_timer) {
}
}
if ( race.time ) {
timer.title = 'Started at: <nobr>' + utils.sanitize(utils.parse_date(1000 * race.time).toLocaleString()) + '</nobr>';
if ( race.time != timer.getAttribute('data-time') ) {
timer.setAttribute('data-time', race.time);
timer.setAttribute('original-title', race.time ? 'Started at: <nobr>' + utils.sanitize(utils.parse_date(1000 * race.time).toLocaleString()) + '</nobr>' : '');
}
if ( ! elapsed )