ID fix and styling fix

This commit is contained in:
Sam Potts
2017-04-17 00:32:41 +10:00
parent 452678867f
commit da15980b8a
4 changed files with 23 additions and 23 deletions

2
dist/plyr.css vendored

File diff suppressed because one or more lines are too long

4
dist/plyr.js vendored

File diff suppressed because one or more lines are too long

View File

@ -397,6 +397,15 @@
firstScriptTag.parentNode.insertBefore(tag, firstScriptTag); firstScriptTag.parentNode.insertBefore(tag, firstScriptTag);
} }
// Determine if we're in an iframe
function inFrame() {
try {
return window.self !== window.top;
} catch (e) {
return true;
}
}
// Element exists in an array // Element exists in an array
function inArray(haystack, needle) { function inArray(haystack, needle) {
return Array.prototype.indexOf && (haystack.indexOf(needle) !== -1); return Array.prototype.indexOf && (haystack.indexOf(needle) !== -1);
@ -985,15 +994,6 @@
return getElements(selector)[0]; return getElements(selector)[0];
} }
// Determine if we're in an iframe
function inFrame() {
try {
return window.self !== window.top;
} catch (e) {
return true;
}
}
// Trap focus inside container // Trap focus inside container
function focusTrap() { function focusTrap() {
var tabbables = getElements('input:not([disabled]), button:not([disabled])'); var tabbables = getElements('input:not([disabled]), button:not([disabled])');
@ -1171,17 +1171,14 @@
// Create an <input type='range'> // Create an <input type='range'>
function createRange(type, attributes) { function createRange(type, attributes) {
var id = 'plyr-' + type + (is.object(attributes) && 'id' in attributes ? '-' + attributes.id : '');
// Seek label // Seek label
var label = createElement('label', { var label = createElement('label', {
for: id, for: attributes.id,
class: config.classes.hidden class: config.classes.hidden
}, config.i18n[type]); }, config.i18n[type]);
// Seek input // Seek input
var input = createElement('input', extend(getAttributesFromSelector(config.selectors.inputs[type]), { var input = createElement('input', extend(getAttributesFromSelector(config.selectors.inputs[type]), {
id: id,
type: 'range', type: 'range',
min: 0, min: 0,
max: 100, max: 100,
@ -1278,7 +1275,7 @@
// Seek range slider // Seek range slider
var seek = createRange('seek', { var seek = createRange('seek', {
id: data.id id: 'plyr-seek-' + data.id
}); });
container.appendChild(seek.label); container.appendChild(seek.label);
container.appendChild(seek.input); container.appendChild(seek.input);
@ -1329,13 +1326,14 @@
// Set the attributes // Set the attributes
var attributes = { var attributes = {
id: data.id,
max: 10, max: 10,
value: config.volume value: config.volume
}; };
// Create the volume range slider // Create the volume range slider
var range = createRange('volume', attributes); var range = createRange('volume', extend(attributes, {
id: 'plyr-volume-' + data.id
}));
volume.appendChild(range.label); volume.appendChild(range.label);
volume.appendChild(range.input); volume.appendChild(range.input);

View File

@ -495,6 +495,7 @@
// The actual menu container // The actual menu container
&__container { &__container {
position: absolute; position: absolute;
z-index: 1;
bottom: 100%; bottom: 100%;
right: -5px; right: -5px;
margin-bottom: 10px; margin-bottom: 10px;
@ -528,7 +529,7 @@
ul { ul {
margin: 0; margin: 0;
padding: 5px; padding: @plyr-control-padding;
list-style: none; list-style: none;
overflow: hidden; overflow: hidden;
} }
@ -561,10 +562,11 @@
&--back { &--back {
position: relative; position: relative;
padding-top: floor(@plyr-control-padding * .7); @horizontal-padding: (@plyr-control-padding * 2);
padding-bottom: floor(@plyr-control-padding * .7); width: ~"calc(100% - @{horizontal-padding})";
margin: @plyr-control-padding;
margin-bottom: floor(@plyr-control-padding / 2);
padding-left: ceil(@plyr-control-padding * 4); padding-left: ceil(@plyr-control-padding * 4);
margin-bottom: ceil(@plyr-control-padding * 1.3);
font-weight: 500; font-weight: 500;
&::after { &::after {