ProximaEntertainment/plyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Conflicts and tracks array on config

Browse Source
This commit is contained in:
Chrysa Papadopoulou 2017-02-24 16:38:00 +02:00
commit 8464ffe6ad
3 changed files with 68 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dist/plyr.js vendored
View File

File diff suppressed because one or more lines are too long

33
src/js/plyr.js
View File

@ -65,6 +65,7 @@
controls: false,
seek: true
},
tracks: [],
selectors: {
html5: 'video, audio',
embed: '[data-type]',
@ -104,7 +105,10 @@
},
captions: '.plyr__captions',
currentTime: '.plyr__time--current',
duration: '.plyr__time--duration'
duration: '.plyr__time--duration',
menu: {
quality: '.js-plyr__menu__list--quality'
}
},
classes: {
setup: 'plyr--setup',
@ -1010,9 +1014,9 @@
'<svg><use xlink:href="' + iconPath + '-settings" /></svg>',
'<span class="plyr__sr-only">' + config.i18n.settings + '</span>',
'</button>',
'<div class="plyr__menu__container" id="plyr-settings-{id}" aria-hidden="true" aria-labelled-by="plyr-settings-toggle-{id}" role="tablist" tabindex="-1">',
'<form class="plyr__menu__container" id="plyr-settings-{id}" aria-hidden="true" aria-labelled-by="plyr-settings-toggle-{id}" role="tablist" tabindex="-1">',
'<div>',
'<div class="plyr__menu__primary" id="plyr-settings-{id}-primary" aria-hidden="false" aria-labelled-by="plyr-settings-toggle-{id}" role="tabpanel" tabindex="-1">',
'<div id="plyr-settings-{id}-primary" aria-hidden="false" aria-labelled-by="plyr-settings-toggle-{id}" role="tabpanel" tabindex="-1">',
'<ul>',
captionsMenuItem,
'<li role="tab">',
@ -1035,7 +1039,7 @@
'</li>',
'</ul>',
'</div>',
'<div class="plyr__menu__secondary" id="plyr-settings-{id}-captions" aria-hidden="true" aria-labelled-by="plyr-settings-{id}-captions-toggle" role="tabpanel" tabindex="-1">',
'<div id="plyr-settings-{id}-captions" aria-hidden="true" aria-labelled-by="plyr-settings-{id}-captions-toggle" role="tabpanel" tabindex="-1">',
'<ul>',
'<li role="tab">',
'<button type="button" class="plyr__control plyr__control--back" aria-haspopup="true" aria-controls="plyr-settings-{id}-primary" aria-expanded="false">',
@ -1050,7 +1054,7 @@
'</li>',
'</ul>',
'</div>',
'<form class="plyr__menu__secondary" id="plyr-settings-{id}-speed" aria-hidden="true" aria-labelled-by="plyr-settings-{id}-speed-toggle" role="tabpanel" tabindex="-1">',
'<div id="plyr-settings-{id}-speed" aria-hidden="true" aria-labelled-by="plyr-settings-{id}-speed-toggle" role="tabpanel" tabindex="-1">',
'<ul>',
'<li role="tab">',
'<button type="button" class="plyr__control plyr__control--back" aria-haspopup="true" aria-controls="plyr-settings-{id}-primary" aria-expanded="false">',
@ -1082,8 +1086,8 @@
'</label>',
'</li>',
'</ul>',
'</form>',
'<div class="plyr__menu__secondary" id="plyr-settings-{id}-quality" aria-hidden="true" aria-labelled-by="plyr-settings-{id}-quality-toggle" role="tabpanel" tabindex="-1">',
'</div>',
'<div id="plyr-settings-{id}-quality" aria-hidden="true" aria-labelled-by="plyr-settings-{id}-quality-toggle" role="tabpanel" tabindex="-1">',
'<ul>',
'<li role="tab">',
'<button type="button" class="plyr__control plyr__control--back" aria-haspopup="true" aria-controls="plyr-settings-{id}-primary" aria-expanded="false">',
@ -1140,7 +1144,7 @@
'</li>',
'</ul>',
'</div>',
'<div class="plyr__menu__secondary" id="plyr-settings-{id}-loop" aria-hidden="true" aria-labelled-by="plyr-settings-{id}-loop-toggle" role="tabpanel" tabindex="-1">',
'<div id="plyr-settings-{id}-loop" aria-hidden="true" aria-labelled-by="plyr-settings-{id}-loop-toggle" role="tabpanel" tabindex="-1">',
'<ul>',
'<li role="tab">',
'<button type="button" class="plyr__control plyr__control--back" aria-haspopup="true" aria-controls="plyr-settings-{id}-primary" aria-expanded="false">',
@ -1173,7 +1177,7 @@
'</ul>',
'</div>',
'</div>',
'</div>',
'</form>',
'</div>'
);
/* beautify ignore:end */
@ -1297,7 +1301,7 @@
return [
'<li>',
'<label class="plyr__control">',
'<input type="radio" name="quality" value="' + quality + '"' + (quality === current ? ' checked' : '') + '>',
'<input type="radio" name="quality" value="' + quality + '"' + (quality === plyr.quality.current ? ' checked' : '') + '>',
getLabel(quality),
getBadge(quality),
'</label>',
@ -1313,7 +1317,7 @@
'</li>'
].join(''));
console.warn(list);
getElement(config.selectors.menu.quality).innerHTML = list.join('');
}
}
@ -2489,7 +2493,7 @@
var currentTime = Number(plyr.media.currentTime);
switch(toggle) {
switch (toggle) {
case 'loopin':
if (config.loopout && config.loopout <= currentTime) {
config.loopout = null;
@ -3693,7 +3697,7 @@
proxy(plyr.buttons.forward, 'click', config.listeners.forward, forward);
// Speed-up
proxy(plyr.buttons.speed, 'click', config.listeners.speed, function () {
proxy(plyr.buttons.speed, 'click', config.listeners.speed, function() {
var speedValue = document.querySelector('[data-plyr="speed"]:checked').value;
setSpeed(Number(speedValue));
});
@ -3713,7 +3717,7 @@
proxy(plyr.buttons.fullscreen, 'click', config.listeners.fullscreen, toggleFullscreen);
// Loop
proxy(plyr.buttons.loop, 'click', config.listeners.loop, function (event) {
proxy(plyr.buttons.loop, 'click', config.listeners.loop, function(event) {
var loopValue = event.target.getAttribute('data-loop__value') || event.target.getAttribute('data-loop__type');
if (['loopin', 'loopout', 'loopall', 'loopclear'].indexOf(loopValue) > -1) {
toggleLoop(loopValue);
@ -4169,7 +4173,6 @@
// Set playback speed
setSpeed();
// Set loop
toggleLoop();

2
src/less/plyr.less
View File

@ -302,8 +302,6 @@
margin-left: 0;
}
@media (min-width: @plyr-bp-screen-sm) {
> .plyr__control,
.plyr__progress,