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

Tidy up

Browse Source
This commit is contained in:
Sam Potts 2017-04-25 18:43:09 +10:00
parent 7889ae1126
commit 8ea4cbd942
2 changed files with 25 additions and 31 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

40
src/js/plyr.js
View File

@ -2815,25 +2815,19 @@
speed = parseFloat(player.storage.speed || config.speed.selected); speed = parseFloat(player.storage.speed || config.speed.selected);
} }
// Set min/max
if (speed < 0.1) {
speed = 0.1;
}
if (speed > 2.0) {
speed = 2.0;
}
if (!is.array(config.speed.options)) { if (!is.array(config.speed.options)) {
warn('Invalid speeds format'); warn('Invalid speeds format');
return; return;
} }
if (!is.number(speed)) {
var index = config.speed.options.indexOf(config.speed.selected);
if (index !== -1) {
var next = index + 1;
if (next >= config.speeds.length) {
next = 0;
}
speed = config.speed.options[next];
} else {
speed = config.speed.selected;
}
}
// Store current speed // Store current speed
config.speed.selected = speed; config.speed.selected = speed;
@ -4026,18 +4020,23 @@
// Settings menu items - use event delegation as items are added/removed // Settings menu items - use event delegation as items are added/removed
on(player.elements.settings.menu, 'click', function(event) { on(player.elements.settings.menu, 'click', function(event) {
// Settings - Speed // Settings - Language
if (matches(event.target, config.selectors.inputs.speed)) { if (matches(event.target, config.selectors.inputs.language)) {
handlerProxy.call(this, event, config.listeners.speed, setSpeed); handlerProxy.call(this, event, config.listeners.language, setLanguage);
} }
// Settings - Quality // Settings - Quality
else if (matches(event.target, config.selectors.inputs.quality)) { else if (matches(event.target, config.selectors.inputs.quality)) {
handlerProxy.call(this, event, config.listeners.quality, function() { handlerProxy.call(this, event, config.listeners.quality, function() {
console.warn("Set quality"); warn("Set quality");
}); });
} }
// Settings - Speed
else if (matches(event.target, config.selectors.inputs.speed)) {
handlerProxy.call(this, event, config.listeners.speed, setSpeed);
}
// Settings - Looping // Settings - Looping
// TODO: use toggle buttons // TODO: use toggle buttons
else if (matches(event.target, config.selectors.buttons.loop)) { else if (matches(event.target, config.selectors.buttons.loop)) {
@ -4050,11 +4049,6 @@
} }
}); });
} }
// Settings - Language
else if (matches(event.target, config.selectors.inputs.language)) {
handlerProxy.call(this, event, config.listeners.language, setLanguage);
}
}); });
// Seek // Seek