aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/js/plyr.js7
-rw-r--r--src/js/support.js6
-rw-r--r--src/js/ui.js3
-rw-r--r--src/sass/plugins/ads.scss2
4 files changed, 11 insertions, 7 deletions
diff --git a/src/js/plyr.js b/src/js/plyr.js
index 4ab2a64a..32c8c062 100644
--- a/src/js/plyr.js
+++ b/src/js/plyr.js
@@ -1029,6 +1029,10 @@ class Plyr {
* @param {boolean} soft - Whether it's a soft destroy (for source changes etc)
*/
destroy(callback, soft = false) {
+ if (!this.ready) {
+ return;
+ }
+
const done = () => {
// Reset overflow (incase destroyed while in fullscreen)
document.body.style.overflow = '';
@@ -1071,6 +1075,9 @@ class Plyr {
callback.call(this.elements.original);
}
+ // Reset state
+ this.ready = false;
+
// Clear for garbage collection
setTimeout(() => {
this.elements = null;
diff --git a/src/js/support.js b/src/js/support.js
index 23a8ebef..7f9a88b1 100644
--- a/src/js/support.js
+++ b/src/js/support.js
@@ -30,13 +30,9 @@ const support = {
break;
case 'youtube:video':
- api = true;
- ui = support.rangeInput && (!browser.isIPhone || playsInline);
- break;
-
case 'vimeo:video':
api = true;
- ui = support.rangeInput && !browser.isIPhone;
+ ui = support.rangeInput && (!browser.isIPhone || playsInline);
break;
default:
diff --git a/src/js/ui.js b/src/js/ui.js
index d910cc91..a083d502 100644
--- a/src/js/ui.js
+++ b/src/js/ui.js
@@ -5,7 +5,6 @@
import utils from './utils';
import captions from './captions';
import controls from './controls';
-import listeners from './listeners';
const ui = {
addStyleHook() {
@@ -25,7 +24,7 @@ const ui = {
// Setup the UI
build() {
// Re-attach media element listeners
- // TODO: Use event bubbling
+ // TODO: Use event bubbling?
this.listeners.media();
// Don't setup interface if no support
diff --git a/src/sass/plugins/ads.scss b/src/sass/plugins/ads.scss
index a5af93ab..c5acef75 100644
--- a/src/sass/plugins/ads.scss
+++ b/src/sass/plugins/ads.scss
@@ -3,9 +3,11 @@
// ==========================================================================
.plyr__ads {
+ border-radius: inherit;
bottom: 0;
cursor: pointer;
left: 0;
+ overflow: hidden;
position: absolute;
right: 0;
top: 0;