aboutsummaryrefslogtreecommitdiffstats
path: root/src/js
diff options
context:
space:
mode:
authorSam Potts <sam@potts.es>2018-04-18 18:29:50 +1000
committerSam Potts <sam@potts.es>2018-04-18 18:29:50 +1000
commit5b39986835e9b5d0932e3e9f491f4ca3a320629c (patch)
tree2ab949aea32de70bd9253c2aad4258de70f78783 /src/js
parenta97b08e8ea0022646eae005ce64a7edf8b26fb29 (diff)
parent56d1be944720a98aad0de52de83ac561af21e93b (diff)
downloadplyr-5b39986835e9b5d0932e3e9f491f4ca3a320629c.tar.lz
plyr-5b39986835e9b5d0932e3e9f491f4ca3a320629c.tar.xz
plyr-5b39986835e9b5d0932e3e9f491f4ca3a320629c.zip
Merge branch 'master' of github.com:sampotts/plyr
Diffstat (limited to 'src/js')
-rw-r--r--src/js/captions.js5
-rw-r--r--src/js/fullscreen.js2
-rw-r--r--src/js/plyr.js4
3 files changed, 3 insertions, 8 deletions
diff --git a/src/js/captions.js b/src/js/captions.js
index 45efcf40..c6618fda 100644
--- a/src/js/captions.js
+++ b/src/js/captions.js
@@ -250,11 +250,6 @@ const captions = {
// Display captions container and button (for initialization)
show() {
- // If there's no caption toggle, bail
- if (!utils.is.element(this.elements.buttons.captions)) {
- return;
- }
-
// Try to load the value from storage
let active = this.storage.get('captions');
diff --git a/src/js/fullscreen.js b/src/js/fullscreen.js
index 857a2edc..8795f460 100644
--- a/src/js/fullscreen.js
+++ b/src/js/fullscreen.js
@@ -90,7 +90,7 @@ class Fullscreen {
static get prefix() {
// No prefix
if (utils.is.function(document.exitFullscreen)) {
- return false;
+ return '';
}
// Check for fullscreen support by vendor prefix
diff --git a/src/js/plyr.js b/src/js/plyr.js
index fe8049e1..4461d154 100644
--- a/src/js/plyr.js
+++ b/src/js/plyr.js
@@ -845,8 +845,8 @@ class Plyr {
* @param {boolean} input - Whether to enable captions
*/
toggleCaptions(input) {
- // If there's no full support, or there's no caption toggle
- if (!this.supported.ui || !utils.is.element(this.elements.buttons.captions)) {
+ // If there's no full support
+ if (!this.supported.ui) {
return;
}