From be9de6de25027b23e3cea23cc22fabca79fecc98 Mon Sep 17 00:00:00 2001
From: SirStendec <sir@stendec.me>
Date: Thu, 21 Dec 2017 20:37:58 -0500
Subject: [PATCH] Fix tool-tip placement. Fix incorrect player width in theater
 mode with collapsed chat and a custom chat width set. Fix channel bar
 placement with minimize navigation. Fix player size when entering fullscreen
 with theater mode enabled. Fix minor bug in `has` method.

---
 changelog.html                                  |  8 ++++++++
 src/modules/metadata.js                         | 17 +++++++++++++++--
 src/modules/tooltips.js                         | 16 +++++++++++++++-
 .../modules/css_tweaks/styles/chat-width.scss   |  2 +-
 .../css_tweaks/styles/minimal-navigation.scss   |  4 ----
 src/sites/twitch-twilight/styles/player.scss    |  4 ++++
 src/utilities/object.js                         |  2 +-
 7 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/changelog.html b/changelog.html
index 2ef37088..26b0655f 100644
--- a/changelog.html
+++ b/changelog.html
@@ -1,3 +1,11 @@
+<div class="list-header">4.0.0-beta1.5<span>@9a60ce1ee6c58905c6eb</span> <time datetime="2017-12-13">(2017-12-13)</time></div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Fixed: Player not covering the whole window in theater mode with a custom chat width and chat collapsed.</li>
+	<li>Fixed: Player not covering the whole screen when you enter fullscreen from theater mode. (Twitch Bug)</li>
+	<li>Fixed: Position of channel bar with Minimize Navigation is enabled.</li>
+	<li>Fixed: Tooltip placement.</li>
+</ul>
+
 <div class="list-header">4.0.0-beta1.5<span>@764c7c372c158220ed04</span> <time datetime="2017-12-13">(2017-12-13)</time></div>
 <ul class="chat-menu-content menu-side-padding">
 	<li>Fixed: Directory stuff breaking.</li>
diff --git a/src/modules/metadata.js b/src/modules/metadata.js
index 7ae1b2b1..9aefabf0 100644
--- a/src/modules/metadata.js
+++ b/src/modules/metadata.js
@@ -401,14 +401,27 @@ export default class Metadata extends Module {
 
 				container.appendChild(el);
 
-				if ( def.tooltip )
+				if ( def.tooltip ) {
+					const parent = document.body.querySelector('.twilight-root') || document.body;
 					el.tooltip = new Tooltip(container, el, {
 						live: false,
 						html: true,
 						content: () => el.tip_content,
 						onShow: (t, tip) => el.tip = tip,
-						onHide: () => el.tip = null
+						onHide: () => el.tip = null,
+						popper: {
+							placement: 'bottom',
+							modifiers: {
+								flip: {
+									behavior: ['bottom', 'top']
+								},
+								preventOverflow: {
+									boundariesElement: parent
+								}
+							}
+						}
 					});
+				}
 
 			} else {
 				stat = el.querySelector('.ffz-stat-text');
diff --git a/src/modules/tooltips.js b/src/modules/tooltips.js
index 9e8d2a8f..5710d4e3 100644
--- a/src/modules/tooltips.js
+++ b/src/modules/tooltips.js
@@ -30,9 +30,15 @@ export default class TooltipProvider extends Module {
 				}, target.dataset.data)
 			]
 		}
+
+		this.types.html = target => {
+			return target.dataset.title;
+		}
 	}
 
 	onEnable() {
+		const container = document.body.querySelector('.twilight-root') || document.body;
+
 		this.tips = new Tooltip('body [data-reactroot]', 'ffz-tooltip', {
 			html: true,
 			delayHide: this.checkDelayHide.bind(this),
@@ -40,7 +46,15 @@ export default class TooltipProvider extends Module {
 			content: this.process.bind(this),
 			interactive: this.checkInteractive.bind(this),
 			popper: {
-				placement: 'top'
+				placement: 'top',
+				modifiers: {
+					flip: {
+						behavior: ['top', 'bottom', 'left', 'right']
+					},
+					preventOverflow: {
+						boundariesElement: container
+					}
+				}
 			}
 		});
 	}
diff --git a/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-width.scss b/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-width.scss
index d248212f..5119ab87 100644
--- a/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-width.scss
+++ b/src/sites/twitch-twilight/modules/css_tweaks/styles/chat-width.scss
@@ -2,7 +2,7 @@ body .whispers--theatre-mode.whispers--right-column-expanded {
 	right: var(--ffz-chat-width);
 }
 
-body .persistent-player--theatre,
+body .persistent-player--theatre:not([style*="width: 100%"]),
 body .channel-page__video-player--theatre-mode {
 	width: calc(100% - var(--ffz-chat-width)) !important;
 }
diff --git a/src/sites/twitch-twilight/modules/css_tweaks/styles/minimal-navigation.scss b/src/sites/twitch-twilight/modules/css_tweaks/styles/minimal-navigation.scss
index 68b8457b..4d14a6f3 100644
--- a/src/sites/twitch-twilight/modules/css_tweaks/styles/minimal-navigation.scss
+++ b/src/sites/twitch-twilight/modules/css_tweaks/styles/minimal-navigation.scss
@@ -20,8 +20,4 @@
 			}
 		}
 	}
-
-	.channel-header {
-		top: -4rem;
-	}
 }
\ No newline at end of file
diff --git a/src/sites/twitch-twilight/styles/player.scss b/src/sites/twitch-twilight/styles/player.scss
index df5ae874..07660d41 100644
--- a/src/sites/twitch-twilight/styles/player.scss
+++ b/src/sites/twitch-twilight/styles/player.scss
@@ -10,4 +10,8 @@
 	top: auto;
 	bottom: 4rem;
 	height: auto;
+}
+
+.video-player--fullscreen.video-player--theatre.video-player--logged-in .video-player__container {
+	bottom: 0 !important;
 }
\ No newline at end of file
diff --git a/src/utilities/object.js b/src/utilities/object.js
index 791928b2..4a894fe1 100644
--- a/src/utilities/object.js
+++ b/src/utilities/object.js
@@ -3,7 +3,7 @@
 const HOP = Object.prototype.hasOwnProperty;
 
 export function has(object, key) {
-	return HOP.call(object, key);
+	return object ? HOP.call(object, key) : false;
 }