aboutsummaryrefslogtreecommitdiffstats
path: root/docs/src
diff options
context:
space:
mode:
authorSam Potts <me@sampotts.me>2016-01-24 11:25:31 +1100
committerSam Potts <me@sampotts.me>2016-01-24 11:25:31 +1100
commita965d8a893a6885848c5c4cceab9f96265c7fa21 (patch)
tree40bc29390472fc994333c11cbf93485e17f7aea4 /docs/src
parent173e651e3f4549b7a337e30854d1e4467940b489 (diff)
downloadplyr-a965d8a893a6885848c5c4cceab9f96265c7fa21.tar.lz
plyr-a965d8a893a6885848c5c4cceab9f96265c7fa21.tar.xz
plyr-a965d8a893a6885848c5c4cceab9f96265c7fa21.zip
Seek tooltip, bug fixes for SASS, fullscreen and icons
Diffstat (limited to 'docs/src')
-rw-r--r--docs/src/js/docs.js18
-rw-r--r--docs/src/less/components/examples.less7
2 files changed, 16 insertions, 9 deletions
diff --git a/docs/src/js/docs.js b/docs/src/js/docs.js
index 9828654e..563d2ebe 100644
--- a/docs/src/js/docs.js
+++ b/docs/src/js/docs.js
@@ -6,11 +6,13 @@
// Setup the player
plyr.setup('.js-media-player', {
- debug: true,
- title: 'Video demo',
- tooltips: true,
+ debug: true,
+ title: 'Video demo',
+ tooltips: {
+ controls: true
+ },
captions: {
- defaultActive: true
+ defaultActive: true
}
});
@@ -63,7 +65,7 @@ shr.setup({
history.replaceState({ 'type': currentType }, '', (video ? '' : '#' + currentType));
}
if(!video) {
- newSource(currentType);
+ newSource(currentType, true);
}
}
@@ -81,10 +83,10 @@ shr.setup({
}
// Set a new source
- function newSource(type) {
-
+ function newSource(type, init) {
// Bail if new type isn't known, it's the current type, or current type is empty (video is default) and new type is video
- if(!(type in types) || type == currentType || (!currentType.length && type == types.video)) {
+ if(!(type in types) || (!init && type == currentType) || (!currentType.length && type == types.video)) {
+ console.warn('Unregonized type.');
return;
}
diff --git a/docs/src/less/components/examples.less b/docs/src/less/components/examples.less
index 61d8d3bc..174a294a 100644
--- a/docs/src/less/components/examples.less
+++ b/docs/src/less/components/examples.less
@@ -50,7 +50,12 @@ video,
}
.plyr__progress {
border-radius: @border-radius-base @border-radius-base 0 0;
- overflow: hidden;
+
+ progress,
+ [type='range'] {
+ border-radius: @border-radius-base @border-radius-base 0 0;
+ overflow: hidden;
+ }
}
}