Turn meta event listener on when playlisItem changes JW7-1984

jwplayer · Jan 28, 2016 · c0ad3b4 · c0ad3b4
1 parent 086da58
commit c0ad3b4
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/js/controller/captions.js b/src/js/controller/captions.js
@@ -17,12 +17,11 @@ define([
         // Listen for provider subtitle tracks
         //   ignoring provider "subtitlesTrackChanged" since index should be managed here
         _model.mediaController.on('subtitlesTracks', function(e) {
-            _model.mediaController.off('meta');
             if(! e.tracks.length) {
-                // If we don't get WebVTT captions, listen for metadata captions
-                _model.mediaController.on('meta',_metaHandler, this);
                 return;
             }
+            // If we get webvtt captions, do not override with metadata captions
+            _model.mediaController.off('meta', _metaHandler);
 
             _tracks = [];
             _tracksById = {};
@@ -115,6 +114,10 @@ define([
             _metaCuesByTextTime = {};
             _unknownCount = 0;
 
+            // meta event listener may have been turned off in subtitlesTracks event
+            _model.mediaController.off('meta', _metaHandler);
+            _model.mediaController.on('meta', _metaHandler, this);
+
             var tracks = item.tracks,
                 track, kind, i;
             for (i = 0; i < tracks.length; i++) {