Code

move timeout back into parseCues#3181

Code

Closed

gkatsev wants to merge 14 commits intovideojs:mastervideojs/video.js:masterfrom gkatsev:fix-vttjs-loadinggkatsev/video.js:fix-vttjs-loadingCopy head branch name to clipboard

+145-3

Commits

Commits on Mar 15, 2016

• move timeout back into parseCues

  gkatsev

  committed
  bf786eb

• fix variable name

  gkatsev

  committed
  dd9dde9

• test to make sure that the parser is called if vttjs is loaded

  gkatsev

  committed
  2e5ce39

• add broken test that tests that parsing is done when webvtt loads

  gkatsev

  committed
  1c3c218

• Make sure we don't try to parse if webvtt hasn't loaded. Thereby fixing the previous test

  gkatsev

  committed
  fb35069

• add semicolons

  gkatsev

  committed
  86a9bf3

Commits on Mar 16, 2016

• Add retries to processing tracks when vttjs hasn't loaded

  gkatsev

  committed
  b20151f

Commits on Mar 17, 2016

• wait for vttjs to load before parsing cues

  gkatsev

  committed
  71a1695

• add a watch task for the novtt file

  gkatsev

  committed
  ef9324e

• fix test to test that cues are parsed when vttjs is loaded

  gkatsev

  committed
  c417ab0

• stop waiting for vttjs if it errored out

  gkatsev

  committed
  74970fc

• test that vttjserror removed the loaded event handler

  gkatsev

  committed
  5d3d68b

• add semicolon

  gkatsev

  committed
  614fe07

• update test wording

  gkatsev

  committed
  aa9c5d6