Merge branch 'master' into develop

# Conflicts: # dist/plyr.css # dist/plyr.js # src/js/plyr.js # src/less/plyr.less # src/scss/plyr.scss
2017-03-25 11:24:38 +11:00
parent ebc7ed538a 4957e4d80c
commit b083bf4297
10 changed files with 76 additions and 26 deletions
--- a/src/js/plyr.js
+++ b/src/js/plyr.js
@ -3752,7 +3752,7 @@
            }

            // Captions
-            on(plyr.buttons.captions, 'click', toggleCaptions);
+            proxy(plyr.buttons.captions, 'click', config.listeners.captions, toggleCaptions);

            // Settings
            on(plyr.buttons.settings, 'click', function(event) {