From 86546ba7d8bd6f4a1b59b68cf1e7edcff94eb572 Mon Sep 17 00:00:00 2001 From: SirStendec Date: Sun, 17 Jul 2016 14:04:19 -0400 Subject: [PATCH] 3.5.252. Emoji changes. Fix the Following tooltip and count. Tweaks to the custom getPlayerInfo method to improve its output's accuracy. --- changelog.html | 20 +++++++++++--- src/ember/chat-input.js | 55 +++++++++++++++++++++++++++++++++++++++ src/ember/player.js | 23 ++++++++++++---- src/ext/betterttv.js | 19 +++++++------- src/main.js | 2 +- src/settings.js | 13 +++++++-- src/ui/about_page.js | 3 ++- src/ui/following-count.js | 14 +++++----- 8 files changed, 120 insertions(+), 29 deletions(-) diff --git a/changelog.html b/changelog.html index 9417f348..137c4ef0 100644 --- a/changelog.html +++ b/changelog.html @@ -1,3 +1,17 @@ +
3.5.252
+ + +
3.5.251
+ +
3.5.250
+
View Older
+
+
3.5.241
- -
-
3.5.183
  • Added: You can now specify a ban reason easilly when banning someone from a moderation card! The list is customizable in Chat Moderation settings.
    • diff --git a/src/ember/chat-input.js b/src/ember/chat-input.js index c17072a2..ec44600e 100644 --- a/src/ember/chat-input.js +++ b/src/ember/chat-input.js @@ -246,6 +246,7 @@ FFZ.prototype.modify_chat_input = function(component) { t.off("keyup"); t.on("keypress", this._ffzKeyPress.bind(this)); t.on("keydown", this._ffzKeyDown.bind(this)); + t.on("paste", this._ffzPaste.bind(this)); t.attr('rows', 1); @@ -272,11 +273,65 @@ FFZ.prototype.modify_chat_input = function(component) { t.off("keyup"); t.off("keydown"); t.off("keypress"); + t.off("paste"); t.on("keyup", this._onKeyUp.bind(this)); t.on("keydown", this._onKeyDown.bind(this)); }, + // Pasting~! + _ffzPaste: function(event) { + var data = (event.clipboardData || (event.originalEvent && event.originalEvent.clipboardData) || window.clipboardData), + text = data && data.getData('text/plain'); + + // If we don't have a colon, there can't be any emoji. + // Likewise, if the user doesn't want input emoji, don't convert them. + if ( ! f.settings.input_emoji || text.indexOf(':') === -1 ) + return; + + // Alright, check for emoji now. + var output = [], + input = text.split(':'), + last_was_emoji = false; + + output.push(input.shift()); + for(var i=0, l = input.length - 1; i < l; i++) { + var segment = input[i], + emoji = ! last_was_emoji ? f.emoji_data[f.emoji_names[segment]] : null; + + if ( emoji ) { + output.push(emoji.raw); + last_was_emoji = true; + } else { + output.push((last_was_emoji ? '' : ':') + segment); + last_was_emoji = false; + } + } + + output = output.join("") + (last_was_emoji ? '' : ':') + input[input.length-1]; + + // Let the browser's paste be do as it do if there weren't any emoji. + if ( output.length === text.length ) + return f.log("No emoji in paste"); + + // Can we get the selection in our input box? + var input = this.get('chatTextArea'), + s_val = input && input.value, + s_start = input && input.selectionStart, + s_end = input && input.selectionEnd; + + if ( ! input || typeof s_start !== "number" || typeof s_end !== "number" ) + return f.log("Can't get input"); + + // Still here? We're clear to inject this ourselves then. + event.stopPropagation(); + event.preventDefault(); + + input.value = s_val.substr(0, s_start) + output + s_val.substr(s_end); + move_selection(input, s_start + output.length); + }, + + // Suggestions ffzBuildSuggestionItem: function(i, item) { diff --git a/src/ember/player.js b/src/ember/player.js index 4facb288..fd588b0b 100644 --- a/src/ember/player.js +++ b/src/ember/player.js @@ -163,7 +163,7 @@ FFZ.prototype.modify_twitch_player = function(player) { var stats_el = stats[0], toggle_btn = this.$('.js-stats-toggle'), - setup_player = function() { + setup_player = function(tries) { // If this player is destroyed, stop trying. if ( ! document.contains(stats_el) ) return; @@ -178,7 +178,11 @@ FFZ.prototype.modify_twitch_player = function(player) { if ( ! res || ! res.length ) { // Not available yet. Keep going. toggle_btn.click(); - setTimeout(setup_player, 100); + tries = (tries || 0) + 1; + if ( tries < 50 ) + setTimeout(setup_player.bind(this, tries), 100); + else + stats_el.classList.remove('hidden'); return; } @@ -214,7 +218,7 @@ FFZ.prototype.modify_twitch_player = function(player) { match = el && / *([\d,]+) *x *([\d,]+)/i.exec(el.textContent); if ( match ) { output.stageWidth = output.vid_display_width = parseInt(match[1]); - output.stageHeight = output.vid_height = parseInt(match[2]); + output.stageHeight = output.vid_display_height = parseInt(match[2]); } // FPS @@ -245,12 +249,21 @@ FFZ.prototype.modify_twitch_player = function(player) { var val = parseFloat(el.textContent), val2 = parseFloat(el2.textContent); - if ( ! isNaN(val) && isFinite(val) && ! isNaN(val2) && isFinite(val2) ) { - if ( val < 1000 && val2 < 1000) { + if ( val === -1 || val2 === -1 ) { + // ... nothing :D + } else if ( ! isNaN(val) && isFinite(val) && ! isNaN(val2) && isFinite(val2) ) { + if ( Math.abs(val) < 1000 && Math.abs(val2) < 1000) { val *= 1000; val2 *= 1000; } + // Only make this change for known bad versions. + var version = player.getVersion(); + if ( version === "0.5.4" ) { + val -= (f._ws_server_offset || 0); + val2 -= (f._ws_server_offset || 0); + } + if ( val > val2 ) { output.hls_latency_broadcaster = val; output.hls_latency_encoder = val2; diff --git a/src/ext/betterttv.js b/src/ext/betterttv.js index 5deb2d56..919e0f88 100644 --- a/src/ext/betterttv.js +++ b/src/ext/betterttv.js @@ -91,10 +91,6 @@ FFZ.prototype.setup_bttv = function(delay) { this.toggle_style('chat-separator-3d-inset'); this.toggle_style('chat-separator-wide'); - /*this.toggle_style('chat-hc-text'); - this.toggle_style('chat-hc-bold'); - this.toggle_style('chat-hc-background');*/ - this.toggle_style('chat-colors-gray'); this.toggle_style('badges-rounded'); this.toggle_style('badges-circular'); @@ -244,9 +240,6 @@ FFZ.prototype.setup_bttv = function(delay) { segments = token.split(constants.EMOJI_REGEX), text = null; - if ( setting === 0 ) - return [token]; - while(segments.length) { text = (text || '') + segments.shift(); if ( segments.length ) { @@ -258,8 +251,16 @@ FFZ.prototype.setup_bttv = function(delay) { if ( src ) { if ( text && text.length ) output.push(text); - var code = utils.quote_attr(data.raw); - output.push(['' + code + '']); + + // We still want to use a special token even if emoji display is disabled + // as, otherwise, BTTV will render the emoji itself, which the user has no + // way of disabling if not for this. + if ( setting === 0 ) + output.push([data.raw]); + else { + var code = utils.quote_attr(data.raw); + output.push(['' + code + '']); + } text = null; } else text = (text || '') + match; diff --git a/src/main.js b/src/main.js index 258e7b09..bc6562ed 100644 --- a/src/main.js +++ b/src/main.js @@ -37,7 +37,7 @@ FFZ.msg_commands = {}; // Version var VER = FFZ.version_info = { - major: 3, minor: 5, revision: 250, + major: 3, minor: 5, revision: 252, toString: function() { return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || ""); } diff --git a/src/settings.js b/src/settings.js index 7dc3b42c..e63b8fc9 100644 --- a/src/settings.js +++ b/src/settings.js @@ -553,8 +553,17 @@ FFZ.menu_pages.settings = { sort_order: 1, render: function(view, container) { - var favorites = this.settings.favorite_settings; - if ( ! favorites.length ) { + var favorites = this.settings.favorite_settings, + count = 0; + + if ( ! this.has_bttv ) + count = favorites.length; + else + for(var i=0; i < favorites.length; i++) + if ( ! FFZ.settings_info[favorites[i]].no_bttv ) + count++; + + if ( ! count ) { var el = utils.createElement('div'); el.className = 'emoticon-grid ffz-no-emotes center'; el.innerHTML = "You have no favorite settings.
    " + diff --git a/src/ui/about_page.js b/src/ui/about_page.js index cbbdec0d..a2f98fdb 100644 --- a/src/ui/about_page.js +++ b/src/ui/about_page.js @@ -133,7 +133,8 @@ var update_player_stats = function(player, container) { try { player_data.backend = player.getBackend(); - } catch(err) { player_data.backend = undefined } + player_data.version = player.getVersion(); + } catch(err) { } var sorted_keys = Object.keys(player_data).sort(); for(var i=0; i < sorted_keys.length; i++) { diff --git a/src/ui/following-count.js b/src/ui/following-count.js index 2babe38d..5e904ca1 100644 --- a/src/ui/following-count.js +++ b/src/ui/following-count.js @@ -41,7 +41,7 @@ FFZ.settings_info.following_count = { on_update: function(val) { this._schedule_following_count(); - var Stream = utils.ember_resolve('model:stream'), + var Stream = utils.ember_resolve('model:deprecated-stream'), Live = Stream && Stream.find("live"); if ( Live ) { @@ -155,7 +155,7 @@ FFZ.prototype._update_following_count = function() { this._following_count_timer = setTimeout(this._update_following_count.bind(this), 55000 + (10000*Math.random())); - var Stream = utils.ember_resolve('model:stream'), + var Stream = utils.ember_resolve('model:deprecated-stream'), Live = Stream && Stream.find("live"), Host = utils.ember_resolve('model:host'), @@ -205,7 +205,7 @@ FFZ.prototype._build_following_tooltip = function(el) { if ( streams && streams.length ) { for(var i=0, l = streams.length; i < l; i++) { var stream = streams[i]; - if ( ! stream || ! stream.channel ) + if ( ! stream || ! stream.channel || (stream.game && this.settings.banned_games.indexOf(stream.game.toLowerCase()) !== -1) ) continue; c += 1; @@ -216,13 +216,11 @@ FFZ.prototype._build_following_tooltip = function(el) { var up_since = this.settings.stream_uptime && stream.created_at && utils.parse_date(stream.created_at), now = Date.now() - (this._ws_server_offset || 0), - uptime = up_since && Math.floor((now - up_since.getTime()) / 1000) || 0, - minutes = Math.floor(uptime / 60) % 60, - hours = Math.floor(uptime / 3600), + uptime = up_since && (Math.floor((now - up_since.getTime()) / 60000) * 60) || 0, tags = stream.channel.game === 'Creative' && this.tokenize_ctags(stream.channel.status, true); - tooltip += (i === 0 ? '
    ' : '') + - (uptime > 0 ? '' + constants.CLOCK + ' ' + (hours > 0 ? hours + 'h' : '') + minutes + 'm' : '') + + tooltip += (c === 1 ? '
    ' : '') + + (uptime > 0 ? '' + constants.CLOCK + ' ' + utils.duration_string(uptime) + '' : '') + '' + constants.LIVE + ' ' + utils.number_commas(stream.viewers) + '' + '' + utils.sanitize(stream.channel.display_name || stream.channel.name) + '
    ' + '' + (stream.channel.game === 'Creative' ? 'Being Creative' : (stream.channel.game ? 'Playing ' + utils.sanitize(stream.channel.game) : 'Not Playing')) + (tags ? ' | ' + _.pluck(tags, "text").join(" ") : '') + '';