diff options
| author | Sam Potts <me@sampotts.me> | 2017-03-25 11:24:38 +1100 |
|---|---|---|
| committer | Sam Potts <me@sampotts.me> | 2017-03-25 11:24:38 +1100 |
| commit | b083bf4297396712e3b3a7270a3658c9fd7aff7a (patch) | |
| tree | 72f856d6b431a26e24b3ddfbb34808944f18220d /src/js/plyr.js | |
| parent | ebc7ed538a292211cf45cc6b638e9527170d0f06 (diff) | |
| parent | 4957e4d80c833bbfa915c0c20d3d79245221b6f6 (diff) | |
| download | plyr-b083bf4297396712e3b3a7270a3658c9fd7aff7a.tar.lz plyr-b083bf4297396712e3b3a7270a3658c9fd7aff7a.tar.xz plyr-b083bf4297396712e3b3a7270a3658c9fd7aff7a.zip | |
Merge branch 'master' into develop
# Conflicts:
# dist/plyr.css
# dist/plyr.js
# src/js/plyr.js
# src/less/plyr.less
# src/scss/plyr.scss
Diffstat (limited to 'src/js/plyr.js')
| -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 2c85af51..d797f66d 100644 --- 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) { |