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

4.0.0-rc16.1

Browse source 
* Fixed: FrankerFaceZ not loading due to a change in the structure of Twitch pages.
* Known Issue: Tooltips not behaving quite right in pop-out chat.
This commit is contained in:
SirStendec 2019-04-12 17:34:01 -04:00
parent c43e572eec
commit 00859ac966
17 changed files with 27 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main.js
View file

@ -149,7 +149,7 @@ ${typeof x[1] === 'string' ? x[1] : JSON.stringify(x[1], null, 4)}`
FrankerFaceZ.Logger = Logger;
const VER = FrankerFaceZ.version_info = {
major: 4, minor: 0, revision: 0, extra: '-rc16',
major: 4, minor: 0, revision: 0, extra: '-rc16.1',
commit: __git_commit__,
build: __webpack_hash__,
toString: () =>

2
src/modules/chat/actions/index.jsx
View file

@ -166,7 +166,7 @@ export default class Actions extends Module {
target._ffz_destroy = target._ffz_outside = null;
}
const parent = document.body.querySelector('.twilight-root,.twilight-minimal-root') || document.body,
const parent = document.body.querySelector('#root>div') || document.body,
tt = target._ffz_popup = new Tooltip(parent, target, {
logger: this.log,
manual: true,

4
src/modules/metadata.jsx
View file

@ -738,7 +738,7 @@ export default class Metadata extends Module {
el._ffz_destroy = el._ffz_outside = null;
};
const parent = document.body.querySelector('.twilight-root') || document.body,
const parent = document.body.querySelector('#root>div') || document.body,
tt = el._ffz_popup = new Tooltip(parent, el, {
logger: this.log,
manual: true,
@ -809,7 +809,7 @@ export default class Metadata extends Module {
subcontainer.appendChild(el);
if ( def.tooltip ) {
const parent = document.body.querySelector('.twilight-root') || document.body;
const parent = document.body.querySelector('#root>div') || document.body;
el.tooltip = new Tooltip(parent, el, {
logger: this.log,
live: false,

6
src/modules/tooltips.js
View file

@ -36,10 +36,10 @@ export default class TooltipProvider extends Module {
}
onEnable() {
const container = document.querySelector('.twilight-root,.twilight-minimal-root,.clips-root') || document.body,
is_minimal = container && container.classList.contains('twilight-minimal-root');
const container = document.querySelector('#root>div,#root,.clips-root') || document.body,
is_minimal = false; //container && container.classList.contains('twilight-minimal-root');
this.tips = new Tooltip(is_minimal ? '.twilight-minimal-root,body' : 'body #root,body', 'ffz-tooltip', {
this.tips = new Tooltip(is_minimal ? '.twilight-minimal-root,body' : '#root>div,#root,body', 'ffz-tooltip', {
html: true,
delayHide: this.checkDelayHide.bind(this),
delayShow: this.checkDelayShow.bind(this),

2
src/modules/viewer_cards/index.js
View file

@ -167,7 +167,7 @@ export default class ViewerCards extends Module {
el.style.top = `${pos_y}px`;
el.style.left = `${pos_x}px`
const container = document.querySelector('.twilight-root>.tw-full-height,.twilight-minimal-root>.tw-full-height');
const container = document.querySelector('#root>div>.tw-full-height,.twilight-minimal-root>.tw-full-height');
container.appendChild(el);
requestAnimationFrame(() => child.constrain());

6
src/sites/twitch-twilight/index.js
View file

@ -217,6 +217,6 @@ Twilight.ROUTES = {
}
Twilight.DIALOG_EXCLUSIVE = '.twilight-main,.twilight-minimal-root>div,.twilight-root>.tw-full-height,.clips-root';
Twilight.DIALOG_MAXIMIZED = '.twilight-main,.twilight-minimal-root,.twilight-root .dashboard-side-nav+.tw-full-height,.clips-root>.tw-full-height .scrollable-area';
Twilight.DIALOG_SELECTOR = '.twilight-root>.tw-full-height,.twilight-minimal-root>.tw-full-height,.clips-root>.tw-full-height .scrollable-area';
Twilight.DIALOG_EXCLUSIVE = '.twilight-main,.twilight-minimal-root>div,#root>div>.tw-full-height,.clips-root';
Twilight.DIALOG_MAXIMIZED = '.twilight-main,.twilight-minimal-root,#root .dashboard-side-nav+.tw-full-height,.clips-root>.tw-full-height .scrollable-area';
Twilight.DIALOG_SELECTOR = '#root>div>.tw-full-height,.twilight-minimal-root>.tw-full-height,.clips-root>.tw-full-height .scrollable-area';

2
src/sites/twitch-twilight/modules/chat/line.js
View file

@ -254,7 +254,7 @@ export default class ChatLine extends Module {
this._ffz_show = show;
return show !== old_show ||
state.ffz_expanded !== this.state.ffz_expanded ||
(state && this.state && (state.ffz_expanded !== this.state.ffz_expanded)) ||
//state.renderDebug !== this.state.renderDebug ||
props.message !== this.props.message ||
props.isCurrentUserModerator !== this.props.isCurrentUserModerator ||

2
src/sites/twitch-twilight/modules/css_tweaks/styles/minimal-navigation.scss
View file

@ -1,4 +1,4 @@
.twilight-root {
#root {
.top-nav {
> div {
height: 5rem !important;

2
src/sites/twitch-twilight/modules/css_tweaks/styles/portrait-swapped.scss
View file

@ -1,5 +1,5 @@
// Unnecessarily expressive rule to make it more important.
.twilight-root .right-column .right-column__toggle-visibility {
#root .right-column .right-column__toggle-visibility {
right: unset !important;
left: 0.5rem !important;
}

2
src/sites/twitch-twilight/modules/css_tweaks/styles/portrait.scss
View file

@ -1,4 +1,4 @@
.twilight-root {
#root {
--ffz-player-width: calc(100vw - var(--ffz-portrait-extra-width));
--ffz-player-height: calc(calc(calc(var(--ffz-player-width) * 0.5625) + var(--ffz-portrait-extra-height)));
--ffz-theater-height: calc(calc(100vw * 0.5625) + var(--ffz-portrait-extra-height));

2
src/sites/twitch-twilight/modules/css_tweaks/styles/theatre-nav.scss
View file

@ -1,4 +1,4 @@
.twilight-root {
#root {
.top-nav {
z-index: 9999;
}

5
src/sites/twitch-twilight/modules/directory/following.jsx
View file

@ -127,6 +127,9 @@ export default class Following extends SiteModule {
out = [];
for(const edge of edges) {
if ( ! edge )
continue;
const node = edge.node || edge,
hosted = node.hosting,
stream = hosted && hosted.stream;
@ -291,7 +294,7 @@ export default class Following extends SiteModule {
</div>
</div>);
const root = (document.body.querySelector('.twilight-root') || document.body);
const root = (document.body.querySelector('#root>div') || document.body);
root.appendChild(this.hostMenu);
this.hostMenuPopper = new Popper(document.body, this.hostMenu, {

3
src/sites/twitch-twilight/modules/directory/index.jsx
View file

@ -343,6 +343,9 @@ export default class Directory extends SiteModule {
blocked_games = this.settings.provider.get('directory.game.blocked-games', []);
for(const edge of edges) {
if ( ! edge )
continue;
const node = edge.node || edge,
stream = node.stream || node;

2
src/sites/twitch-twilight/modules/following_link.off
View file

@ -57,7 +57,7 @@ export default class FollowingText extends SiteModule {
textContent: 'Following'
});
const height = document.body.querySelector('.twilight-root').clientHeight - 50;
const height = document.body.querySelector('#root>div').clientHeight - 50;
const max_lines = Math.max(Math.floor(height / 40) - 1, 2);
let c = 0;

2
src/sites/twitch-twilight/styles/chat.scss
View file

@ -180,7 +180,7 @@
@media only screen and (max-height: 750px) {
.emote-picker__tab-content {
.twilight-root & {
#root & {
max-height: calc(100vh - 31rem);
}

2
src/sites/twitch-twilight/styles/theme.scss
View file

@ -1535,7 +1535,7 @@
.tw-elevation-5 {
box-shadow: 0 14px 20px 8px var(--ffz-color-36), 0 10px 22px -8px var(--ffz-color-37), 0 8px 38px 0 var(--ffz-color-38) !important;
}
.twilight-root {
#root {
background-color: var(--ffz-color-21);
color: var(--ffz-color-1);
}

3
src/sites/twitch-twilight/switchboard.js
View file

@ -34,7 +34,7 @@ export default class Switchboard extends Module {
async onEnable() {
await this.parent.awaitElement('.twilight-minimal-root,.twilight-root');
await this.parent.awaitElement('.twilight-minimal-root,.twilight-root,#root>div');
if ( this.web_munch._require || this.web_munch.v4 === false )
return;
@ -44,7 +44,6 @@ export default class Switchboard extends Module {
if ( ! da_switch )
return new Promise(r => setTimeout(r, 50)).then(() => this.onEnable());
// Identify Router
this.log.info(`Found Router and Switch with ${da_switch.props.children.length} routes.`);