oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-09-17 10:16:57 +00:00
Code Wiki Activity

3.5.394. Fix the /card command and switching mod card targets while the mod card is open. Add more modifier emotes for Christmas.

Browse source
This commit is contained in:
SirStendec 2016-12-10 22:24:31 -05:00
parent 70ec6d5348
commit c4142edeb2
8 changed files with 44 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ember/moderation-card.js
View file

@ -1574,7 +1574,7 @@ FFZ.prototype._build_mod_card_history = function(msg, modcard, show_from, ts_cli
if ( modcard ) {
modcard.get('cardInfo.user.id') !== msg.from && jQuery('span.from', l_el).click(function(e) {
var el = modcard.get('element');
el && f._roomv && f._roomv.get('context.model.id') === msg.room && f._roomv.get('controller').send('showModOverlay', {
el && f._roomv && f._roomv.get('room.id') === msg.room && f._roomv.actions.showModCard.call(f._roomv, {
sender: msg.from,
top: parseInt(el.style.top),
left: parseInt(el.style.left)

2
src/ember/room.js
View file

@ -1035,7 +1035,7 @@ FFZ.prototype.add_room = function(room_id, room) {
// Why don't we set the scrollback length, too?
room.set('messageBufferSize', this.settings.scrollback_length + ((this._roomv && !this._roomv.get('stuckToBottom') && this._roomv.get('controller.model.id') === room_id) ? 150 : 0));
room.set('messageBufferSize', this.settings.scrollback_length + ((this._roomv && !this._roomv.get('stuckToBottom') && this._roomv.get('room.id') === room_id) ? 150 : 0));
// Load the room's data from the API.
this.load_room(room_id);