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

Simplify how the Chat Freeze feature is implemented to hopefully fix any FFZ-related bugs there. Also fix an issue with FFZ failing to load when there are extra React roots in the page.

Browse source
This commit is contained in:
SirStendec 2017-11-15 14:05:58 -05:00
parent 23e2fadba3
commit 1357a3e143
2 changed files with 26 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/sites/twitch-twilight/modules/chat/scroller.js
View file

@ -55,30 +55,20 @@ export default class Scroller extends Module {
const old_freeze = this.freeze; const old_freeze = this.freeze;
this.freeze = val; this.freeze = val;
for(const inst of this.ChatScroller.instances) for(const inst of this.ChatScroller.instances) {
if ( val === 0 ) inst.ffzDisableFreeze();
inst.ffzDisableFreeze(); if ( val !== 0 )
else if ( old_freeze === 0 )
inst.ffzEnableFreeze(); inst.ffzEnableFreeze();
else }
inst.ffzUpdateText();
}); });
this.ChatScroller.ready((cls, instances) => { this.ChatScroller.ready((cls, instances) => {
const t = this; const t = this,
old_scroll = cls.prototype.scrollToBottom;
cls.prototype.componentDidUpdate = function(props, state) {
if ( state.isAutoScrolling &&
! state.ffzFrozen &&
this.props.messages !== props.messages )
this.scrollToBottom();
}
const old_scroll = cls.prototype.scrollToBottom;
cls.prototype.scrollToBottom = function() { cls.prototype.scrollToBottom = function() {
if ( this.state.ffzFrozen ) if ( ! this.state.ffzFrozen )
this.setState({ffzFrozen: false}); return old_scroll.call(this);
return old_scroll.call(this);
} }
cls.prototype.ffzShouldBeFrozen = function(since) { cls.prototype.ffzShouldBeFrozen = function(since) {
@ -190,10 +180,12 @@ export default class Scroller extends Module {
this.ffz_freeze_enabled = true; this.ffz_freeze_enabled = true;
document.body.addEventListener('keydown', if ( t.freeze > 1 ) {
this._ffz_key = this.ffzKey.bind(this)); document.body.addEventListener('keydown',
this._ffz_key = this.ffzKey.bind(this));
document.body.addEventListener('keyup', this._ffz_key); document.body.addEventListener('keyup', this._ffz_key);
}
node.addEventListener('mousemove', node.addEventListener('mousemove',
this._ffz_mousemove = this.ffzMouseMove.bind(this)); this._ffz_mousemove = this.ffzMouseMove.bind(this));

17
src/utilities/compat/fine.js
View file

@ -21,14 +21,17 @@ export default class Fine extends Module {
} }
async onEnable() { async onEnable(tries=0) {
// TODO: Move awaitElement to utilities/dom // TODO: Move awaitElement to utilities/dom
if ( ! this.root_element ) if ( ! this.root_element )
this.root_element = await this.parent.awaitElement(this.selector || '[data-reactroot]'); this.root_element = await this.parent.awaitElement(this.selector || '#root [data-reactroot]');
const accessor = this.accessor = Fine.findAccessor(this.root_element); const accessor = this.accessor = Fine.findAccessor(this.root_element);
if ( ! accessor ) if ( ! accessor ) {
return new Promise(r => setTimeout(r, 50)).then(() => this.onEnable()); if ( tries > 500 )
throw new Error(`unable to find React after 25 seconds`);
return new Promise(r => setTimeout(r, 50)).then(() => this.onEnable(tries+1));
}
this.react = this.getReactInstance(this.root_element); this.react = this.getReactInstance(this.root_element);
} }
@ -449,6 +452,12 @@ export class FineWrapper extends EventEmitter {
} }
forceUpdate() {
for(const inst of this.instances)
inst.forceUpdate();
}
on(event, fn, ctx) { on(event, fn, ctx) {
this._maybeWrap(event); this._maybeWrap(event);
return super.on(event, fn, ctx); return super.on(event, fn, ctx);