Merge branch 'stable'

jgubman · Oct 9, 2015 · 7ce59ef · 7ce59ef
2 parents aab9246 + 8c101e2
commit 7ce59ef
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@ CHANGELOG
 =========
 
 ## HEAD (Unreleased)
-_(none)_
+* @imbcmdth fixed an issue with emulateTextTracks being called before the tech dom was ready ([view](https://github.com/videojs/video.js/pull/2692))
 
 --------------------
 

diff --git a/src/js/tech/tech.js b/src/js/tech/tech.js
@@ -58,7 +58,7 @@ class Tech extends Component {
     }
 
     if (!this.featuresNativeTextTracks) {
-      this.emulateTextTracks();
+      this.on('ready', this.emulateTextTracks);
     }
 
     this.initTextTrackListeners();