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

3.5.58 to 3.5.62. Added enhanced following controls to the profile page. New Conversations options. Tweaked conversation styles.

Browse source
This commit is contained in:
SirStendec 2015-11-10 21:37:30 -05:00
parent c40b3ba337
commit 4f6dcc9999
15 changed files with 3017 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/ember/room.js
View file

@ -115,6 +115,8 @@ FFZ.prototype.setup_room = function() {
FFZ.prototype._modify_rview = function(view) {
var f = this;
view.reopen({
alternate: false,
didInsertElement: function() {
this._super();
@ -134,6 +136,10 @@ FFZ.prototype._modify_rview = function(view) {
this._super();
},
ffzUpdateAlternate: function() {
this.get('element').classList.toggle('ffz-alternate', this.get('ffzAlternate'));
}.observes("ffzAlternate"),
ffzInit: function() {
f._roomv = this;
@ -1182,10 +1188,10 @@ FFZ.prototype._modify_room = function(room) {
return;
var is_whisper = msg.style === 'whisper';
if ( f.settings.group_tabs && f.settings.whisper_room ) {
if ( ( is_whisper && ! this.ffz_whisper_room ) || ( ! is_whisper && this.ffz_whisper_room ) )
return;
}
// Ignore whispers if conversations are enabled.
if ( is_whisper && App.__container__.lookup('route:application').controller.get('isConversationsEnabled') )
return;
if ( ! is_whisper )
msg.room = this.get('id');