oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-07-04 01:58:31 +00:00
Code Wiki Activity

3.5.136. Fix for grouped hosts (Ember upgrade) and viewer list name capitalization (3.5.134 regression)

Browse source
This commit is contained in:
SirStendec 2016-03-24 12:25:14 -04:00
parent f1300f3a1e
commit 4972ae3c54
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/ember/directory.js
View file

@ -432,11 +432,11 @@ FFZ.prototype._modify_directory_host = function(dir) {
dir.reopen({ dir.reopen({
didInsertElement: function() { didInsertElement: function() {
this._super(); this._super();
try { //try {
this.ffzInit(); this.ffzInit();
} catch(err) { //} catch(err) {
f.error("directory/host ffzInit: " + err); //f.error("directory/host ffzInit: " + err);
} //}
}, },
willClearRender: function() { willClearRender: function() {
@ -626,7 +626,7 @@ FFZ.prototype._modify_directory_host = function(dir) {
if ( hosts && hosts.length > 1 ) { if ( hosts && hosts.length > 1 ) {
title.textContent = utils.number_commas(hosts.length) + ' hosting ' + utils.sanitize(target.display_name); title.textContent = utils.number_commas(hosts.length) + ' hosting ' + utils.sanitize(target.display_name);
title.title = _.sortBy(hosts, "name").mapProperty("display_name").join(", "); title.title = _.sortBy(hosts, "name").mapBy("display_name").join(", ");
jQuery(title).tipsy({gravity: 's'}); jQuery(title).tipsy({gravity: 's'});
} }
} }

6
src/ember/viewers.js
View file

@ -22,7 +22,7 @@ FFZ.settings_info.sort_viewers = {
FFZ.prototype.setup_viewers = function() { FFZ.prototype.setup_viewers = function() {
this.log("Hooking the Ember Viewers controller."); this.log("Hooking the Ember Viewers controller.");
var Viewers = utils.ember_lookup('controller:viewers'); var Viewers = utils.ember_resolve('controller:viewers');
if ( Viewers ) if ( Viewers )
this._modify_viewers(Viewers); this._modify_viewers(Viewers);
@ -61,11 +61,11 @@ FFZ.prototype._modify_viewers = function(controller) {
// Get the broadcaster name. // Get the broadcaster name.
var Channel = utils.ember_lookup('controller:channel'), var Channel = utils.ember_lookup('controller:channel'),
room_id = this.get('parentController.model.id'), room_id = this.get('parentController.model.id'),
broadcaster = Channel && Channel.get('id'); broadcaster = Channel && Channel.get('model.id');
// We can get capitalization for the broadcaster from the channel. // We can get capitalization for the broadcaster from the channel.
if ( broadcaster ) { if ( broadcaster ) {
var display_name = Channel.get('display_name'); var display_name = Channel.get('model.display_name');
if ( display_name ) if ( display_name )
FFZ.capitalization[broadcaster] = [display_name, Date.now()]; FFZ.capitalization[broadcaster] = [display_name, Date.now()];
} }

2
src/main.js
View file

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