aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/js/plyr.js29
-rw-r--r--src/less/plyr.less6
-rw-r--r--src/scss/plyr.scss6
3 files changed, 23 insertions, 18 deletions
diff --git a/src/js/plyr.js b/src/js/plyr.js
index 36b99fd2..e21c5ab7 100644
--- a/src/js/plyr.js
+++ b/src/js/plyr.js
@@ -581,22 +581,25 @@
(function() {
// Determine the prefix
var prefix = (function() {
- if (!_is.undefined(document.cancelFullScreen)) {
- return '';
+ var value = false;
+
+ if (_is.function(document.cancelFullScreen)) {
+ value = '';
} else {
// Check for fullscreen support by vendor prefix
- ['webkit', 'o', 'moz', 'ms', 'khtml'].forEach(function(prefix) {
- if (!_is.undefined(document[prefix + 'CancelFullScreen'])) {
- return prefix;
- } else if (!_is.undefined(document.msExitFullscreen) && document.msFullscreenEnabled) {
+ ['webkit', 'o', 'moz', 'ms', 'khtml'].some(function(prefix) {
+ if (_is.function(document[prefix + 'CancelFullScreen'])) {
+ value = prefix;
+ return true;
+ } else if (_is.function(document.msExitFullscreen) && document.msFullscreenEnabled) {
// Special case for MS (when isn't it?)
- return 'ms';
+ value = 'ms';
+ return true;
}
});
}
- // If we got this far, there's no support
- return false;
+ return value;
})();
_fullscreen = {
@@ -625,9 +628,12 @@
if (!_support.fullscreen) {
return false;
}
- if (_is.undefined(element)) {
+ if (!_is.htmlElement(element)) {
element = document.body;
}
+
+ console.log(prefix);
+
return (prefix === '') ? element.requestFullScreen() : element[prefix + (prefix === 'ms' ? 'RequestFullscreen' : 'RequestFullScreen')]();
},
cancelFullScreen: function() {
@@ -988,7 +994,6 @@
}
// Picture in picture button
- console.log(_support.pip);
if (_inArray(config.controls, 'pip') && _support.pip) {
html.push(
'<button type="button" data-plyr="pip">',
@@ -3315,7 +3320,7 @@
_on(plyr.buttons.pip, 'click', function() {
//if ()
- plyr.media.webkitSetPresentationMode(plyr.media.webkitPresentationMode === 'optimized' ? 'inline' : 'optimized');
+ plyr.media.webkitSetPresentationMode(plyr.media.webkitPresentationMode === 'picture-in-picture' ? 'inline' : 'picture-in-picture');
});
// Seek tooltip
diff --git a/src/less/plyr.less b/src/less/plyr.less
index a23924e6..81f4960d 100644
--- a/src/less/plyr.less
+++ b/src/less/plyr.less
@@ -189,6 +189,9 @@
position: relative;
background: #000;
border-radius: inherit;
+ // Require z-index to force border-radius
+ z-index: 0;
+ overflow: hidden;
}
// Container for embeds
@@ -197,9 +200,6 @@
height: 0;
overflow: hidden;
- // Require z-index to force border-radius
- z-index: 0;
-
iframe {
position: absolute;
top: 0;
diff --git a/src/scss/plyr.scss b/src/scss/plyr.scss
index 70518591..f4f439d3 100644
--- a/src/scss/plyr.scss
+++ b/src/scss/plyr.scss
@@ -172,6 +172,9 @@
position: relative;
background: #000;
border-radius: inherit;
+ // Require z-index to force border-radius
+ z-index: 0;
+ overflow: hidden;
}
// Container for embeds
@@ -181,9 +184,6 @@
overflow: hidden;
border-radius: inherit;
- // Require z-index to force border-radius
- z-index: 0;
-
iframe {
position: absolute;
top: 0;