From 44ef88fe94816944fe8dbb6faf41f5dc8c279091 Mon Sep 17 00:00:00 2001 From: Ayushya Amitabh Date: Mon, 7 Sep 2020 15:09:50 -0400 Subject: [PATCH] v1.7.0/release --- app/src/Chat.js | 6 ++++++ app/src/VideoListener.js | 23 ++++++++++------------- app/src/index.css | 23 +++++++++++++++++++++++ 3 files changed, 39 insertions(+), 13 deletions(-) diff --git a/app/src/Chat.js b/app/src/Chat.js index 476f15b..bfc7a04 100644 --- a/app/src/Chat.js +++ b/app/src/Chat.js @@ -42,6 +42,8 @@ import { UpdateAdminOnly, scrollThread, removeLocalData, + PLAYER_SOURCE, + getPlayerSource, } from './Api'; import { Send, @@ -521,6 +523,10 @@ export default class Chat extends Component { condition: () => adminOnly, message: 'Party is currently in admin only mode.', }, + { + condition: () => getPlayerSource() === PLAYER_SOURCE.FUNIMATION, + message: 'If sync stops working, try (Ctrl + Shift + R) or (⌘ + Shift + R)', + }, ]; return (
diff --git a/app/src/VideoListener.js b/app/src/VideoListener.js index 1ab9477..5e497bf 100644 --- a/app/src/VideoListener.js +++ b/app/src/VideoListener.js @@ -267,8 +267,10 @@ export default class VideoListener { const ashow = document.querySelector(nS.show).innerText || ''; return ashow === '' ? null : ashow; case PLAYER_SOURCE.HULU: - const hshow = document.querySelector(nS.show).innerText; - const hepisode = document.querySelector(nS.episode).innerText.replace(/\n/gi, ' '); + const hshowContainer = document.querySelector(nS.show); + const hepisodeContainer = document.querySelector(nS.episode); + const hshow = hshowContainer ? hshowContainer.innerText : ''; + const hepisode = hepisodeContainer ? hepisodeContainer.innerText.replace(/\n/gi, ' ') : ''; return hshow === '' && hepisode === '' ? null : hshow + '\n' + hepisode; case PLAYER_SOURCE.DISNEY: this.video.element.parentElement.click(); @@ -715,17 +717,12 @@ export default class VideoListener { if (funimationIframe) { this.firstTimeSync(funimationIframe); } else { - setInterval( - this.video.element - ? null - : () => { - const fif = document.querySelector(this.selectors[PLAYER_SOURCE.FUNIMATION]); - if (fif) { - this.firstTimeSync(fif); - } - }, - 1000 - ); + setInterval(() => { + const fif = document.querySelector(this.selectors[PLAYER_SOURCE.FUNIMATION]); + if (!this.video.element && fif) { + this.firstTimeSync(fif); + } + }, 1000); } break; case PLAYER_SOURCE.ROOSTERTEETH: diff --git a/app/src/index.css b/app/src/index.css index d741461..0799dda 100644 --- a/app/src/index.css +++ b/app/src/index.css @@ -278,6 +278,23 @@ body.roosterteeth.visible .party-content-wrapper textarea:focus { border-bottom: none !important; box-shadow: none !important; } +/* VIKI */ + +body.viki .party-content-wrapper input, +body.viki .party-content-wrapper input:focus { + padding: 18.5px 14px !important; + padding-top: 10.5px !important; + padding-bottom: 10.5px !important; +} + +body.viki .party-content-wrapper input, +body.viki .party-content-wrapper input:focus, +body.viki .party-content-wrapper textarea, +body.viki .party-content-wrapper textarea:focus { + border-bottom: none !important; + box-shadow: none !important; + margin: 0 !important; +} #party-loading { position: absolute; @@ -1045,6 +1062,12 @@ button.giphy-list-item { opacity: 0; bottom: -30px; transition: all ease-in-out 0.2s; + max-height: 32px; + overflow: hidden; + text-overflow: ellipsis; + white-space: pre; + padding-left: 10px; + padding-right: 10px; } .vxt-video:first-of-type {