Merge branch 'beta' into beta-with-ads

# Conflicts: # demo/dist/demo.js # demo/dist/demo.js.map # dist/plyr.js # dist/plyr.js.map
2018-01-14 22:55:44 +11:00
parent bbdf225d7b 5f96ec6ac2
commit cfc86bcb7c
6 changed files with 9 additions and 19 deletions
--- a/demo/src/js/demo.js
+++ b/demo/src/js/demo.js
@ -48,19 +48,6 @@ document.addEventListener('DOMContentLoaded', () => {
        captions: {
            active: true,
        },
-        controls: [
-            'play-large',
-            'play',
-            'progress',
-            'current-time',
-            'mute',
-            'volume',
-            'captions',
-            'settings',
-            'fullscreen',
-            'pip',
-            'airplay',
-        ],
        keys: {
            google: 'AIzaSyDrNwtN3nLH_8rjCmu5Wq3ZCm4MNAVdc0c',
        },