Merge branch 'beta' of github.com:sampotts/plyr into beta
# Conflicts: # dist/plyr.js # dist/plyr.js.map
This commit is contained in:
@ -56,7 +56,7 @@ const defaults = {
|
||||
// Sprite (for icons)
|
||||
loadSprite: true,
|
||||
iconPrefix: 'plyr',
|
||||
iconUrl: 'https://cdn.plyr.io/3.0.0-beta.10/plyr.svg',
|
||||
iconUrl: 'https://cdn.plyr.io/3.0.0-beta.11/plyr.svg',
|
||||
|
||||
// Blank video (used to prevent errors on source change)
|
||||
blankVideo: 'https://cdn.plyr.io/static/blank.mp4',
|
||||
|
@ -1,6 +1,6 @@
|
||||
// ==========================================================================
|
||||
// Plyr
|
||||
// plyr.js v3.0.0-beta.10
|
||||
// plyr.js v3.0.0-beta.11
|
||||
// https://github.com/sampotts/plyr
|
||||
// License: The MIT License (MIT)
|
||||
// ==========================================================================
|
||||
@ -559,6 +559,10 @@ class Plyr {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (this.isAudio) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// Get audio tracks
|
||||
return this.media.mozHasAudio || Boolean(this.media.webkitAudioDecodedByteCount) || Boolean(this.media.audioTracks && this.media.audioTracks.length);
|
||||
}
|
||||
|
@ -9,7 +9,7 @@ const utils = {
|
||||
// Check variable types
|
||||
is: {
|
||||
plyr(input) {
|
||||
return this.instanceof(input, Plyr);
|
||||
return this.instanceof(input, window.Plyr);
|
||||
},
|
||||
object(input) {
|
||||
return this.getConstructor(input) === Object;
|
||||
@ -620,7 +620,7 @@ const utils = {
|
||||
const event = new CustomEvent(type, {
|
||||
bubbles: utils.is.boolean(bubbles) ? bubbles : false,
|
||||
detail: Object.assign({}, detail, {
|
||||
plyr: this instanceof Plyr ? this : null,
|
||||
plyr: utils.is.plyr(this) ? this : null,
|
||||
}),
|
||||
});
|
||||
|
||||
|
Reference in New Issue
Block a user