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

3.5.140. Fixed navigation for hosts in the directory. Potential fix for weird "Welcome to the chat room!" messages, which is a race condition afaik.

Browse source
This commit is contained in:
SirStendec 2016-03-24 20:04:39 -04:00
parent 4e5d736651
commit 9eb1d3a724
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/ember/directory.js
View file

@ -369,7 +369,7 @@ FFZ.prototype._modify_directory_live = function(dir, is_csgo) {
return; return;
e.preventDefault(); e.preventDefault();
t.get('controller').transitionTo('channel.index', Channel.find({id: channel_id}).load()); utils.ember_lookup('router:main').transitionTo('channel.index', Channel.find({id: channel_id}).load());
return false; return false;
}); });
@ -462,7 +462,7 @@ FFZ.prototype._modify_directory_host = function(dir) {
} }
f.close_popup(); f.close_popup();
this.get('controller').transitionTo('channel.index', Channel.find({id: target}).load()); utils.ember_lookup('router:main').transitionTo('channel.index', Channel.find({id: target}).load());
return false; return false;
}, },
@ -570,7 +570,7 @@ FFZ.prototype._modify_directory_host = function(dir) {
if ( ! boxart && thumb && this.get('context.model.game') ) { if ( ! boxart && thumb && this.get('context.model.game') ) {
var img = document.createElement('img'), var img = document.createElement('img'),
game = this.get("context.model.game"), game = this.get("context.model.game"),
c = this.get('controller'); c = utils.ember_lookup('router:main');
boxart = document.createElement('a'); boxart = document.createElement('a');
boxart.className = 'boxart'; boxart.className = 'boxart';
@ -589,7 +589,7 @@ FFZ.prototype._modify_directory_host = function(dir) {
else if ( game === "Creative" ) else if ( game === "Creative" )
c.transitionTo('creative.channels.index'); c.transitionTo('creative.channels.index');
else else
c.transitionTo('gameDirectory.index', encodeURIComponent(game)); c.transitionTo('game-directory.index', encodeURIComponent(game));
return false; return false;
}); });

3
src/ember/line.js
View file

@ -834,6 +834,9 @@ FFZ.prototype._modify_chat_line = function(component, is_vod) {
var el = this.get('element'), var el = this.get('element'),
output = this.buildSenderHTML(); output = this.buildSenderHTML();
if ( el.tagName === 'DIV' )
return this.rerender();
if ( this.get('msgObject.deleted') ) if ( this.get('msgObject.deleted') )
output += this.buildDeletedMessageHTML() output += this.buildDeletedMessageHTML()
else else