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

IE & Edge fixes, Storage & Console classes

Browse Source
This commit is contained in:
Sam Potts
2017-12-08 10:05:38 +00:00
parent de54929bb7
commit c8990bd379
33 changed files with 1051 additions and 615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/js/captions.js
View File

@ -5,7 +5,6 @@
import support from './support';
import utils from './utils';
import controls from './controls';
import storage from './storage';
const captions = {
// Setup captions
@ -16,18 +15,24 @@ const captions = {
}
// Set default language if not set
if (!utils.is.empty(storage.get.call(this).language)) {
this.captions.language = storage.get.call(this).language;
} else if (utils.is.empty(this.captions.language)) {
const stored = this.storage.get('language');
if (!utils.is.empty(stored)) {
this.captions.language = stored;
}
if (utils.is.empty(this.captions.language)) {
this.captions.language = this.config.captions.language.toLowerCase();
}
// Set captions enabled state if not set
if (!utils.is.boolean(this.captions.enabled)) {
if (!utils.is.empty(storage.get.call(this).language)) {
this.captions.enabled = storage.get.call(this).captions;
if (!utils.is.boolean(this.captions.active)) {
const active = this.storage.get('captions');
if (utils.is.boolean(active)) {
this.captions.active = active;
} else {
this.captions.enabled = this.config.captions.active;
this.captions.active = this.config.captions.active;
}
}
@ -42,7 +47,7 @@ const captions = {
}
// Inject the container
if (!utils.is.htmlElement(this.elements.captions)) {
if (!utils.is.element(this.elements.captions)) {
this.elements.captions = utils.createElement('div', utils.getAttributesFromSelector(this.config.selectors.captions));
utils.insertAfter(this.elements.captions, this.elements.wrapper);
@ -141,7 +146,7 @@ const captions = {
return;
}
if (utils.is.htmlElement(this.elements.captions)) {
if (utils.is.element(this.elements.captions)) {
const content = utils.createElement('span');
// Empty the container
@ -160,19 +165,19 @@ const captions = {
// Set new caption text
this.elements.captions.appendChild(content);
} else {
this.console.warn('No captions element to render to');
this.debug.warn('No captions element to render to');
}
},
// Display captions container and button (for initialization)
show() {
// If there's no caption toggle, bail
if (!utils.is.htmlElement(this.elements.buttons.captions)) {
if (!utils.is.element(this.elements.buttons.captions)) {
return;
}
// Try to load the value from storage
let active = storage.get.call(this).captions;
let active = this.storage.get('captions');
// Otherwise fall back to the default config
if (!utils.is.boolean(active)) {