\ No newline at end of file
diff --git a/old_changes.html b/old_changes.html
index 76ed6398..96678639 100644
--- a/old_changes.html
+++ b/old_changes.html
@@ -1,3 +1,16 @@
+
3.5.378
+
+
Fixed: Chat breaking when trying to access data for a badge that ended up not loading.
+
Fixed: Host mode would no longer trigger with FFZ enabled due to the removal of an experiment flag.
+
API Changed: Add name_key parameter to API constructor.
+
+
+
3.5.377
+
+
Fixed: Group bits emoticons in chat based on their prefix rather than as one single lump.
+
Fixed: Properly generate CSS for bits emoticons with every possible prefix.
+
+
3.5.376
Fixed: Cheers aren't working yet, but they also don't break chat completely.
diff --git a/src/ember/channel.js b/src/ember/channel.js
index 6b8ba041..3f95b72b 100644
--- a/src/ember/channel.js
+++ b/src/ember/channel.js
@@ -165,10 +165,10 @@ FFZ.prototype.modify_channel_live = function(view) {
if ( f.settings.auto_theater ) {
var layout = this.get('layout'),
- player = f.players && f.players[channel_id] && f.players[channel_id].get('player'),
- func = function() {
- if ( typeof player.isLoading === 'function' && player.isLoading() )
- return setTimeout(func, 500);
+ func = function(tries) {
+ var player = f._player && f._player.get('player');
+ if ( ! player || typeof player.isLoading === 'function' && player.isLoading() )
+ return (tries||0) < 20 ? setTimeout(func.bind(this, (tries||0) + 1), 500) : null;
// In case this happens before the event bindings are in, we just set
// the layout into theater mode manually.
@@ -176,8 +176,7 @@ FFZ.prototype.modify_channel_live = function(view) {
layout.setTheatreMode(true);
}
- if ( player )
- func();
+ func();
}
this.$().on("click", ".ffz-creative-tag-link", utils.transition_link(function(e) {
diff --git a/src/ember/chatview.js b/src/ember/chatview.js
index 0c7e68d9..febb18a4 100644
--- a/src/ember/chatview.js
+++ b/src/ember/chatview.js
@@ -350,6 +350,13 @@ FFZ.prototype.setup_chatview = function() {
if ( Chat ) {
Chat.set('ffz_last_channel_room', Chat.get('currentChannelRoom.id'));
Chat.reopen({
+ openPopout: function() {
+ var room_id = this.get('currentRoom.id'),
+ width = f.settings.right_column_width;
+
+ return window.open("/" + room_id + "/chat?popout=", "_blank", "right=50,top=50,width=" + width + ",height=600,resizable=yes,scrollbars=no,toolbar=no,location=no,directories=no,status=no,menubar=no,copyhistory=no");
+ },
+
ffzUpdateChannels: function() {
if ( ! f._chatv || f.has_bttv )
return;
diff --git a/src/ember/directory.js b/src/ember/directory.js
index 60bb56ee..093f1f2d 100644
--- a/src/ember/directory.js
+++ b/src/ember/directory.js
@@ -164,17 +164,40 @@ FFZ.settings_info.directory_host_menus = {
help: "Display a menu to select which channel to visit when clicking a hosted channel in the directory.",
on_update: function() {
- var f = this,
- HostModel = utils.ember_resolve('model:host'),
- Following = HostModel && HostModel.collections[HostModel.collectionId("following")];
+ var f = this,
+ HostModel = utils.ember_resolve('model:host'),
+ Following = HostModel && HostModel.collections[HostModel.collectionId("following")];
- if ( ! Following )
- return;
+ if ( ! Following )
+ return;
- Following.clear();
- Following.load();
- }
- };
+ Following.clear();
+ Following.load();
+ }
+};
+
+
+FFZ.settings_info.directory_uploads_position = {
+ type: "select",
+ options: {
+ 0: "Default",
+ 1: "At Bottom",
+ 2: "Hidden"
+ },
+
+ value: 0,
+ process_value: utils.process_int(0),
+
+ category: "Directory",
+ no_mobile: true,
+
+ name: "Display Latest Uploads",
+ help: "Choose where to display the Latest Uploads section.",
+
+ on_update: function(val) {
+ utils.toggle_cls('ffz-hide-directory-uploads')(val === 2);
+ }
+};
// --------------------
@@ -184,8 +207,9 @@ FFZ.settings_info.directory_host_menus = {
FFZ._image_cache = {};
FFZ.prototype.setup_directory = function() {
- document.body.classList.toggle('ffz-creative-tags', this.settings.directory_creative_all_tags);
- document.body.classList.toggle('ffz-creative-showcase', this.settings.directory_creative_showcase);
+ utils.toggle_cls('ffz-creative-tags')(this.settings.directory_creative_all_tags);
+ utils.toggle_cls('ffz-creative-showcase')(this.settings.directory_creative_showcase);
+ utils.toggle_cls('ffz-hide-directory-uploads')(this.settings.directory_uploads_position === 2);
var f = this,
VodCoviews = utils.ember_lookup('service:vod-coviews');
@@ -222,6 +246,7 @@ FFZ.prototype.setup_directory = function() {
this.update_views('component:twitch-carousel/stream-item', function(x) { this.modify_directory_live(x, false, true) }, true);
this.update_views('component:host-preview', this.modify_directory_host, true, true);
this.update_views('component:video-preview', this.modify_video_preview, true);
+ this.update_views("component:video/following-uploads", this.modify_following_uploads);
this.update_views('component:game-follow-button', this.modify_game_follow_button);
@@ -230,6 +255,23 @@ FFZ.prototype.setup_directory = function() {
}
+FFZ.prototype.modify_following_uploads = function(component) {
+ var f = this;
+ utils.ember_reopen_view(component, {
+ ffz_init: function() {
+ var el = this.get('element');
+ el.classList.add('ffz-following-uploads');
+
+ if ( f.settings.directory_uploads_position === 1 ) {
+ var p = el.parentElement;
+ p.removeChild(el);
+ p.appendChild(el);
+ }
+ }
+ });
+}
+
+
FFZ.prototype._modify_following = function() {
var HostModel = utils.ember_resolve('model:host'),
f = this;
diff --git a/src/ember/layout.js b/src/ember/layout.js
index 704cacb9..1ed0ce9a 100644
--- a/src/ember/layout.js
+++ b/src/ember/layout.js
@@ -253,11 +253,11 @@ FFZ.prototype.setup_layout = function() {
i = Math.round(9 * r / 16) + c,
d = h - extra_height,
- c = h - extra_theater_height,
+ e = h - extra_theater_height,
l = Math.floor(r),
o = Math.floor(Math.min(i, d)),
- s = Math.floor(Math.min(i, c));
+ s = Math.floor(Math.min(i, e));
return {
width: l,
diff --git a/src/ember/moderation-card.js b/src/ember/moderation-card.js
index 89b9cf6a..a48d705a 100644
--- a/src/ember/moderation-card.js
+++ b/src/ember/moderation-card.js
@@ -915,11 +915,10 @@ FFZ.prototype.modify_moderation_card = function(component) {
}
var el = this.get('element'),
- controller = this.get('controller'),
t = this,
line,
- is_mod = controller.get('cardInfo.isModeratorOrHigher'),
+ is_mod = t.get('cardInfo.isModeratorOrHigher'),
ban_reasons,
chat = utils.ember_lookup('controller:chat'),
@@ -929,7 +928,7 @@ FFZ.prototype.modify_moderation_card = function(component) {
ffz_room = f.rooms && f.rooms[room_id] || {},
is_broadcaster = user && room_id === user.login,
- user_id = controller.get('cardInfo.user.id'),
+ user_id = this.get('cardInfo.user.id'),
alias = f.aliases[user_id],
handle_key,
@@ -997,7 +996,7 @@ FFZ.prototype.modify_moderation_card = function(component) {
var name = el.querySelector('.moderation-card__name a');
if ( name ) {
name.classList.add('ffz-alias');
- var results = f.format_display_name(controller.get('cardInfo.user.display_name'), user_id);
+ var results = f.format_display_name(this.get('cardInfo.user.display_name'), user_id);
name.innerHTML = results[0];
name.title = results[1] || '';
@@ -1053,7 +1052,7 @@ FFZ.prototype.modify_moderation_card = function(component) {
},
add_btn_click = function(cmd) {
- var user = controller.get('cardInfo.user'),
+ var user = t.get('cardInfo.user'),
chat_controller = utils.ember_lookup('controller:chat'),
room = chat_controller && chat_controller.get('currentRoom');
@@ -1072,7 +1071,7 @@ FFZ.prototype.modify_moderation_card = function(component) {
html: true,
gravity: utils.tooltip_placement(constants.TOOLTIP_DISTANCE, 'n'),
title: function() {
- var user = controller.get('cardInfo.user'),
+ var user = t.get('cardInfo.user'),
chat_controller = utils.ember_lookup('controller:chat'),
room = chat_controller && chat_controller.get('currentRoom');
@@ -1122,8 +1121,8 @@ FFZ.prototype.modify_moderation_card = function(component) {
var key = e.keyCode || e.which,
is_meta = e.ctrlKey || e.altKey || e.metaKey,
tag = e.target && e.target.tagName,
- user_id = controller.get('cardInfo.user.id'),
- is_mod = controller.get('cardInfo.isModeratorOrHigher'),
+ user_id = t.get('cardInfo.user.id'),
+ is_mod = t.get('cardInfo.isModeratorOrHigher'),
room = utils.ember_lookup('controller:chat').get('currentRoom');
// We don't want modifier keys. Also don't override input to input elements.
@@ -1182,7 +1181,7 @@ FFZ.prototype.modify_moderation_card = function(component) {
el.classList.add('ffz-is-mod');
var btn_click = function(timeout) {
- var user_id = controller.get('cardInfo.user.id'),
+ var user_id = t.get('cardInfo.user.id'),
room = utils.ember_lookup('controller:chat').get('currentRoom');
if ( timeout === -1 )
@@ -1295,7 +1294,7 @@ FFZ.prototype.modify_moderation_card = function(component) {
real_msg.title = "Message User";
real_msg.addEventListener('click', function() {
- window.open('//www.twitch.tv/message/compose?to=' + controller.get('cardInfo.user.id'));
+ window.open('//www.twitch.tv/message/compose?to=' + t.get('cardInfo.user.id'));
})
msg_btn.parentElement.insertBefore(real_msg, msg_btn.nextSibling);
@@ -1308,9 +1307,9 @@ FFZ.prototype.modify_moderation_card = function(component) {
alias_btn.title = "Set Alias";
alias_btn.addEventListener('click', function() {
- var user = controller.get('cardInfo.user.id'),
+ var user = t.get('cardInfo.user.id'),
alias = f.aliases[user],
- results = f.format_display_name(controller.get('cardInfo.user.display_name'), user, true);
+ results = f.format_display_name(t.get('cardInfo.user.display_name'), user, true);
utils.prompt(
"Alias for ' : '>') + results[0] + "",
@@ -1333,7 +1332,7 @@ FFZ.prototype.modify_moderation_card = function(component) {
var name = el.querySelector('h4.name');
if ( name ) {
name.classList.toggle('ffz-alias', new_val);
- var results = f.format_display_name(controller.get('cardInfo.user.display_name'), user_id);
+ var results = f.format_display_name(t.get('cardInfo.user.display_name'), user_id);
name.innerHTML = results[0];
name.title = results[1] || '';
diff --git a/src/ember/player.js b/src/ember/player.js
index 5315eb58..853486aa 100644
--- a/src/ember/player.js
+++ b/src/ember/player.js
@@ -59,7 +59,7 @@ FFZ.settings_info.player_volume_bar = {
};
-FFZ.settings_info.player_pause_hosts = {
+/*FFZ.settings_info.player_pause_hosts = {
type: "select",
options: {
0: "Disabled",
@@ -73,7 +73,7 @@ FFZ.settings_info.player_pause_hosts = {
category: "Player",
name: "Auto-Pause Hosted Channels",
help: "Automatically pause hosted channels if you paused the channel doing the hosting, or just pause all hosts."
-}
+}*/
// ---------------
@@ -88,8 +88,6 @@ FFZ.prototype.setup_player = function() {
if ( Layout )
Layout.set('PLAYER_CONTROLS_HEIGHT', this.settings.classic_player ? 32 : 0);
- this.players = {};
-
this.update_views('component:twitch-player2', this.modify_twitch_player);
}
@@ -102,8 +100,11 @@ FFZ.prototype.modify_twitch_player = function(player) {
var f = this;
utils.ember_reopen_view(player, {
ffz_init: function() {
- var channel_id = this.get('hostChannel.name');
- f.players[channel_id] = this;
+ // We can have multiple players in page now, thanks to persistent players.
+ // Usually the second one will be something we don't want though. Like
+ // the creative showcase.
+ if ( ! f._player || f._player.isDestroying || f._player.isDestroyed )
+ f._player = this;
var player = this.get('player');
if ( player && !this.get('ffz_post_player') )
@@ -111,12 +112,11 @@ FFZ.prototype.modify_twitch_player = function(player) {
},
ffz_destroy: function() {
- var channel_id = this.get('hostChannel.name');
- if ( f.players[channel_id] === this )
- f.players[channel_id] = undefined;
+ if ( f._player === this )
+ f._player = undefined;
},
- insertPlayer: function(ffz_reset) {
+ /*insertPlayer: function(ffz_reset) {
// We want to see if this is a hosted video on a play
var should_start_paused = this.get('shouldStartPaused'),
channel_id = this.get('hostChannel.name'),
@@ -136,7 +136,7 @@ FFZ.prototype.modify_twitch_player = function(player) {
// Restore the previous value so it doesn't mess anything up.
this.set('shouldStartPaused', should_start_paused);
- }.on('didInsertElement'),
+ }.on('didInsertElement'),*/
postPlayerSetup: function() {
this._super();
@@ -157,16 +157,16 @@ FFZ.prototype.modify_twitch_player = function(player) {
player.destroy();
// Break down everything left over from that player.
- this.$('#video-1').html('');
+ this.$('#player').html('');
Mousetrap.unbind(['alt+x', 'alt+t', 'esc']);
this.set('player', null);
this.set('ffz_post_player', false);
// Now, let Twitch create a new player as usual.
- Ember.run.next(this.insertPlayer.bind(this, true));
+ Ember.run.next(this.didInsertElement.bind(this));
},
- ffzUpdatePlayerPaused: function() {
+ /*ffzUpdatePlayerPaused: function() {
var channel_id = this.get('hostChannel.name'),
hosted_id = this.get('channel.name'),
is_hosting = channel_id !== hosted_id,
@@ -193,13 +193,13 @@ FFZ.prototype.modify_twitch_player = function(player) {
ffzHostChange: function() {
this.set('ffz_host_paused', false);
- }.observes('channel'),
+ }.observes('channel'),*/
ffzPostPlayer: function() {
var f = this,
- channel_id = this.get('hostChannel.name'),
+ /*channel_id = this.get('hostChannel.name'),
hosted_id = this.get('channel.name'),
- is_hosting = channel_id !== hosted_id,
+ is_hosting = channel_id !== hosted_id,*/
player = this.get('player');
if ( ! player )
@@ -207,11 +207,11 @@ FFZ.prototype.modify_twitch_player = function(player) {
this.set('ffz_post_player', true);
- if ( ! is_hosting )
- this.set('ffz_original_paused', player.paused);
+ //if ( ! is_hosting )
+ // this.set('ffz_original_paused', player.paused);
- player.addEventListener('pause', this.ffzUpdatePlayerPaused.bind(this));
- player.addEventListener('play', this.ffzUpdatePlayerPaused.bind(this));
+ //player.addEventListener('pause', this.ffzUpdatePlayerPaused.bind(this));
+ //player.addEventListener('play', this.ffzUpdatePlayerPaused.bind(this));
// Make the stats window draggable and fix the button.
var stats = this.$('.player .js-playback-stats');
diff --git a/src/main.js b/src/main.js
index 308fc989..7fe5b42c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -61,7 +61,7 @@ FFZ.channel_metadata = {};
// Version
var VER = FFZ.version_info = {
- major: 3, minor: 5, revision: 387,
+ major: 3, minor: 5, revision: 389,
toString: function() {
return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || "");
}
diff --git a/src/ui/about_page.js b/src/ui/about_page.js
index 36f6a731..121d794d 100644
--- a/src/ui/about_page.js
+++ b/src/ui/about_page.js
@@ -262,9 +262,8 @@ FFZ.debugging_blocks = {
type: "list",
get_player: function() {
- for(var key in this.players)
- if ( this.players[key] && ! this.players[key].isDestroyed && this.players[key].player )
- return this.players[key].player;
+ if ( this._player && ! this._player.isDestroyed )
+ return this._player.player;
},
visible: function() { return FFZ.debugging_blocks.player.get_player.call(this) },
@@ -283,6 +282,8 @@ FFZ.debugging_blocks = {
try {
data.backend = player.getBackend();
data.version = player.getVersion();
+ data.quality = player.getVariant();
+ data.qualities = _.map(player.getQualities(), function(x) { return x.group });
} catch(err) {}
var sorted_keys = Object.keys(data).sort(),
diff --git a/src/ui/channel_stats.js b/src/ui/channel_stats.js
index e319d395..4f96f6a7 100644
--- a/src/ui/channel_stats.js
+++ b/src/ui/channel_stats.js
@@ -82,7 +82,7 @@ metadata.player_stats = {
setup: function(view, maybe_channel, is_hosting, channel) {
var channel_id = channel.get('id'),
- player_cont = this.players && this.players[channel_id],
+ player_cont = this._player,
player = player_cont && player_cont.player,
stats;
diff --git a/style.css b/style.css
index 0a2471d6..d8b75a5e 100644
--- a/style.css
+++ b/style.css
@@ -18,6 +18,7 @@ body > div.tipsy .tipsy-arrow { opacity: 0.8; }
cursor: pointer;
}
+.ffz-hide-directory-uploads .ffz-following-uploads,
.pinned-cheers__dismiss,
.ffz-hide-pinned-cheers .pinned-cheers,
.cn-hosting--bottom .ffz-channel-options .balloon:after,
@@ -1306,6 +1307,7 @@ body:not(.ffz-bttv) .dropmenu.share { margin-bottom: 0; }
margin-top: -10px;
}
+.ember-chat .chat-messages .chat-line--force-timestamp .timestamp,
.ffz-moderation-card.ffz-has-info .moderation-card__name .intl-login { display: inline }
.ffz-moderation-card.ffz-has-info .flex { position: relative }
@@ -1400,6 +1402,10 @@ body:not(.ffz-hide-friends) .ffz-moderation-card .follow-button {
text-shadow: black 0 0 5px;
}
+.ffz-moderation-card .moderation-card__name {
+ max-width: 235px;
+}
+
.ffz-moderation-card .ffz-ban-reasons {
margin-top: 10px;
width: 100%;