diff options
author | Sam Potts <sam@potts.es> | 2018-04-04 16:50:06 +1000 |
---|---|---|
committer | Sam Potts <sam@potts.es> | 2018-04-04 16:50:06 +1000 |
commit | ee79c46145578c77fbf37c93389a3c7e7a950b0c (patch) | |
tree | 7e61587b1b0d078baeeb3bf94bfa03fcdde9d260 /src | |
parent | 384010a2c0b4c08bb226240f48b5e615564fbd22 (diff) | |
parent | 1e47019122248b1376e09e30c51fab885fb3c200 (diff) | |
download | plyr-ee79c46145578c77fbf37c93389a3c7e7a950b0c.tar.lz plyr-ee79c46145578c77fbf37c93389a3c7e7a950b0c.tar.xz plyr-ee79c46145578c77fbf37c93389a3c7e7a950b0c.zip |
Merge branch 'master' of github.com:sampotts/plyr
Diffstat (limited to 'src')
-rw-r--r-- | src/js/plyr.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/js/plyr.js b/src/js/plyr.js index fade0096..6be0d2cc 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -57,7 +57,7 @@ class Plyr { this.config = utils.extend( {}, defaults, - options, + options || {}, (() => { try { return JSON.parse(this.media.getAttribute('data-plyr-config')); |