Release v4.12.7

Added background-color to vjs-poster to remove transparent borders around scaled poster image

.gitignore

@@ -1,6 +1,7 @@
 .DS_Store
 dist/*
 build/files/*
+build/temp/*
 docs/api/*
 dev.html
 projects

.jshintrc

@@ -11,10 +11,13 @@
     "trailing" : true,
     "undef"    : true,
     "laxbreak" : true,
+    "globals"  : {
+        "vjs": true,
+        "videojs": true,
+        "PlayerTest": true,
+        "TestHelpers": true
+    },
     "predef"   : [
-        "_V_",
-        "videojs",
-        "vjs",
         "goog",
         "console",
 
@@ -24,8 +27,6 @@
         "exports",
         "process",
 
-        "PlayerTest",
-        "TestHelpers",
         "asyncTest",
         "deepEqual",
         "equal",

CHANGELOG.md

@@ -6,13 +6,99 @@ _(none)_
 
 --------------------
 
+## 4.12.7 (2015-05-19)
+* @tjenkinson Added background-color to vjs-poster to remove transparent borders around scaled poster image ([view](https://github.com/videojs/video.js/pull/2138))
+* @bc-bbay fixed a bug where the player would try to autoplay when there was no source ([view](https://github.com/videojs/video.js/pull/2127))
+* @bc-bbay update time display on loadedmetadata ([view](https://github.com/videojs/video.js/pull/2151))
+* @dmlap update swf to 4.7 to pick up preload fix ([view](https://github.com/videojs/video.js/pull/2170))
+
+## 4.12.6 (2015-05-07)
+* @saxena-gaurav fixed a bug from disposing after changing techs ([view](https://github.com/videojs/video.js/pull/2125))
+
+## 4.12.5 (2015-03-17)
+* Updated to videojs-swf v4.5.4 to fix a potential security issue ([view](https://github.com/videojs/video.js/pull/1955))
+
+## 4.12.4 (2015-03-05)
+* Randomized the Google Analytics calls to stay under the limit ([view](https://github.com/videojs/video.js/pull/1916))
+
+## 4.12.3 (2015-02-28)
+* @heff fixed setting the source to an empty string ([view](https://github.com/videojs/video.js/pull/1905))
+
+## 4.12.2 (2015-02-27)
+* @gkatsev fixed disabling of default text tracks ([view](https://github.com/videojs/video.js/pull/1892))
+
+## 4.12.1 (2015-02-19)
+* @gkatsev fixed the track list reference while switching techs that use emulated tracks ([view](https://github.com/videojs/video.js/pull/1874))
+* @gkatsev fixed a Firefox error with the captions settings select menu options ([view](https://github.com/videojs/video.js/pull/1877))
+
+## 4.12.0 (2015-02-17)
+* @PeterDaveHello added a Traditional Chinese translation ([view](https://github.com/videojs/video.js/pull/1729))
+* @mmcc updated the hide/show functions to use a class instead of inline styles ([view](https://github.com/videojs/video.js/pull/1681))
+* @mister-ben added better handling of the additional videojs() arguments when the player is already initialized ([view](https://github.com/videojs/video.js/pull/1730))
+* @anhskohbo added a Vietnamese translation ([view](https://github.com/videojs/video.js/pull/1734))
+* @Sxmanek added a Czech translation ([view](https://github.com/videojs/video.js/pull/1739))
+* @jcaron23 added the vjs-scrubbing CSS class and prevented menus from showing while scrubbing ([view](https://github.com/videojs/video.js/pull/1741))
+* @dmlap fixed URL parsing in IE9 ([view](https://github.com/videojs/video.js/pull/1765))
+* @gkatsev Fixed issue where ManualTimeUpdatesOff was not de-registering events ([view](https://github.com/videojs/video.js/pull/1793))
+* @brycefisher Added a guide on player disposal ([view](https://github.com/videojs/video.js/pull/1803))
+* @toniher added a Catalan translation ([view](https://github.com/videojs/video.js/pull/1794))
+* @mmcc added a VERSION key to the videojs object ([view](https://github.com/videojs/video.js/pull/1798))
+* @mmcc fixed an issue with text track hiding introduced in #1681 ([view](https://github.com/videojs/video.js/pull/1804))
+* @dmlap exported video.js as a named AMD module ([view](https://github.com/videojs/video.js/pull/1844))
+* @dmlap fixed poster hiding when the loadstart event does not fire ([view](https://github.com/videojs/video.js/pull/1834))
+* @chikathreesix fixed an object delete error in Chrome ([view](https://github.com/videojs/video.js/pull/1858))
+* @steverandy fixed an issue with scrolling over the player on touch devices ([view](https://github.com/videojs/video.js/pull/1809))
+* @mmcc improved tap sensitivity ([view](https://github.com/videojs/video.js/pull/1830))
+* @mister-ben added a vjs-ended class when playback reaches the end of the timeline ([view](https://github.com/videojs/video.js/pull/1857))
+* @dmlap Add network and ready state properties ([view](https://github.com/videojs/video.js/pull/1854))
+* @woollybogger exported the hasClass function ([view](https://github.com/videojs/video.js/pull/1839))
+* @DevGavin fixed the Chinese translation ([view](https://github.com/videojs/video.js/pull/1841))
+* @iSimonWeb added font-path variable ([view](https://github.com/videojs/video.js/pull/1847))
+* @shoshomiga added a Bulgarian translation ([view](https://github.com/videojs/video.js/pull/1849))
+* @ragecub3 added a Turkish translation ([view](https://github.com/videojs/video.js/pull/1853))
+* @gkatsev greatly improved text track support and implemented vtt.js as the webvtt parser ([view](https://github.com/videojs/video.js/pull/1749))
+* @gkatsev fixed captions showing by default in Chrome and Safari ([view](https://github.com/videojs/video.js/pull/1865))
+* @mister-ben fixed a woff warning in Firefox ([view](https://github.com/videojs/video.js/pull/1870))
+
+## 4.11.4 (2015-01-23)
+* @heff exported missing source handler functions ([view](https://github.com/videojs/video.js/pull/1787))
+* @heff fixed type support checking for an empty src string ([view](https://github.com/videojs/video.js/pull/1797))
+* @carpasse fixed a bug in updating child indexes after removing components ([view](https://github.com/videojs/video.js/pull/1814))
+* @dmlap fixed a bug where native controls would show after switching techs ([view](https://github.com/videojs/video.js/pull/1811))
+* @H1D fixed an issue with file extension type detection ([view](https://github.com/videojs/video.js/pull/1818))
+* @bclwhitaker updated to v4.5.3 of video-js-swf ([view](https://github.com/videojs/video.js/pull/1823))
+
+## 4.11.3 (2014-12-19)
+* @gdkraus fixed a bug where you could no longer tab-navigate passed a menu button ([view](https://github.com/videojs/video.js/pull/1760))
+* @matteos exported the setSource functions so source handlers will work in the minified version ([view](https://github.com/videojs/video.js/pull/1753))
+* @matteos fixed RTMP playback ([view](https://github.com/videojs/video.js/pull/1755))
+
+## 4.11.2 (2014-12-17)
+* @mmcc fixed a bug where the playback rate menu would not open ([view](https://github.com/videojs/video.js/pull/1716))
+* @gkatsev fixed an issue with source handlers that caused subclasses of source handler classes to break ([view](https://github.com/videojs/video.js/pull/1746))
+
+## 4.11.1 (2014-12-04)
+* @heff fixed a code bug in track XHR requests ([view](https://github.com/videojs/video.js/pull/1715))
+
+## 4.11.0 (2014-12-04)
+* @rutkat updated sliders to use keydown instead of keyup for more responsive key control ([view](https://github.com/videojs/video.js/pull/1616))
+* @toloudis fixed an issue with checking for an existing source on the video element ([view](https://github.com/videojs/video.js/pull/1651))
+* @rafalwrzeszcz fixed the Flash object tag markup for strict XML ([view](https://github.com/videojs/video.js/pull/1702))
+* @thijstriemstra fixed a number of typos in the docs ([view](https://github.com/videojs/video.js/pull/1704))
+* @heff added the Source Handler interface for handling advanced formats including adaptive streaming ([view](https://github.com/videojs/video.js/pull/1560))
+* @azawawi added an Arabic translation ([view](https://github.com/videojs/video.js/pull/1692))
+* @mmcc added functions for better timeout and interval handling ([view](https://github.com/videojs/video.js/pull/1642))
+* @mmcc fixed the vdata exception when you dispose a player with tracks ([view](https://github.com/videojs/video.js/pull/1710))
+* @nemesreviz added a Hungarian translation ([view](https://github.com/videojs/video.js/pull/1711))
+* @heff updated the SWF to the latest version ([view](https://github.com/videojs/video.js/pull/1714))
+
 ## 4.10.2 (2014-10-30)
 * @heff fixed checking for child options in the parent options to allow for 'false' ([view](https://github.com/videojs/video.js/pull/1630))
 * @heff fixed the VolumeMenuButton options to allow passing 'vertical' to the VolumeBar ([view](https://github.com/videojs/video.js/pull/1631))
 * @mmcc fixed localization of captions/subtitles menu off buttons ([view](https://github.com/videojs/video.js/pull/1632))
 
 ## 4.10.1 (2014-10-29)
-@heff removed his own stupid error ([view])(https://github.com/videojs/video.js/commit/a12dd770572a7f16e436e2332eba7ffbb1f1b9b9)
+@heff removed his own stupid error [view](https://github.com/videojs/video.js/commit/a12dd770572a7f16e436e2332eba7ffbb1f1b9b9)
 
 ## 4.10.0 (2014-10-28)
 * @aptx4869 fixed an issue where the native JSON parser wasn't used ([view](https://github.com/videojs/video.js/pull/1565))

CONTRIBUTING.md

@@ -222,7 +222,7 @@ Make sure your changes are pushed to origin
 git push
 ```
 
-Use contrib to submit a a pull request (make sure you're in your feature branch)
+Use contrib to submit a pull request (make sure you're in your feature branch)
 
 ```bash
 contrib feature submit

Gruntfile.js

@@ -1,16 +1,7 @@
 module.exports = function(grunt) {
-  var pkg, s3, semver, version, verParts, uglify, exec;
+  var pkg, version, verParts;
 
-  semver = require('semver');
   pkg = grunt.file.readJSON('package.json');
-  uglify = require('uglify-js');
-  exec = require('child_process').exec;
-
-  try {
-    s3 = grunt.file.readJSON('.s3config.json');
-  } catch(e) {
-    s3 = {};
-  }
 
   verParts = pkg.version.split('.');
   version = {
@@ -20,6 +11,7 @@ module.exports = function(grunt) {
     patch: verParts[2]
   };
   version.majorMinor = version.major + '.' + version.minor;
+  grunt.vjsVersion = version;
 
   // loading predefined source order from source-loader.js
   // trust me, this is the easist way to do it so far
@@ -28,6 +20,8 @@ module.exports = function(grunt) {
   var sourceFiles; // Needed to satisfy jshint
   eval(grunt.file.read('./build/source-loader.js'));
 
+  grunt.sourceFiles = sourceFiles;
+
   // Project configuration.
   grunt.initConfig({
     pkg: pkg,
@@ -43,7 +37,7 @@ module.exports = function(grunt) {
     },
     jshint: {
       src: {
-        src: ['src/js/*.js', 'Gruntfile.js', 'test/unit/*.js'],
+        src: ['src/js/**/*.js', 'Gruntfile.js', 'test/unit/**/*.js'],
         options: {
           jshintrc: '.jshintrc'
         }
@@ -91,33 +85,58 @@ module.exports = function(grunt) {
         ]
       }
     },
-    s3: {
-      options: s3,
-      minor: {
-        upload: [
+    aws_s3: {
+      options: {
+        accessKeyId: process.env.VJS_S3_KEY,
+        secretAccessKey: process.env.VJS_S3_SECRET,
+        bucket: process.env.VJS_S3_BUCKET,
+        access: 'public-read',
+        uploadConcurrency: 5
+      },
+      patch: {
+        files: [
           {
-            src: 'dist/cdn/*',
-            dest: 'vjs/'+version.majorMinor+'/',
-            rel: 'dist/cdn/',
-            headers: {
-              'Cache-Control': 'public, max-age=2628000'
-            }
+            expand: true,
+            cwd: 'dist/cdn/',
+            src: ['**'],
+            dest: 'vjs/'+version.full+'/',
+            params: { CacheControl: 'public, max-age=31536000' }
           }
         ]
       },
-      patch: {
-        upload: [
+      minor: {
+        files: [
           {
-            src: 'dist/cdn/*',
-            dest: 'vjs/'+version.full+'/',
-            rel: 'dist/cdn/',
-            headers: {
-              'Cache-Control': 'public, max-age=31536000'
-            }
+            expand: true,
+            cwd: 'dist/cdn/',
+            src: ['**'],
+            dest: 'vjs/'+version.majorMinor+'/',
+            params: { CacheControl: 'public, max-age=2628000' }
           }
         ]
       }
     },
+    fastly: {
+      options: {
+        key: process.env.VJS_FASTLY_API_KEY
+      },
+      minor: {
+        options: {
+          host: 'vjs.zencdn.net',
+          urls: [
+            version.majorMinor+'/*'
+          ]
+        }
+      },
+      patch: {
+        options: {
+          host: 'vjs.zencdn.net',
+          urls: [
+            version.full+'/*'
+          ]
+        }
+      }
+    },
     cssmin: {
       minify: {
         expand: true,
@@ -308,11 +327,22 @@ module.exports = function(grunt) {
         src: ['package.json', 'bower.json', 'component.json']
       }
     },
-    tagrelease: {
-      file: 'package.json',
-      commit:  true,
-      message: 'Release %version%',
-      prefix:  'v'
+    'github-release': {
+      options: {
+        repository: 'videojs/video.js',
+        auth: {
+          user: process.env.VJS_GITHUB_USER,
+          password: process.env.VJS_GITHUB_TOKEN
+        },
+        release: {
+          tag_name: 'v'+ version.full,
+          name: version.full,
+          body: require('chg').find(version.full).changesRaw
+        }
+      },
+      files: {
+        src: ['dist/video-js-'+ version.full +'.zip'] // Files that you want to attach to Release
+      }
     }
   });
 
@@ -325,354 +355,29 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-copy');
   grunt.loadNpmTasks('grunt-contrib-cssmin');
   grunt.loadNpmTasks('grunt-contrib-less');
-  grunt.loadNpmTasks('grunt-s3');
   grunt.loadNpmTasks('contribflow');
   grunt.loadNpmTasks('grunt-karma');
   grunt.loadNpmTasks('videojs-doc-generator');
   grunt.loadNpmTasks('grunt-zip');
   grunt.loadNpmTasks('grunt-banner');
   grunt.loadNpmTasks('grunt-version');
-  grunt.loadNpmTasks('grunt-tagrelease');
   grunt.loadNpmTasks('chg');
+  grunt.loadNpmTasks('grunt-fastly');
+  grunt.loadNpmTasks('grunt-github-releaser');
+  grunt.loadNpmTasks('grunt-aws-s3');
 
   // grunt.loadTasks('./docs/tasks/');
   // grunt.loadTasks('../videojs-doc-generator/tasks/');
 
-  grunt.registerTask('pretask', ['jshint', 'less', 'vjslanguages', 'build', 'minify', 'usebanner']);
+  grunt.registerTask('pretask', ['jshint', 'less', 'vjslanguages', 'build', 'minify', 'vttjs', 'usebanner']);
   // Default task.
   grunt.registerTask('default', ['pretask', 'dist']);
   // Development watch task
   grunt.registerTask('dev', ['jshint', 'less', 'vjslanguages', 'build', 'qunit:source']);
   grunt.registerTask('test-qunit', ['pretask', 'qunit']);
 
-  // The test task will run `karma:saucelabs` when running in travis,
-  // when running via a PR from a fork, it'll run qunit tests in phantom using
-  // karma otherwise, it'll run the tests in chrome via karma
-  // You can specify which browsers to build with by using grunt-style arguments
-  // or separating them with a comma:
-  //   grunt test:chrome:firefox  # grunt-style
-  //   grunt test:chrome,firefox  # comma-separated
-  grunt.registerTask('test', function() {
-    var tasks = this.args,
-        tasksMinified,
-        tasksMinifiedApi;
-
-    grunt.task.run(['pretask']);
-
-    if (process.env.TRAVIS_PULL_REQUEST !== 'false') {
-      grunt.task.run(['karma:phantomjs', 'karma:minified_phantomjs', 'karma:minified_api_phantomjs']);
-    } else if (process.env.TRAVIS) {
-      grunt.task.run(['karma:phantomjs', 'karma:minified_phantomjs', 'karma:minified_api_phantomjs']);
-      //Disabling saucelabs until we figure out how to make it run reliably.
-      //grunt.task.run([
-        //'karma:chrome_sl',
-        //'karma:firefox_sl',
-        //'karma:safari_sl',
-        //'karma:ipad_sl',
-        //'karma:android_sl',
-        //'karma:ie_sl'
-      //]);
-    } else {
-      // if we aren't running this in a CI, but running it manually, we can
-      // supply arguments to this task. These arguments are either colon (`:`)
-      // separated which is the default grunt separator for arguments, or they
-      // are comma (`,`) separated to make it easier.
-      // The arguments are the names of which browsers you want. It'll then
-      // make sure you have the `minified` and `minified_api` for those browsers
-      // as well.
-      if (tasks.length === 0) {
-        tasks.push('chrome');
-      }
-      if (tasks.length === 1) {
-        tasks = tasks[0].split(',');
-      }
-
-      tasksMinified = tasks.slice();
-      tasksMinifiedApi = tasks.slice();
-
-      tasksMinified = tasksMinified.map(function(task) {
-        return 'minified_' + task;
-      });
-
-      tasksMinifiedApi = tasksMinifiedApi.map(function(task) {
-        return 'minified_api_' + task;
-      });
-
-      tasks = tasks.concat(tasksMinified).concat(tasksMinifiedApi);
-      tasks = tasks.map(function(task) {
-        return 'karma:' + task;
-      });
-
-      grunt.task.run(tasks);
-    }
-  });
-
-  grunt.registerTask('saucelabs', function() {
-    var done = this.async();
-
-    if (this.args[0] == 'connect') {
-      exec('curl https://gist.githubusercontent.com/santiycr/5139565/raw/sauce_connect_setup.sh | bash',
-        function(error, stdout, stderr) {
-          if (error) {
-            grunt.log.error(error);
-            return done();
-          }
-
-          grunt.verbose.error(stderr.toString());
-          grunt.verbose.writeln(stdout.toString());
-          grunt.task.run(['karma:saucelabs']);
-          done();
-      });
-    } else {
-      grunt.task.run(['karma:saucelabs']);
-      done();
-    }
-  });
-
-  var fs = require('fs');
-
-  grunt.registerMultiTask('build', 'Building Source', function(){
-
-    // Fix windows file path delimiter issue
-    var i = sourceFiles.length;
-    while (i--) {
-      sourceFiles[i] = sourceFiles[i].replace(/\\/g, '/');
-    }
-
-    // Create a combined sources file. https://github.com/zencoder/video-js/issues/287
-    var combined = '';
-    sourceFiles.forEach(function(result){
-      combined += grunt.file.read(result);
-    });
-    // Replace CDN version ref in js. Use major/minor version.
-    combined = combined.replace(/GENERATED_CDN_VSN/g, version.majorMinor);
-
-    grunt.file.write('build/files/combined.video.js', combined);
-
-    // Copy over other files
-    // grunt.file.copy('src/css/video-js.png', 'build/files/video-js.png');
-    grunt.file.copy('node_modules/videojs-swf/dist/video-js.swf', 'build/files/video-js.swf');
-
-    // Inject version number into css file
-    var css = grunt.file.read('build/files/video-js.css');
-    css = css.replace(/GENERATED_AT_BUILD/g, version.full);
-    grunt.file.write('build/files/video-js.css', css);
-
-    // Copy over font files
-    grunt.file.recurse('src/css/font', function(absdir, rootdir, subdir, filename) {
-      // Block .DS_Store files
-      if ('filename'.substring(0,1) !== '.') {
-        grunt.file.copy(absdir, 'build/files/font/' + filename);
-      }
-    });
-
-    // Minify CSS
-    grunt.task.run(['cssmin']);
-  });
-
-  grunt.registerMultiTask('minify', 'Minify JS files using Closure Compiler.', function() {
-    var done = this.async();
-    var exec = require('child_process').exec;
-
-    var externs = this.data.externs || [];
-    var dest = this.data.dest;
-    var filePatterns = [];
-
-    // Make sure deeper directories exist for compiler
-    grunt.file.write(dest, '');
-
-    if (this.data.sourcelist) {
-      filePatterns = filePatterns.concat(grunt.file.read(this.data.sourcelist).split(','));
-    }
-    if (this.data.src) {
-      filePatterns = filePatterns.concat(this.data.src);
-    }
-
-    // Build closure compiler shell command
-    var command = 'java -jar build/compiler/compiler.jar'
-                + ' --compilation_level ADVANCED_OPTIMIZATIONS'
-                // + ' --formatting=pretty_print'
-                + ' --js_output_file=' + dest
-                + ' --create_source_map ' + dest + '.map --source_map_format=V3'
-                + ' --jscomp_warning=checkTypes --warning_level=VERBOSE'
-                + ' --output_wrapper "(function() {%output%})();"';
-                //@ sourceMappingURL=video.js.map
-
-    // Add each js file
-    grunt.file.expand(filePatterns).forEach(function(file){
-      command += ' --js='+file;
-    });
-
-    // Add externs
-    externs.forEach(function(extern){
-      command += ' --externs='+extern;
-    });
-
-    // Run command
-    exec(command, { maxBuffer: 500*1024 }, function(err, stdout, stderr){
-
-      if (err) {
-        grunt.warn(err);
-        done(false);
-      }
-
-      if (stdout) {
-        grunt.log.writeln(stdout);
-      }
-
-      done();
-    });
-  });
-
-  grunt.registerTask('dist-copy', 'Assembling distribution', function(){
-    var css, jsmin, jsdev, cdnjs;
-
-    // Manually copy each source file
-    grunt.file.copy('build/files/minified.video.js', 'dist/video-js/video.js');
-    grunt.file.copy('build/files/combined.video.js', 'dist/video-js/video.dev.js');
-    grunt.file.copy('build/files/video-js.css', 'dist/video-js/video-js.css');
-    grunt.file.copy('build/files/video-js.min.css', 'dist/video-js/video-js.min.css');
-    grunt.file.copy('node_modules/videojs-swf/dist/video-js.swf', 'dist/video-js/video-js.swf');
-    grunt.file.copy('build/demo-files/demo.html', 'dist/video-js/demo.html');
-    grunt.file.copy('build/demo-files/demo.captions.vtt', 'dist/video-js/demo.captions.vtt');
-    grunt.file.copy('src/css/video-js.less', 'dist/video-js/video-js.less');
-
-
-    // Copy over font files
-    grunt.file.recurse('build/files/font', function(absdir, rootdir, subdir, filename) {
-      // Block .DS_Store files
-      if ('filename'.substring(0,1) !== '.') {
-        grunt.file.copy(absdir, 'dist/video-js/font/' + filename);
-      }
-    });
-
-    // Copy over language files
-    grunt.file.recurse('build/files/lang', function(absdir, rootdir, subdir, filename) {
-      // Block .DS_Store files
-      if ('filename'.substring(0,1) !== '.') {
-        grunt.file.copy(absdir, 'dist/cdn/lang/' + filename);
-        grunt.file.copy(absdir, 'dist/video-js/lang/' + filename);
-      }
-    });
-
-    // ds_store files sometime find their way in
-    if (grunt.file.exists('dist/video-js/.DS_Store')) {
-      grunt.file['delete']('dist/video-js/.DS_Store');
-    }
-
-    // CDN version uses already hosted font files
-    // Minified version only, doesn't need demo files
-    grunt.file.copy('build/files/minified.video.js', 'dist/cdn/video.js');
-    grunt.file.copy('build/files/video-js.min.css', 'dist/cdn/video-js.css');
-    grunt.file.copy('node_modules/videojs-swf/dist/video-js.swf', 'dist/cdn/video-js.swf');
-    grunt.file.copy('build/demo-files/demo.captions.vtt', 'dist/cdn/demo.captions.vtt');
-    grunt.file.copy('build/demo-files/demo.html', 'dist/cdn/demo.html');
-
-    // Replace font urls with CDN versions
-    css = grunt.file.read('dist/cdn/video-js.css');
-    css = css.replace(/font\//g, '../f/3/');
-    grunt.file.write('dist/cdn/video-js.css', css);
-
-    // Add CDN-specfic JS
-    jsmin = grunt.file.read('dist/cdn/video.js');
-    // GA Tracking Pixel (manually building the pixel URL)
-    cdnjs = uglify.minify('src/js/cdn.js').code.replace('v0.0.0', 'v'+version.full);
-    grunt.file.write('dist/cdn/video.js', jsmin + cdnjs);
-  });
-
-  grunt.registerTask('cdn-links', 'Update the version of CDN links in docs', function(){
-    var doc = grunt.file.read('docs/guides/setup.md');
-    var version = pkg.version;
-
-    // remove the patch version to point to the latest patch
-    version = version.replace(/(\d+\.\d+)\.\d+/, '$1');
-
-    // update the version in http://vjs.zencdn.net/4.3/video.js
-    doc = doc.replace(/(\/\/vjs\.zencdn\.net\/)\d+\.\d+(\.\d+)?/g, '$1'+version);
-    grunt.file.write('docs/guides/setup.md', doc);
-  });
-
   grunt.registerTask('dist', 'Creating distribution', ['dist-copy', 'zip:dist']);
 
-  grunt.registerTask('next-issue', 'Get the next issue that needs a response', function(){
-    var done = this.async();
-    var GitHubApi = require('github');
-    var open = require('open');
-
-    var github = new GitHubApi({
-        // required
-        version: '3.0.0',
-        // optional
-        debug: true,
-        protocol: 'https',
-        // host: 'github.my-GHE-enabled-company.com',
-        // pathPrefix: '/api/v3', // for some GHEs
-        timeout: 5000
-    });
-
-    github.issues.repoIssues({
-        // optional:
-        // headers: {
-        //     'cookie': 'blahblah'
-        // },
-        user: 'videojs',
-        repo: 'video.js',
-        sort: 'updated',
-        direction: 'asc',
-        state: 'open',
-        per_page: 100
-    }, function(err, res) {
-      var issueToOpen;
-      var usersWithWrite = ['heff', 'mmcc'];
-      var categoryLabels = ['enhancement', 'bug', 'question', 'feature'];
-
-      console.log('Number of issues: '+res.length);
-
-      // TODO: Find the best way to exclude an issue where a question has been asked of the
-      // issue owner/submitter that hasn't been answerd yet.
-      // A stupid simple first step would be to check for the needs: more info label
-      // and exactly one comment (the question)
-
-      // find issues that need categorizing, no category labels
-      res.some(function(issue){
-        if (issue.labels.length === 0) {
-          return issueToOpen = issue; // break
-        }
-        // look for category labels
-        var categorized = issue.labels.some(function(label){
-          return categoryLabels.indexOf(label.name) >= 0;
-        });
-        if (!categorized) {
-          return issueToOpen = issue; // break
-        }
-      });
-      if (issueToOpen) {
-        open(issueToOpen.html_url);
-        return done();
-      }
-
-      // find issues that need confirming or answering
-      res.some(function(issue){
-        // look for confirmed label
-        var confirmed = issue.labels.some(function(label){
-          return label.name === 'confirmed';
-        });
-        // Was exluding questions, but that might leave a lot of people hanging
-        // var question = issue.labels.some(function(label){
-        //   return label.name === 'question';
-        // });
-        if (!confirmed) { //  && !question
-          return issueToOpen = issue; // break
-        }
-      });
-      if (issueToOpen) {
-        open(issueToOpen.html_url);
-        return done();
-      }
-
-      grunt.log.writeln('No next issue found');
-      done();
-    });
-  });
-
+  // Load all the tasks in the tasks directory
+  grunt.loadTasks('tasks');
 };

README.md

@@ -1,6 +1,6 @@
 ![Video.js logo](https://i.cloudup.com/C3nAUZ-l4c.png)
 
-# [Video.js - HTML5 Video Player](http://videojs.com)  [![Build Status](https://travis-ci.org/videojs/video.js.png?branch=master)](https://travis-ci.org/videojs/video.js)
+# [Video.js - HTML5 Video Player](http://videojs.com)  [![Build Status](https://travis-ci.org/videojs/video.js.svg?branch=master)](https://travis-ci.org/videojs/video.js)
 
 > Video.js is a web video player built from the ground up for an HTML5 world. It supports HTML5 and Flash video, as well as YouTube and Vimeo (through [plugins](https://github.com/videojs/video.js/wiki/Plugins)). It supports video playback on desktops and mobile devices. This project was started mid 2010, and the player is now used on over ~~50,000~~ 100,000 websites.
 
@@ -9,8 +9,8 @@ Thanks to the awesome folks over at [Fastly](http://www.fastly.com/), there's a
 `<head>`:
 
 ```html
-<link href="http://vjs.zencdn.net/4.9/video-js.css" rel="stylesheet">
-<script src="http://vjs.zencdn.net/4.9/video.js"></script>
+<link href="http://vjs.zencdn.net/4.11/video-js.css" rel="stylesheet">
+<script src="http://vjs.zencdn.net/4.11/video.js"></script>
 ```
 
 Then, whenever you want to use Video.js you can simply use the `<video>` element as your normally would, but with an additional `data-setup` attribute containing any Video.js options. These options
@@ -44,8 +44,8 @@ var player = videojs('really-cool-video', { /* Options */ }, function() {
 });
 ```
 
-If you're ready to dive in, the [documentation](/blob/master/docs/index.md) is the first place to go for more information. Generally the
-[player API docs](/blob/master/docs/api/vjs.Player.md) are the most pertinent.
+If you're ready to dive in, the [documentation](docs/index.md) is the first place to go for more information. Generally the
+[player API docs](docs/api/vjs.Player.md) are the most pertinent.
 
 ## Contributing
 Video.js is a free and open source library, and we appreciate any help you're willing to give. Check out the [contributing guide](CONTRIBUTING.md).

bower.json

@@ -1,10 +1,14 @@
 {
   "name": "video.js",
   "description": "An HTML5 and Flash video player with a common API and skin for both.",
-  "version": "4.10.2",
+  "version": "4.12.7",
   "main": [
     "dist/video-js/video.js",
-    "dist/video-js/video-js.css"
+    "dist/video-js/video-js.css",
+    "dist/video-js/font/vjs.eot",
+    "dist/video-js/font/vjs.svg",
+    "dist/video-js/font/vjs.ttf",
+    "dist/video-js/font/vjs.woff"
   ],
   "keywords": [
     "videojs",

build/bin/version

@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+
+var version = require('../../package.json').version;
+
+console.log(version);

build/source-loader.js

@@ -19,7 +19,9 @@ var sourceFiles = [
   "src/js/core-object.js",
   "src/js/events.js",
   "src/js/lib.js",
+  "src/js/xhr.js",
   "src/js/util.js",
+  "src/js/event-emitter.js",
   "src/js/component.js",
   "src/js/button.js",
   "src/js/slider.js",
@@ -44,8 +46,14 @@ var sourceFiles = [
   "src/js/media/media.js",
   "src/js/media/html5.js",
   "src/js/media/flash.js",
+  "src/js/media/flash.rtmp.js",
   "src/js/media/loader.js",
-  "src/js/tracks.js",
+  "src/js/tracks/text-track-enums.js",
+  "src/js/tracks/text-track.js",
+  "src/js/tracks/text-track-list.js",
+  "src/js/tracks/text-track-cue-list.js",
+  "src/js/tracks/text-track-controls.js",
+  "src/js/tracks/text-track-settings.js",
   "src/js/json.js",
   "src/js/setup.js",
   "src/js/plugins.js"

component.json

@@ -1,7 +1,7 @@
 {
   "name": "video.js",
   "description": "An HTML5 and Flash video player with a common API and skin for both.",
-  "version": "4.10.2",
+  "version": "4.12.7",
   "keywords": [
     "videojs",
     "html5",

contrib.json

@@ -1,6 +1,6 @@
 {
-  "project": {
-    "owner": "videojs",
+  "meta": {
+    "org": "videojs",
     "name": "video.js",
     "requirements": [
       {
@@ -13,7 +13,6 @@
       }
     ],
     "urls": {
-      "git": "https://github.com/videojs/video.js.git",
       "repo_api": "https://api.github.com/repos/videojs/video.js",
       "repo_ui": "https://github.com/videojs/video.js"
     },
@@ -23,13 +22,28 @@
     }
   },
 
-  "install": [
-    [ "git fetch origin",                             "Get all git branches" ],
-    [ "git checkout -b stable origin/stable",         "Create the stable branch for patches" ],
-    [ "git remote add upstream {{project.urls.git}}", "Add the upstream project as a remote for pulling changes" ],
-    [ "git fetch upstream",                           "Get all upstream branches and changes" ],
-    { "include": "update all" }
-  ],
+  "install": {
+    "desc": "Fork, download, and setup the project",
+    "steps": [
+      { "prompt": "confirm", "desc": "You will now be taken to Github where you will choose an account to fork the project under. Remember which account you choose." },
+      { "exec": "open https://github.com/{{meta.org}}/{{meta.name}}/fork" },
+      { "prompt": "text", "desc": "Which account did you choose? (no '@')", "id": "owner" },
+      { "exec": "git clone https://github.com/{{ owner }}/{{ meta.name }}.git" },
+      { "exec": "cd {{ meta.name }}", "desc": "Change to the project directory" },
+      { "include": "setup" }
+    ]
+  },
+
+  "setup": {
+    "desc": "Set up version control and install dependencies",
+    "steps": [
+      [ "git fetch origin",                      "Get all git branches" ],
+      [ "git checkout -b stable origin/stable",  "Create the stable branch for patches" ],
+      [ "git remote add upstream https://github.com/{{meta.org}}/{{meta.name}}.git",  "Add the upstream project as a remote for pulling changes" ],
+      [ "git fetch upstream",                    "Get all upstream branches and changes" ],
+      { "include": "update all" }
+    ]
+  },
 
   "update": {
     "all": {
@@ -66,25 +80,34 @@
     "start": {
       "desc": "Start a new feature",
       "steps": [
-        { "include": "update {{project.branches.development}}" },
+        { "include": "update {{meta.branches.development}}" },
         { "include": "branch start" }
       ]
     },
+    "save": {
+      "desc": "Save changes to your feature",
+      "steps": [{ "include": "branch save" }]
+    },
     "submit": {
       "desc": "Submit a pull request for a feature when it's finished",
-      "steps": [
-        { "include": "branch submit" }
-      ]
+      "steps": [{ "include": "pull_request submit" }]
     },
     "delete": {
       "desc": "Delete the current feature branch",
-      "steps": [
-        { "include": "branch delete" }
-      ]
+      "steps": [{ "include": "branch delete" }]
+    },
+    "review": {
+      "desc": "Review a submitted feature",
+      "steps": [{ "include": "pull_request review" }]
+    },
+    "modify": {
+      "desc": "Modify a submitted feature that you are reviewing",
+      "steps": [{ "include": "pull_request modify" }]
     },
     "accept": {
+      "desc": "Merge a submitted feature",
       "steps": [
-        { "include": "update {{project.branches.development}}" },
+        { "include": "update {{meta.branches.development}}" },
         { "include": "pull_request accept" }
       ]
     }
@@ -97,25 +120,34 @@
       "desc": "Start a new patch",
       "finished": "Make your changes and then run `contrib patch submit`",
       "steps": [
-        { "include": "update {{project.branches.release}}" },
+        { "include": "update {{meta.branches.release}}" },
         { "include": "branch start" }
       ]
     },
+    "save": {
+      "desc": "Save changes to your feature",
+      "steps": [{ "include": "branch save" }]
+    },
     "submit": {
       "desc": "Submit a pull request for a patch when it's finished",
-      "steps": [
-        { "include": "branch submit" }
-      ]
+      "steps": [{ "include": "pull_request submit" }]
     },
     "delete": {
       "desc": "Delete the current patch branch",
-      "steps": [
-        { "include": "branch delete" }
-      ]
+      "steps": [{ "include": "branch delete" }]
+    },
+    "review": {
+      "desc": "Review a submitted patch",
+      "steps": [{ "include": "pull_request review" }]
+    },
+    "modify": {
+      "desc": "Modify a submitted patch that you are reviewing",
+      "steps": [{ "include": "pull_request modify" }]
     },
     "accept": {
+      "desc": "Merge a submitted patch",
       "steps": [
-        { "include": "update {{project.branches.release}}" },
+        { "include": "update {{meta.branches.release}}" },
         { "include": "pull_request accept" }
       ]
     }
@@ -133,7 +165,7 @@
       { "prompt": "text", "desc": "What browsers/platforms did you experience this in (e.g. Win 7, IE10; Android 4, Chrome;)?", "id": "browsers" },
       { "prompt": "text", "desc": "Is there a URL to a live example, or a jsbin (e.g. http://jsbin.com/axedog/9999/edit)?",     "id": "example" },
       { "prompt": "text", "desc": "Are there any other details you'd like to provide?",                                         "id": "details" },
-      { "open": "{{project.urls.repo_ui}}/issues/new?title={{title}}&body=**Steps to reproduce:**\n> {{reproduce}}\n\n**What was expected:**\n> {{expected}}\n\n**What Happened:**\n> {{actual}}\n\n**Video.js Version:**\n> {{version}}\n\n**Plugins:**\n> {{plugins}}\n\n**Browsers experienced on:**\n> {{browsers}}\n\n**Example:**\n> {{example}}\n\n**Other details:**\n> {{details}}" }
+      { "open": "{{meta.urls.repo_ui}}/issues/new?title={{title}}&body=**Steps to reproduce:**\n> {{reproduce}}\n\n**What was expected:**\n> {{expected}}\n\n**What Happened:**\n> {{actual}}\n\n**Video.js Version:**\n> {{version}}\n\n**Plugins:**\n> {{plugins}}\n\n**Browsers experienced on:**\n> {{browsers}}\n\n**Example:**\n> {{example}}\n\n**Other details:**\n> {{details}}" }
     ],
     "finished": "Thanks for submitting a bug report! One of our contributors will address it as soon as possible."
   },
@@ -146,80 +178,131 @@
       { "prompt": "text", "desc": "Is there any existing documentation or related specifications?", "id": "docs" },
       { "prompt": "text", "desc": "Are there any existing examples?", "id": "examples" },
       { "prompt": "confirm", "desc": "You will be redirected to Github where you can submit this issue, OK?" },
-      { "open": "{{project.urls.repo_ui}}/issues/new?title={{ title }}&body=**Describe the feature/enhancement:**\n> {{ describe }}\n\n**Existing docs/specs:**\n> {{ docs }}\n\n**Existing examples:**\n> {{ examples }}" }
+      { "open": "{{meta.urls.repo_ui}}/issues/new?title={{ title }}&body=**Describe the feature/enhancement:**\n> {{ describe }}\n\n**Existing docs/specs:**\n> {{ docs }}\n\n**Existing examples:**\n> {{ examples }}" }
     ],
     "finished": "Thanks for submitting a feature request! One of our contributors will address it as soon as possible."
   },
 
   "release": {
-    "desc": "Create and publish a release",
-    "steps": [
-      [ "git diff --exit-code",             "Ensure there's no unadded changes" ],
-      [ "git diff --cached --exit-code",    "Ensure there's no added changes" ],
-      { "prompt": "confirm", "desc": "Have the changes been merged into the release branch (stable)?" },
-      { "prompt": "text",    "desc": "Provide the release type (major, minor, patch)", "id": "type" },
-      [ "git checkout stable",                     "Checkout the release branch" ],
-      [ "git pull upstream stable",                "Update the release branch" ],
-      [ "grunt test",                              "Run tests" ],
-      [ "grunt chg-release:{{ type }}",            "Update the changelog with the new release" ],
-      [ "grunt version:{{ type }}",                "Bump package versions" ],
-      [ "grunt",                                   "Build the release" ],
-      [ "git add dist/video-js --force",           "Add the (otherwise ignored) release files" ],
-      [ "grunt vjsdocs",                           "Rebuild the docs" ],
-      [ "grunt cdn-links",                         "Update the cdn urls in the docs" ],
-      [ "grunt tagrelease",                        "Tag the release" ],
-      [ "git push upstream stable",                "Push changes to the remote" ],
-      [ "git push upstream --tags",                "Push tags to the remote" ],
-      [ "npm publish",                             "Publish to npm" ],
-      [ "git checkout master",                     "Checkout the development branch" ],
-      [ "git pull upstream master",                "Update the development branch" ],
-      [ "git merge stable",                        "Merge changes" ],
-      [ "grunt clean:dist",                        "Remove built dist files to re-ignore them" ],
-      [ "git add -u",                              "Add the changes for the removed dist files" ],
-      [ "git commit -m 'Removed dist files'",      "Commit the removed dist files" ],
-      [ "git push upstream master",                "Push development branch changes" ]
-    ]
+    "desc": "Create and publish releases",
+
+    "patch": {
+      "release_type": "patch",
+      "steps": [{ "include": "release run" }]
+    },
+    "minor": {
+      "release_type": "minor",
+      "steps": [{ "include": "release run" }]
+    },
+
+    "run": {
+      "steps": [
+        { "include": "branch check" },
+        [ "git checkout stable",                       "Checkout the release branch" ],
+        [ "git pull upstream stable",                  "Update the release branch" ],
+        [ "npm install",                               "Ensure dependency updates have been installed" ],
+        [ "grunt test",                                "Run tests" ],
+        [ "grunt version:{{ release_type }}",          "Bump package versions" ],
+        [ "./build/bin/version",                       "Return the current VJS Version from the package.json file", "version" ],
+        [ "grunt chg-release:{{ version }}",           "Update the changelog with the new release" ],
+        [ "grunt clean:dist",                          "Clean out the dist folder before the build" ],
+        [ "grunt",                                     "Build the release" ],
+        [ "git add dist/video-js --force",             "Add the (otherwise ignored) release files" ],
+        [ "grunt vjsdocs",                             "Rebuild the docs" ],
+        [ "grunt cdn-links",                           "Update the cdn urls in the docs" ],
+        [ "git commit -am 'Release v{{ version }}'",   "Commit the unstaged changes (package.json, changelog, etc)" ],
+        [ "git tag -a v{{version}} -m 'v{{version}}'", "Tag the current version" ],
+        [ "git push upstream stable",                  "Push changes to the remote" ],
+        [ "git push upstream --tags",                  "Push tags to the remote" ],
+        [ "npm publish",                               "Publish to npm" ],
+        [ "grunt github-release",                      "Create a new release on Github" ],
+        [ "git checkout master",                       "Checkout the development branch" ],
+        [ "git pull upstream master",                  "Update the development branch" ],
+        [ "git merge stable",                          "Merge changes" ],
+        [ "grunt clean:dist",                          "Remove built dist files again to re-ignore them" ],
+        [ "git add -u",                                "Add the changes for the removed dist files" ],
+        [ "git commit -m 'Removed dist files'",        "Commit the removed dist files" ],
+        [ "git push upstream master",                  "Push development branch changes" ]
+      ]
+    }
   },
 
   "branch": {
     "private": true,
+
     "start": {
       "steps": [
-        { "prompt": "text", "desc": "Name the branch",                "id": "name" },
-        [ "git checkout -b {{name}} {{baseBranch}}",  "Create the branch" ],
-        [ "git push -u origin {{name}}",              "Push the branch to your remote copy of the project" ]
+        { "prompt": "text", "id": "name",                     "desc": "Name the branch" },
+        { "exec": "git checkout -b {{name}} {{baseBranch}}",  "desc": "Create the branch" },
+        { "exec": "git push -u origin {{name}}",              "desc": "Push the branch to your remote copy of the project" }
       ]
     },
-    "submit": {
-      "desc": "Submit a pull request for when the change is finished",
+    "save": {
+      "desc": "Commit and push changes made to files in the project",
       "steps": [
-        { "exec": "git diff --exit-code", "desc": "Test for unadded changes {{ args.[0] }}", "fail": "Make sure all changes have been added and committed, or stashed, before switching branches" },
-        { "exec": "git diff --cached --exit-code", "desc": "Test for uncommitted changes", "fail": "Make sure all changes have been added and committed, or stashed, before switching branches" },
-        { "include": "test" },
-        { "exec": "git rev-parse --abbrev-ref HEAD", "desc": "Get the current branch", "id": "branch" },
-        { "prompt": "confirm", "desc": "Are you sure {{branch}} is the branch you want to submit?" },
-        { "prompt": "text", "desc": "Which github user or org are you submitting from?", "id": "user" },
-        { "open": "{{project.urls.repo_ui}}/compare/videojs:{{baseBranch}}...{{user}}:{{branch}}", "desc": "Open the github pull request page" }
+        { "include": "branch confirm" },
+        { "prompt": "text", "id": "message",         "desc": "Briefly describe the changes made" },
+        { "exec": "git add .",                       "desc": "Add the changes" },
+        { "exec": "git commit -m '{{message}}'",     "desc": "Commit the changes" },
+        { "exec": "git push origin {{branch_name}}", "desc": "Push the changes to your remote copy of the project" }
+      ]
+    },
+    "check": {
+      "private": true,
+      "desc": "Check for unsaved changes",
+      "steps": [
+        { "exec": "git diff --exit-code",          "desc": "Ensure there's no unadded changes",     "fail": "Make sure all changes have been saved (added and committed) or stashed" },
+        { "exec": "git diff --cached --exit-code", "desc": "Ensure there's no uncommitted changes", "fail": "Make sure all changes have been saved (added and committed) or stashed" }
+      ]
+    },
+    "name": {
+      "private": true,
+      "steps": [
+        { "exec": "git rev-parse --abbrev-ref HEAD", "desc": "Get the current branch", "id": "branch_name" }
+      ]
+    },
+    "confirm": {
+      "private": true,
+      "steps": [
+        { "include": "branch name" },
+        { "prompt": "confirm", "desc": "Are you sure *{{branch_name}}* is the correct branch?" }
       ]
     },
     "delete": {
       "desc": "Delete the current branch",
       "steps": [
-        { "exec": "git rev-parse --abbrev-ref HEAD", "desc": "Get the current branch name", "id": "name" },
-        { "prompt": "confirm", "desc": "Are you sure '{{name}}' is the branch you want to delete?" },
-        { "exec": "git branch -D {{name}}",          "desc": "Delete the local copy of the branch" },
-        { "exec": "git push origin :{{name}}",       "desc": "Delete the remote copy of the branch" }
+        { "include": "branch confirm" },
+        { "exec": "git checkout master",              "desc": "Exit the branch being deleted" },
+        { "exec": "git branch -D {{branch_name}}",    "desc": "Delete the local copy of the branch" },
+        { "exec": "git push origin :{{branch_name}}", "desc": "Delete the remote copy of the branch" }
       ]
     }
   },
 
   "pull_request": {
     "private": true,
+    "desc": "Pull request related commands",
 
+    "prepare": {
+      "private": true,
+      "steps": [
+        { "include": "branch check" },
+        { "include": "branch confirm" },
+        { "include": "test" },
+        { "prompt": "text", "desc": "Which github user or org are you submitting from?", "id": "user" }
+      ]
+    },
+    "submit": {
+      "desc": "Submit a pull request for when the change is finished",
+      "steps": [
+        { "include": "pull_request prepare" },
+        { "open": "{{meta.urls.repo_ui}}/compare/videojs:{{baseBranch}}...{{user}}:{{branch_name}}", "desc": "Open the github pull request page" }
+      ]
+    },
     "review": {
       "steps": [
         { "prompt": "text", "desc": "What is the the pull request number?", "id": "prNum" },
-        { "get": "{{project.urls.repo_api}}/pulls/{{prNum}}",   "desc": "Get the PR information", "id": "pr" },
+        { "get": "{{meta.urls.repo_api}}/pulls/{{prNum}}",   "desc": "Get the PR information", "id": "pr" },
         [ "git fetch {{pr.head.repo.ssh_url}} {{pr.head.ref}}", "Get the pull request changes but don't merge them" ],
         [ "git merge-base master FETCH_HEAD",                   "Get the common ancestor commit", "base" ],
         [ "git checkout -b review-{{pr.user.login}}-{{pr.head.ref}} {{base}}", "Create a new local branch for the pull request that has a base of the common commit" ],
@@ -227,33 +310,26 @@
         [ "grunt test",                                         "Build and run tests" ]
       ]
     },
-
     "modify": {
-      "desc": "Submit a modification to an existing pull request",
+      "desc": "Submit a modification to a pull request that you are currently reviewing",
       "steps": [
-        { "exec": "git diff --exit-code",            "desc": "Test for unadded changes",     "fail": "Make sure all changes have been added and committed before submitting changes" },
-        { "exec": "git diff --cached --exit-code",   "desc": "Test for uncommitted changes", "fail": "Make sure all changes have been committed before submitting changes" },
-        { "include": "test" },
-        { "exec": "git rev-parse --abbrev-ref HEAD", "desc": "Get the current branch", "id": "branch" },
-        { "prompt": "confirm", "desc": "Are you sure {{branch}} is the branch you want to submit?" },
-        { "prompt": "text", "desc": "Which github user or org are you submitting from?", "id": "user" },
-        { "prompt": "text", "desc": "What is the the pull request number?",              "id": "prNum" },
-        { "get": "{{project.urls.repo_api}}/pulls/{{prNum}}", "desc": "Get the PR information", "id": "pr" },
-        { "exec": "git push -u origin {{branch}}",                                "desc": "Push the changes to the remote repo" },
-        { "open": "https://github.com/{{user}}/video.js/compare/{{pr.head.label}}...{{user}}:{{branch}}", "desc": "Open the github pull request page" }
+        { "include": "pull_request prepare" },
+        { "prompt": "text", "desc": "What is the the pull request number?",                  "id": "prNum" },
+        { "get": "{{meta.urls.repo_api}}/pulls/{{prNum}}", "desc": "Get the PR information", "id": "pr" },
+        { "exec": "git push -u origin {{branch_name}}",                                "desc": "Push the changes to the remote repo" },
+        { "open": "https://github.com/{{user}}/video.js/compare/{{pr.head.label}}...{{user}}:{{branch_name}}", "desc": "Open the github pull request page" }
       ]
     },
-
     "accept": {
       "steps": [
-        { "prompt": "text", "desc": "What is the the pull request number?",              "id": "prNum" },
-        { "get": "{{project.urls.repo_api}}/pulls/{{prNum}}",          "desc": "Get the PR information", "id": "pr" },
-        { "get": "{{project.urls.repo_api}}/pulls/{{prNum}}/commits",  "desc": "Get the PR commits to access author info", "id": "prCommits" },
+        { "prompt": "text", "id": "prNum",                             "desc": "What is the the pull request number?" },
+        { "get": "{{meta.urls.repo_api}}/pulls/{{prNum}}",             "desc": "Get the PR information", "id": "pr" },
+        { "get": "{{meta.urls.repo_api}}/pulls/{{prNum}}/commits",     "desc": "Get the PR commits to access author info", "id": "prCommits" },
         [ "git checkout -b {{pr.user.login}}-{{pr.head.ref}} {{pr.base.ref}}", "Create a new branch for merging the changes" ],
         [ "git fetch {{pr.head.repo.ssh_url}} {{pr.head.ref}}",                "Fetch the changes" ],
         [ "git merge --no-commit --squash FETCH_HEAD",                         "Merge the changes in without committing so they can be squashed" ],
         [ "grunt test",                                                        "Run tests to make sure they still pass" ],
-        { "prompt": "text", "desc": "Describe this change in one line",                  "id": "line" },
+        { "prompt": "text", "id": "line",                              "desc": "Describe this change in one line" },
         [ "grunt chg-add:'{{line}} ([view](https\\://github.com/videojs/video.js/pull/{{prNum}}))'", "Add a line to the changelog" ],
         [ "git add CHANGELOG.md",                                              "Add the changlelog change to be committed" ],
         [ "git commit -a --author='{{prCommits.[0].commit.author.name}} <{{prCommits.[0].commit.author.email}}>' -m '{{line}}. closes #{{prNum}}'", "Commit the changes" ],

dist/video-js/lang/ar.js

@@ -0,0 +1,26 @@
+videojs.addLanguage("ar",{
+ "Play": "تشغيل",
+ "Pause": "ايقاف",
+ "Current Time": "الوقت الحالي",
+ "Duration Time": "Dauer",
+ "Remaining Time": "الوقت المتبقي",
+ "Stream Type": "نوع التيار",
+ "LIVE": "مباشر",
+ "Loaded": "تم التحميل",
+ "Progress": "التقدم",
+ "Fullscreen": "ملء الشاشة",
+ "Non-Fullscreen": "غير ملء الشاشة",
+ "Mute": "صامت",
+ "Unmuted": "غير الصامت",
+ "Playback Rate": "معدل التشغيل",
+ "Subtitles": "الترجمة",
+ "subtitles off": "ايقاف الترجمة",
+ "Captions": "التعليقات",
+ "captions off": "ايقاف التعليقات",
+ "Chapters": "فصول",
+ "You aborted the video playback": "لقد ألغيت تشغيل الفيديو",
+ "A network error caused the video download to fail part-way.": "تسبب خطأ في الشبكة بفشل تحميل الفيديو بالكامل.",
+ "The video could not be loaded, either because the server or network failed or because the format is not supported.": "لا يمكن تحميل الفيديو بسبب فشل في الخادم أو الشبكة ، أو فشل بسبب عدم امكانية قراءة تنسيق الفيديو.",
+ "The video playback was aborted due to a corruption problem or because the video used features your browser did not support.": "تم ايقاف تشغيل الفيديو بسبب مشكلة فساد أو لأن الفيديو المستخدم يستخدم ميزات غير مدعومة من متصفحك.",
+ "No compatible source was found for this video.": "فشل العثور على أي مصدر متوافق مع هذا الفيديو."
+});

dist/video-js/lang/bg.js

@@ -0,0 +1,26 @@
+videojs.addLanguage("bg",{
+ "Play": "Възпроизвеждане",
+ "Pause": "Пауза",
+ "Current Time": "Текущо време",
+ "Duration Time": "Продължителност",
+ "Remaining Time": "Оставащо време",
+ "Stream Type": "Тип на потока",
+ "LIVE": "НА ЖИВО",
+ "Loaded": "Заредено",
+ "Progress": "Прогрес",
+ "Fullscreen": "Цял екран",
+ "Non-Fullscreen": "Спиране на цял екран",
+ "Mute": "Без звук",
+ "Unmuted": "Със звук",
+ "Playback Rate": "Скорост на възпроизвеждане",
+ "Subtitles": "Субтитри",
+ "subtitles off": "Спряни субтитри",
+ "Captions": "Аудио надписи",
+ "captions off": "Спряни аудио надписи",
+ "Chapters": "Глави",
+ "You aborted the video playback": "Спряхте възпроизвеждането на видеото",
+ "A network error caused the video download to fail part-way.": "Грешка в мрежата провали изтеглянето на видеото.",
+ "The video could not be loaded, either because the server or network failed or because the format is not supported.": "Видеото не може да бъде заредено заради проблем със сървъра или мрежата или защото този формат не е поддържан.",
+ "The video playback was aborted due to a corruption problem or because the video used features your browser did not support.": "Възпроизвеждането на видеото беше прекъснато заради проблем с файла или защото видеото използва опции които браузърът Ви не поддържа.",
+ "No compatible source was found for this video.": "Не беше намерен съвместим източник за това видео."
+});

dist/video-js/lang/ca.js

@@ -0,0 +1,26 @@
+videojs.addLanguage("ca",{
+ "Play": "Reproducció",
+ "Pause": "Pausa",
+ "Current Time": "Temps reproduït",
+ "Duration Time": "Durada total",
+ "Remaining Time": "Temps restant",
+ "Stream Type": "Tipus de seqüència",
+ "LIVE": "EN DIRECTE",
+ "Loaded": "Carregat",
+ "Progress": "Progrés",
+ "Fullscreen": "Pantalla completa",
+ "Non-Fullscreen": "Pantalla no completa",
+ "Mute": "Silencia",
+ "Unmuted": "Amb so",
+ "Playback Rate": "Velocitat de reproducció",
+ "Subtitles": "Subtítols",
+ "subtitles off": "Subtítols desactivats",
+ "Captions": "Llegendes",
+ "captions off": "Llegendes desactivades",
+ "Chapters": "Capítols",
+ "You aborted the video playback": "Heu interromput la reproducció del vídeo.",
+ "A network error caused the video download to fail part-way.": "Un error de la xarxa ha interromput la baixada del vídeo.",
+ "The video could not be loaded, either because the server or network failed or because the format is not supported.": "No s'ha pogut carregar el vídeo perquè el servidor o la xarxa han fallat, o bé perquè el seu format no és compatible.",
+ "The video playback was aborted due to a corruption problem or because the video used features your browser did not support.": "La reproducció de vídeo s'ha interrumput per un problema de corrupció de dades o bé perquè el vídeo demanava funcions que el vostre navegador no ofereix.",
+ "No compatible source was found for this video.": "No s'ha trobat cap font compatible amb el vídeo."
+});

dist/video-js/lang/cs.js

@@ -0,0 +1,26 @@
+videojs.addLanguage("cs",{
+ "Play": "Přehrát",
+ "Pause": "Pauza",
+ "Current Time": "Aktuální čas",
+ "Duration Time": "Doba trvání",
+ "Remaining Time": "Zbývající čas",
+ "Stream Type": "Stream Type",
+ "LIVE": "ŽIVĚ",
+ "Loaded": "Načteno",
+ "Progress": "Stav",
+ "Fullscreen": "Celá obrazovka",
+ "Non-Fullscreen": "Zmenšená obrazovka",
+ "Mute": "Ztlumit zvuk",
+ "Unmuted": "Přehrát zvuk",
+ "Playback Rate": "Rychlost přehrávání",
+ "Subtitles": "Titulky",
+ "subtitles off": "Titulky vypnuty",
+ "Captions": "Popisky",
+ "captions off": "Popisky vypnuty",
+ "Chapters": "Kapitoly",
+ "You aborted the video playback": "Přehrávání videa je přerušeno.",
+ "A network error caused the video download to fail part-way.": "Video nemohlo být načteno, kvůli chybě v síti.",
+ "The video could not be loaded, either because the server or network failed or because the format is not supported.": "Video nemohlo být načteno, buď kvůli chybě serveru nebo sítě nebo proto, že daný formát není podporován.",
+ "The video playback was aborted due to a corruption problem or because the video used features your browser did not support.": "Váš prohlížeč nepodporuje formát videa.",
+ "No compatible source was found for this video.": "Špatně zadaný zdroj videa."
+});

dist/video-js/lang/hu.js

@@ -0,0 +1,26 @@
+videojs.addLanguage("hu",{
+ "Play": "Lejátszás",
+ "Pause": "Szünet",
+ "Current Time": "Aktuális időpont",
+ "Duration Time": "Hossz",
+ "Remaining Time": "Hátralévő idő",
+ "Stream Type": "Adatfolyam típusa",
+ "LIVE": "ÉLŐ",
+ "Loaded": "Betöltve",
+ "Progress": "Állapot",
+ "Fullscreen": "Teljes képernyő",
+ "Non-Fullscreen": "Normál méret",
+ "Mute": "Némítás",
+ "Unmuted": "Némítás kikapcsolva",
+ "Playback Rate": "Lejátszási sebesség",
+ "Subtitles": "Feliratok",
+ "subtitles off": "Feliratok kikapcsolva",
+ "Captions": "Magyarázó szöveg",
+ "captions off": "Magyarázó szöveg kikapcsolva",
+ "Chapters": "Fejezetek",
+ "You aborted the video playback": "Leállította a lejátszást",
+ "A network error caused the video download to fail part-way.": "Hálózati hiba miatt a videó részlegesen töltődött le.",
+ "The video could not be loaded, either because the server or network failed or because the format is not supported.": "A videó nem tölthető be hálózati vagy kiszolgálói hiba miatt, vagy a formátuma nem támogatott.",
+ "The video playback was aborted due to a corruption problem or because the video used features your browser did not support.": "A lejátszás adatsérülés miatt leállt, vagy a videó egyes tulajdonságait a böngészője nem támogatja.",
+ "No compatible source was found for this video.": "Nincs kompatibilis forrás ehhez a videóhoz."
+});

dist/video-js/lang/tr.js

@@ -0,0 +1,26 @@
+videojs.addLanguage("tr",{
+ "Play": "Oynat",
+ "Pause": "Duraklat",
+ "Current Time": "Süre",
+ "Duration Time": "Toplam Süre",
+ "Remaining Time": "Kalan Süre",
+ "Stream Type": "Yayın Tipi",
+ "LIVE": "CANLI",
+ "Loaded": "Yüklendi",
+ "Progress": "Yükleniyor",
+ "Fullscreen": "Tam Ekran",
+ "Non-Fullscreen": "Küçük Ekran",
+ "Mute": "Ses Kapa",
+ "Unmuted": "Ses Aç",
+ "Playback Rate": "Oynatma Hızı",
+ "Subtitles": "Altyazı",
+ "subtitles off": "Altyazı Kapat",
+ "Captions": "Ek Açıklamalar",
+ "captions off": "Ek Açıklamalar Kapalı",
+ "Chapters": "Bölümler",
+ "You aborted the video playback": "Video oynatmayı iptal ettiniz",
+ "A network error caused the video download to fail part-way.": "Video indirilirken bağlantı sorunu oluştu.",
+ "The video could not be loaded, either because the server or network failed or because the format is not supported.": "Video oynatılamadı, Ağ yada sunucu hattası veya belirtilen format desteklenmiyor.",
+ "The video playback was aborted due to a corruption problem or because the video used features your browser did not support.": "Tarayıcınız desteklemediği için videoda hata oluştu.",
+ "No compatible source was found for this video.": "Video için kaynak bulunamadı."
+});

dist/video-js/lang/vi.js

@@ -0,0 +1,26 @@
+videojs.addLanguage("vi",{
+ "Play": "Phát",
+ "Pause": "Tạm dừng",
+ "Current Time": "Thời gian hiện tại",
+ "Duration Time": "Độ dài",
+ "Remaining Time": "Thời gian còn lại",
+ "Stream Type": "Kiểu Stream",
+ "LIVE": "TRỰC TIẾP",
+ "Loaded": "Đã tải",
+ "Progress": "Tiến trình",
+ "Fullscreen": "Toàn màn hình",
+ "Non-Fullscreen": "Thoát toàn màn hình",
+ "Mute": "Tắt tiếng",
+ "Unmuted": "Bật âm thanh",
+ "Playback Rate": "Tốc độ phát",
+ "Subtitles": "Phụ đề",
+ "subtitles off": "Tắt phụ đề",
+ "Captions": "Chú thích",
+ "captions off": "Tắt chú thích",
+ "Chapters": "Chương",
+ "You aborted the video playback": "Bạn đã hủy việc phát video.",
+ "A network error caused the video download to fail part-way.": "Một lỗi mạng dẫn đến việc tải video bị lỗi.",
+ "The video could not be loaded, either because the server or network failed or because the format is not supported.": "Video không tải được, mạng hay server có lỗi hoặc định dạng không được hỗ trợ.",
+ "The video playback was aborted due to a corruption problem or because the video used features your browser did not support.": "Phát video đã bị hủy do một sai lỗi hoặc video sử dụng những tính năng trình duyệt không hỗ trợ.",
+ "No compatible source was found for this video.": "Không có nguồn tương thích cho video này."
+});

dist/video-js/lang/zh-CN.js

@@ -1,4 +1,4 @@
-videojs.addLanguage("zh",{
+videojs.addLanguage("zh-CN",{
  "Play": "播放",
  "Pause": "暂停",
  "Current Time": "当前时间",

dist/video-js/lang/zh-TW.js

@@ -0,0 +1,27 @@
+videojs.addLanguage("zh-TW",{
+ "Play": "播放",
+ "Pause": "暫停",
+ "Current Time": "目前時間",
+ "Duration Time": "總共時間",
+ "Remaining Time": "剩餘時間",
+ "Stream Type": "串流類型",
+ "LIVE": "直播",
+ "Loaded": "載入完畢",
+ "Progress": "進度",
+ "Fullscreen": "全螢幕",
+ "Non-Fullscreen": "退出全螢幕",
+ "Mute": "靜音",
+ "Unmuted": "取消靜音",
+ "Playback Rate": " 播放速率",
+ "Subtitles": "字幕",
+ "subtitles off": "關閉字幕",
+ "Captions": "內嵌字幕",
+ "captions off": "關閉內嵌字幕",
+ "Chapters": "章節",
+ "You aborted the video playback": "影片播放已終止",
+ "A network error caused the video download to fail part-way.": "網路錯誤導致影片下載失敗。",
+ "The video could not be loaded, either because the server or network failed or because the format is not supported.": "影片因格式不支援或者伺服器或網路的問題無法載入。",
+ "The video playback was aborted due to a corruption problem or because the video used features your browser did not support.": "由於影片檔案損毀或是該影片使用了您的瀏覽器不支援的功能，播放終止。",
+ "No compatible source was found for this video.": "無法找到相容此影片的來源。",
+ "The video is encrypted and we do not have the keys to decrypt it.": "影片已加密，無法解密。"
+});

dist/video-js/video-js.css

@@ -1,12 +1,12 @@
 /*!
 Video.js Default Styles (http://videojs.com)
-Version 4.10.2
+Version 4.12.7
 Create your own skin at http://designer.videojs.com
 */
 /* SKIN
 ================================================================================
 The main class name for all skin-specific styles. To make your own skin,
-replace all occurances of 'vjs-default-skin' with a new name. Then add your new
+replace all occurrences of 'vjs-default-skin' with a new name. Then add your new
 skin name to your video tag instead of the default skin.
 e.g. <video class="video-js my-skin-name">
 */
@@ -30,7 +30,7 @@ The control icons are from a custom font. Each icon corresponds to a character
 */
 /* Slider - used for Volume bar and Seek bar */
 .vjs-default-skin .vjs-slider {
-  /* Replace browser focus hightlight with handle highlight */
+  /* Replace browser focus highlight with handle highlight */
   outline: 0;
   position: relative;
   cursor: pointer;
@@ -714,6 +714,10 @@ easily in the skin designer. http://designer.videojs.com/
 .vjs-default-skin .vjs-control-content .vjs-menu.vjs-lock-showing {
   display: block;
 }
+/* prevent menus from opening while scrubbing (FF, IE) */
+.vjs-default-skin.vjs-scrubbing .vjs-menu-button:hover .vjs-control-content .vjs-menu {
+  display: none;
+}
 .vjs-default-skin .vjs-menu-button ul li {
   list-style: none;
   margin: 0;
@@ -794,7 +798,7 @@ control positioning and full window mode. **
      easily calculable. */
 
   font-size: 10px;
-  /* Allow poster to be vertially aligned. */
+  /* Allow poster to be vertically aligned. */
 
   vertical-align: middle;
   /*  display: table-cell; */
@@ -864,6 +868,7 @@ body.vjs-full-window {
   background-repeat: no-repeat;
   background-position: 50% 50%;
   background-size: contain;
+  background-color: #000000;
   cursor: pointer;
   margin: 0;
   padding: 0;
@@ -900,44 +905,82 @@ body.vjs-full-window {
 /* Text Track Styles */
 /* Overall track holder for both captions and subtitles */
 .video-js .vjs-text-track-display {
-  text-align: center;
   position: absolute;
-  bottom: 4em;
-  /* Leave padding on left and right */
-  left: 1em;
+  top: 0;
+  left: 0;
+  bottom: 3em;
+  right: 0;
+  pointer-events: none;
+}
+/* Captions Settings Dialog */
+.vjs-caption-settings {
+  position: relative;
+  top: 1em;
+  background-color: #000;
+  opacity: 0.75;
+  color: #FFF;
+  margin: 0 auto;
+  padding: 0.5em;
+  height: 15em;
+  font-family: Arial, Helvetica, sans-serif;
+  font-size: 12px;
+  width: 40em;
+}
+.vjs-caption-settings .vjs-tracksettings {
+  top: 0;
+  bottom: 2em;
+  left: 0;
+  right: 0;
+  position: absolute;
+  overflow: auto;
+}
+.vjs-caption-settings .vjs-tracksettings-colors,
+.vjs-caption-settings .vjs-tracksettings-font {
+  float: left;
+}
+.vjs-caption-settings .vjs-tracksettings-colors:after,
+.vjs-caption-settings .vjs-tracksettings-font:after,
+.vjs-caption-settings .vjs-tracksettings-controls:after {
+  clear: both;
+}
+.vjs-caption-settings .vjs-tracksettings-controls {
+  position: absolute;
+  bottom: 1em;
   right: 1em;
 }
-/* Move captions down when controls aren't being shown */
-.video-js.vjs-user-inactive.vjs-playing .vjs-text-track-display {
-  bottom: 1em;
+.vjs-caption-settings .vjs-tracksetting {
+  margin: 5px;
+  padding: 3px;
+  min-height: 40px;
 }
-/* Individual tracks */
-.video-js .vjs-text-track {
-  display: none;
-  font-size: 1.4em;
-  text-align: center;
-  margin-bottom: 0.1em;
-  /* Transparent black background, or fallback to all black (oldIE) */
-  /* background-color-with-alpha */
-  background-color: #000000;
-  background-color: rgba(0, 0, 0, 0.5);
-}
-.video-js .vjs-subtitles {
-  color: #ffffff /* Subtitles are white */;
-}
-.video-js .vjs-captions {
-  color: #ffcc66 /* Captions are yellow */;
-}
-.vjs-tt-cue {
+.vjs-caption-settings .vjs-tracksetting label {
   display: block;
+  width: 100px;
+  margin-bottom: 5px;
 }
-/* Increase font-size when fullscreen */
-.video-js.vjs-fullscreen .vjs-text-track {
-  font-size: 3em;
+.vjs-caption-settings .vjs-tracksetting span {
+  display: inline;
+  margin-left: 5px;
+}
+.vjs-caption-settings .vjs-tracksetting > div {
+  margin-bottom: 5px;
+  min-height: 20px;
+}
+.vjs-caption-settings .vjs-tracksetting > div:last-child {
+  margin-bottom: 0;
+  padding-bottom: 0;
+  min-height: 0;
+}
+.vjs-caption-settings label > input {
+  margin-right: 10px;
+}
+.vjs-caption-settings input[type="button"] {
+  width: 40px;
+  height: 40px;
 }
 /* Hide disabled or unsupported controls */
-.vjs-default-skin .vjs-hidden {
-  display: none;
+.vjs-hidden {
+  display: none !important;
 }
 .vjs-lock-showing {
   display: block !important;
@@ -949,15 +992,15 @@ body.vjs-full-window {
     This optional paragraph inside the video tag can provide a message to users
     about what's required to play video. */
 .vjs-no-js {
-  padding: 20px;
+  padding: 2em;
   color: #ccc;
   background-color: #333;
-  font-size: 18px;
+  font-size: 1.8em;
   font-family: Arial, sans-serif;
   text-align: center;
-  width: 300px;
-  height: 150px;
-  margin: 0px auto;
+  width: 30em;
+  height: 15em;
+  margin: 0 auto;
 }
 .vjs-no-js a,
 .vjs-no-js a:visited {

dist/video-js/video-js.less

@@ -1,4 +1,4 @@
-/*!
+ /*!
 Video.js Default Styles (http://videojs.com)
 Version GENERATED_AT_BUILD
 Create your own skin at http://designer.videojs.com
@@ -9,7 +9,7 @@ Create your own skin at http://designer.videojs.com
 // (This file uses LESS. Learn more at http://lesscss.org/)
 
 // The base font size controls the size of everything, not just text. All
-// diminensions use em-based sizes so that the scale along with the font size.
+// dimensions use em-based sizes so that the scale along with the font size.
 // Try increasing it to 20px and see what happens.
 @base-font-size: 10px;
 @touch-device-font-size: 15px;
@@ -60,7 +60,7 @@ Create your own skin at http://designer.videojs.com
 /* SKIN
 ================================================================================
 The main class name for all skin-specific styles. To make your own skin,
-replace all occurances of 'vjs-default-skin' with a new name. Then add your new
+replace all occurrences of 'vjs-default-skin' with a new name. Then add your new
 skin name to your video tag instead of the default skin.
 e.g. <video class="video-js my-skin-name">
 */
@@ -73,13 +73,14 @@ e.g. <video class="video-js my-skin-name">
 The control icons are from a custom font. Each icon corresponds to a character
 (e.g. "\e001"). Font icons allow for easy scaling and coloring of icons.
 */
+@vjs-font-path: 'font';
 @font-face{
   font-family: 'VideoJS';
-  src: url('font/vjs.eot');
-  src: url('font/vjs.eot?#iefix') format('embedded-opentype'),
-  url('font/vjs.woff') format('woff'),
-  url('font/vjs.ttf') format('truetype'),
-  url('font/vjs.svg#icomoon') format('svg');
+  src: url('@{vjs-font-path}/vjs.eot');
+  src: url('@{vjs-font-path}/vjs.eot?#iefix') format('embedded-opentype'),
+  url('@{vjs-font-path}/vjs.woff') format('woff'),
+  url('@{vjs-font-path}/vjs.ttf') format('truetype'),
+  url('@{vjs-font-path}/vjs.svg#icomoon') format('svg');
 
   font-weight: normal;
   font-style: normal;
@@ -111,7 +112,7 @@ The control icons are from a custom font. Each icon corresponds to a character
 
 /* Slider - used for Volume bar and Seek bar */
 .vjs-default-skin .vjs-slider {
-  /* Replace browser focus hightlight with handle highlight *///
+  /* Replace browser focus highlight with handle highlight *///
   outline: 0;
   position: relative;
   cursor: pointer;
@@ -777,6 +778,10 @@ easily in the skin designer. http://designer.videojs.com/
 .vjs-default-skin .vjs-control-content .vjs-menu.vjs-lock-showing {
   display: block;
 }
+/* prevent menus from opening while scrubbing (FF, IE) */
+.vjs-default-skin.vjs-scrubbing .vjs-menu-button:hover .vjs-control-content .vjs-menu {
+  display: none;
+}
 .vjs-default-skin .vjs-menu-button ul li {
   list-style: none;
   margin: 0;
@@ -855,7 +860,7 @@ control positioning and full window mode. **
   /* Start with 10px for base font size so other dimensions can be em based and
      easily calculable. */
   font-size: @base-font-size;
-  /* Allow poster to be vertially aligned. */
+  /* Allow poster to be vertically aligned. */
   vertical-align: middle;
   /*  display: table-cell; */ /*This works in Safari but not Firefox.*/
 
@@ -919,6 +924,7 @@ body.vjs-full-window {
   background-repeat: no-repeat;
   background-position: 50% 50%;
   background-size: contain;
+  background-color: #000000;
   cursor: pointer;
   margin: 0;
   padding: 0;
@@ -960,37 +966,92 @@ body.vjs-full-window {
 /* Text Track Styles */
 /* Overall track holder for both captions and subtitles */
 .video-js .vjs-text-track-display {
-  text-align: center;
   position: absolute;
-  bottom: 4em;
-  /* Leave padding on left and right *///
-  left: 1em;
+  top: 0;
+  left: 0;
+  bottom: 3em;
+  right: 0;
+  pointer-events: none;
+}
+
+/* Captions Settings Dialog */
+.vjs-caption-settings {
+  position: relative;
+  top: 1em;
+  background-color: #000;
+  opacity: 0.75;
+  color: #FFF;
+  margin: 0 auto;
+  padding: 0.5em;
+  height: 15em;
+  font-family: Arial, Helvetica, sans-serif;
+  font-size: 12px;
+  width: 40em;
+}
+
+.vjs-caption-settings .vjs-tracksettings {
+  top: 0;
+  bottom: 2em;
+  left: 0;
+  right: 0;
+  position: absolute;
+  overflow: auto;
+}
+
+.vjs-caption-settings .vjs-tracksettings-colors,
+.vjs-caption-settings .vjs-tracksettings-font {
+  float: left;
+}
+.vjs-caption-settings .vjs-tracksettings-colors:after,
+.vjs-caption-settings .vjs-tracksettings-font:after,
+.vjs-caption-settings .vjs-tracksettings-controls:after {
+  clear: both;
+}
+
+.vjs-caption-settings .vjs-tracksettings-controls {
+  position: absolute;
+  bottom: 1em;
   right: 1em;
 }
 
-/* Move captions down when controls aren't being shown */
-.video-js.vjs-user-inactive.vjs-playing .vjs-text-track-display {
-  bottom: 1em;
+.vjs-caption-settings .vjs-tracksetting {
+  margin: 5px;
+  padding: 3px;
+  min-height: 40px;
+}
+.vjs-caption-settings .vjs-tracksetting label {
+  display: block;
+  width: 100px;
+  margin-bottom: 5px;
 }
 
-/* Individual tracks */
-.video-js .vjs-text-track {
-  display: none;
-  font-size: 1.4em;
-  text-align: center;
-  margin-bottom: 0.1em;
-  /* Transparent black background, or fallback to all black (oldIE) *///
-  .background-color-with-alpha(rgb(0, 0, 0), 0.5);
+.vjs-caption-settings .vjs-tracksetting span {
+  display: inline;
+  margin-left: 5px;
 }
-.video-js .vjs-subtitles { color: #fff /* Subtitles are white */; }
-.video-js .vjs-captions { color: #fc6 /* Captions are yellow */; }
-.vjs-tt-cue { display: block; }
 
-/* Increase font-size when fullscreen */
-.video-js.vjs-fullscreen .vjs-text-track { font-size: 3em; }
+.vjs-caption-settings .vjs-tracksetting > div {
+  margin-bottom: 5px;
+  min-height: 20px;
+}
+
+.vjs-caption-settings .vjs-tracksetting > div:last-child {
+  margin-bottom: 0;
+  padding-bottom: 0;
+  min-height: 0;
+}
+
+.vjs-caption-settings label > input {
+  margin-right: 10px;
+}
+
+.vjs-caption-settings input[type="button"] {
+  width: 40px;
+  height: 40px;
+}
 
 /* Hide disabled or unsupported controls */
-.vjs-default-skin .vjs-hidden { display: none; }
+.vjs-hidden { display: none !important; }
 
 .vjs-lock-showing {
   display: block !important;
@@ -1003,15 +1064,15 @@ body.vjs-full-window {
     This optional paragraph inside the video tag can provide a message to users
     about what's required to play video. */
 .vjs-no-js {
-  padding: 20px;
+  padding: 2em;
   color: #ccc;
   background-color: #333;
-  font-size: 18px;
+  font-size: 1.8em;
   font-family: Arial, sans-serif;
   text-align: center;
-  width: 300px;
-  height: 150px;
-  margin: 0px auto;
+  width: 30em;
+  height: 15em;
+  margin: 0 auto;
 }
 
 .vjs-no-js a, .vjs-no-js a:visited {

dist/video-js/video.novtt.js

@@ -0,0 +1,196 @@
+(function() {var b=void 0,f=!0,j=null,l=!1;function m(){return function(){}}function n(a){return function(){return this[a]}}function q(a){return function(){return a}}var s;document.createElement("video");document.createElement("audio");document.createElement("track");
+function t(a,c,d){if("string"===typeof a){0===a.indexOf("#")&&(a=a.slice(1));if(t.Aa[a])return c&&t.log.warn('Player "'+a+'" is already initialised. Options will not be applied.'),d&&t.Aa[a].I(d),t.Aa[a];a=t.m(a)}if(!a||!a.nodeName)throw new TypeError("The element or ID supplied is not valid. (videojs)");return a.player||new t.Player(a,c,d)}var videojs=window.videojs=t;t.ic="4.12";t.vd="https:"==document.location.protocol?"https://":"http://";t.VERSION="4.12.7";
+t.options={techOrder:["html5","flash"],html5:{},flash:{},width:300,height:150,defaultVolume:0,playbackRates:[],inactivityTimeout:2E3,children:{mediaLoader:{},posterImage:{},loadingSpinner:{},textTrackDisplay:{},bigPlayButton:{},controlBar:{},errorDisplay:{},textTrackSettings:{}},language:document.getElementsByTagName("html")[0].getAttribute("lang")||navigator.languages&&navigator.languages[0]||navigator.If||navigator.language||"en",languages:{},notSupportedMessage:"No compatible source was found for this video."};
+"GENERATED_CDN_VSN"!==t.ic&&(videojs.options.flash.swf=t.vd+"vjs.zencdn.net/"+t.ic+"/video-js.swf");t.Jd=function(a,c){t.options.languages[a]=t.options.languages[a]!==b?t.$.ya(t.options.languages[a],c):c;return t.options.languages};t.Aa={};"function"===typeof define&&define.amd?define("videojs",[],function(){return videojs}):"object"===typeof exports&&"object"===typeof module&&(module.exports=videojs);t.Ea=t.CoreObject=m();
+t.Ea.extend=function(a){var c,d;a=a||{};c=a.init||a.l||this.prototype.init||this.prototype.l||m();d=function(){c.apply(this,arguments)};d.prototype=t.i.create(this.prototype);d.prototype.constructor=d;d.extend=t.Ea.extend;d.create=t.Ea.create;for(var e in a)a.hasOwnProperty(e)&&(d.prototype[e]=a[e]);return d};t.Ea.create=function(){var a=t.i.create(this.prototype);this.apply(a,arguments);return a};
+t.b=function(a,c,d){if(t.i.isArray(c))return v(t.b,a,c,d);var e=t.getData(a);e.G||(e.G={});e.G[c]||(e.G[c]=[]);d.s||(d.s=t.s++);e.G[c].push(d);e.ca||(e.disabled=l,e.ca=function(c){if(!e.disabled){c=t.Pb(c);var d=e.G[c.type];if(d)for(var d=d.slice(0),k=0,p=d.length;k<p&&!c.Rc();k++)d[k].call(a,c)}});1==e.G[c].length&&(a.addEventListener?a.addEventListener(c,e.ca,l):a.attachEvent&&a.attachEvent("on"+c,e.ca))};
+t.n=function(a,c,d){if(t.Mc(a)){var e=t.getData(a);if(e.G){if(t.i.isArray(c))return v(t.n,a,c,d);if(c){var g=e.G[c];if(g){if(d){if(d.s)for(e=0;e<g.length;e++)g[e].s===d.s&&g.splice(e--,1)}else e.G[c]=[];t.Ac(a,c)}}else for(g in e.G)c=g,e.G[c]=[],t.Ac(a,c)}}};t.Ac=function(a,c){var d=t.getData(a);0===d.G[c].length&&(delete d.G[c],a.removeEventListener?a.removeEventListener(c,d.ca,l):a.detachEvent&&a.detachEvent("on"+c,d.ca));t.ib(d.G)&&(delete d.G,delete d.ca,delete d.disabled);t.ib(d)&&t.cd(a)};
+t.Pb=function(a){function c(){return f}function d(){return l}if(!a||!a.Vb){var e=a||window.event;a={};for(var g in e)"layerX"!==g&&("layerY"!==g&&"keyLocation"!==g)&&("returnValue"==g&&e.preventDefault||(a[g]=e[g]));a.target||(a.target=a.srcElement||document);a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement;a.preventDefault=function(){e.preventDefault&&e.preventDefault();a.returnValue=l;a.ie=c;a.defaultPrevented=f};a.ie=d;a.defaultPrevented=l;a.stopPropagation=function(){e.stopPropagation&&
+e.stopPropagation();a.cancelBubble=f;a.Vb=c};a.Vb=d;a.stopImmediatePropagation=function(){e.stopImmediatePropagation&&e.stopImmediatePropagation();a.Rc=c;a.stopPropagation()};a.Rc=d;if(a.clientX!=j){g=document.documentElement;var h=document.body;a.pageX=a.clientX+(g&&g.scrollLeft||h&&h.scrollLeft||0)-(g&&g.clientLeft||h&&h.clientLeft||0);a.pageY=a.clientY+(g&&g.scrollTop||h&&h.scrollTop||0)-(g&&g.clientTop||h&&h.clientTop||0)}a.which=a.charCode||a.keyCode;a.button!=j&&(a.button=a.button&1?0:a.button&
+4?1:a.button&2?2:0)}return a};t.o=function(a,c){var d=t.Mc(a)?t.getData(a):{},e=a.parentNode||a.ownerDocument;"string"===typeof c&&(c={type:c,target:a});c=t.Pb(c);d.ca&&d.ca.call(a,c);if(e&&!c.Vb()&&c.bubbles!==l)t.o(e,c);else if(!e&&!c.defaultPrevented&&(d=t.getData(c.target),c.target[c.type])){d.disabled=f;if("function"===typeof c.target[c.type])c.target[c.type]();d.disabled=l}return!c.defaultPrevented};
+t.N=function(a,c,d){function e(){t.n(a,c,e);d.apply(this,arguments)}if(t.i.isArray(c))return v(t.N,a,c,d);e.s=d.s=d.s||t.s++;t.b(a,c,e)};function v(a,c,d,e){t.wc.forEach(d,function(d){a(c,d,e)})}var w=Object.prototype.hasOwnProperty;t.e=function(a,c){var d;c=c||{};d=document.createElement(a||"div");t.i.da(c,function(a,c){-1!==a.indexOf("aria-")||"role"==a?d.setAttribute(a,c):d[a]=c});return d};t.ua=function(a){return a.charAt(0).toUpperCase()+a.slice(1)};t.i={};
+t.i.create=Object.create||function(a){function c(){}c.prototype=a;return new c};t.i.da=function(a,c,d){for(var e in a)w.call(a,e)&&c.call(d||this,e,a[e])};t.i.D=function(a,c){if(!c)return a;for(var d in c)w.call(c,d)&&(a[d]=c[d]);return a};t.i.Rd=function(a,c){var d,e,g;a=t.i.copy(a);for(d in c)w.call(c,d)&&(e=a[d],g=c[d],a[d]=t.i.jb(e)&&t.i.jb(g)?t.i.Rd(e,g):c[d]);return a};t.i.copy=function(a){return t.i.D({},a)};
+t.i.jb=function(a){return!!a&&"object"===typeof a&&"[object Object]"===a.toString()&&a.constructor===Object};t.i.isArray=Array.isArray||function(a){return"[object Array]"===Object.prototype.toString.call(a)};t.ke=function(a){return a!==a};t.bind=function(a,c,d){function e(){return c.apply(a,arguments)}c.s||(c.s=t.s++);e.s=d?d+"_"+c.s:c.s;return e};t.ta={};t.s=1;t.expando="vdata"+(new Date).getTime();t.getData=function(a){var c=a[t.expando];c||(c=a[t.expando]=t.s++);t.ta[c]||(t.ta[c]={});return t.ta[c]};
+t.Mc=function(a){a=a[t.expando];return!(!a||t.ib(t.ta[a]))};t.cd=function(a){var c=a[t.expando];if(c){delete t.ta[c];try{delete a[t.expando]}catch(d){a.removeAttribute?a.removeAttribute(t.expando):a[t.expando]=j}}};t.ib=function(a){for(var c in a)if(a[c]!==j)return l;return f};t.Oa=function(a,c){return-1!==(" "+a.className+" ").indexOf(" "+c+" ")};t.p=function(a,c){t.Oa(a,c)||(a.className=""===a.className?c:a.className+" "+c)};
+t.r=function(a,c){var d,e;if(t.Oa(a,c)){d=a.className.split(" ");for(e=d.length-1;0<=e;e--)d[e]===c&&d.splice(e,1);a.className=d.join(" ")}};t.A=t.e("video");var x=document.createElement("track");x.Wb="captions";x.hd="en";x.label="English";t.A.appendChild(x);t.P=navigator.userAgent;t.Cd=/iPhone/i.test(t.P);t.Bd=/iPad/i.test(t.P);t.Dd=/iPod/i.test(t.P);t.Ad=t.Cd||t.Bd||t.Dd;var aa=t,y;var z=t.P.match(/OS (\d+)_/i);y=z&&z[1]?z[1]:b;aa.kf=y;t.zd=/Android/i.test(t.P);var ba=t,B;
+var C=t.P.match(/Android (\d+)(?:\.(\d+))?(?:\.(\d+))*/i),D,E;C?(D=C[1]&&parseFloat(C[1]),E=C[2]&&parseFloat(C[2]),B=D&&E?parseFloat(C[1]+"."+C[2]):D?D:j):B=j;ba.hc=B;t.Ed=t.zd&&/webkit/i.test(t.P)&&2.3>t.hc;t.jc=/Firefox/i.test(t.P);t.lf=/Chrome/i.test(t.P);t.oa=/MSIE\s8\.0/.test(t.P);t.Eb=!!("ontouchstart"in window||window.xd&&document instanceof window.xd);t.wd="backgroundSize"in t.A.style;
+t.ed=function(a,c){t.i.da(c,function(c,e){e===j||"undefined"===typeof e||e===l?a.removeAttribute(c):a.setAttribute(c,e===f?"":e)})};t.Na=function(a){var c,d,e,g;c={};if(a&&a.attributes&&0<a.attributes.length){d=a.attributes;for(var h=d.length-1;0<=h;h--){e=d[h].name;g=d[h].value;if("boolean"===typeof a[e]||-1!==",autoplay,controls,loop,muted,default,".indexOf(","+e+","))g=g!==j?f:l;c[e]=g}}return c};
+t.vf=function(a,c){var d="";document.defaultView&&document.defaultView.getComputedStyle?d=document.defaultView.getComputedStyle(a,"").getPropertyValue(c):a.currentStyle&&(d=a["client"+c.substr(0,1).toUpperCase()+c.substr(1)]+"px");return d};t.Ub=function(a,c){c.firstChild?c.insertBefore(a,c.firstChild):c.appendChild(a)};t.cb={};t.m=function(a){0===a.indexOf("#")&&(a=a.slice(1));return document.getElementById(a)};
+t.Ma=function(a,c){c=c||a;var d=Math.floor(a%60),e=Math.floor(a/60%60),g=Math.floor(a/3600),h=Math.floor(c/60%60),k=Math.floor(c/3600);if(isNaN(a)||Infinity===a)g=e=d="-";g=0<g||0<k?g+":":"";return g+(((g||10<=h)&&10>e?"0"+e:e)+":")+(10>d?"0"+d:d)};t.Ld=function(){document.body.focus();document.onselectstart=q(l)};t.af=function(){document.onselectstart=q(f)};t.trim=function(a){return(a+"").replace(/^\s+|\s+$/g,"")};t.round=function(a,c){c||(c=0);return Math.round(a*Math.pow(10,c))/Math.pow(10,c)};
+t.Lb=function(a,c){return{length:1,start:function(){return a},end:function(){return c}}};t.Me=function(a){try{var c=window.localStorage||l;c&&(c.volume=a)}catch(d){22==d.code||1014==d.code?t.log("LocalStorage Full (VideoJS)",d):18==d.code?t.log("LocalStorage not allowed (VideoJS)",d):t.log("LocalStorage Error (VideoJS)",d)}};t.$d=function(a){a.match(/^https?:\/\//)||(a=t.e("div",{innerHTML:'<a href="'+a+'">x</a>'}).firstChild.href);return a};
+t.Ee=function(a){var c,d,e,g;g="protocol hostname port pathname search hash host".split(" ");d=t.e("a",{href:a});if(e=""===d.host&&"file:"!==d.protocol)c=t.e("div"),c.innerHTML='<a href="'+a+'"></a>',d=c.firstChild,c.setAttribute("style","display:none; position:absolute;"),document.body.appendChild(c);a={};for(var h=0;h<g.length;h++)a[g[h]]=d[g[h]];"http:"===a.protocol&&(a.host=a.host.replace(/:80$/,""));"https:"===a.protocol&&(a.host=a.host.replace(/:443$/,""));e&&document.body.removeChild(c);return a};
+function F(a,c){var d,e;d=Array.prototype.slice.call(c);e=m();e=window.console||{log:e,warn:e,error:e};a?d.unshift(a.toUpperCase()+":"):a="log";t.log.history.push(d);d.unshift("VIDEOJS:");if(e[a].apply)e[a].apply(e,d);else e[a](d.join(" "))}t.log=function(){F(j,arguments)};t.log.history=[];t.log.error=function(){F("error",arguments)};t.log.warn=function(){F("warn",arguments)};
+t.Yd=function(a){var c,d;a.getBoundingClientRect&&a.parentNode&&(c=a.getBoundingClientRect());if(!c)return{left:0,top:0};a=document.documentElement;d=document.body;return{left:t.round(c.left+(window.pageXOffset||d.scrollLeft)-(a.clientLeft||d.clientLeft||0)),top:t.round(c.top+(window.pageYOffset||d.scrollTop)-(a.clientTop||d.clientTop||0))}};t.wc={};t.wc.forEach=function(a,c,d){if(t.i.isArray(a)&&c instanceof Function)for(var e=0,g=a.length;e<g;++e)c.call(d||t,a[e],e,a);return a};
+t.ff=function(a,c){var d,e,g,h,k,p,r;"string"===typeof a&&(a={uri:a});videojs.$.ya({method:"GET",timeout:45E3},a);c=c||m();p=function(){window.clearTimeout(k);c(j,e,e.response||e.responseText)};r=function(a){window.clearTimeout(k);if(!a||"string"===typeof a)a=Error(a);c(a,e)};d=window.XMLHttpRequest;"undefined"===typeof d&&(d=function(){try{return new window.ActiveXObject("Msxml2.XMLHTTP.6.0")}catch(a){}try{return new window.ActiveXObject("Msxml2.XMLHTTP.3.0")}catch(c){}try{return new window.ActiveXObject("Msxml2.XMLHTTP")}catch(d){}throw Error("This browser does not support XMLHttpRequest.");
+});e=new d;e.uri=a.uri;d=t.Ee(a.uri);g=window.location;d.protocol+d.host!==g.protocol+g.host&&window.XDomainRequest&&!("withCredentials"in e)?(e=new window.XDomainRequest,e.onload=p,e.onerror=r,e.onprogress=m(),e.ontimeout=m()):(h="file:"==d.protocol||"file:"==g.protocol,e.onreadystatechange=function(){if(4===e.readyState){if(e.Ye)return r("timeout");200===e.status||h&&0===e.status?p():r()}},a.timeout&&(k=window.setTimeout(function(){4!==e.readyState&&(e.Ye=f,e.abort())},a.timeout)));try{e.open(a.method||
+"GET",a.uri,f)}catch(u){r(u);return}a.withCredentials&&(e.withCredentials=f);a.responseType&&(e.responseType=a.responseType);try{e.send()}catch(A){r(A)}};t.$={};t.$.ya=function(a,c){var d,e,g;a=t.i.copy(a);for(d in c)c.hasOwnProperty(d)&&(e=a[d],g=c[d],a[d]=t.i.jb(e)&&t.i.jb(g)?t.$.ya(e,g):c[d]);return a};t.z=m();s=t.z.prototype;s.bb={};s.b=function(a,c){var d=this.addEventListener;this.addEventListener=Function.prototype;t.b(this,a,c);this.addEventListener=d};s.addEventListener=t.z.prototype.b;
+s.n=function(a,c){t.n(this,a,c)};s.removeEventListener=t.z.prototype.n;s.N=function(a,c){t.N(this,a,c)};s.o=function(a){var c=a.type||a;"string"===typeof a&&(a={type:c});a=t.Pb(a);if(this.bb[c]&&this["on"+c])this["on"+c](a);t.o(this,a)};s.dispatchEvent=t.z.prototype.o;
+t.a=t.Ea.extend({l:function(a,c,d){this.d=a;this.q=t.i.copy(this.q);c=this.options(c);this.Pa=c.id||c.el&&c.el.id;this.Pa||(this.Pa=(a.id&&a.id()||"no_player")+"_component_"+t.s++);this.te=c.name||j;this.c=c.el||this.e();this.R=[];this.fb={};this.gb={};this.Oc();this.I(d);if(c.dd!==l){var e,g;this.k().reportUserActivity&&(e=t.bind(this.k(),this.k().reportUserActivity),this.b("touchstart",function(){e();this.clearInterval(g);g=this.setInterval(e,250)}),a=function(){e();this.clearInterval(g)},this.b("touchmove",
+e),this.b("touchend",a),this.b("touchcancel",a))}}});s=t.a.prototype;s.dispose=function(){this.o({type:"dispose",bubbles:l});if(this.R)for(var a=this.R.length-1;0<=a;a--)this.R[a].dispose&&this.R[a].dispose();this.gb=this.fb=this.R=j;this.n();this.c.parentNode&&this.c.parentNode.removeChild(this.c);t.cd(this.c);this.c=j};s.d=f;s.k=n("d");s.options=function(a){return a===b?this.q:this.q=t.$.ya(this.q,a)};s.e=function(a,c){return t.e(a,c)};
+s.v=function(a){var c=this.d.language(),d=this.d.languages();return d&&d[c]&&d[c][a]?d[c][a]:a};s.m=n("c");s.va=function(){return this.B||this.c};s.id=n("Pa");s.name=n("te");s.children=n("R");s.ae=function(a){return this.fb[a]};s.ea=function(a){return this.gb[a]};
+s.ba=function(a,c){var d,e;"string"===typeof a?(e=a,c=c||{},d=c.componentClass||t.ua(e),c.name=e,d=new window.videojs[d](this.d||this,c)):d=a;this.R.push(d);"function"===typeof d.id&&(this.fb[d.id()]=d);(e=e||d.name&&d.name())&&(this.gb[e]=d);"function"===typeof d.el&&d.el()&&this.va().appendChild(d.el());return d};
+s.removeChild=function(a){"string"===typeof a&&(a=this.ea(a));if(a&&this.R){for(var c=l,d=this.R.length-1;0<=d;d--)if(this.R[d]===a){c=f;this.R.splice(d,1);break}c&&(this.fb[a.id()]=j,this.gb[a.name()]=j,(c=a.m())&&c.parentNode===this.va()&&this.va().removeChild(a.m()))}};
+s.Oc=function(){var a,c,d,e,g,h;a=this;c=a.options();if(d=c.children)if(h=function(d,e){c[d]!==b&&(e=c[d]);e!==l&&(a[d]=a.ba(d,e))},t.i.isArray(d))for(var k=0;k<d.length;k++)e=d[k],"string"==typeof e?(g=e,e={}):g=e.name,h(g,e);else t.i.da(d,h)};s.V=q("");
+s.b=function(a,c,d){var e,g,h;"string"===typeof a||t.i.isArray(a)?t.b(this.c,a,t.bind(this,c)):(e=t.bind(this,d),h=this,g=function(){h.n(a,c,e)},g.s=e.s,this.b("dispose",g),d=function(){h.n("dispose",g)},d.s=e.s,a.nodeName?(t.b(a,c,e),t.b(a,"dispose",d)):"function"===typeof a.b&&(a.b(c,e),a.b("dispose",d)));return this};
+s.n=function(a,c,d){!a||"string"===typeof a||t.i.isArray(a)?t.n(this.c,a,c):(d=t.bind(this,d),this.n("dispose",d),a.nodeName?(t.n(a,c,d),t.n(a,"dispose",d)):(a.n(c,d),a.n("dispose",d)));return this};s.N=function(a,c,d){var e,g,h;"string"===typeof a||t.i.isArray(a)?t.N(this.c,a,t.bind(this,c)):(e=t.bind(this,d),g=this,h=function(){g.n(a,c,h);e.apply(this,arguments)},h.s=e.s,this.b(a,c,h));return this};s.o=function(a){t.o(this.c,a);return this};
+s.I=function(a){a&&(this.wa?a.call(this):(this.nb===b&&(this.nb=[]),this.nb.push(a)));return this};s.Wa=function(){this.wa=f;var a=this.nb;if(a&&0<a.length){for(var c=0,d=a.length;c<d;c++)a[c].call(this);this.nb=[];this.o("ready")}};s.Oa=function(a){return t.Oa(this.c,a)};s.p=function(a){t.p(this.c,a);return this};s.r=function(a){t.r(this.c,a);return this};s.show=function(){this.r("vjs-hidden");return this};s.Y=function(){this.p("vjs-hidden");return this};function G(a){a.r("vjs-lock-showing")}
+s.width=function(a,c){return ca(this,"width",a,c)};s.height=function(a,c){return ca(this,"height",a,c)};s.Td=function(a,c){return this.width(a,f).height(c)};function ca(a,c,d,e){if(d!==b){if(d===j||t.ke(d))d=0;a.c.style[c]=-1!==(""+d).indexOf("%")||-1!==(""+d).indexOf("px")?d:"auto"===d?"":d+"px";e||a.o("resize");return a}if(!a.c)return 0;d=a.c.style[c];e=d.indexOf("px");return-1!==e?parseInt(d.slice(0,e),10):parseInt(a.c["offset"+t.ua(c)],10)}
+function da(a){var c,d,e,g,h,k,p,r;c=0;d=j;a.b("touchstart",function(a){1===a.touches.length&&(d=t.i.copy(a.touches[0]),c=(new Date).getTime(),g=f)});a.b("touchmove",function(a){1<a.touches.length?g=l:d&&(k=a.touches[0].pageX-d.pageX,p=a.touches[0].pageY-d.pageY,r=Math.sqrt(k*k+p*p),10<r&&(g=l))});h=function(){g=l};a.b("touchleave",h);a.b("touchcancel",h);a.b("touchend",function(a){d=j;g===f&&(e=(new Date).getTime()-c,200>e&&(a.preventDefault(),this.o("tap")))})}
+s.setTimeout=function(a,c){function d(){this.clearTimeout(e)}a=t.bind(this,a);var e=setTimeout(a,c);d.s="vjs-timeout-"+e;this.b("dispose",d);return e};s.clearTimeout=function(a){function c(){}clearTimeout(a);c.s="vjs-timeout-"+a;this.n("dispose",c);return a};s.setInterval=function(a,c){function d(){this.clearInterval(e)}a=t.bind(this,a);var e=setInterval(a,c);d.s="vjs-interval-"+e;this.b("dispose",d);return e};
+s.clearInterval=function(a){function c(){}clearInterval(a);c.s="vjs-interval-"+a;this.n("dispose",c);return a};t.w=t.a.extend({l:function(a,c){t.a.call(this,a,c);da(this);this.b("tap",this.u);this.b("click",this.u);this.b("focus",this.lb);this.b("blur",this.kb)}});s=t.w.prototype;
+s.e=function(a,c){var d;c=t.i.D({className:this.V(),role:"button","aria-live":"polite",tabIndex:0},c);d=t.a.prototype.e.call(this,a,c);c.innerHTML||(this.B=t.e("div",{className:"vjs-control-content"}),this.Jb=t.e("span",{className:"vjs-control-text",innerHTML:this.v(this.sa)||"Need Text"}),this.B.appendChild(this.Jb),d.appendChild(this.B));return d};s.V=function(){return"vjs-control "+t.a.prototype.V.call(this)};s.u=m();s.lb=function(){t.b(document,"keydown",t.bind(this,this.ka))};
+s.ka=function(a){if(32==a.which||13==a.which)a.preventDefault(),this.u()};s.kb=function(){t.n(document,"keydown",t.bind(this,this.ka))};t.U=t.a.extend({l:function(a,c){t.a.call(this,a,c);this.Kd=this.ea(this.q.barName);this.handle=this.ea(this.q.handleName);this.b("mousedown",this.mb);this.b("touchstart",this.mb);this.b("focus",this.lb);this.b("blur",this.kb);this.b("click",this.u);this.b(a,"controlsvisible",this.update);this.b(a,this.Yc,this.update)}});s=t.U.prototype;
+s.e=function(a,c){c=c||{};c.className+=" vjs-slider";c=t.i.D({role:"slider","aria-valuenow":0,"aria-valuemin":0,"aria-valuemax":100,tabIndex:0},c);return t.a.prototype.e.call(this,a,c)};s.mb=function(a){a.preventDefault();t.Ld();this.p("vjs-sliding");this.b(document,"mousemove",this.la);this.b(document,"mouseup",this.za);this.b(document,"touchmove",this.la);this.b(document,"touchend",this.za);this.la(a)};s.la=m();
+s.za=function(){t.af();this.r("vjs-sliding");this.n(document,"mousemove",this.la);this.n(document,"mouseup",this.za);this.n(document,"touchmove",this.la);this.n(document,"touchend",this.za);this.update()};s.update=function(){if(this.c){var a,c=this.Sb(),d=this.handle,e=this.Kd;if("number"!==typeof c||c!==c||0>c||Infinity===c)c=0;a=c;if(d){a=this.c.offsetWidth;var g=d.m().offsetWidth;a=g?g/a:0;c*=1-a;a=c+a/2;d.m().style.left=t.round(100*c,2)+"%"}e&&(e.m().style.width=t.round(100*a,2)+"%")}};
+function ea(a,c){var d,e,g,h;d=a.c;e=t.Yd(d);h=g=d.offsetWidth;d=a.handle;if(a.options().vertical)return h=e.top,e=c.changedTouches?c.changedTouches[0].pageY:c.pageY,d&&(d=d.m().offsetHeight,h+=d/2,g-=d),Math.max(0,Math.min(1,(h-e+g)/g));g=e.left;e=c.changedTouches?c.changedTouches[0].pageX:c.pageX;d&&(d=d.m().offsetWidth,g+=d/2,h-=d);return Math.max(0,Math.min(1,(e-g)/h))}s.lb=function(){this.b(document,"keydown",this.ka)};
+s.ka=function(a){if(37==a.which||40==a.which)a.preventDefault(),this.jd();else if(38==a.which||39==a.which)a.preventDefault(),this.kd()};s.kb=function(){this.n(document,"keydown",this.ka)};s.u=function(a){a.stopImmediatePropagation();a.preventDefault()};t.ha=t.a.extend();t.ha.prototype.defaultValue=0;t.ha.prototype.e=function(a,c){c=c||{};c.className+=" vjs-slider-handle";c=t.i.D({innerHTML:'<span class="vjs-control-text">'+this.defaultValue+"</span>"},c);return t.a.prototype.e.call(this,"div",c)};
+t.pa=t.a.extend();function fa(a,c){a.ba(c);c.b("click",t.bind(a,function(){G(this)}))}t.pa.prototype.e=function(){var a=this.options().Cc||"ul";this.B=t.e(a,{className:"vjs-menu-content"});a=t.a.prototype.e.call(this,"div",{append:this.B,className:"vjs-menu"});a.appendChild(this.B);t.b(a,"click",function(a){a.preventDefault();a.stopImmediatePropagation()});return a};t.M=t.w.extend({l:function(a,c){t.w.call(this,a,c);this.selected(c.selected)}});
+t.M.prototype.e=function(a,c){return t.w.prototype.e.call(this,"li",t.i.D({className:"vjs-menu-item",innerHTML:this.v(this.q.label)},c))};t.M.prototype.u=function(){this.selected(f)};t.M.prototype.selected=function(a){a?(this.p("vjs-selected"),this.c.setAttribute("aria-selected",f)):(this.r("vjs-selected"),this.c.setAttribute("aria-selected",l))};
+t.O=t.w.extend({l:function(a,c){t.w.call(this,a,c);this.update();this.b("keydown",this.ka);this.c.setAttribute("aria-haspopup",f);this.c.setAttribute("role","button")}});s=t.O.prototype;s.update=function(){var a=this.Ja();this.xa&&this.removeChild(this.xa);this.xa=a;this.ba(a);this.H&&0===this.H.length?this.Y():this.H&&1<this.H.length&&this.show()};s.Ha=l;
+s.Ja=function(){var a=new t.pa(this.d);this.options().title&&a.va().appendChild(t.e("li",{className:"vjs-menu-title",innerHTML:t.ua(this.options().title),We:-1}));if(this.H=this.createItems())for(var c=0;c<this.H.length;c++)fa(a,this.H[c]);return a};s.Ia=m();s.V=function(){return this.className+" vjs-menu-button "+t.w.prototype.V.call(this)};s.lb=m();s.kb=m();s.u=function(){this.N("mouseout",t.bind(this,function(){G(this.xa);this.c.blur()}));this.Ha?H(this):ga(this)};
+s.ka=function(a){32==a.which||13==a.which?(this.Ha?H(this):ga(this),a.preventDefault()):27==a.which&&(this.Ha&&H(this),a.preventDefault())};function ga(a){a.Ha=f;a.xa.p("vjs-lock-showing");a.c.setAttribute("aria-pressed",f);a.H&&0<a.H.length&&a.H[0].m().focus()}function H(a){a.Ha=l;G(a.xa);a.c.setAttribute("aria-pressed",l)}t.J=function(a){"number"===typeof a?this.code=a:"string"===typeof a?this.message=a:"object"===typeof a&&t.i.D(this,a);this.message||(this.message=t.J.Sd[this.code]||"")};
+t.J.prototype.code=0;t.J.prototype.message="";t.J.prototype.status=j;t.J.hb="MEDIA_ERR_CUSTOM MEDIA_ERR_ABORTED MEDIA_ERR_NETWORK MEDIA_ERR_DECODE MEDIA_ERR_SRC_NOT_SUPPORTED MEDIA_ERR_ENCRYPTED".split(" ");
+t.J.Sd={1:"You aborted the video playback",2:"A network error caused the video download to fail part-way.",3:"The video playback was aborted due to a corruption problem or because the video used features your browser did not support.",4:"The video could not be loaded, either because the server or network failed or because the format is not supported.",5:"The video is encrypted and we do not have the keys to decrypt it."};for(var I=0;I<t.J.hb.length;I++)t.J[t.J.hb[I]]=I,t.J.prototype[t.J.hb[I]]=I;
+var J,ha,K,L;
+J=["requestFullscreen exitFullscreen fullscreenElement fullscreenEnabled fullscreenchange fullscreenerror".split(" "),"webkitRequestFullscreen webkitExitFullscreen webkitFullscreenElement webkitFullscreenEnabled webkitfullscreenchange webkitfullscreenerror".split(" "),"webkitRequestFullScreen webkitCancelFullScreen webkitCurrentFullScreenElement webkitCancelFullScreen webkitfullscreenchange webkitfullscreenerror".split(" "),"mozRequestFullScreen mozCancelFullScreen mozFullScreenElement mozFullScreenEnabled mozfullscreenchange mozfullscreenerror".split(" "),"msRequestFullscreen msExitFullscreen msFullscreenElement msFullscreenEnabled MSFullscreenChange MSFullscreenError".split(" ")];
+ha=J[0];for(L=0;L<J.length;L++)if(J[L][1]in document){K=J[L];break}if(K){t.cb.Rb={};for(L=0;L<K.length;L++)t.cb.Rb[ha[L]]=K[L]}
+t.Player=t.a.extend({l:function(a,c,d){this.L=a;a.id=a.id||"vjs_video_"+t.s++;this.Xe=a&&t.Na(a);c=t.i.D(ia(a),c);this.Tc=c.language||t.options.language;this.ne=c.languages||t.options.languages;this.K={};this.Zc=c.poster||"";this.Kb=!!c.controls;a.controls=l;c.dd=l;ja(this,"audio"===this.L.nodeName.toLowerCase());t.a.call(this,this,c,d);this.controls()?this.p("vjs-controls-enabled"):this.p("vjs-controls-disabled");ja(this)&&this.p("vjs-audio");t.Aa[this.Pa]=this;c.plugins&&t.i.da(c.plugins,function(a,
+c){this[a](c)},this);var e,g,h,k,p;e=t.bind(this,this.reportUserActivity);this.b("mousedown",function(){e();this.clearInterval(g);g=this.setInterval(e,250)});this.b("mousemove",function(a){if(a.screenX!=k||a.screenY!=p)k=a.screenX,p=a.screenY,e()});this.b("mouseup",function(){e();this.clearInterval(g)});this.b("keydown",e);this.b("keyup",e);this.setInterval(function(){if(this.Da){this.Da=l;this.userActive(f);this.clearTimeout(h);var a=this.options().inactivityTimeout;0<a&&(h=this.setTimeout(function(){this.Da||
+this.userActive(l)},a))}},250)}});s=t.Player.prototype;s.language=function(a){if(a===b)return this.Tc;this.Tc=a;return this};s.languages=n("ne");s.q=t.options;s.dispose=function(){this.o("dispose");this.n("dispose");t.Aa[this.Pa]=j;this.L&&this.L.player&&(this.L.player=j);this.c&&this.c.player&&(this.c.player=j);this.h&&this.h.dispose();t.a.prototype.dispose.call(this)};
+function ia(a){var c,d,e={sources:[],tracks:[]};c=t.Na(a);d=c["data-setup"];d!==j&&t.i.D(c,t.JSON.parse(d||"{}"));t.i.D(e,c);if(a.hasChildNodes()){var g,h;a=a.childNodes;g=0;for(h=a.length;g<h;g++)c=a[g],d=c.nodeName.toLowerCase(),"source"===d?e.sources.push(t.Na(c)):"track"===d&&e.tracks.push(t.Na(c))}return e}
+s.e=function(){var a=this.c=t.a.prototype.e.call(this,"div"),c=this.L,d;c.removeAttribute("width");c.removeAttribute("height");d=t.Na(c);t.i.da(d,function(c){"class"==c?a.className=d[c]:a.setAttribute(c,d[c])});c.id+="_html5_api";c.className="vjs-tech";c.player=a.player=this;this.p("vjs-paused");this.width(this.q.width,f);this.height(this.q.height,f);c.ge=c.networkState;c.parentNode&&c.parentNode.insertBefore(a,c);t.Ub(c,a);this.c=a;this.b("loadstart",this.xe);this.b("waiting",this.De);this.b(["canplay",
+"canplaythrough","playing","ended"],this.Ce);this.b("seeking",this.Ae);this.b("seeked",this.ze);this.b("ended",this.ue);this.b("play",this.$b);this.b("firstplay",this.ve);this.b("pause",this.Zb);this.b("progress",this.ye);this.b("durationchange",this.Wc);this.b("fullscreenchange",this.we);return a};
+function ka(a,c,d){a.h&&(a.wa=l,a.h.dispose(),a.h=l);"Html5"!==c&&a.L&&(t.f.Mb(a.L),a.L=j);a.Ua=c;a.wa=l;var e=t.i.D({source:d,parentEl:a.c},a.q[c.toLowerCase()]);d&&(a.Gc=d.type,d.src==a.K.src&&0<a.K.currentTime&&(e.startTime=a.K.currentTime),a.K.src=d.src);a.h=new window.videojs[c](a,e);a.h.I(function(){this.d.Wa()})}s.xe=function(){this.r("vjs-ended");this.error(j);this.paused()?la(this,l):this.o("firstplay")};s.Nc=l;
+function la(a,c){c!==b&&a.Nc!==c&&((a.Nc=c)?(a.p("vjs-has-started"),a.o("firstplay")):a.r("vjs-has-started"))}s.$b=function(){this.r("vjs-ended");this.r("vjs-paused");this.p("vjs-playing");la(this,f)};s.De=function(){this.p("vjs-waiting")};s.Ce=function(){this.r("vjs-waiting")};s.Ae=function(){this.p("vjs-seeking")};s.ze=function(){this.r("vjs-seeking")};s.ve=function(){this.q.starttime&&this.currentTime(this.q.starttime);this.p("vjs-has-started")};s.Zb=function(){this.r("vjs-playing");this.p("vjs-paused")};
+s.ye=function(){1==this.bufferedPercent()&&this.o("loadedalldata")};s.ue=function(){this.p("vjs-ended");this.q.loop?(this.currentTime(0),this.play()):this.paused()||this.pause()};s.Wc=function(){var a=M(this,"duration");a&&(0>a&&(a=Infinity),this.duration(a),Infinity===a?this.p("vjs-live"):this.r("vjs-live"))};s.we=function(){this.isFullscreen()?this.p("vjs-fullscreen"):this.r("vjs-fullscreen")};
+function N(a,c,d){if(a.h&&!a.h.wa)a.h.I(function(){this[c](d)});else try{a.h[c](d)}catch(e){throw t.log(e),e;}}function M(a,c){if(a.h&&a.h.wa)try{return a.h[c]()}catch(d){throw a.h[c]===b?t.log("Video.js: "+c+" method not defined for "+a.Ua+" playback technology.",d):"TypeError"==d.name?(t.log("Video.js: "+c+" unavailable on "+a.Ua+" playback technology element.",d),a.h.wa=l):t.log(d),d;}}s.play=function(){N(this,"play");return this};s.pause=function(){N(this,"pause");return this};
+s.paused=function(){return M(this,"paused")===l?l:f};s.currentTime=function(a){return a!==b?(N(this,"setCurrentTime",a),this):this.K.currentTime=M(this,"currentTime")||0};s.duration=function(a){if(a!==b)return this.K.duration=parseFloat(a),this;this.K.duration===b&&this.Wc();return this.K.duration||0};s.remainingTime=function(){return this.duration()-this.currentTime()};s.buffered=function(){var a=M(this,"buffered");if(!a||!a.length)a=t.Lb(0,0);return a};
+s.bufferedPercent=function(){var a=this.duration(),c=this.buffered(),d=0,e,g;if(!a)return 0;for(var h=0;h<c.length;h++)e=c.start(h),g=c.end(h),g>a&&(g=a),d+=g-e;return d/a};s.volume=function(a){if(a!==b)return a=Math.max(0,Math.min(1,parseFloat(a))),this.K.volume=a,N(this,"setVolume",a),t.Me(a),this;a=parseFloat(M(this,"volume"));return isNaN(a)?1:a};s.muted=function(a){return a!==b?(N(this,"setMuted",a),this):M(this,"muted")||l};s.Ta=function(){return M(this,"supportsFullScreen")||l};s.Qc=l;
+s.isFullscreen=function(a){return a!==b?(this.Qc=!!a,this):this.Qc};s.isFullScreen=function(a){t.log.warn('player.isFullScreen() has been deprecated, use player.isFullscreen() with a lowercase "s")');return this.isFullscreen(a)};
+s.requestFullscreen=function(){var a=t.cb.Rb;this.isFullscreen(f);a?(t.b(document,a.fullscreenchange,t.bind(this,function(c){this.isFullscreen(document[a.fullscreenElement]);this.isFullscreen()===l&&t.n(document,a.fullscreenchange,arguments.callee);this.o("fullscreenchange")})),this.c[a.requestFullscreen]()):this.h.Ta()?N(this,"enterFullScreen"):(this.Jc(),this.o("fullscreenchange"));return this};
+s.requestFullScreen=function(){t.log.warn('player.requestFullScreen() has been deprecated, use player.requestFullscreen() with a lowercase "s")');return this.requestFullscreen()};s.exitFullscreen=function(){var a=t.cb.Rb;this.isFullscreen(l);if(a)document[a.exitFullscreen]();else this.h.Ta()?N(this,"exitFullScreen"):(this.Nb(),this.o("fullscreenchange"));return this};s.cancelFullScreen=function(){t.log.warn("player.cancelFullScreen() has been deprecated, use player.exitFullscreen()");return this.exitFullscreen()};
+s.Jc=function(){this.je=f;this.Ud=document.documentElement.style.overflow;t.b(document,"keydown",t.bind(this,this.Kc));document.documentElement.style.overflow="hidden";t.p(document.body,"vjs-full-window");this.o("enterFullWindow")};s.Kc=function(a){27===a.keyCode&&(this.isFullscreen()===f?this.exitFullscreen():this.Nb())};s.Nb=function(){this.je=l;t.n(document,"keydown",this.Kc);document.documentElement.style.overflow=this.Ud;t.r(document.body,"vjs-full-window");this.o("exitFullWindow")};
+s.selectSource=function(a){for(var c=0,d=this.q.techOrder;c<d.length;c++){var e=t.ua(d[c]),g=window.videojs[e];if(g){if(g.isSupported())for(var h=0,k=a;h<k.length;h++){var p=k[h];if(g.canPlaySource(p))return{source:p,h:e}}}else t.log.error('The "'+e+'" tech is undefined. Skipped browser support check for that tech.')}return l};
+s.src=function(a){if(a===b)return M(this,"src");t.i.isArray(a)?ma(this,a):"string"===typeof a?this.src({src:a}):a instanceof Object&&(a.type&&!window.videojs[this.Ua].canPlaySource(a)?ma(this,[a]):(this.K.src=a.src,this.Gc=a.type||"",this.I(function(){window.videojs[this.Ua].prototype.hasOwnProperty("setSource")?N(this,"setSource",a):N(this,"src",a.src);"auto"==this.q.preload&&this.load();this.q.autoplay&&this.play()})));return this};
+function ma(a,c){var d=a.selectSource(c);d?d.h===a.Ua?a.src(d.source):ka(a,d.h,d.source):(a.setTimeout(function(){this.error({code:4,message:this.v(this.options().notSupportedMessage)})},0),a.Wa())}s.load=function(){N(this,"load");return this};s.currentSrc=function(){return M(this,"currentSrc")||this.K.src||""};s.Qd=function(){return this.Gc||""};s.Qa=function(a){return a!==b?(N(this,"setPreload",a),this.q.preload=a,this):M(this,"preload")};
+s.autoplay=function(a){return a!==b?(N(this,"setAutoplay",a),this.q.autoplay=a,this):M(this,"autoplay")};s.loop=function(a){return a!==b?(N(this,"setLoop",a),this.q.loop=a,this):M(this,"loop")};s.poster=function(a){if(a===b)return this.Zc;a||(a="");this.Zc=a;N(this,"setPoster",a);this.o("posterchange");return this};
+s.controls=function(a){return a!==b?(a=!!a,this.Kb!==a&&((this.Kb=a)?(this.r("vjs-controls-disabled"),this.p("vjs-controls-enabled"),this.o("controlsenabled")):(this.r("vjs-controls-enabled"),this.p("vjs-controls-disabled"),this.o("controlsdisabled"))),this):this.Kb};t.Player.prototype.ec;s=t.Player.prototype;
+s.usingNativeControls=function(a){return a!==b?(a=!!a,this.ec!==a&&((this.ec=a)?(this.p("vjs-using-native-controls"),this.o("usingnativecontrols")):(this.r("vjs-using-native-controls"),this.o("usingcustomcontrols"))),this):this.ec};s.ja=j;s.error=function(a){if(a===b)return this.ja;if(a===j)return this.ja=a,this.r("vjs-error"),this;this.ja=a instanceof t.J?a:new t.J(a);this.o("error");this.p("vjs-error");t.log.error("(CODE:"+this.ja.code+" "+t.J.hb[this.ja.code]+")",this.ja.message,this.ja);return this};
+s.ended=function(){return M(this,"ended")};s.seeking=function(){return M(this,"seeking")};s.Da=f;s.reportUserActivity=function(){this.Da=f};s.dc=f;s.userActive=function(a){return a!==b?(a=!!a,a!==this.dc&&((this.dc=a)?(this.Da=f,this.r("vjs-user-inactive"),this.p("vjs-user-active"),this.o("useractive")):(this.Da=l,this.h&&this.h.N("mousemove",function(a){a.stopPropagation();a.preventDefault()}),this.r("vjs-user-active"),this.p("vjs-user-inactive"),this.o("userinactive"))),this):this.dc};
+s.playbackRate=function(a){return a!==b?(N(this,"setPlaybackRate",a),this):this.h&&this.h.featuresPlaybackRate?M(this,"playbackRate"):1};s.Pc=l;function ja(a,c){return c!==b?(a.Pc=!!c,a):a.Pc}s.networkState=function(){return M(this,"networkState")};s.readyState=function(){return M(this,"readyState")};s.textTracks=function(){return this.h&&this.h.textTracks()};s.Z=function(){return this.h&&this.h.remoteTextTracks()};s.addTextTrack=function(a,c,d){return this.h&&this.h.addTextTrack(a,c,d)};
+s.ia=function(a){return this.h&&this.h.addRemoteTextTrack(a)};s.Ba=function(a){this.h&&this.h.removeRemoteTextTrack(a)};t.ub=t.a.extend();t.ub.prototype.q={wf:"play",children:{playToggle:{},currentTimeDisplay:{},timeDivider:{},durationDisplay:{},remainingTimeDisplay:{},liveDisplay:{},progressControl:{},fullscreenToggle:{},volumeControl:{},muteToggle:{},playbackRateMenuButton:{},subtitlesButton:{},captionsButton:{},chaptersButton:{}}};t.ub.prototype.e=function(){return t.e("div",{className:"vjs-control-bar"})};
+t.kc=t.a.extend({l:function(a,c){t.a.call(this,a,c)}});t.kc.prototype.e=function(){var a=t.a.prototype.e.call(this,"div",{className:"vjs-live-controls vjs-control"});this.B=t.e("div",{className:"vjs-live-display",innerHTML:'<span class="vjs-control-text">'+this.v("Stream Type")+"</span>"+this.v("LIVE"),"aria-live":"off"});a.appendChild(this.B);return a};t.nc=t.w.extend({l:function(a,c){t.w.call(this,a,c);this.b(a,"play",this.$b);this.b(a,"pause",this.Zb)}});s=t.nc.prototype;s.sa="Play";
+s.V=function(){return"vjs-play-control "+t.w.prototype.V.call(this)};s.u=function(){this.d.paused()?this.d.play():this.d.pause()};s.$b=function(){this.r("vjs-paused");this.p("vjs-playing");this.c.children[0].children[0].innerHTML=this.v("Pause")};s.Zb=function(){this.r("vjs-playing");this.p("vjs-paused");this.c.children[0].children[0].innerHTML=this.v("Play")};t.vb=t.a.extend({l:function(a,c){t.a.call(this,a,c);this.b(a,"timeupdate",this.ga)}});
+t.vb.prototype.e=function(){var a=t.a.prototype.e.call(this,"div",{className:"vjs-current-time vjs-time-controls vjs-control"});this.B=t.e("div",{className:"vjs-current-time-display",innerHTML:'<span class="vjs-control-text">Current Time </span>0:00',"aria-live":"off"});a.appendChild(this.B);return a};t.vb.prototype.ga=function(){var a=this.d.ob?this.d.K.currentTime:this.d.currentTime();this.B.innerHTML='<span class="vjs-control-text">'+this.v("Current Time")+"</span> "+t.Ma(a,this.d.duration())};
+t.wb=t.a.extend({l:function(a,c){t.a.call(this,a,c);this.b(a,"timeupdate",this.ga);this.b(a,"loadedmetadata",this.ga)}});t.wb.prototype.e=function(){var a=t.a.prototype.e.call(this,"div",{className:"vjs-duration vjs-time-controls vjs-control"});this.B=t.e("div",{className:"vjs-duration-display",innerHTML:'<span class="vjs-control-text">'+this.v("Duration Time")+"</span> 0:00","aria-live":"off"});a.appendChild(this.B);return a};
+t.wb.prototype.ga=function(){var a=this.d.duration();a&&(this.B.innerHTML='<span class="vjs-control-text">'+this.v("Duration Time")+"</span> "+t.Ma(a))};t.tc=t.a.extend({l:function(a,c){t.a.call(this,a,c)}});t.tc.prototype.e=function(){return t.a.prototype.e.call(this,"div",{className:"vjs-time-divider",innerHTML:"<div><span>/</span></div>"})};t.Db=t.a.extend({l:function(a,c){t.a.call(this,a,c);this.b(a,"timeupdate",this.ga)}});
+t.Db.prototype.e=function(){var a=t.a.prototype.e.call(this,"div",{className:"vjs-remaining-time vjs-time-controls vjs-control"});this.B=t.e("div",{className:"vjs-remaining-time-display",innerHTML:'<span class="vjs-control-text">'+this.v("Remaining Time")+"</span> -0:00","aria-live":"off"});a.appendChild(this.B);return a};t.Db.prototype.ga=function(){this.d.duration()&&(this.B.innerHTML='<span class="vjs-control-text">'+this.v("Remaining Time")+"</span> -"+t.Ma(this.d.remainingTime()))};
+t.Za=t.w.extend({l:function(a,c){t.w.call(this,a,c)}});t.Za.prototype.sa="Fullscreen";t.Za.prototype.V=function(){return"vjs-fullscreen-control "+t.w.prototype.V.call(this)};t.Za.prototype.u=function(){this.d.isFullscreen()?(this.d.exitFullscreen(),this.Jb.innerHTML=this.v("Fullscreen")):(this.d.requestFullscreen(),this.Jb.innerHTML=this.v("Non-Fullscreen"))};t.Cb=t.a.extend({l:function(a,c){t.a.call(this,a,c)}});t.Cb.prototype.q={children:{seekBar:{}}};
+t.Cb.prototype.e=function(){return t.a.prototype.e.call(this,"div",{className:"vjs-progress-control vjs-control"})};t.qc=t.U.extend({l:function(a,c){t.U.call(this,a,c);this.b(a,"timeupdate",this.Ca);a.I(t.bind(this,this.Ca))}});s=t.qc.prototype;s.q={children:{loadProgressBar:{},playProgressBar:{},seekHandle:{}},barName:"playProgressBar",handleName:"seekHandle"};s.Yc="timeupdate";s.e=function(){return t.U.prototype.e.call(this,"div",{className:"vjs-progress-holder","aria-label":"video progress bar"})};
+s.Ca=function(){var a=this.d.ob?this.d.K.currentTime:this.d.currentTime();this.c.setAttribute("aria-valuenow",t.round(100*this.Sb(),2));this.c.setAttribute("aria-valuetext",t.Ma(a,this.d.duration()))};s.Sb=function(){return this.d.currentTime()/this.d.duration()};s.mb=function(a){t.U.prototype.mb.call(this,a);this.d.ob=f;this.d.p("vjs-scrubbing");this.df=!this.d.paused();this.d.pause()};s.la=function(a){a=ea(this,a)*this.d.duration();a==this.d.duration()&&(a-=0.1);this.d.currentTime(a)};
+s.za=function(a){t.U.prototype.za.call(this,a);this.d.ob=l;this.d.r("vjs-scrubbing");this.df&&this.d.play()};s.kd=function(){this.d.currentTime(this.d.currentTime()+5)};s.jd=function(){this.d.currentTime(this.d.currentTime()-5)};t.zb=t.a.extend({l:function(a,c){t.a.call(this,a,c);this.b(a,"progress",this.update)}});t.zb.prototype.e=function(){return t.a.prototype.e.call(this,"div",{className:"vjs-load-progress",innerHTML:'<span class="vjs-control-text"><span>'+this.v("Loaded")+"</span>: 0%</span>"})};
+t.zb.prototype.update=function(){var a,c,d,e,g=this.d.buffered();a=this.d.duration();var h,k=this.d;h=k.buffered();k=k.duration();h=h.end(h.length-1);h>k&&(h=k);k=this.c.children;this.c.style.width=100*(h/a||0)+"%";for(a=0;a<g.length;a++)c=g.start(a),d=g.end(a),(e=k[a])||(e=this.c.appendChild(t.e())),e.style.left=100*(c/h||0)+"%",e.style.width=100*((d-c)/h||0)+"%";for(a=k.length;a>g.length;a--)this.c.removeChild(k[a-1])};t.mc=t.a.extend({l:function(a,c){t.a.call(this,a,c)}});
+t.mc.prototype.e=function(){return t.a.prototype.e.call(this,"div",{className:"vjs-play-progress",innerHTML:'<span class="vjs-control-text"><span>'+this.v("Progress")+"</span>: 0%</span>"})};t.$a=t.ha.extend({l:function(a,c){t.ha.call(this,a,c);this.b(a,"timeupdate",this.ga)}});t.$a.prototype.defaultValue="00:00";t.$a.prototype.e=function(){return t.ha.prototype.e.call(this,"div",{className:"vjs-seek-handle","aria-live":"off"})};
+t.$a.prototype.ga=function(){var a=this.d.ob?this.d.K.currentTime:this.d.currentTime();this.c.innerHTML='<span class="vjs-control-text">'+t.Ma(a,this.d.duration())+"</span>"};t.Gb=t.a.extend({l:function(a,c){t.a.call(this,a,c);a.h&&a.h.featuresVolumeControl===l&&this.p("vjs-hidden");this.b(a,"loadstart",function(){a.h.featuresVolumeControl===l?this.p("vjs-hidden"):this.r("vjs-hidden")})}});t.Gb.prototype.q={children:{volumeBar:{}}};
+t.Gb.prototype.e=function(){return t.a.prototype.e.call(this,"div",{className:"vjs-volume-control vjs-control"})};t.Fb=t.U.extend({l:function(a,c){t.U.call(this,a,c);this.b(a,"volumechange",this.Ca);a.I(t.bind(this,this.Ca))}});s=t.Fb.prototype;s.Ca=function(){this.c.setAttribute("aria-valuenow",t.round(100*this.d.volume(),2));this.c.setAttribute("aria-valuetext",t.round(100*this.d.volume(),2)+"%")};s.q={children:{volumeLevel:{},volumeHandle:{}},barName:"volumeLevel",handleName:"volumeHandle"};
+s.Yc="volumechange";s.e=function(){return t.U.prototype.e.call(this,"div",{className:"vjs-volume-bar","aria-label":"volume level"})};s.la=function(a){this.d.muted()&&this.d.muted(l);this.d.volume(ea(this,a))};s.Sb=function(){return this.d.muted()?0:this.d.volume()};s.kd=function(){this.d.volume(this.d.volume()+0.1)};s.jd=function(){this.d.volume(this.d.volume()-0.1)};t.uc=t.a.extend({l:function(a,c){t.a.call(this,a,c)}});
+t.uc.prototype.e=function(){return t.a.prototype.e.call(this,"div",{className:"vjs-volume-level",innerHTML:'<span class="vjs-control-text"></span>'})};t.Hb=t.ha.extend();t.Hb.prototype.defaultValue="00:00";t.Hb.prototype.e=function(){return t.ha.prototype.e.call(this,"div",{className:"vjs-volume-handle"})};
+t.qa=t.w.extend({l:function(a,c){t.w.call(this,a,c);this.b(a,"volumechange",this.update);a.h&&a.h.featuresVolumeControl===l&&this.p("vjs-hidden");this.b(a,"loadstart",function(){a.h.featuresVolumeControl===l?this.p("vjs-hidden"):this.r("vjs-hidden")})}});t.qa.prototype.e=function(){return t.w.prototype.e.call(this,"div",{className:"vjs-mute-control vjs-control",innerHTML:'<div><span class="vjs-control-text">'+this.v("Mute")+"</span></div>"})};
+t.qa.prototype.u=function(){this.d.muted(this.d.muted()?l:f)};t.qa.prototype.update=function(){var a=this.d.volume(),c=3;0===a||this.d.muted()?c=0:0.33>a?c=1:0.67>a&&(c=2);this.d.muted()?this.c.children[0].children[0].innerHTML!=this.v("Unmute")&&(this.c.children[0].children[0].innerHTML=this.v("Unmute")):this.c.children[0].children[0].innerHTML!=this.v("Mute")&&(this.c.children[0].children[0].innerHTML=this.v("Mute"));for(a=0;4>a;a++)t.r(this.c,"vjs-vol-"+a);t.p(this.c,"vjs-vol-"+c)};
+t.Fa=t.O.extend({l:function(a,c){t.O.call(this,a,c);this.b(a,"volumechange",this.ef);a.h&&a.h.featuresVolumeControl===l&&this.p("vjs-hidden");this.b(a,"loadstart",function(){a.h.featuresVolumeControl===l?this.p("vjs-hidden"):this.r("vjs-hidden")});this.p("vjs-menu-button")}});t.Fa.prototype.Ja=function(){var a=new t.pa(this.d,{Cc:"div"}),c=new t.Fb(this.d,this.q.volumeBar);c.b("focus",function(){a.p("vjs-lock-showing")});c.b("blur",function(){G(a)});a.ba(c);return a};
+t.Fa.prototype.u=function(){t.qa.prototype.u.call(this);t.O.prototype.u.call(this)};t.Fa.prototype.e=function(){return t.w.prototype.e.call(this,"div",{className:"vjs-volume-menu-button vjs-menu-button vjs-control",innerHTML:'<div><span class="vjs-control-text">'+this.v("Mute")+"</span></div>"})};t.Fa.prototype.ef=t.qa.prototype.update;t.oc=t.O.extend({l:function(a,c){t.O.call(this,a,c);this.sd();this.rd();this.b(a,"loadstart",this.sd);this.b(a,"ratechange",this.rd)}});s=t.oc.prototype;s.sa="Playback Rate";
+s.className="vjs-playback-rate";s.e=function(){var a=t.O.prototype.e.call(this);this.Sc=t.e("div",{className:"vjs-playback-rate-value",innerHTML:1});a.appendChild(this.Sc);return a};s.Ja=function(){var a=new t.pa(this.k()),c=this.k().options().playbackRates;if(c)for(var d=c.length-1;0<=d;d--)a.ba(new t.Bb(this.k(),{rate:c[d]+"x"}));return a};s.Ca=function(){this.m().setAttribute("aria-valuenow",this.k().playbackRate())};
+s.u=function(){for(var a=this.k().playbackRate(),c=this.k().options().playbackRates,d=c[0],e=0;e<c.length;e++)if(c[e]>a){d=c[e];break}this.k().playbackRate(d)};function na(a){return a.k().h&&a.k().h.featuresPlaybackRate&&a.k().options().playbackRates&&0<a.k().options().playbackRates.length}s.sd=function(){na(this)?this.r("vjs-hidden"):this.p("vjs-hidden")};s.rd=function(){na(this)&&(this.Sc.innerHTML=this.k().playbackRate()+"x")};
+t.Bb=t.M.extend({Cc:"button",l:function(a,c){var d=this.label=c.rate,e=this.$c=parseFloat(d,10);c.label=d;c.selected=1===e;t.M.call(this,a,c);this.b(a,"ratechange",this.update)}});t.Bb.prototype.u=function(){t.M.prototype.u.call(this);this.k().playbackRate(this.$c)};t.Bb.prototype.update=function(){this.selected(this.k().playbackRate()==this.$c)};t.pc=t.w.extend({l:function(a,c){t.w.call(this,a,c);this.update();a.b("posterchange",t.bind(this,this.update))}});s=t.pc.prototype;
+s.dispose=function(){this.k().n("posterchange",this.update);t.w.prototype.dispose.call(this)};s.e=function(){var a=t.e("div",{className:"vjs-poster",tabIndex:-1});t.wd||(this.Ob=t.e("img"),a.appendChild(this.Ob));return a};s.update=function(){var a=this.k().poster();this.ma(a);a?this.show():this.Y()};s.ma=function(a){var c;this.Ob?this.Ob.src=a:(c="",a&&(c='url("'+a+'")'),this.c.style.backgroundImage=c)};s.u=function(){this.d.play()};t.lc=t.a.extend({l:function(a,c){t.a.call(this,a,c)}});
+t.lc.prototype.e=function(){return t.a.prototype.e.call(this,"div",{className:"vjs-loading-spinner"})};t.sb=t.w.extend();t.sb.prototype.e=function(){return t.w.prototype.e.call(this,"div",{className:"vjs-big-play-button",innerHTML:'<span aria-hidden="true"></span>',"aria-label":"play video"})};t.sb.prototype.u=function(){this.d.play()};t.xb=t.a.extend({l:function(a,c){t.a.call(this,a,c);this.update();this.b(a,"error",this.update)}});
+t.xb.prototype.e=function(){var a=t.a.prototype.e.call(this,"div",{className:"vjs-error-display"});this.B=t.e("div");a.appendChild(this.B);return a};t.xb.prototype.update=function(){this.k().error()&&(this.B.innerHTML=this.v(this.k().error().message))};var O;t.j=t.a.extend({l:function(a,c,d){c=c||{};c.dd=l;t.a.call(this,a,c,d);this.featuresProgressEvents||this.re();this.featuresTimeupdateEvents||this.se();this.fe();this.featuresNativeTextTracks||this.Vd();this.he()}});s=t.j.prototype;
+s.fe=function(){var a,c;a=this.k();c=function(){a.controls()&&!a.usingNativeControls()&&this.Id()};this.I(c);this.b(a,"controlsenabled",c);this.b(a,"controlsdisabled",this.He);this.I(function(){this.networkState&&0<this.networkState()&&this.k().o("loadstart")})};
+s.Id=function(){var a;this.b("mousedown",this.u);this.b("touchstart",function(){a=this.d.userActive()});this.b("touchmove",function(){a&&this.k().reportUserActivity()});this.b("touchend",function(a){a.preventDefault()});da(this);this.b("tap",this.Be)};s.He=function(){this.n("tap");this.n("touchstart");this.n("touchmove");this.n("touchleave");this.n("touchcancel");this.n("touchend");this.n("click");this.n("mousedown")};
+s.u=function(a){0===a.button&&this.k().controls()&&(this.k().paused()?this.k().play():this.k().pause())};s.Be=function(){this.k().userActive(!this.k().userActive())};s.re=function(){this.Uc=f;this.$e()};s.qe=function(){this.Uc=l;this.ld()};s.$e=function(){this.Ge=this.setInterval(function(){var a=this.k().bufferedPercent();this.Md!=a&&this.k().o("progress");this.Md=a;1===a&&this.ld()},500)};s.ld=function(){this.clearInterval(this.Ge)};
+s.se=function(){var a=this.d;this.Yb=f;this.b(a,"play",this.pd);this.b(a,"pause",this.rb);this.N("timeupdate",function(){this.featuresTimeupdateEvents=f;this.Vc()})};s.Vc=function(){var a=this.d;this.Yb=l;this.rb();this.n(a,"play",this.pd);this.n(a,"pause",this.rb)};s.pd=function(){this.Fc&&this.rb();this.Fc=this.setInterval(function(){this.k().o("timeupdate")},250)};s.rb=function(){this.clearInterval(this.Fc);this.k().o("timeupdate")};s.dispose=function(){this.Uc&&this.qe();this.Yb&&this.Vc();t.a.prototype.dispose.call(this)};
+s.bc=function(){this.Yb&&this.k().o("timeupdate")};s.he=function(){function a(){var a=c.ea("textTrackDisplay");a&&a.C()}var c=this.d,d;if(d=this.textTracks())d.addEventListener("removetrack",a),d.addEventListener("addtrack",a),this.b("dispose",t.bind(this,function(){d.removeEventListener("removetrack",a);d.removeEventListener("addtrack",a)}))};
+s.Vd=function(){var a=this.d,c,d,e;window.WebVTT||(e=document.createElement("script"),e.src=a.options()["vtt.js"]||"../node_modules/vtt.js/dist/vtt.js",a.m().appendChild(e),window.WebVTT=f);if(d=this.textTracks())c=function(){var c,d,e;e=a.ea("textTrackDisplay");e.C();for(c=0;c<this.length;c++)d=this[c],d.removeEventListener("cuechange",t.bind(e,e.C)),"showing"===d.mode&&d.addEventListener("cuechange",t.bind(e,e.C))},d.addEventListener("change",c),this.b("dispose",t.bind(this,function(){d.removeEventListener("change",
+c)}))};s.textTracks=function(){this.d.od=this.d.od||new t.F;return this.d.od};s.Z=function(){this.d.ad=this.d.ad||new t.F;return this.d.ad};O=function(a,c,d,e,g){var h=a.textTracks();g=g||{};g.kind=c;d&&(g.label=d);e&&(g.language=e);g.player=a.d;a=new t.t(g);P(h,a);return a};t.j.prototype.addTextTrack=function(a,c,d){if(!a)throw Error("TextTrack kind is required but was not provided");return O(this,a,c,d)};t.j.prototype.ia=function(a){a=O(this,a.kind,a.label,a.language,a);P(this.Z(),a);return{T:a}};
+t.j.prototype.Ba=function(a){Q(this.textTracks(),a);Q(this.Z(),a)};t.j.prototype.fd=m();t.j.prototype.featuresVolumeControl=f;t.j.prototype.featuresFullscreenResize=l;t.j.prototype.featuresPlaybackRate=l;t.j.prototype.featuresProgressEvents=l;t.j.prototype.featuresTimeupdateEvents=l;t.j.prototype.featuresNativeTextTracks=l;
+t.j.gc=function(a){a.Ra=function(c,d){var e=a.gd;e||(e=a.gd=[]);d===b&&(d=e.length);e.splice(d,0,c)};a.pb=function(c){for(var d=a.gd||[],e,g=0;g<d.length;g++)if(e=d[g].eb(c))return d[g];return j};a.zc=function(c){var d=a.pb(c);return d?d.eb(c):""};a.prototype.Sa=function(c){var d=a.pb(c);d||(a.S?d=a.S:t.log.error("No source hander found for the current source."));this.Ka();this.n("dispose",this.Ka);this.Ec=c;this.cc=d.Tb(c,this);this.b("dispose",this.Ka);return this};a.prototype.Ka=function(){this.cc&&
+this.cc.dispose&&this.cc.dispose()}};t.media={};
+t.f=t.j.extend({l:function(a,c,d){var e,g,h;if(c.nativeCaptions===l||c.nativeTextTracks===l)this.featuresNativeTextTracks=l;t.j.call(this,a,c,d);for(d=t.f.yb.length-1;0<=d;d--)this.b(t.f.yb[d],this.Wd);(c=c.source)&&(this.c.currentSrc!==c.src||a.L&&3===a.L.ge)&&this.Sa(c);if(this.c.hasChildNodes()){d=this.c.childNodes;e=d.length;for(c=[];e--;)g=d[e],h=g.nodeName.toLowerCase(),"track"===h&&(this.featuresNativeTextTracks?P(this.Z(),g.track):c.push(g));for(d=0;d<c.length;d++)this.c.removeChild(c[d])}this.featuresNativeTextTracks&&
+this.b("loadstart",t.bind(this,this.ee));if(t.Eb&&a.options().nativeControlsForTouch===f){var k,p,r,u;k=this;p=this.k();c=p.controls();k.c.controls=!!c;r=function(){k.c.controls=f};u=function(){k.c.controls=l};p.b("controlsenabled",r);p.b("controlsdisabled",u);c=function(){p.n("controlsenabled",r);p.n("controlsdisabled",u)};k.b("dispose",c);p.b("usingcustomcontrols",c);p.usingNativeControls(f)}a.I(function(){this.src()&&(this.L&&this.q.autoplay&&this.paused())&&(delete this.L.poster,this.play())});
+this.Wa()}});s=t.f.prototype;s.dispose=function(){t.f.Mb(this.c);t.j.prototype.dispose.call(this)};
+s.e=function(){var a=this.d,c,d,e,g=a.L;if(!g||this.movingMediaElementInDOM===l){g?(e=g.cloneNode(l),t.f.Mb(g),g=e,a.L=j):(g=t.e("video"),e=videojs.$.ya({},a.Xe),(!t.Eb||a.options().nativeControlsForTouch!==f)&&delete e.controls,t.ed(g,t.i.D(e,{id:a.id()+"_html5_api","class":"vjs-tech"})));g.player=a;if(a.q.qd)for(e=0;e<a.q.qd.length;e++)c=a.q.qd[e],d=document.createElement("track"),d.Wb=c.Wb,d.label=c.label,d.hd=c.hd,d.src=c.src,"default"in c&&d.setAttribute("default","default"),g.appendChild(d);
+t.Ub(g,a.m())}c=["autoplay","preload","loop","muted"];for(e=c.length-1;0<=e;e--){d=c[e];var h={};"undefined"!==typeof a.q[d]&&(h[d]=a.q[d]);t.ed(g,h)}return g};s.ee=function(){for(var a=this.c.querySelectorAll("track"),c,d=a.length,e={captions:1,subtitles:1};d--;)if((c=a[d].T)&&c.kind in e&&!a[d]["default"])c.mode="disabled"};s.Wd=function(a){"error"==a.type&&this.error()?this.k().error(this.error().code):(a.bubbles=l,this.k().o(a))};s.play=function(){this.c.play()};s.pause=function(){this.c.pause()};
+s.paused=function(){return this.c.paused};s.currentTime=function(){return this.c.currentTime};s.bc=function(a){try{this.c.currentTime=a}catch(c){t.log(c,"Video is not ready. (Video.js)")}};s.duration=function(){return this.c.duration||0};s.buffered=function(){return this.c.buffered};s.volume=function(){return this.c.volume};s.Se=function(a){this.c.volume=a};s.muted=function(){return this.c.muted};s.Oe=function(a){this.c.muted=a};s.width=function(){return this.c.offsetWidth};s.height=function(){return this.c.offsetHeight};
+s.Ta=function(){return"function"==typeof this.c.webkitEnterFullScreen&&(/Android/.test(t.P)||!/Chrome|Mac OS X 10.5/.test(t.P))?f:l};s.Ic=function(){var a=this.c;"webkitDisplayingFullscreen"in a&&this.N("webkitbeginfullscreen",function(){this.d.isFullscreen(f);this.N("webkitendfullscreen",function(){this.d.isFullscreen(l);this.d.o("fullscreenchange")});this.d.o("fullscreenchange")});a.paused&&a.networkState<=a.jf?(this.c.play(),this.setTimeout(function(){a.pause();a.webkitEnterFullScreen()},0)):a.webkitEnterFullScreen()};
+s.Xd=function(){this.c.webkitExitFullScreen()};s.src=function(a){if(a===b)return this.c.src;this.ma(a)};s.ma=function(a){this.c.src=a};s.load=function(){this.c.load()};s.currentSrc=function(){return this.c.currentSrc};s.poster=function(){return this.c.poster};s.fd=function(a){this.c.poster=a};s.Qa=function(){return this.c.Qa};s.Qe=function(a){this.c.Qa=a};s.autoplay=function(){return this.c.autoplay};s.Le=function(a){this.c.autoplay=a};s.controls=function(){return this.c.controls};s.loop=function(){return this.c.loop};
+s.Ne=function(a){this.c.loop=a};s.error=function(){return this.c.error};s.seeking=function(){return this.c.seeking};s.ended=function(){return this.c.ended};s.playbackRate=function(){return this.c.playbackRate};s.Pe=function(a){this.c.playbackRate=a};s.networkState=function(){return this.c.networkState};s.readyState=function(){return this.c.readyState};s.textTracks=function(){return!this.featuresNativeTextTracks?t.j.prototype.textTracks.call(this):this.c.textTracks};
+s.addTextTrack=function(a,c,d){return!this.featuresNativeTextTracks?t.j.prototype.addTextTrack.call(this,a,c,d):this.c.addTextTrack(a,c,d)};
+s.ia=function(a){if(!this.featuresNativeTextTracks)return t.j.prototype.ia.call(this,a);var c=document.createElement("track");a=a||{};a.kind&&(c.kind=a.kind);a.label&&(c.label=a.label);if(a.language||a.srclang)c.srclang=a.language||a.srclang;a["default"]&&(c["default"]=a["default"]);a.id&&(c.id=a.id);a.src&&(c.src=a.src);this.m().appendChild(c);c.track.mode="metadata"===c.T.kind?"hidden":"disabled";c.onload=function(){var a=c.track;2<=c.readyState&&("metadata"===a.kind&&"hidden"!==a.mode?a.mode="hidden":
+"metadata"!==a.kind&&"disabled"!==a.mode&&(a.mode="disabled"),c.onload=j)};P(this.Z(),c.T);return c};s.Ba=function(a){if(!this.featuresNativeTextTracks)return t.j.prototype.Ba.call(this,a);var c,d;Q(this.Z(),a);c=this.m().querySelectorAll("track");for(d=0;d<c.length;d++)if(c[d]===a||c[d].track===a){c[d].parentNode.removeChild(c[d]);break}};t.f.isSupported=function(){try{t.A.volume=0.5}catch(a){return l}return!!t.A.canPlayType};t.j.gc(t.f);t.f.S={};
+t.f.S.eb=function(a){function c(a){try{return t.A.canPlayType(a)}catch(c){return""}}return a.type?c(a.type):a.src?(a=(a=a.src.match(/\.([^.\/\?]+)(\?[^\/]+)?$/i))&&a[1],c("video/"+a)):""};t.f.S.Tb=function(a,c){c.ma(a.src)};t.f.S.dispose=m();t.f.Ra(t.f.S);t.f.Od=function(){var a=t.A.volume;t.A.volume=a/2+0.1;return a!==t.A.volume};t.f.Nd=function(){var a=t.A.playbackRate;t.A.playbackRate=a/2+0.1;return a!==t.A.playbackRate};
+t.f.Ve=function(){var a;(a=!!t.A.textTracks)&&0<t.A.textTracks.length&&(a="number"!==typeof t.A.textTracks[0].mode);a&&t.jc&&(a=l);return a};t.f.prototype.featuresVolumeControl=t.f.Od();t.f.prototype.featuresPlaybackRate=t.f.Nd();t.f.prototype.movingMediaElementInDOM=!t.Ad;t.f.prototype.featuresFullscreenResize=f;t.f.prototype.featuresProgressEvents=f;t.f.prototype.featuresNativeTextTracks=t.f.Ve();var S,oa=/^application\/(?:x-|vnd\.apple\.)mpegurl/i,pa=/^video\/mp4/i;
+t.f.Xc=function(){4<=t.hc&&(S||(S=t.A.constructor.prototype.canPlayType),t.A.constructor.prototype.canPlayType=function(a){return a&&oa.test(a)?"maybe":S.call(this,a)});t.Ed&&(S||(S=t.A.constructor.prototype.canPlayType),t.A.constructor.prototype.canPlayType=function(a){return a&&pa.test(a)?"maybe":S.call(this,a)})};t.f.bf=function(){var a=t.A.constructor.prototype.canPlayType;t.A.constructor.prototype.canPlayType=S;S=j;return a};t.f.Xc();t.f.yb="loadstart suspend abort error emptied stalled loadedmetadata loadeddata canplay canplaythrough playing waiting seeking seeked ended durationchange timeupdate progress play pause ratechange volumechange".split(" ");
+t.f.Mb=function(a){if(a){a.player=j;for(a.parentNode&&a.parentNode.removeChild(a);a.hasChildNodes();)a.removeChild(a.firstChild);a.removeAttribute("src");if("function"===typeof a.load)try{a.load()}catch(c){}}};
+t.g=t.j.extend({l:function(a,c,d){t.j.call(this,a,c,d);var e=c.source;d=a.id()+"_flash_api";var g=a.q,g=t.i.D({readyFunction:"videojs.Flash.onReady",eventProxyFunction:"videojs.Flash.onEvent",errorEventProxyFunction:"videojs.Flash.onError",autoplay:g.autoplay,preload:g.Qa,loop:g.loop,muted:g.muted},c.flashVars),h=t.i.D({wmode:"opaque",bgcolor:"#000000"},c.params);d=t.i.D({id:d,name:d,"class":"vjs-tech"},c.attributes);e&&this.I(function(){this.Sa(e)});t.Ub(this.c,c.parentEl);c.startTime&&this.I(function(){this.load();
+this.play();this.currentTime(c.startTime)});t.jc&&this.I(function(){this.b("mousemove",function(){this.k().o({type:"mousemove",bubbles:l})})});a.b("stageclick",a.reportUserActivity);this.c=t.g.Hc(c.swf,this.c,g,h,d)}});s=t.g.prototype;s.dispose=function(){t.j.prototype.dispose.call(this)};s.play=function(){this.c.vjs_play()};s.pause=function(){this.c.vjs_pause()};s.src=function(a){return a===b?this.currentSrc():this.ma(a)};
+s.ma=function(a){a=t.$d(a);this.c.vjs_src(a);if(this.d.autoplay()){var c=this;this.setTimeout(function(){c.play()},0)}};t.g.prototype.setCurrentTime=function(a){this.oe=a;this.c.vjs_setProperty("currentTime",a);t.j.prototype.bc.call(this)};t.g.prototype.currentTime=function(){return this.seeking()?this.oe||0:this.c.vjs_getProperty("currentTime")};t.g.prototype.currentSrc=function(){return this.Ec?this.Ec.src:this.c.vjs_getProperty("currentSrc")};t.g.prototype.load=function(){this.c.vjs_load()};
+t.g.prototype.poster=function(){this.c.vjs_getProperty("poster")};t.g.prototype.setPoster=m();t.g.prototype.buffered=function(){return t.Lb(0,this.c.vjs_getProperty("buffered"))};t.g.prototype.Ta=q(l);t.g.prototype.Ic=q(l);function qa(){var a=T[U],c=a.charAt(0).toUpperCase()+a.slice(1);ra["set"+c]=function(c){return this.c.vjs_setProperty(a,c)}}function sa(a){ra[a]=function(){return this.c.vjs_getProperty(a)}}
+var ra=t.g.prototype,T="rtmpConnection rtmpStream preload defaultPlaybackRate playbackRate autoplay loop mediaGroup controller controls volume muted defaultMuted".split(" "),ta="error networkState readyState seeking initialTime duration startOffsetTime paused played seekable ended videoTracks audioTracks videoWidth videoHeight".split(" "),U;for(U=0;U<T.length;U++)sa(T[U]),qa();for(U=0;U<ta.length;U++)sa(ta[U]);t.g.isSupported=function(){return 10<=t.g.version()[0]};t.j.gc(t.g);t.g.S={};
+t.g.S.eb=function(a){return!a.type?"":a.type.replace(/;.*/,"").toLowerCase()in t.g.Zd?"maybe":""};t.g.S.Tb=function(a,c){c.ma(a.src)};t.g.S.dispose=m();t.g.Ra(t.g.S);t.g.Zd={"video/flv":"FLV","video/x-flv":"FLV","video/mp4":"MP4","video/m4v":"MP4"};t.g.onReady=function(a){var c;if(c=(a=t.m(a))&&a.parentNode&&a.parentNode.player)a.player=c,t.g.checkReady(c.h)};t.g.checkReady=function(a){a.m()&&(a.m().vjs_getProperty?a.Wa():this.setTimeout(function(){t.g.checkReady(a)},50))};
+t.g.onEvent=function(a,c){t.m(a).player.o(c)};t.g.onError=function(a,c){var d=t.m(a).player,e="FLASH: "+c;"srcnotfound"==c?d.error({code:4,message:e}):d.error(e)};
+t.g.version=function(){var a="0,0,0";try{a=(new window.ActiveXObject("ShockwaveFlash.ShockwaveFlash")).GetVariable("$version").replace(/\D+/g,",").match(/^,?(.+),?$/)[1]}catch(c){try{navigator.mimeTypes["application/x-shockwave-flash"].enabledPlugin&&(a=(navigator.plugins["Shockwave Flash 2.0"]||navigator.plugins["Shockwave Flash"]).description.replace(/\D+/g,",").match(/^,?(.+),?$/)[1])}catch(d){}}return a.split(",")};
+t.g.Hc=function(a,c,d,e,g){a=t.g.ce(a,d,e,g);a=t.e("div",{innerHTML:a}).childNodes[0];d=c.parentNode;c.parentNode.replaceChild(a,c);a[t.expando]=c[t.expando];var h=d.childNodes[0];setTimeout(function(){h.style.display="block"},1E3);return a};
+t.g.ce=function(a,c,d,e){var g="",h="",k="";c&&t.i.da(c,function(a,c){g+=a+"="+c+"&amp;"});d=t.i.D({movie:a,flashvars:g,allowScriptAccess:"always",allowNetworking:"all"},d);t.i.da(d,function(a,c){h+='<param name="'+a+'" value="'+c+'" />'});e=t.i.D({data:a,width:"100%",height:"100%"},e);t.i.da(e,function(a,c){k+=a+'="'+c+'" '});return'<object type="application/x-shockwave-flash" '+k+">"+h+"</object>"};t.g.Ue={"rtmp/mp4":"MP4","rtmp/flv":"FLV"};t.g.Hf=function(a,c){return a+"&"+c};
+t.g.Te=function(a){var c={Bc:"",md:""};if(!a)return c;var d=a.indexOf("&"),e;-1!==d?e=d+1:(d=e=a.lastIndexOf("/")+1,0===d&&(d=e=a.length));c.Bc=a.substring(0,d);c.md=a.substring(e,a.length);return c};t.g.me=function(a){return a in t.g.Ue};t.g.Gd=/^rtmp[set]?:\/\//i;t.g.le=function(a){return t.g.Gd.test(a)};t.g.ac={};t.g.ac.eb=function(a){return t.g.me(a.type)||t.g.le(a.src)?"maybe":""};t.g.ac.Tb=function(a,c){var d=t.g.Te(a.src);c.setRtmpConnection(d.Bc);c.setRtmpStream(d.md)};t.g.Ra(t.g.ac);
+t.Fd=t.a.extend({l:function(a,c,d){t.a.call(this,a,c,d);if(!a.q.sources||0===a.q.sources.length){c=0;for(d=a.q.techOrder;c<d.length;c++){var e=t.ua(d[c]),g=window.videojs[e];if(g&&g.isSupported()){ka(a,e);break}}}else a.src(a.q.sources)}});t.rc={disabled:"disabled",hidden:"hidden",showing:"showing"};t.Hd={subtitles:"subtitles",captions:"captions",descriptions:"descriptions",chapters:"chapters",metadata:"metadata"};
+t.t=function(a){var c,d,e,g,h,k,p,r,u,A,R;a=a||{};if(!a.player)throw Error("A player was not provided.");c=this;if(t.oa)for(R in c=document.createElement("custom"),t.t.prototype)c[R]=t.t.prototype[R];c.d=a.player;e=t.rc[a.mode]||"disabled";g=t.Hd[a.kind]||"subtitles";h=a.label||"";k=a.language||a.srclang||"";d=a.id||"vjs_text_track_"+t.s++;if("metadata"===g||"chapters"===g)e="hidden";c.X=[];c.Ga=[];p=new t.W(c.X);r=new t.W(c.Ga);A=l;u=t.bind(c,function(){this.activeCues;A&&(this.trigger("cuechange"),
+A=l)});"disabled"!==e&&c.d.b("timeupdate",u);Object.defineProperty(c,"kind",{get:function(){return g},set:Function.prototype});Object.defineProperty(c,"label",{get:function(){return h},set:Function.prototype});Object.defineProperty(c,"language",{get:function(){return k},set:Function.prototype});Object.defineProperty(c,"id",{get:function(){return d},set:Function.prototype});Object.defineProperty(c,"mode",{get:function(){return e},set:function(a){t.rc[a]&&(e=a,"showing"===e&&this.d.b("timeupdate",u),
+this.o("modechange"))}});Object.defineProperty(c,"cues",{get:function(){return!this.Xb?j:p},set:Function.prototype});Object.defineProperty(c,"activeCues",{get:function(){var a,c,d,e,g;if(!this.Xb)return j;if(0===this.cues.length)return r;e=this.d.currentTime();a=0;c=this.cues.length;for(d=[];a<c;a++)g=this.cues[a],g.startTime<=e&&g.endTime>=e?d.push(g):g.startTime===g.endTime&&(g.startTime<=e&&g.startTime+0.5>=e)&&d.push(g);A=l;if(d.length!==this.Ga.length)A=f;else for(a=0;a<d.length;a++)-1===ua.call(this.Ga,
+d[a])&&(A=f);this.Ga=d;r.qb(this.Ga);return r},set:Function.prototype});a.src?va(a.src,c):c.Xb=f;if(t.oa)return c};t.t.prototype=t.i.create(t.z.prototype);t.t.prototype.constructor=t.t;t.t.prototype.bb={cuechange:"cuechange"};t.t.prototype.vc=function(a){var c=this.d.textTracks(),d=0;if(c)for(;d<c.length;d++)c[d]!==this&&c[d].bd(a);this.X.push(a);this.cues.qb(this.X)};t.t.prototype.bd=function(a){for(var c=0,d=this.X.length,e,g=l;c<d;c++)e=this.X[c],e===a&&(this.X.splice(c,1),g=f);g&&this.Dc.qb(this.X)};
+var va,V,ua;va=function(a,c){t.ff(a,t.bind(this,function(a,e,g){if(a)return t.log.error(a);c.Xb=f;V(g,c)}))};V=function(a,c){if("function"!==typeof window.WebVTT)window.setTimeout(function(){V(a,c)},25);else{var d=new window.WebVTT.Parser(window,window.vttjs,window.WebVTT.StringDecoder());d.oncue=function(a){c.vc(a)};d.onparsingerror=function(a){t.log.error(a)};d.parse(a);d.flush()}};
+ua=function(a,c){var d;if(this==j)throw new TypeError('"this" is null or not defined');var e=Object(this),g=e.length>>>0;if(0===g)return-1;d=+c||0;Infinity===Math.abs(d)&&(d=0);if(d>=g)return-1;for(d=Math.max(0<=d?d:g-Math.abs(d),0);d<g;){if(d in e&&e[d]===a)return d;d++}return-1};
+t.F=function(a){var c=this,d,e=0;if(t.oa)for(d in c=document.createElement("custom"),t.F.prototype)c[d]=t.F.prototype[d];a=a||[];c.Va=[];for(Object.defineProperty(c,"length",{get:function(){return this.Va.length}});e<a.length;e++)P(c,a[e]);if(t.oa)return c};t.F.prototype=t.i.create(t.z.prototype);t.F.prototype.constructor=t.F;t.F.prototype.bb={change:"change",addtrack:"addtrack",removetrack:"removetrack"};for(var wa in t.F.prototype.bb)t.F.prototype["on"+wa]=j;
+function P(a,c){var d=a.Va.length;""+d in a||Object.defineProperty(a,d,{get:function(){return this.Va[d]}});c.addEventListener("modechange",t.bind(a,function(){this.o("change")}));a.Va.push(c);a.o({type:"addtrack",T:c})}function Q(a,c){for(var d=0,e=a.length,g;d<e;d++)if(g=a[d],g===c){a.Va.splice(d,1);break}a.o({type:"removetrack",T:c})}t.F.prototype.de=function(a){for(var c=0,d=this.length,e=j,g;c<d;c++)if(g=this[c],g.id===a){e=g;break}return e};
+t.W=function(a){var c=this,d;if(t.oa)for(d in c=document.createElement("custom"),t.W.prototype)c[d]=t.W.prototype[d];t.W.prototype.qb.call(c,a);Object.defineProperty(c,"length",{get:n("pe")});if(t.oa)return c};t.W.prototype.qb=function(a){var c=this.length||0,d=0,e=a.length;this.X=a;this.pe=a.length;a=function(a){""+a in this||Object.defineProperty(this,""+a,{get:function(){return this.X[a]}})};if(c<e)for(d=c;d<e;d++)a.call(this,d)};
+t.W.prototype.be=function(a){for(var c=0,d=this.length,e=j,g;c<d;c++)if(g=this[c],g.id===a){e=g;break}return e};t.ra=t.a.extend({l:function(a,c,d){t.a.call(this,a,c,d);a.b("loadstart",t.bind(this,this.Ze));a.I(t.bind(this,function(){if(a.h&&a.h.featuresNativeTextTracks)this.Y();else{var c,d,h;a.b("fullscreenchange",t.bind(this,this.C));d=a.q.tracks||[];for(c=0;c<d.length;c++)h=d[c],this.d.ia(h)}}))}});t.ra.prototype.Ze=function(){this.d.h&&this.d.h.featuresNativeTextTracks?this.Y():this.show()};
+t.ra.prototype.e=function(){return t.a.prototype.e.call(this,"div",{className:"vjs-text-track-display"})};t.ra.prototype.Pd=function(){"function"===typeof window.WebVTT&&window.WebVTT.processCues(window,[],this.c)};function W(a,c){return"rgba("+parseInt(a[1]+a[1],16)+","+parseInt(a[2]+a[2],16)+","+parseInt(a[3]+a[3],16)+","+c+")"}
+var xa={xf:"monospace",Df:"sans-serif",Ff:"serif",yf:'"Andale Mono", "Lucida Console", monospace',zf:'"Courier New", monospace',Bf:"sans-serif",Cf:"serif",of:'"Comic Sans MS", Impact, fantasy',Ef:'"Monotype Corsiva", cursive',Gf:'"Andale Mono", "Lucida Console", monospace, sans-serif'};t.ra.prototype.C=function(){var a=this.d.textTracks(),c=0,d;this.Pd();if(a)for(;c<a.length;c++)d=a[c],"showing"===d.mode&&this.cf(d)};
+t.ra.prototype.cf=function(a){if("function"===typeof window.WebVTT&&a.activeCues){for(var c=0,d=this.d.textTrackSettings.Lc(),e,g=[];c<a.activeCues.length;c++)g.push(a.activeCues[c]);window.WebVTT.processCues(window,a.activeCues,this.c);for(c=g.length;c--;){a=g[c].pf;d.color&&(a.firstChild.style.color=d.color);if(d.nd)try{a.firstChild.style.color=W(d.color||"#fff",d.nd)}catch(h){}d.backgroundColor&&(a.firstChild.style.backgroundColor=d.backgroundColor);if(d.yc)try{a.firstChild.style.backgroundColor=
+W(d.backgroundColor||"#000",d.yc)}catch(k){}if(d.fc)if(d.ud)try{a.style.backgroundColor=W(d.fc,d.ud)}catch(p){}else a.style.backgroundColor=d.fc;d.La&&("dropshadow"===d.La?a.firstChild.style.textShadow="2px 2px 3px #222, 2px 2px 4px #222, 2px 2px 5px #222":"raised"===d.La?a.firstChild.style.textShadow="1px 1px #222, 2px 2px #222, 3px 3px #222":"depressed"===d.La?a.firstChild.style.textShadow="1px 1px #ccc, 0 1px #ccc, -1px -1px #222, 0 -1px #222":"uniform"===d.La&&(a.firstChild.style.textShadow="0 0 4px #222, 0 0 4px #222, 0 0 4px #222, 0 0 4px #222"));
+d.Qb&&1!==d.Qb&&(e=window.Af(a.style.fontSize),a.style.fontSize=e*d.Qb+"px",a.style.height="auto",a.style.top="auto",a.style.bottom="2px");d.fontFamily&&"default"!==d.fontFamily&&("small-caps"===d.fontFamily?a.firstChild.style.fontVariant="small-caps":a.firstChild.style.fontFamily=xa[d.fontFamily])}}};
+t.aa=t.M.extend({l:function(a,c){var d=this.T=c.track,e=a.textTracks(),g,h;e&&(g=t.bind(this,function(){var a="showing"===this.T.mode,c,d,g;if(this instanceof t.Ab){a=f;d=0;for(g=e.length;d<g;d++)if(c=e[d],c.kind===this.T.kind&&"showing"===c.mode){a=l;break}}this.selected(a)}),e.addEventListener("change",g),a.b("dispose",function(){e.removeEventListener("change",g)}));c.label=d.label||d.language||"Unknown";c.selected=d["default"]||"showing"===d.mode;t.M.call(this,a,c);e&&e.onchange===b&&this.b(["tap",
+"click"],function(){if("object"!==typeof window.yd)try{h=new window.yd("change")}catch(a){}h||(h=document.createEvent("Event"),h.initEvent("change",f,f));e.dispatchEvent(h)})}});t.aa.prototype.u=function(){var a=this.T.kind,c=this.d.textTracks(),d,e=0;t.M.prototype.u.call(this);if(c)for(;e<c.length;e++)d=c[e],d.kind===a&&(d.mode=d===this.T?"showing":"disabled")};t.Ab=t.aa.extend({l:function(a,c){c.track={kind:c.kind,player:a,label:c.kind+" off","default":l,mode:"disabled"};t.aa.call(this,a,c);this.selected(f)}});
+t.tb=t.aa.extend({l:function(a,c){c.track={kind:c.kind,player:a,label:c.kind+" settings","default":l,mode:"disabled"};t.aa.call(this,a,c);this.p("vjs-texttrack-settings")}});t.tb.prototype.u=function(){this.k().ea("textTrackSettings").show()};
+t.Q=t.O.extend({l:function(a,c){var d,e;t.O.call(this,a,c);d=this.d.textTracks();1>=this.H.length&&this.Y();d&&(e=t.bind(this,this.update),d.addEventListener("removetrack",e),d.addEventListener("addtrack",e),this.d.b("dispose",function(){d.removeEventListener("removetrack",e);d.removeEventListener("addtrack",e)}))}});
+t.Q.prototype.Ia=function(){var a=[],c,d;this instanceof t.na&&(!this.k().h||!this.k().h.featuresNativeTextTracks)&&a.push(new t.tb(this.d,{kind:this.fa}));a.push(new t.Ab(this.d,{kind:this.fa}));d=this.d.textTracks();if(!d)return a;for(var e=0;e<d.length;e++)c=d[e],c.kind===this.fa&&a.push(new t.aa(this.d,{track:c}));return a};t.na=t.Q.extend({l:function(a,c,d){t.Q.call(this,a,c,d);this.c.setAttribute("aria-label","Captions Menu")}});t.na.prototype.fa="captions";t.na.prototype.sa="Captions";
+t.na.prototype.className="vjs-captions-button";t.na.prototype.update=function(){var a=2;t.Q.prototype.update.call(this);this.k().h&&this.k().h.featuresNativeTextTracks&&(a=1);this.H&&this.H.length>a?this.show():this.Y()};t.ab=t.Q.extend({l:function(a,c,d){t.Q.call(this,a,c,d);this.c.setAttribute("aria-label","Subtitles Menu")}});t.ab.prototype.fa="subtitles";t.ab.prototype.sa="Subtitles";t.ab.prototype.className="vjs-subtitles-button";
+t.Xa=t.Q.extend({l:function(a,c,d){t.Q.call(this,a,c,d);this.c.setAttribute("aria-label","Chapters Menu")}});s=t.Xa.prototype;s.fa="chapters";s.sa="Chapters";s.className="vjs-chapters-button";s.Ia=function(){var a=[],c,d;d=this.d.textTracks();if(!d)return a;for(var e=0;e<d.length;e++)c=d[e],c.kind===this.fa&&a.push(new t.aa(this.d,{track:c}));return a};
+s.Ja=function(){for(var a=this.d.textTracks()||[],c=0,d=a.length,e,g,h=this.H=[];c<d;c++)if(e=a[c],e.kind==this.fa)if(e.Dc){g=e;break}else e.mode="hidden",window.setTimeout(t.bind(this,function(){this.Ja()}),100);a=this.xa;a===b&&(a=new t.pa(this.d),a.va().appendChild(t.e("li",{className:"vjs-menu-title",innerHTML:t.ua(this.fa),We:-1})));if(g){e=g.cues;for(var k,c=0,d=e.length;c<d;c++)k=e[c],k=new t.Ya(this.d,{track:g,cue:k}),h.push(k),a.ba(k);this.ba(a)}0<this.H.length&&this.show();return a};
+t.Ya=t.M.extend({l:function(a,c){var d=this.T=c.track,e=this.cue=c.cue,g=a.currentTime();c.label=e.text;c.selected=e.startTime<=g&&g<e.endTime;t.M.call(this,a,c);d.addEventListener("cuechange",t.bind(this,this.update))}});t.Ya.prototype.u=function(){t.M.prototype.u.call(this);this.d.currentTime(this.cue.startTime);this.update(this.cue.startTime)};t.Ya.prototype.update=function(){var a=this.cue,c=this.d.currentTime();this.selected(a.startTime<=c&&c<a.endTime)};
+function X(a){var c;a.Ke?c=a.Ke[0]:a.options&&(c=a.options[a.options.selectedIndex]);return c.value}function Y(a,c){var d,e;if(c){for(d=0;d<a.options.length&&!(e=a.options[d],e.value===c);d++);a.selectedIndex=d}}
+t.sc=t.a.extend({l:function(a,c){t.a.call(this,a,c);this.Y();t.b(this.m().querySelector(".vjs-done-button"),"click",t.bind(this,function(){this.Je();this.Y()}));t.b(this.m().querySelector(".vjs-default-button"),"click",t.bind(this,function(){this.m().querySelector(".vjs-fg-color > select").selectedIndex=0;this.m().querySelector(".vjs-bg-color > select").selectedIndex=0;this.m().querySelector(".window-color > select").selectedIndex=0;this.m().querySelector(".vjs-text-opacity > select").selectedIndex=
+0;this.m().querySelector(".vjs-bg-opacity > select").selectedIndex=0;this.m().querySelector(".vjs-window-opacity > select").selectedIndex=0;this.m().querySelector(".vjs-edge-style select").selectedIndex=0;this.m().querySelector(".vjs-font-family select").selectedIndex=0;this.m().querySelector(".vjs-font-percent select").selectedIndex=2;this.C()}));t.b(this.m().querySelector(".vjs-fg-color > select"),"change",t.bind(this,this.C));t.b(this.m().querySelector(".vjs-bg-color > select"),"change",t.bind(this,
+this.C));t.b(this.m().querySelector(".window-color > select"),"change",t.bind(this,this.C));t.b(this.m().querySelector(".vjs-text-opacity > select"),"change",t.bind(this,this.C));t.b(this.m().querySelector(".vjs-bg-opacity > select"),"change",t.bind(this,this.C));t.b(this.m().querySelector(".vjs-window-opacity > select"),"change",t.bind(this,this.C));t.b(this.m().querySelector(".vjs-font-percent select"),"change",t.bind(this,this.C));t.b(this.m().querySelector(".vjs-edge-style select"),"change",t.bind(this,
+this.C));t.b(this.m().querySelector(".vjs-font-family select"),"change",t.bind(this,this.C));a.options().persistTextTrackSettings&&this.Ie()}});s=t.sc.prototype;s.e=function(){return t.a.prototype.e.call(this,"div",{className:"vjs-caption-settings vjs-modal-overlay",innerHTML:'<div class="vjs-tracksettings"><div class="vjs-tracksettings-colors"><div class="vjs-fg-color vjs-tracksetting"><label class="vjs-label">Foreground</label><select><option value="">---</option><option value="#FFF">White</option><option value="#000">Black</option><option value="#F00">Red</option><option value="#0F0">Green</option><option value="#00F">Blue</option><option value="#FF0">Yellow</option><option value="#F0F">Magenta</option><option value="#0FF">Cyan</option></select><span class="vjs-text-opacity vjs-opacity"><select><option value="">---</option><option value="1">Opaque</option><option value="0.5">Semi-Opaque</option></select></span></div><div class="vjs-bg-color vjs-tracksetting"><label class="vjs-label">Background</label><select><option value="">---</option><option value="#FFF">White</option><option value="#000">Black</option><option value="#F00">Red</option><option value="#0F0">Green</option><option value="#00F">Blue</option><option value="#FF0">Yellow</option><option value="#F0F">Magenta</option><option value="#0FF">Cyan</option></select><span class="vjs-bg-opacity vjs-opacity"><select><option value="">---</option><option value="1">Opaque</option><option value="0.5">Semi-Transparent</option><option value="0">Transparent</option></select></span></div><div class="window-color vjs-tracksetting"><label class="vjs-label">Window</label><select><option value="">---</option><option value="#FFF">White</option><option value="#000">Black</option><option value="#F00">Red</option><option value="#0F0">Green</option><option value="#00F">Blue</option><option value="#FF0">Yellow</option><option value="#F0F">Magenta</option><option value="#0FF">Cyan</option></select><span class="vjs-window-opacity vjs-opacity"><select><option value="">---</option><option value="1">Opaque</option><option value="0.5">Semi-Transparent</option><option value="0">Transparent</option></select></span></div></div><div class="vjs-tracksettings-font"><div class="vjs-font-percent vjs-tracksetting"><label class="vjs-label">Font Size</label><select><option value="0.50">50%</option><option value="0.75">75%</option><option value="1.00" selected>100%</option><option value="1.25">125%</option><option value="1.50">150%</option><option value="1.75">175%</option><option value="2.00">200%</option><option value="3.00">300%</option><option value="4.00">400%</option></select></div><div class="vjs-edge-style vjs-tracksetting"><label class="vjs-label">Text Edge Style</label><select><option value="none">None</option><option value="raised">Raised</option><option value="depressed">Depressed</option><option value="uniform">Uniform</option><option value="dropshadow">Dropshadow</option></select></div><div class="vjs-font-family vjs-tracksetting"><label class="vjs-label">Font Family</label><select><option value="">Default</option><option value="monospaceSerif">Monospace Serif</option><option value="proportionalSerif">Proportional Serif</option><option value="monospaceSansSerif">Monospace Sans-Serif</option><option value="proportionalSansSerif">Proportional Sans-Serif</option><option value="casual">Casual</option><option value="script">Script</option><option value="small-caps">Small Caps</option></select></div></div></div><div class="vjs-tracksettings-controls"><button class="vjs-default-button">Defaults</button><button class="vjs-done-button">Done</button></div>'})};
+s.Lc=function(){var a,c,d,e,g,h,k,p,r,u;a=this.m();g=X(a.querySelector(".vjs-edge-style select"));h=X(a.querySelector(".vjs-font-family select"));k=X(a.querySelector(".vjs-fg-color > select"));d=X(a.querySelector(".vjs-text-opacity > select"));p=X(a.querySelector(".vjs-bg-color > select"));c=X(a.querySelector(".vjs-bg-opacity > select"));r=X(a.querySelector(".window-color > select"));e=X(a.querySelector(".vjs-window-opacity > select"));a=window.parseFloat(X(a.querySelector(".vjs-font-percent > select")));
+c={backgroundOpacity:c,textOpacity:d,windowOpacity:e,edgeStyle:g,fontFamily:h,color:k,backgroundColor:p,windowColor:r,fontPercent:a};for(u in c)(""===c[u]||"none"===c[u]||"fontPercent"===u&&1===c[u])&&delete c[u];return c};
+s.Re=function(a){var c=this.m();Y(c.querySelector(".vjs-edge-style select"),a.La);Y(c.querySelector(".vjs-font-family select"),a.fontFamily);Y(c.querySelector(".vjs-fg-color > select"),a.color);Y(c.querySelector(".vjs-text-opacity > select"),a.nd);Y(c.querySelector(".vjs-bg-color > select"),a.backgroundColor);Y(c.querySelector(".vjs-bg-opacity > select"),a.yc);Y(c.querySelector(".window-color > select"),a.fc);Y(c.querySelector(".vjs-window-opacity > select"),a.ud);(a=a.Qb)&&(a=a.toFixed(2));Y(c.querySelector(".vjs-font-percent > select"),
+a)};s.Ie=function(){var a;try{a=JSON.parse(window.localStorage.getItem("vjs-text-track-settings"))}catch(c){}a&&this.Re(a)};s.Je=function(){var a;if(this.d.options().persistTextTrackSettings){a=this.Lc();try{t.ib(a)?window.localStorage.removeItem("vjs-text-track-settings"):window.localStorage.setItem("vjs-text-track-settings",JSON.stringify(a))}catch(c){}}};s.C=function(){var a=this.d.ea("textTrackDisplay");a&&a.C()};
+if("undefined"!==typeof window.JSON&&"function"===typeof window.JSON.parse)t.JSON=window.JSON;else{t.JSON={};var Z=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;t.JSON.parse=function(a,c){function d(a,e){var k,p,r=a[e];if(r&&"object"===typeof r)for(k in r)Object.prototype.hasOwnProperty.call(r,k)&&(p=d(r,k),p!==b?r[k]=p:delete r[k]);return c.call(a,e,r)}var e;a=String(a);Z.lastIndex=0;Z.test(a)&&(a=a.replace(Z,function(a){return"\\u"+("0000"+
+a.charCodeAt(0).toString(16)).slice(-4)}));if(/^[\],:{}\s]*$/.test(a.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,"")))return e=eval("("+a+")"),"function"===typeof c?d({"":e},""):e;throw new SyntaxError("JSON.parse(): invalid or malformed JSON data");}}
+t.xc=function(){var a,c,d,e;a=document.getElementsByTagName("video");c=document.getElementsByTagName("audio");var g=[];if(a&&0<a.length){d=0;for(e=a.length;d<e;d++)g.push(a[d])}if(c&&0<c.length){d=0;for(e=c.length;d<e;d++)g.push(c[d])}if(g&&0<g.length){d=0;for(e=g.length;d<e;d++)if((c=g[d])&&c.getAttribute)c.player===b&&(a=c.getAttribute("data-setup"),a!==j&&videojs(c));else{t.Ib();break}}else t.td||t.Ib()};t.Ib=function(){setTimeout(t.xc,1)};
+"complete"===document.readyState?t.td=f:t.N(window,"load",function(){t.td=f});t.Ib();t.Fe=function(a,c){t.Player.prototype[a]=c};var ya=this;function $(a,c){var d=a.split("."),e=ya;!(d[0]in e)&&e.execScript&&e.execScript("var "+d[0]);for(var g;d.length&&(g=d.shift());)!d.length&&c!==b?e[g]=c:e=e[g]?e[g]:e[g]={}};$("videojs",t);$("_V_",t);$("videojs.options",t.options);$("videojs.players",t.Aa);$("videojs.TOUCH_ENABLED",t.Eb);$("videojs.cache",t.ta);$("videojs.Component",t.a);t.a.prototype.player=t.a.prototype.k;t.a.prototype.options=t.a.prototype.options;t.a.prototype.init=t.a.prototype.l;t.a.prototype.dispose=t.a.prototype.dispose;t.a.prototype.createEl=t.a.prototype.e;t.a.prototype.contentEl=t.a.prototype.va;t.a.prototype.el=t.a.prototype.m;t.a.prototype.addChild=t.a.prototype.ba;
+t.a.prototype.getChild=t.a.prototype.ea;t.a.prototype.getChildById=t.a.prototype.ae;t.a.prototype.children=t.a.prototype.children;t.a.prototype.initChildren=t.a.prototype.Oc;t.a.prototype.removeChild=t.a.prototype.removeChild;t.a.prototype.on=t.a.prototype.b;t.a.prototype.off=t.a.prototype.n;t.a.prototype.one=t.a.prototype.N;t.a.prototype.trigger=t.a.prototype.o;t.a.prototype.triggerReady=t.a.prototype.Wa;t.a.prototype.show=t.a.prototype.show;t.a.prototype.hide=t.a.prototype.Y;
+t.a.prototype.width=t.a.prototype.width;t.a.prototype.height=t.a.prototype.height;t.a.prototype.dimensions=t.a.prototype.Td;t.a.prototype.ready=t.a.prototype.I;t.a.prototype.addClass=t.a.prototype.p;t.a.prototype.removeClass=t.a.prototype.r;t.a.prototype.hasClass=t.a.prototype.Oa;t.a.prototype.buildCSSClass=t.a.prototype.V;t.a.prototype.localize=t.a.prototype.v;t.a.prototype.setInterval=t.a.prototype.setInterval;t.a.prototype.setTimeout=t.a.prototype.setTimeout;$("videojs.EventEmitter",t.z);
+t.z.prototype.on=t.z.prototype.b;t.z.prototype.addEventListener=t.z.prototype.addEventListener;t.z.prototype.off=t.z.prototype.n;t.z.prototype.removeEventListener=t.z.prototype.removeEventListener;t.z.prototype.one=t.z.prototype.N;t.z.prototype.trigger=t.z.prototype.o;t.z.prototype.dispatchEvent=t.z.prototype.dispatchEvent;t.Player.prototype.ended=t.Player.prototype.ended;t.Player.prototype.enterFullWindow=t.Player.prototype.Jc;t.Player.prototype.exitFullWindow=t.Player.prototype.Nb;
+t.Player.prototype.preload=t.Player.prototype.Qa;t.Player.prototype.remainingTime=t.Player.prototype.remainingTime;t.Player.prototype.supportsFullScreen=t.Player.prototype.Ta;t.Player.prototype.currentType=t.Player.prototype.Qd;t.Player.prototype.requestFullScreen=t.Player.prototype.requestFullScreen;t.Player.prototype.requestFullscreen=t.Player.prototype.requestFullscreen;t.Player.prototype.cancelFullScreen=t.Player.prototype.cancelFullScreen;t.Player.prototype.exitFullscreen=t.Player.prototype.exitFullscreen;
+t.Player.prototype.isFullScreen=t.Player.prototype.isFullScreen;t.Player.prototype.isFullscreen=t.Player.prototype.isFullscreen;t.Player.prototype.textTracks=t.Player.prototype.textTracks;t.Player.prototype.remoteTextTracks=t.Player.prototype.Z;t.Player.prototype.addTextTrack=t.Player.prototype.addTextTrack;t.Player.prototype.addRemoteTextTrack=t.Player.prototype.ia;t.Player.prototype.removeRemoteTextTrack=t.Player.prototype.Ba;$("videojs.MediaLoader",t.Fd);$("videojs.TextTrackDisplay",t.ra);
+$("videojs.ControlBar",t.ub);$("videojs.Button",t.w);$("videojs.PlayToggle",t.nc);$("videojs.FullscreenToggle",t.Za);$("videojs.BigPlayButton",t.sb);$("videojs.LoadingSpinner",t.lc);$("videojs.CurrentTimeDisplay",t.vb);$("videojs.DurationDisplay",t.wb);$("videojs.TimeDivider",t.tc);$("videojs.RemainingTimeDisplay",t.Db);$("videojs.LiveDisplay",t.kc);$("videojs.ErrorDisplay",t.xb);$("videojs.Slider",t.U);$("videojs.ProgressControl",t.Cb);$("videojs.SeekBar",t.qc);$("videojs.LoadProgressBar",t.zb);
+$("videojs.PlayProgressBar",t.mc);$("videojs.SeekHandle",t.$a);$("videojs.VolumeControl",t.Gb);$("videojs.VolumeBar",t.Fb);$("videojs.VolumeLevel",t.uc);$("videojs.VolumeMenuButton",t.Fa);$("videojs.VolumeHandle",t.Hb);$("videojs.MuteToggle",t.qa);$("videojs.PosterImage",t.pc);$("videojs.Menu",t.pa);$("videojs.MenuItem",t.M);$("videojs.MenuButton",t.O);$("videojs.PlaybackRateMenuButton",t.oc);$("videojs.ChaptersTrackMenuItem",t.Ya);$("videojs.TextTrackButton",t.Q);$("videojs.TextTrackMenuItem",t.aa);
+$("videojs.OffTextTrackMenuItem",t.Ab);$("videojs.CaptionSettingsMenuItem",t.tb);t.O.prototype.createItems=t.O.prototype.Ia;t.Q.prototype.createItems=t.Q.prototype.Ia;t.Xa.prototype.createItems=t.Xa.prototype.Ia;$("videojs.SubtitlesButton",t.ab);$("videojs.CaptionsButton",t.na);$("videojs.ChaptersButton",t.Xa);$("videojs.MediaTechController",t.j);t.j.withSourceHandlers=t.j.gc;t.j.prototype.featuresVolumeControl=t.j.prototype.uf;t.j.prototype.featuresFullscreenResize=t.j.prototype.qf;
+t.j.prototype.featuresPlaybackRate=t.j.prototype.rf;t.j.prototype.featuresProgressEvents=t.j.prototype.sf;t.j.prototype.featuresTimeupdateEvents=t.j.prototype.tf;t.j.prototype.setPoster=t.j.prototype.fd;t.j.prototype.textTracks=t.j.prototype.textTracks;t.j.prototype.remoteTextTracks=t.j.prototype.Z;t.j.prototype.addTextTrack=t.j.prototype.addTextTrack;t.j.prototype.addRemoteTextTrack=t.j.prototype.ia;t.j.prototype.removeRemoteTextTrack=t.j.prototype.Ba;$("videojs.Html5",t.f);t.f.Events=t.f.yb;
+t.f.isSupported=t.f.isSupported;t.f.canPlaySource=t.f.zc;t.f.patchCanPlayType=t.f.Xc;t.f.unpatchCanPlayType=t.f.bf;t.f.prototype.setCurrentTime=t.f.prototype.bc;t.f.prototype.setVolume=t.f.prototype.Se;t.f.prototype.setMuted=t.f.prototype.Oe;t.f.prototype.setPreload=t.f.prototype.Qe;t.f.prototype.setAutoplay=t.f.prototype.Le;t.f.prototype.setLoop=t.f.prototype.Ne;t.f.prototype.enterFullScreen=t.f.prototype.Ic;t.f.prototype.exitFullScreen=t.f.prototype.Xd;t.f.prototype.playbackRate=t.f.prototype.playbackRate;
+t.f.prototype.setPlaybackRate=t.f.prototype.Pe;t.f.registerSourceHandler=t.f.Ra;t.f.selectSourceHandler=t.f.pb;t.f.prototype.setSource=t.f.prototype.Sa;t.f.prototype.disposeSourceHandler=t.f.prototype.Ka;t.f.prototype.textTracks=t.f.prototype.textTracks;t.f.prototype.remoteTextTracks=t.f.prototype.Z;t.f.prototype.addTextTrack=t.f.prototype.addTextTrack;t.f.prototype.addRemoteTextTrack=t.f.prototype.ia;t.f.prototype.removeRemoteTextTrack=t.f.prototype.Ba;$("videojs.Flash",t.g);t.g.isSupported=t.g.isSupported;
+t.g.canPlaySource=t.g.zc;t.g.onReady=t.g.onReady;t.g.embed=t.g.Hc;t.g.version=t.g.version;t.g.prototype.setSource=t.g.prototype.Sa;t.g.registerSourceHandler=t.g.Ra;t.g.selectSourceHandler=t.g.pb;t.g.prototype.setSource=t.g.prototype.Sa;t.g.prototype.disposeSourceHandler=t.g.prototype.Ka;$("videojs.TextTrack",t.t);$("videojs.TextTrackList",t.F);$("videojs.TextTrackCueList",t.W);$("videojs.TextTrackSettings",t.sc);t.t.prototype.id=t.t.prototype.id;t.t.prototype.label=t.t.prototype.label;
+t.t.prototype.kind=t.t.prototype.Wb;t.t.prototype.mode=t.t.prototype.mode;t.t.prototype.cues=t.t.prototype.Dc;t.t.prototype.activeCues=t.t.prototype.nf;t.t.prototype.addCue=t.t.prototype.vc;t.t.prototype.removeCue=t.t.prototype.bd;t.F.prototype.getTrackById=t.F.prototype.de;t.W.prototype.getCueById=t.F.prototype.be;$("videojs.CaptionsTrack",t.gf);$("videojs.SubtitlesTrack",t.mf);$("videojs.ChaptersTrack",t.hf);$("videojs.autoSetup",t.xc);$("videojs.plugin",t.Fe);$("videojs.createTimeRange",t.Lb);
+$("videojs.util",t.$);t.$.mergeOptions=t.$.ya;t.addLanguage=t.Jd;})();

docs/api/vjs.BigPlayButton.md

@@ -17,6 +17,8 @@ big play button is done via CSS and player states.
   - [addClass](#addclass-classtoadd-) _`inherited`_
   - [buildCSSClass](#buildcssclass) _`inherited`_
   - [children](#children) _`inherited`_
+  - [clearInterval](#clearinterval-intervalid-) _`inherited`_
+  - [clearTimeout](#cleartimeout-timeoutid-) _`inherited`_
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
@@ -40,6 +42,8 @@ big play button is done via CSS and player states.
   - [ready](#ready-fn-) _`inherited`_
   - [removeChild](#removechild-component-) _`inherited`_
   - [removeClass](#removeclass-classtoremove-) _`inherited`_
+  - [setInterval](#setinterval-fn-interval-) _`inherited`_
+  - [setTimeout](#settimeout-fn-timeout-) _`inherited`_
   - [show](#show) _`inherited`_
   - [trigger](#trigger-event-) _`inherited`_
   - [triggerReady](#triggerready) _`inherited`_
@@ -121,6 +125,32 @@ _inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js
 
 ---
 
+### clearInterval( intervalId )
+> Clears an interval and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __intervalId__ `Number` The id of the interval to clear
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1223](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1223)
+
+---
+
+### clearTimeout( timeoutId )
+> Clears a timeout and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __timeoutId__ `Number` The id of the timeout to clear
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1185](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1185)
+
+---
+
 ### contentEl()
 > Return the component's DOM element for embedding content.
 > Will either be el_ or a new element defined in createEl.
@@ -202,7 +232,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 > whenever touch events happen, and this can be turned off by components that
 > want touch events to act differently.
 
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
+_inherited from_: [src/js/component.js#L1124](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1124)
 
 ---
 
@@ -394,7 +424,7 @@ _inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js
 > 
 > The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
 > and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
+> will be automatically cleaned up when either component is disposed.
 > It will also bind myComponent as the context of myFunc.
 > 
 > **NOTE**: When using this on elements in the page other than window
@@ -498,7 +528,7 @@ _inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js
 ### ready( fn )
 > Bind a listener to the component's ready state
 > 
-> Different from event listeners in that if the ready event has already happend
+> Different from event listeners in that if the ready event has already happened
 > it will trigger the function immediately.
 
 ##### PARAMETERS: 
@@ -535,6 +565,34 @@ _inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js
 
 ---
 
+### setInterval( fn, interval )
+> Creates an interval and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run every N seconds.
+* __interval__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1202](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1202)
+
+---
+
+### setTimeout( fn, timeout )
+> Creates timeout and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run after the timeout.
+* __timeout__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1162](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1162)
+
+---
+
 ### show()
 > Show the component element if hidden
 

docs/api/vjs.Button.md

@@ -17,6 +17,8 @@ Base class for all buttons
   - [addClass](#addclass-classtoadd-) _`inherited`_
   - [buildCSSClass](#buildcssclass) _`inherited`_
   - [children](#children) _`inherited`_
+  - [clearInterval](#clearinterval-intervalid-) _`inherited`_
+  - [clearTimeout](#cleartimeout-timeoutid-) _`inherited`_
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
@@ -39,6 +41,8 @@ Base class for all buttons
   - [ready](#ready-fn-) _`inherited`_
   - [removeChild](#removechild-component-) _`inherited`_
   - [removeClass](#removeclass-classtoremove-) _`inherited`_
+  - [setInterval](#setinterval-fn-interval-) _`inherited`_
+  - [setTimeout](#settimeout-fn-timeout-) _`inherited`_
   - [show](#show) _`inherited`_
   - [trigger](#trigger-event-) _`inherited`_
   - [triggerReady](#triggerready) _`inherited`_
@@ -120,6 +124,32 @@ _inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js
 
 ---
 
+### clearInterval( intervalId )
+> Clears an interval and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __intervalId__ `Number` The id of the interval to clear
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1223](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1223)
+
+---
+
+### clearTimeout( timeoutId )
+> Clears a timeout and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __timeoutId__ `Number` The id of the timeout to clear
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1185](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1185)
+
+---
+
 ### contentEl()
 > Return the component's DOM element for embedding content.
 > Will either be el_ or a new element defined in createEl.
@@ -201,7 +231,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 > whenever touch events happen, and this can be turned off by components that
 > want touch events to act differently.
 
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
+_inherited from_: [src/js/component.js#L1124](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1124)
 
 ---
 
@@ -393,7 +423,7 @@ _inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js
 > 
 > The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
 > and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
+> will be automatically cleaned up when either component is disposed.
 > It will also bind myComponent as the context of myFunc.
 > 
 > **NOTE**: When using this on elements in the page other than window
@@ -497,7 +527,7 @@ _inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js
 ### ready( fn )
 > Bind a listener to the component's ready state
 > 
-> Different from event listeners in that if the ready event has already happend
+> Different from event listeners in that if the ready event has already happened
 > it will trigger the function immediately.
 
 ##### PARAMETERS: 
@@ -534,6 +564,34 @@ _inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js
 
 ---
 
+### setInterval( fn, interval )
+> Creates an interval and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run every N seconds.
+* __interval__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1202](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1202)
+
+---
+
+### setTimeout( fn, timeout )
+> Creates timeout and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run after the timeout.
+* __timeout__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1162](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1162)
+
+---
+
 ### show()
 > Show the component element if hidden
 

docs/api/vjs.CaptionsButton.md

@@ -2,604 +2,9 @@
 
 # vjs.CaptionsButton
 
-__EXTENDS__: [vjs.TextTrackButton](vjs.TextTrackButton.md)  
-__DEFINED IN__: [src/js/tracks.js#L856](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L856)  
+__DEFINED IN__: [src/js/tracks/text-track-controls.js#L401](https://github.com/videojs/video.js/blob/master/src/js/tracks/text-track-controls.js#L401)  
 
 The button component for toggling and selecting captions
 
 ---
 
-## INDEX
-
-- [METHODS](#methods)
-  - [init](#init-player-options-ready-)
-  - [addChild](#addchild-child-options-) _`inherited`_
-  - [addClass](#addclass-classtoadd-) _`inherited`_
-  - [buildCSSClass](#buildcssclass) _`inherited`_
-  - [children](#children) _`inherited`_
-  - [contentEl](#contentel) _`inherited`_
-  - [createEl](#createel-tagname-attributes-) _`inherited`_
-  - [createItems](#createitems) _`inherited`_
-  - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [dispose](#dispose) _`inherited`_
-  - [el](#el) _`inherited`_
-  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
-  - [getChild](#getchild-name-) _`inherited`_
-  - [getChildById](#getchildbyid-id-) _`inherited`_
-  - [hasClass](#hasclass-classtocheck-) _`inherited`_
-  - [height](#height-num-skiplisteners-) _`inherited`_
-  - [hide](#hide) _`inherited`_
-  - [id](#id) _`inherited`_
-  - [initChildren](#initchildren) _`inherited`_
-  - [name](#name) _`inherited`_
-  - [off](#off-first-second-third-) _`inherited`_
-  - [on](#on-first-second-third-) _`inherited`_
-  - [one](#one-first-second-third-) _`inherited`_
-  - [options](#options-obj-) _`inherited`_
-  - [player](#player) _`inherited`_
-  - [ready](#ready-fn-) _`inherited`_
-  - [removeChild](#removechild-component-) _`inherited`_
-  - [removeClass](#removeclass-classtoremove-) _`inherited`_
-  - [show](#show) _`inherited`_
-  - [trigger](#trigger-event-) _`inherited`_
-  - [triggerReady](#triggerready) _`inherited`_
-  - [width](#width-num-skiplisteners-) _`inherited`_
-
-- [EVENTS](#events)
-  - [resize](#resize-event) _`inherited`_
-
----
-
-## METHODS
-
-### addChild( child, [options] )
-> Adds a child component inside this component
-> 
->     myComponent.el();
->     // -> <div class='my-component'></div>
->     myComonent.children();
->     // [empty array]
-> 
->     var myButton = myComponent.addChild('MyButton');
->     // -> <div class='my-component'><div class="my-button">myButton<div></div>
->     // -> myButton === myComonent.children()[0];
-> 
-> Pass in options for child constructors and options for children of the child
-> 
->     var myButton = myComponent.addChild('MyButton', {
->       text: 'Press Me',
->       children: {
->         buttonChildExample: {
->           buttonChildOption: true
->         }
->       }
->     });
-
-##### PARAMETERS: 
-* __child__ `String|vjs.Component` The class name or instance of a child to add
-* __options__ `Object` _(OPTIONAL)_ Options, including options to be passed to children of the child.
-
-##### RETURNS: 
-* `vjs.Component` The child component (created by this process if a string was used)
-
-_inherited from_: [src/js/component.js#L362](https://github.com/videojs/video.js/blob/master/src/js/component.js#L362)
-
----
-
-### addClass( classToAdd )
-> Add a CSS class name to the component's element
-
-##### PARAMETERS: 
-* __classToAdd__ `String` Classname to add
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L826](https://github.com/videojs/video.js/blob/master/src/js/component.js#L826)
-
----
-
-### buildCSSClass()
-> Allows sub components to stack CSS class names
-
-_inherited from_: [src/js/menu.js#L157](https://github.com/videojs/video.js/blob/master/src/js/menu.js#L157)
-
----
-
-### children()
-> Get an array of all child components
-> 
->     var kids = myComponent.children();
-
-##### RETURNS: 
-* `Array` The children
-
-_inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js/blob/master/src/js/component.js#L296)
-
----
-
-### contentEl()
-> Return the component's DOM element for embedding content.
-> Will either be el_ or a new element defined in createEl.
-
-##### RETURNS: 
-* `Element` 
-
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
-
----
-
-### createEl( [tagName], [attributes] )
-> Create the component's DOM element
-
-##### PARAMETERS: 
-* __tagName__ `String` _(OPTIONAL)_ Element's node type. e.g. 'div'
-* __attributes__ `Object` _(OPTIONAL)_ An object of element attributes that should be set on the element
-
-##### RETURNS: 
-* `Element` 
-
-_inherited from_: [src/js/component.js#L200](https://github.com/videojs/video.js/blob/master/src/js/component.js#L200)
-
----
-
-### createItems()
-> Create the list of menu items. Specific to each subclass.
-
-_inherited from_: [src/js/menu.js#L154](https://github.com/videojs/video.js/blob/master/src/js/menu.js#L154)
-
----
-
-### dimensions( width, height )
-> Set both width and height at the same time
-
-##### PARAMETERS: 
-* __width__ `Number|String` 
-* __height__ `Number|String` 
-
-##### RETURNS: 
-* `vjs.Component` The component
-
-_inherited from_: [src/js/component.js#L938](https://github.com/videojs/video.js/blob/master/src/js/component.js#L938)
-
----
-
-### dispose()
-> Dispose of the component and all child components
-
-_inherited from_: [src/js/component.js#L84](https://github.com/videojs/video.js/blob/master/src/js/component.js#L84)
-
----
-
-### el()
-> Get the component's DOM element
-> 
->     var domEl = myComponent.el();
-
-##### RETURNS: 
-* `Element` 
-
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
-
----
-
-### enableTouchActivity()
-> Report user touch activity when touch events occur
-> 
-> User activity is used to determine when controls should show/hide. It's
-> relatively simple when it comes to mouse events, because any mouse event
-> should show the controls. So we capture mouse events that bubble up to the
-> player and report activity when that happens.
-> 
-> With touch events it isn't as easy. We can't rely on touch events at the
-> player level, because a tap (touchstart + touchend) on the video itself on
-> mobile devices is meant to turn controls off (and on). User activity is
-> checked asynchronously, so what could happen is a tap event on the video
-> turns the controls off, then the touchend event bubbles up to the player,
-> which if it reported user activity, would turn the controls right back on.
-> (We also don't want to completely block touch events from bubbling up)
-> 
-> Also a touchmove, touch+hold, and anything other than a tap is not supposed
-> to turn the controls back on on a mobile device.
-> 
-> Here we're setting the default component behavior to report user activity
-> whenever touch events happen, and this can be turned off by components that
-> want touch events to act differently.
-
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
-
----
-
-### getChild( name )
-> Returns a child component with the provided name
-
-##### PARAMETERS: 
-* __name__ 
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L330](https://github.com/videojs/video.js/blob/master/src/js/component.js#L330)
-
----
-
-### getChildById( id )
-> Returns a child component with the provided ID
-
-##### PARAMETERS: 
-* __id__ 
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L313](https://github.com/videojs/video.js/blob/master/src/js/component.js#L313)
-
----
-
-### hasClass( classToCheck )
-> Check if a component's element has a CSS class name
-
-##### PARAMETERS: 
-* __classToCheck__ `String` Classname to check
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
-
----
-
-### height( [num], [skipListeners] )
-> Get or set the height of the component (CSS values)
-> 
-> Setting the video tag dimension values only works with values in pixels.
-> Percent values will not work.
-> Some percents can be used, but width()/height() will return the number + %,
-> not the actual computed width/height.
-
-##### PARAMETERS: 
-* __num__ `Number|String` _(OPTIONAL)_ New component height
-* __skipListeners__ `Boolean` _(OPTIONAL)_ Skip the resize event trigger
-
-##### RETURNS: 
-* `vjs.Component` This component, when setting the height
-* `Number|String` The height, when getting
-
-_inherited from_: [src/js/component.js#L927](https://github.com/videojs/video.js/blob/master/src/js/component.js#L927)
-
----
-
-### hide()
-> Hide the component element if currently showing
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L857](https://github.com/videojs/video.js/blob/master/src/js/component.js#L857)
-
----
-
-### id()
-> Get the component's ID
-> 
->     var id = myComponent.id();
-
-##### RETURNS: 
-* `String` 
-
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
-
----
-
-### init( player, options, ready )
-
-##### PARAMETERS: 
-* __player__ 
-* __options__ 
-* __ready__ 
-
-_defined in_: [src/js/tracks.js#L858](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L858)
-
----
-
-### initChildren()
-> Add and initialize default child components from options
-> 
->     // when an instance of MyComponent is created, all children in options
->     // will be added to the instance by their name strings and options
->     MyComponent.prototype.options_.children = {
->       myChildComponent: {
->         myChildOption: true
->       }
->     }
-> 
->     // Or when creating the component
->     var myComp = new MyComponent(player, {
->       children: {
->         myChildComponent: {
->           myChildOption: true
->         }
->       }
->     });
-> 
-> The children option can also be an Array of child names or
-> child options objects (that also include a 'name' key).
-> 
->     var myComp = new MyComponent(player, {
->       children: [
->         'button',
->         {
->           name: 'button',
->           someOtherOption: true
->         }
->       ]
->     });
-
-_inherited from_: [src/js/component.js#L481](https://github.com/videojs/video.js/blob/master/src/js/component.js#L481)
-
----
-
-### name()
-> Get the component's name. The name is often used to reference the component.
-> 
->     var name = myComponent.name();
-
-##### RETURNS: 
-* `String` 
-
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
-
----
-
-### off( [first], [second], [third] )
-> Remove an event listener from this component's element
-> 
->     myComponent.off('eventType', myFunc);
-> 
-> If myFunc is excluded, ALL listeners for the event type will be removed.
-> If eventType is excluded, ALL listeners will be removed from the component.
-> 
-> Alternatively you can use `off` to remove listeners that were added to other
-> elements or components using `myComponent.on(otherComponent...`.
-> In this case both the event type and listener function are REQUIRED.
-> 
->     myComponent.off(otherElement, 'eventType', myFunc);
->     myComponent.off(otherComponent, 'eventType', myFunc);
-
-##### PARAMETERS: 
-* __first__ `String|vjs.Component` _(OPTIONAL)_ The event type or other component
-* __second__ `Function|String` _(OPTIONAL)_ The listener function or event type
-* __third__ `Function` _(OPTIONAL)_ The listener for other component
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js/blob/master/src/js/component.js#L646)
-
----
-
-### on( first, second, third )
-> Add an event listener to this component's element
-> 
->     var myFunc = function(){
->       var myComponent = this;
->       // Do something when the event is fired
->     };
-> 
->     myComponent.on('eventType', myFunc);
-> 
-> The context of myFunc will be myComponent unless previously bound.
-> 
-> Alternatively, you can add a listener to another element or component.
-> 
->     myComponent.on(otherElement, 'eventName', myFunc);
->     myComponent.on(otherComponent, 'eventName', myFunc);
-> 
-> The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
-> and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
-> It will also bind myComponent as the context of myFunc.
-> 
-> **NOTE**: When using this on elements in the page other than window
-> and document (both permanent), if you remove the element from the DOM
-> you need to call `vjs.trigger(el, 'dispose')` on it to clean up
-> references to it and allow the browser to garbage collect it.
-
-##### PARAMETERS: 
-* __first__ `String|vjs.Component` The event type or other component
-* __second__ `Function|String` The event handler or event type
-* __third__ `Function` The event handler
-
-##### RETURNS: 
-* `vjs.Component` self
-
-_inherited from_: [src/js/component.js#L577](https://github.com/videojs/video.js/blob/master/src/js/component.js#L577)
-
----
-
-### one( first, second, [third] )
-> Add an event listener to be triggered only once and then removed
-> 
->     myComponent.one('eventName', myFunc);
-> 
-> Alternatively you can add a listener to another element or component
-> that will be triggered only once.
-> 
->     myComponent.one(otherElement, 'eventName', myFunc);
->     myComponent.one(otherComponent, 'eventName', myFunc);
-
-##### PARAMETERS: 
-* __first__ `String|vjs.Component` The event type or other component
-* __second__ `Function|String` The listener function or event type
-* __third__ `Function` _(OPTIONAL)_ The listener function for other component
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
-
----
-
-### options( obj )
-> Deep merge of options objects
-> 
-> Whenever a property is an object on both options objects
-> the two properties will be merged using vjs.obj.deepMerge.
-> 
-> This is used for merging options for child components. We
-> want it to be easy to override individual options on a child
-> component without having to rewrite all the other default options.
-> 
->     Parent.prototype.options_ = {
->       children: {
->         'childOne': { 'foo': 'bar', 'asdf': 'fdsa' },
->         'childTwo': {},
->         'childThree': {}
->       }
->     }
->     newOptions = {
->       children: {
->         'childOne': { 'foo': 'baz', 'abc': '123' }
->         'childTwo': null,
->         'childFour': {}
->       }
->     }
-> 
->     this.options(newOptions);
-> 
-> RESULT
-> 
->     {
->       children: {
->         'childOne': { 'foo': 'baz', 'asdf': 'fdsa', 'abc': '123' },
->         'childTwo': null, // Disabled. Won't be initialized.
->         'childThree': {},
->         'childFour': {}
->       }
->     }
-
-##### PARAMETERS: 
-* __obj__ `Object` Object of new option values
-
-##### RETURNS: 
-* `Object` A NEW object of this.options_ and obj merged
-
-_inherited from_: [src/js/component.js#L179](https://github.com/videojs/video.js/blob/master/src/js/component.js#L179)
-
----
-
-### player()
-> Return the component's player
-
-##### RETURNS: 
-* `vjs.Player` 
-
-_inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js/blob/master/src/js/component.js#L126)
-
----
-
-### ready( fn )
-> Bind a listener to the component's ready state
-> 
-> Different from event listeners in that if the ready event has already happend
-> it will trigger the function immediately.
-
-##### PARAMETERS: 
-* __fn__ `Function` Ready listener
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L769](https://github.com/videojs/video.js/blob/master/src/js/component.js#L769)
-
----
-
-### removeChild( component )
-> Remove a child component from this component's list of children, and the
-> child component's element from this component's element
-
-##### PARAMETERS: 
-* __component__ `vjs.Component` Component to remove
-
-_inherited from_: [src/js/component.js#L420](https://github.com/videojs/video.js/blob/master/src/js/component.js#L420)
-
----
-
-### removeClass( classToRemove )
-> Remove a CSS class name from the component's element
-
-##### PARAMETERS: 
-* __classToRemove__ `String` Classname to remove
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js/blob/master/src/js/component.js#L837)
-
----
-
-### show()
-> Show the component element if hidden
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L847](https://github.com/videojs/video.js/blob/master/src/js/component.js#L847)
-
----
-
-### trigger( event )
-> Trigger an event on an element
-> 
->     myComponent.trigger('eventName');
->     myComponent.trigger({'type':'eventName'});
-
-##### PARAMETERS: 
-* __event__ `Event|Object|String` A string (the type) or an event object with a type attribute
-
-##### RETURNS: 
-* `vjs.Component` self
-
-_inherited from_: [src/js/component.js#L724](https://github.com/videojs/video.js/blob/master/src/js/component.js#L724)
-
----
-
-### triggerReady()
-> Trigger the ready listeners
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L788](https://github.com/videojs/video.js/blob/master/src/js/component.js#L788)
-
----
-
-### width( [num], skipListeners )
-> Set or get the width of the component (CSS values)
-> 
-> Setting the video tag dimension values only works with values in pixels.
-> Percent values will not work.
-> Some percents can be used, but width()/height() will return the number + %,
-> not the actual computed width/height.
-
-##### PARAMETERS: 
-* __num__ `Number|String` _(OPTIONAL)_ Optional width number
-* __skipListeners__ `Boolean` Skip the 'resize' event trigger
-
-##### RETURNS: 
-* `vjs.Component` This component, when setting the width
-* `Number|String` The width, when getting
-
-_inherited from_: [src/js/component.js#L910](https://github.com/videojs/video.js/blob/master/src/js/component.js#L910)
-
----
-
-## EVENTS
-
-### resize `EVENT`
-> Fired when the width and/or height of the component changes
-
-_inherited from_: [src/js/component.js#L1020](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1020)
-
----
-

docs/api/vjs.CaptionsTrack.md

@@ -3,7 +3,7 @@
 # vjs.CaptionsTrack
 
 __EXTENDS__: [vjs.TextTrack](vjs.TextTrack.md)  
-__DEFINED IN__: [src/js/tracks.js#L668](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L668)  
+__DEFINED IN__: [src/js/tracks.js#L676](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L676)  
 
 The track component for managing the hiding and showing of captions
 
@@ -18,6 +18,8 @@ The track component for managing the hiding and showing of captions
   - [addClass](#addclass-classtoadd-) _`inherited`_
   - [buildCSSClass](#buildcssclass) _`inherited`_
   - [children](#children) _`inherited`_
+  - [clearInterval](#clearinterval-intervalid-) _`inherited`_
+  - [clearTimeout](#cleartimeout-timeoutid-) _`inherited`_
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel) _`inherited`_
   - [cues](#cues) _`inherited`_
@@ -50,6 +52,8 @@ The track component for managing the hiding and showing of captions
   - [readyState](#readystate) _`inherited`_
   - [removeChild](#removechild-component-) _`inherited`_
   - [removeClass](#removeclass-classtoremove-) _`inherited`_
+  - [setInterval](#setinterval-fn-interval-) _`inherited`_
+  - [setTimeout](#settimeout-fn-timeout-) _`inherited`_
   - [show](#show) _`inherited`_
   - [src](#src) _`inherited`_
   - [title](#title) _`inherited`_
@@ -67,7 +71,7 @@ The track component for managing the hiding and showing of captions
 ### activate()
 > Turn on cue tracking. Tracks that are showing OR hidden are active.
 
-_inherited from_: [src/js/tracks.js#L373](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L373)
+_inherited from_: [src/js/tracks.js#L375](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L375)
 
 ---
 
@@ -77,7 +81,7 @@ _inherited from_: [src/js/tracks.js#L373](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `Array` 
 
-_inherited from_: [src/js/tracks.js#L268](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L268)
+_inherited from_: [src/js/tracks.js#L270](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L270)
 
 ---
 
@@ -150,6 +154,32 @@ _inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js
 
 ---
 
+### clearInterval( intervalId )
+> Clears an interval and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __intervalId__ `Number` The id of the interval to clear
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1219](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1219)
+
+---
+
+### clearTimeout( timeoutId )
+> Clears a timeout and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __timeoutId__ `Number` The id of the timeout to clear
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1181](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1181)
+
+---
+
 ### contentEl()
 > Return the component's DOM element for embedding content.
 > Will either be el_ or a new element defined in createEl.
@@ -167,7 +197,7 @@ _inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/tracks.js#L313](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L313)
+_inherited from_: [src/js/tracks.js#L315](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L315)
 
 ---
 
@@ -177,14 +207,14 @@ _inherited from_: [src/js/tracks.js#L313](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `Array` 
 
-_inherited from_: [src/js/tracks.js#L253](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L253)
+_inherited from_: [src/js/tracks.js#L255](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L255)
 
 ---
 
 ### deactivate()
 > Turn off cue tracking.
 
-_inherited from_: [src/js/tracks.js#L396](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L396)
+_inherited from_: [src/js/tracks.js#L398](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L398)
 
 ---
 
@@ -194,7 +224,7 @@ _inherited from_: [src/js/tracks.js#L396](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `Boolean` 
 
-_inherited from_: [src/js/tracks.js#L194](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L194)
+_inherited from_: [src/js/tracks.js#L196](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L196)
 
 ---
 
@@ -217,7 +247,7 @@ _inherited from_: [src/js/component.js#L938](https://github.com/videojs/video.js
 > Indicates that the text track is not active. Other than for the purposes of exposing the track in the DOM, the user agent is ignoring the text track.
 > No cues are active, no events are fired, and the user agent will not attempt to obtain the track's cues.
 
-_inherited from_: [src/js/tracks.js#L359](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L359)
+_inherited from_: [src/js/tracks.js#L361](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L361)
 
 ---
 
@@ -332,7 +362,7 @@ _inherited from_: [src/js/component.js#L927](https://github.com/videojs/video.js
 > If no attempt has yet been made to obtain the track's cues, the user agent will perform such an attempt momentarily.
 > The user agent is maintaining a list of which cues are active, and events are being fired accordingly.
 
-_inherited from_: [src/js/tracks.js#L344](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L344)
+_inherited from_: [src/js/tracks.js#L346](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L346)
 
 ---
 
@@ -401,7 +431,7 @@ _inherited from_: [src/js/component.js#L481](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/tracks.js#L165](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L165)
+_inherited from_: [src/js/tracks.js#L167](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L167)
 
 ---
 
@@ -411,7 +441,7 @@ _inherited from_: [src/js/tracks.js#L165](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/tracks.js#L238](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L238)
+_inherited from_: [src/js/tracks.js#L240](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L240)
 
 ---
 
@@ -421,7 +451,7 @@ _inherited from_: [src/js/tracks.js#L238](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/tracks.js#L223](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L223)
+_inherited from_: [src/js/tracks.js#L225](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L225)
 
 ---
 
@@ -431,7 +461,7 @@ _inherited from_: [src/js/tracks.js#L223](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `Number` 
 
-_inherited from_: [src/js/tracks.js#L305](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L305)
+_inherited from_: [src/js/tracks.js#L307](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L307)
 
 ---
 
@@ -493,7 +523,7 @@ _inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js
 > 
 > The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
 > and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
+> will be automatically cleaned up when either component is disposed.
 > It will also bind myComponent as the context of myFunc.
 > 
 > **NOTE**: When using this on elements in the page other than window
@@ -597,7 +627,7 @@ _inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js
 ### ready( fn )
 > Bind a listener to the component's ready state
 > 
-> Different from event listeners in that if the ready event has already happend
+> Different from event listeners in that if the ready event has already happened
 > it will trigger the function immediately.
 
 ##### PARAMETERS: 
@@ -616,7 +646,7 @@ _inherited from_: [src/js/component.js#L769](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Number` 
 
-_inherited from_: [src/js/tracks.js#L287](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L287)
+_inherited from_: [src/js/tracks.js#L289](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L289)
 
 ---
 
@@ -644,6 +674,34 @@ _inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js
 
 ---
 
+### setInterval( fn, interval )
+> Creates an interval and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run every N seconds.
+* __interval__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1198](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1198)
+
+---
+
+### setTimeout( fn, timeout )
+> Creates timeout and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run after the timeout.
+* __timeout__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1158](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1158)
+
+---
+
 ### show()
 > Show: Mode Showing (2)
 > Indicates that the text track is active. If no attempt has yet been made to obtain the track's cues, the user agent will perform such an attempt momentarily.
@@ -654,7 +712,7 @@ _inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js
 > The showing by default state is used in conjunction with the default attribute on track elements to indicate that the text track was enabled due to that attribute.
 > This allows the user agent to override the state if a later track is discovered that is more appropriate per the user's preferences.
 
-_inherited from_: [src/js/tracks.js#L329](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L329)
+_inherited from_: [src/js/tracks.js#L331](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L331)
 
 ---
 
@@ -664,7 +722,7 @@ _inherited from_: [src/js/tracks.js#L329](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/tracks.js#L179](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L179)
+_inherited from_: [src/js/tracks.js#L181](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L181)
 
 ---
 
@@ -674,7 +732,7 @@ _inherited from_: [src/js/tracks.js#L179](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/tracks.js#L208](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L208)
+_inherited from_: [src/js/tracks.js#L210](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L210)
 
 ---
 

docs/api/vjs.ChaptersButton.md

@@ -2,604 +2,9 @@
 
 # vjs.ChaptersButton
 
-__EXTENDS__: [vjs.TextTrackButton](vjs.TextTrackButton.md)  
-__DEFINED IN__: [src/js/tracks.js#L890](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L890)  
+__DEFINED IN__: [src/js/tracks/text-track-controls.js#L451](https://github.com/videojs/video.js/blob/master/src/js/tracks/text-track-controls.js#L451)  
 
 The button component for toggling and selecting chapters
 
 ---
 
-## INDEX
-
-- [METHODS](#methods)
-  - [init](#init-player-options-ready-)
-  - [addChild](#addchild-child-options-) _`inherited`_
-  - [addClass](#addclass-classtoadd-) _`inherited`_
-  - [buildCSSClass](#buildcssclass) _`inherited`_
-  - [children](#children) _`inherited`_
-  - [contentEl](#contentel) _`inherited`_
-  - [createEl](#createel-tagname-attributes-) _`inherited`_
-  - [createItems](#createitems) _`inherited`_
-  - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [dispose](#dispose) _`inherited`_
-  - [el](#el) _`inherited`_
-  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
-  - [getChild](#getchild-name-) _`inherited`_
-  - [getChildById](#getchildbyid-id-) _`inherited`_
-  - [hasClass](#hasclass-classtocheck-) _`inherited`_
-  - [height](#height-num-skiplisteners-) _`inherited`_
-  - [hide](#hide) _`inherited`_
-  - [id](#id) _`inherited`_
-  - [initChildren](#initchildren) _`inherited`_
-  - [name](#name) _`inherited`_
-  - [off](#off-first-second-third-) _`inherited`_
-  - [on](#on-first-second-third-) _`inherited`_
-  - [one](#one-first-second-third-) _`inherited`_
-  - [options](#options-obj-) _`inherited`_
-  - [player](#player) _`inherited`_
-  - [ready](#ready-fn-) _`inherited`_
-  - [removeChild](#removechild-component-) _`inherited`_
-  - [removeClass](#removeclass-classtoremove-) _`inherited`_
-  - [show](#show) _`inherited`_
-  - [trigger](#trigger-event-) _`inherited`_
-  - [triggerReady](#triggerready) _`inherited`_
-  - [width](#width-num-skiplisteners-) _`inherited`_
-
-- [EVENTS](#events)
-  - [resize](#resize-event) _`inherited`_
-
----
-
-## METHODS
-
-### addChild( child, [options] )
-> Adds a child component inside this component
-> 
->     myComponent.el();
->     // -> <div class='my-component'></div>
->     myComonent.children();
->     // [empty array]
-> 
->     var myButton = myComponent.addChild('MyButton');
->     // -> <div class='my-component'><div class="my-button">myButton<div></div>
->     // -> myButton === myComonent.children()[0];
-> 
-> Pass in options for child constructors and options for children of the child
-> 
->     var myButton = myComponent.addChild('MyButton', {
->       text: 'Press Me',
->       children: {
->         buttonChildExample: {
->           buttonChildOption: true
->         }
->       }
->     });
-
-##### PARAMETERS: 
-* __child__ `String|vjs.Component` The class name or instance of a child to add
-* __options__ `Object` _(OPTIONAL)_ Options, including options to be passed to children of the child.
-
-##### RETURNS: 
-* `vjs.Component` The child component (created by this process if a string was used)
-
-_inherited from_: [src/js/component.js#L362](https://github.com/videojs/video.js/blob/master/src/js/component.js#L362)
-
----
-
-### addClass( classToAdd )
-> Add a CSS class name to the component's element
-
-##### PARAMETERS: 
-* __classToAdd__ `String` Classname to add
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L826](https://github.com/videojs/video.js/blob/master/src/js/component.js#L826)
-
----
-
-### buildCSSClass()
-> Allows sub components to stack CSS class names
-
-_inherited from_: [src/js/menu.js#L157](https://github.com/videojs/video.js/blob/master/src/js/menu.js#L157)
-
----
-
-### children()
-> Get an array of all child components
-> 
->     var kids = myComponent.children();
-
-##### RETURNS: 
-* `Array` The children
-
-_inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js/blob/master/src/js/component.js#L296)
-
----
-
-### contentEl()
-> Return the component's DOM element for embedding content.
-> Will either be el_ or a new element defined in createEl.
-
-##### RETURNS: 
-* `Element` 
-
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
-
----
-
-### createEl( [tagName], [attributes] )
-> Create the component's DOM element
-
-##### PARAMETERS: 
-* __tagName__ `String` _(OPTIONAL)_ Element's node type. e.g. 'div'
-* __attributes__ `Object` _(OPTIONAL)_ An object of element attributes that should be set on the element
-
-##### RETURNS: 
-* `Element` 
-
-_inherited from_: [src/js/component.js#L200](https://github.com/videojs/video.js/blob/master/src/js/component.js#L200)
-
----
-
-### createItems()
-> Create the list of menu items. Specific to each subclass.
-
-_inherited from_: [src/js/menu.js#L154](https://github.com/videojs/video.js/blob/master/src/js/menu.js#L154)
-
----
-
-### dimensions( width, height )
-> Set both width and height at the same time
-
-##### PARAMETERS: 
-* __width__ `Number|String` 
-* __height__ `Number|String` 
-
-##### RETURNS: 
-* `vjs.Component` The component
-
-_inherited from_: [src/js/component.js#L938](https://github.com/videojs/video.js/blob/master/src/js/component.js#L938)
-
----
-
-### dispose()
-> Dispose of the component and all child components
-
-_inherited from_: [src/js/component.js#L84](https://github.com/videojs/video.js/blob/master/src/js/component.js#L84)
-
----
-
-### el()
-> Get the component's DOM element
-> 
->     var domEl = myComponent.el();
-
-##### RETURNS: 
-* `Element` 
-
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
-
----
-
-### enableTouchActivity()
-> Report user touch activity when touch events occur
-> 
-> User activity is used to determine when controls should show/hide. It's
-> relatively simple when it comes to mouse events, because any mouse event
-> should show the controls. So we capture mouse events that bubble up to the
-> player and report activity when that happens.
-> 
-> With touch events it isn't as easy. We can't rely on touch events at the
-> player level, because a tap (touchstart + touchend) on the video itself on
-> mobile devices is meant to turn controls off (and on). User activity is
-> checked asynchronously, so what could happen is a tap event on the video
-> turns the controls off, then the touchend event bubbles up to the player,
-> which if it reported user activity, would turn the controls right back on.
-> (We also don't want to completely block touch events from bubbling up)
-> 
-> Also a touchmove, touch+hold, and anything other than a tap is not supposed
-> to turn the controls back on on a mobile device.
-> 
-> Here we're setting the default component behavior to report user activity
-> whenever touch events happen, and this can be turned off by components that
-> want touch events to act differently.
-
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
-
----
-
-### getChild( name )
-> Returns a child component with the provided name
-
-##### PARAMETERS: 
-* __name__ 
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L330](https://github.com/videojs/video.js/blob/master/src/js/component.js#L330)
-
----
-
-### getChildById( id )
-> Returns a child component with the provided ID
-
-##### PARAMETERS: 
-* __id__ 
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L313](https://github.com/videojs/video.js/blob/master/src/js/component.js#L313)
-
----
-
-### hasClass( classToCheck )
-> Check if a component's element has a CSS class name
-
-##### PARAMETERS: 
-* __classToCheck__ `String` Classname to check
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
-
----
-
-### height( [num], [skipListeners] )
-> Get or set the height of the component (CSS values)
-> 
-> Setting the video tag dimension values only works with values in pixels.
-> Percent values will not work.
-> Some percents can be used, but width()/height() will return the number + %,
-> not the actual computed width/height.
-
-##### PARAMETERS: 
-* __num__ `Number|String` _(OPTIONAL)_ New component height
-* __skipListeners__ `Boolean` _(OPTIONAL)_ Skip the resize event trigger
-
-##### RETURNS: 
-* `vjs.Component` This component, when setting the height
-* `Number|String` The height, when getting
-
-_inherited from_: [src/js/component.js#L927](https://github.com/videojs/video.js/blob/master/src/js/component.js#L927)
-
----
-
-### hide()
-> Hide the component element if currently showing
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L857](https://github.com/videojs/video.js/blob/master/src/js/component.js#L857)
-
----
-
-### id()
-> Get the component's ID
-> 
->     var id = myComponent.id();
-
-##### RETURNS: 
-* `String` 
-
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
-
----
-
-### init( player, options, ready )
-
-##### PARAMETERS: 
-* __player__ 
-* __options__ 
-* __ready__ 
-
-_defined in_: [src/js/tracks.js#L892](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L892)
-
----
-
-### initChildren()
-> Add and initialize default child components from options
-> 
->     // when an instance of MyComponent is created, all children in options
->     // will be added to the instance by their name strings and options
->     MyComponent.prototype.options_.children = {
->       myChildComponent: {
->         myChildOption: true
->       }
->     }
-> 
->     // Or when creating the component
->     var myComp = new MyComponent(player, {
->       children: {
->         myChildComponent: {
->           myChildOption: true
->         }
->       }
->     });
-> 
-> The children option can also be an Array of child names or
-> child options objects (that also include a 'name' key).
-> 
->     var myComp = new MyComponent(player, {
->       children: [
->         'button',
->         {
->           name: 'button',
->           someOtherOption: true
->         }
->       ]
->     });
-
-_inherited from_: [src/js/component.js#L481](https://github.com/videojs/video.js/blob/master/src/js/component.js#L481)
-
----
-
-### name()
-> Get the component's name. The name is often used to reference the component.
-> 
->     var name = myComponent.name();
-
-##### RETURNS: 
-* `String` 
-
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
-
----
-
-### off( [first], [second], [third] )
-> Remove an event listener from this component's element
-> 
->     myComponent.off('eventType', myFunc);
-> 
-> If myFunc is excluded, ALL listeners for the event type will be removed.
-> If eventType is excluded, ALL listeners will be removed from the component.
-> 
-> Alternatively you can use `off` to remove listeners that were added to other
-> elements or components using `myComponent.on(otherComponent...`.
-> In this case both the event type and listener function are REQUIRED.
-> 
->     myComponent.off(otherElement, 'eventType', myFunc);
->     myComponent.off(otherComponent, 'eventType', myFunc);
-
-##### PARAMETERS: 
-* __first__ `String|vjs.Component` _(OPTIONAL)_ The event type or other component
-* __second__ `Function|String` _(OPTIONAL)_ The listener function or event type
-* __third__ `Function` _(OPTIONAL)_ The listener for other component
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js/blob/master/src/js/component.js#L646)
-
----
-
-### on( first, second, third )
-> Add an event listener to this component's element
-> 
->     var myFunc = function(){
->       var myComponent = this;
->       // Do something when the event is fired
->     };
-> 
->     myComponent.on('eventType', myFunc);
-> 
-> The context of myFunc will be myComponent unless previously bound.
-> 
-> Alternatively, you can add a listener to another element or component.
-> 
->     myComponent.on(otherElement, 'eventName', myFunc);
->     myComponent.on(otherComponent, 'eventName', myFunc);
-> 
-> The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
-> and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
-> It will also bind myComponent as the context of myFunc.
-> 
-> **NOTE**: When using this on elements in the page other than window
-> and document (both permanent), if you remove the element from the DOM
-> you need to call `vjs.trigger(el, 'dispose')` on it to clean up
-> references to it and allow the browser to garbage collect it.
-
-##### PARAMETERS: 
-* __first__ `String|vjs.Component` The event type or other component
-* __second__ `Function|String` The event handler or event type
-* __third__ `Function` The event handler
-
-##### RETURNS: 
-* `vjs.Component` self
-
-_inherited from_: [src/js/component.js#L577](https://github.com/videojs/video.js/blob/master/src/js/component.js#L577)
-
----
-
-### one( first, second, [third] )
-> Add an event listener to be triggered only once and then removed
-> 
->     myComponent.one('eventName', myFunc);
-> 
-> Alternatively you can add a listener to another element or component
-> that will be triggered only once.
-> 
->     myComponent.one(otherElement, 'eventName', myFunc);
->     myComponent.one(otherComponent, 'eventName', myFunc);
-
-##### PARAMETERS: 
-* __first__ `String|vjs.Component` The event type or other component
-* __second__ `Function|String` The listener function or event type
-* __third__ `Function` _(OPTIONAL)_ The listener function for other component
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
-
----
-
-### options( obj )
-> Deep merge of options objects
-> 
-> Whenever a property is an object on both options objects
-> the two properties will be merged using vjs.obj.deepMerge.
-> 
-> This is used for merging options for child components. We
-> want it to be easy to override individual options on a child
-> component without having to rewrite all the other default options.
-> 
->     Parent.prototype.options_ = {
->       children: {
->         'childOne': { 'foo': 'bar', 'asdf': 'fdsa' },
->         'childTwo': {},
->         'childThree': {}
->       }
->     }
->     newOptions = {
->       children: {
->         'childOne': { 'foo': 'baz', 'abc': '123' }
->         'childTwo': null,
->         'childFour': {}
->       }
->     }
-> 
->     this.options(newOptions);
-> 
-> RESULT
-> 
->     {
->       children: {
->         'childOne': { 'foo': 'baz', 'asdf': 'fdsa', 'abc': '123' },
->         'childTwo': null, // Disabled. Won't be initialized.
->         'childThree': {},
->         'childFour': {}
->       }
->     }
-
-##### PARAMETERS: 
-* __obj__ `Object` Object of new option values
-
-##### RETURNS: 
-* `Object` A NEW object of this.options_ and obj merged
-
-_inherited from_: [src/js/component.js#L179](https://github.com/videojs/video.js/blob/master/src/js/component.js#L179)
-
----
-
-### player()
-> Return the component's player
-
-##### RETURNS: 
-* `vjs.Player` 
-
-_inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js/blob/master/src/js/component.js#L126)
-
----
-
-### ready( fn )
-> Bind a listener to the component's ready state
-> 
-> Different from event listeners in that if the ready event has already happend
-> it will trigger the function immediately.
-
-##### PARAMETERS: 
-* __fn__ `Function` Ready listener
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L769](https://github.com/videojs/video.js/blob/master/src/js/component.js#L769)
-
----
-
-### removeChild( component )
-> Remove a child component from this component's list of children, and the
-> child component's element from this component's element
-
-##### PARAMETERS: 
-* __component__ `vjs.Component` Component to remove
-
-_inherited from_: [src/js/component.js#L420](https://github.com/videojs/video.js/blob/master/src/js/component.js#L420)
-
----
-
-### removeClass( classToRemove )
-> Remove a CSS class name from the component's element
-
-##### PARAMETERS: 
-* __classToRemove__ `String` Classname to remove
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js/blob/master/src/js/component.js#L837)
-
----
-
-### show()
-> Show the component element if hidden
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L847](https://github.com/videojs/video.js/blob/master/src/js/component.js#L847)
-
----
-
-### trigger( event )
-> Trigger an event on an element
-> 
->     myComponent.trigger('eventName');
->     myComponent.trigger({'type':'eventName'});
-
-##### PARAMETERS: 
-* __event__ `Event|Object|String` A string (the type) or an event object with a type attribute
-
-##### RETURNS: 
-* `vjs.Component` self
-
-_inherited from_: [src/js/component.js#L724](https://github.com/videojs/video.js/blob/master/src/js/component.js#L724)
-
----
-
-### triggerReady()
-> Trigger the ready listeners
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L788](https://github.com/videojs/video.js/blob/master/src/js/component.js#L788)
-
----
-
-### width( [num], skipListeners )
-> Set or get the width of the component (CSS values)
-> 
-> Setting the video tag dimension values only works with values in pixels.
-> Percent values will not work.
-> Some percents can be used, but width()/height() will return the number + %,
-> not the actual computed width/height.
-
-##### PARAMETERS: 
-* __num__ `Number|String` _(OPTIONAL)_ Optional width number
-* __skipListeners__ `Boolean` Skip the 'resize' event trigger
-
-##### RETURNS: 
-* `vjs.Component` This component, when setting the width
-* `Number|String` The width, when getting
-
-_inherited from_: [src/js/component.js#L910](https://github.com/videojs/video.js/blob/master/src/js/component.js#L910)
-
----
-
-## EVENTS
-
-### resize `EVENT`
-> Fired when the width and/or height of the component changes
-
-_inherited from_: [src/js/component.js#L1020](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1020)
-
----
-

docs/api/vjs.ChaptersTrack.md

@@ -3,7 +3,7 @@
 # vjs.ChaptersTrack
 
 __EXTENDS__: [vjs.TextTrack](vjs.TextTrack.md)  
-__DEFINED IN__: [src/js/tracks.js#L686](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L686)  
+__DEFINED IN__: [src/js/tracks.js#L694](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L694)  
 
 The track component for managing the hiding and showing of chapters
 
@@ -18,6 +18,8 @@ The track component for managing the hiding and showing of chapters
   - [addClass](#addclass-classtoadd-) _`inherited`_
   - [buildCSSClass](#buildcssclass) _`inherited`_
   - [children](#children) _`inherited`_
+  - [clearInterval](#clearinterval-intervalid-) _`inherited`_
+  - [clearTimeout](#cleartimeout-timeoutid-) _`inherited`_
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel) _`inherited`_
   - [cues](#cues) _`inherited`_
@@ -50,6 +52,8 @@ The track component for managing the hiding and showing of chapters
   - [readyState](#readystate) _`inherited`_
   - [removeChild](#removechild-component-) _`inherited`_
   - [removeClass](#removeclass-classtoremove-) _`inherited`_
+  - [setInterval](#setinterval-fn-interval-) _`inherited`_
+  - [setTimeout](#settimeout-fn-timeout-) _`inherited`_
   - [show](#show) _`inherited`_
   - [src](#src) _`inherited`_
   - [title](#title) _`inherited`_
@@ -67,7 +71,7 @@ The track component for managing the hiding and showing of chapters
 ### activate()
 > Turn on cue tracking. Tracks that are showing OR hidden are active.
 
-_inherited from_: [src/js/tracks.js#L373](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L373)
+_inherited from_: [src/js/tracks.js#L375](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L375)
 
 ---
 
@@ -77,7 +81,7 @@ _inherited from_: [src/js/tracks.js#L373](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `Array` 
 
-_inherited from_: [src/js/tracks.js#L268](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L268)
+_inherited from_: [src/js/tracks.js#L270](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L270)
 
 ---
 
@@ -150,6 +154,32 @@ _inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js
 
 ---
 
+### clearInterval( intervalId )
+> Clears an interval and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __intervalId__ `Number` The id of the interval to clear
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1219](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1219)
+
+---
+
+### clearTimeout( timeoutId )
+> Clears a timeout and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __timeoutId__ `Number` The id of the timeout to clear
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1181](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1181)
+
+---
+
 ### contentEl()
 > Return the component's DOM element for embedding content.
 > Will either be el_ or a new element defined in createEl.
@@ -167,7 +197,7 @@ _inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/tracks.js#L313](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L313)
+_inherited from_: [src/js/tracks.js#L315](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L315)
 
 ---
 
@@ -177,14 +207,14 @@ _inherited from_: [src/js/tracks.js#L313](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `Array` 
 
-_inherited from_: [src/js/tracks.js#L253](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L253)
+_inherited from_: [src/js/tracks.js#L255](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L255)
 
 ---
 
 ### deactivate()
 > Turn off cue tracking.
 
-_inherited from_: [src/js/tracks.js#L396](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L396)
+_inherited from_: [src/js/tracks.js#L398](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L398)
 
 ---
 
@@ -194,7 +224,7 @@ _inherited from_: [src/js/tracks.js#L396](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `Boolean` 
 
-_inherited from_: [src/js/tracks.js#L194](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L194)
+_inherited from_: [src/js/tracks.js#L196](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L196)
 
 ---
 
@@ -217,7 +247,7 @@ _inherited from_: [src/js/component.js#L938](https://github.com/videojs/video.js
 > Indicates that the text track is not active. Other than for the purposes of exposing the track in the DOM, the user agent is ignoring the text track.
 > No cues are active, no events are fired, and the user agent will not attempt to obtain the track's cues.
 
-_inherited from_: [src/js/tracks.js#L359](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L359)
+_inherited from_: [src/js/tracks.js#L361](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L361)
 
 ---
 
@@ -332,7 +362,7 @@ _inherited from_: [src/js/component.js#L927](https://github.com/videojs/video.js
 > If no attempt has yet been made to obtain the track's cues, the user agent will perform such an attempt momentarily.
 > The user agent is maintaining a list of which cues are active, and events are being fired accordingly.
 
-_inherited from_: [src/js/tracks.js#L344](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L344)
+_inherited from_: [src/js/tracks.js#L346](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L346)
 
 ---
 
@@ -401,7 +431,7 @@ _inherited from_: [src/js/component.js#L481](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/tracks.js#L165](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L165)
+_inherited from_: [src/js/tracks.js#L167](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L167)
 
 ---
 
@@ -411,7 +441,7 @@ _inherited from_: [src/js/tracks.js#L165](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/tracks.js#L238](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L238)
+_inherited from_: [src/js/tracks.js#L240](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L240)
 
 ---
 
@@ -421,7 +451,7 @@ _inherited from_: [src/js/tracks.js#L238](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/tracks.js#L223](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L223)
+_inherited from_: [src/js/tracks.js#L225](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L225)
 
 ---
 
@@ -431,7 +461,7 @@ _inherited from_: [src/js/tracks.js#L223](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `Number` 
 
-_inherited from_: [src/js/tracks.js#L305](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L305)
+_inherited from_: [src/js/tracks.js#L307](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L307)
 
 ---
 
@@ -493,7 +523,7 @@ _inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js
 > 
 > The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
 > and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
+> will be automatically cleaned up when either component is disposed.
 > It will also bind myComponent as the context of myFunc.
 > 
 > **NOTE**: When using this on elements in the page other than window
@@ -597,7 +627,7 @@ _inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js
 ### ready( fn )
 > Bind a listener to the component's ready state
 > 
-> Different from event listeners in that if the ready event has already happend
+> Different from event listeners in that if the ready event has already happened
 > it will trigger the function immediately.
 
 ##### PARAMETERS: 
@@ -616,7 +646,7 @@ _inherited from_: [src/js/component.js#L769](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Number` 
 
-_inherited from_: [src/js/tracks.js#L287](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L287)
+_inherited from_: [src/js/tracks.js#L289](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L289)
 
 ---
 
@@ -644,6 +674,34 @@ _inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js
 
 ---
 
+### setInterval( fn, interval )
+> Creates an interval and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run every N seconds.
+* __interval__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1198](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1198)
+
+---
+
+### setTimeout( fn, timeout )
+> Creates timeout and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run after the timeout.
+* __timeout__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1158](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1158)
+
+---
+
 ### show()
 > Show: Mode Showing (2)
 > Indicates that the text track is active. If no attempt has yet been made to obtain the track's cues, the user agent will perform such an attempt momentarily.
@@ -654,7 +712,7 @@ _inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js
 > The showing by default state is used in conjunction with the default attribute on track elements to indicate that the text track was enabled due to that attribute.
 > This allows the user agent to override the state if a later track is discovered that is more appropriate per the user's preferences.
 
-_inherited from_: [src/js/tracks.js#L329](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L329)
+_inherited from_: [src/js/tracks.js#L331](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L331)
 
 ---
 
@@ -664,7 +722,7 @@ _inherited from_: [src/js/tracks.js#L329](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/tracks.js#L179](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L179)
+_inherited from_: [src/js/tracks.js#L181](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L181)
 
 ---
 
@@ -674,7 +732,7 @@ _inherited from_: [src/js/tracks.js#L179](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/tracks.js#L208](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L208)
+_inherited from_: [src/js/tracks.js#L210](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L210)
 
 ---
 

docs/api/vjs.ChaptersTrackMenuItem.md

@@ -2,612 +2,7 @@
 
 # vjs.ChaptersTrackMenuItem
 
-__EXTENDS__: [vjs.MenuItem](vjs.MenuItem.md)  
-__DEFINED IN__: [src/js/tracks.js#L978](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L978)  
-
----
-
-## INDEX
-
-- [METHODS](#methods)
-  - [init](#init-player-options-)
-  - [addChild](#addchild-child-options-) _`inherited`_
-  - [addClass](#addclass-classtoadd-) _`inherited`_
-  - [buildCSSClass](#buildcssclass) _`inherited`_
-  - [children](#children) _`inherited`_
-  - [contentEl](#contentel) _`inherited`_
-  - [createEl](#createel-tagname-attributes-) _`inherited`_
-  - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [dispose](#dispose) _`inherited`_
-  - [el](#el) _`inherited`_
-  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
-  - [getChild](#getchild-name-) _`inherited`_
-  - [getChildById](#getchildbyid-id-) _`inherited`_
-  - [hasClass](#hasclass-classtocheck-) _`inherited`_
-  - [height](#height-num-skiplisteners-) _`inherited`_
-  - [hide](#hide) _`inherited`_
-  - [id](#id) _`inherited`_
-  - [initChildren](#initchildren) _`inherited`_
-  - [name](#name) _`inherited`_
-  - [off](#off-first-second-third-) _`inherited`_
-  - [on](#on-first-second-third-) _`inherited`_
-  - [onClick](#onclick) _`inherited`_
-  - [one](#one-first-second-third-) _`inherited`_
-  - [options](#options-obj-) _`inherited`_
-  - [player](#player) _`inherited`_
-  - [ready](#ready-fn-) _`inherited`_
-  - [removeChild](#removechild-component-) _`inherited`_
-  - [removeClass](#removeclass-classtoremove-) _`inherited`_
-  - [selected](#selected-selected-) _`inherited`_
-  - [show](#show) _`inherited`_
-  - [trigger](#trigger-event-) _`inherited`_
-  - [triggerReady](#triggerready) _`inherited`_
-  - [width](#width-num-skiplisteners-) _`inherited`_
-
-- [EVENTS](#events)
-  - [resize](#resize-event) _`inherited`_
-
----
-
-## METHODS
-
-### addChild( child, [options] )
-> Adds a child component inside this component
-> 
->     myComponent.el();
->     // -> <div class='my-component'></div>
->     myComonent.children();
->     // [empty array]
-> 
->     var myButton = myComponent.addChild('MyButton');
->     // -> <div class='my-component'><div class="my-button">myButton<div></div>
->     // -> myButton === myComonent.children()[0];
-> 
-> Pass in options for child constructors and options for children of the child
-> 
->     var myButton = myComponent.addChild('MyButton', {
->       text: 'Press Me',
->       children: {
->         buttonChildExample: {
->           buttonChildOption: true
->         }
->       }
->     });
-
-##### PARAMETERS: 
-* __child__ `String|vjs.Component` The class name or instance of a child to add
-* __options__ `Object` _(OPTIONAL)_ Options, including options to be passed to children of the child.
-
-##### RETURNS: 
-* `vjs.Component` The child component (created by this process if a string was used)
-
-_inherited from_: [src/js/component.js#L362](https://github.com/videojs/video.js/blob/master/src/js/component.js#L362)
-
----
-
-### addClass( classToAdd )
-> Add a CSS class name to the component's element
-
-##### PARAMETERS: 
-* __classToAdd__ `String` Classname to add
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L826](https://github.com/videojs/video.js/blob/master/src/js/component.js#L826)
-
----
-
-### buildCSSClass()
-> Allows sub components to stack CSS class names
-
-##### RETURNS: 
-* `String` The constructed class name
-
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
-
----
-
-### children()
-> Get an array of all child components
-> 
->     var kids = myComponent.children();
-
-##### RETURNS: 
-* `Array` The children
-
-_inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js/blob/master/src/js/component.js#L296)
-
----
-
-### contentEl()
-> Return the component's DOM element for embedding content.
-> Will either be el_ or a new element defined in createEl.
-
-##### RETURNS: 
-* `Element` 
-
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
-
----
-
-### createEl( [tagName], [attributes] )
-> Create the component's DOM element
-
-##### PARAMETERS: 
-* __tagName__ `String` _(OPTIONAL)_ Element's node type. e.g. 'div'
-* __attributes__ `Object` _(OPTIONAL)_ An object of element attributes that should be set on the element
-
-_inherited from_: [src/js/menu.js#L64](https://github.com/videojs/video.js/blob/master/src/js/menu.js#L64)
-
----
-
-### dimensions( width, height )
-> Set both width and height at the same time
-
-##### PARAMETERS: 
-* __width__ `Number|String` 
-* __height__ `Number|String` 
-
-##### RETURNS: 
-* `vjs.Component` The component
-
-_inherited from_: [src/js/component.js#L938](https://github.com/videojs/video.js/blob/master/src/js/component.js#L938)
-
----
-
-### dispose()
-> Dispose of the component and all child components
-
-_inherited from_: [src/js/component.js#L84](https://github.com/videojs/video.js/blob/master/src/js/component.js#L84)
-
----
-
-### el()
-> Get the component's DOM element
-> 
->     var domEl = myComponent.el();
-
-##### RETURNS: 
-* `Element` 
-
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
-
----
-
-### enableTouchActivity()
-> Report user touch activity when touch events occur
-> 
-> User activity is used to determine when controls should show/hide. It's
-> relatively simple when it comes to mouse events, because any mouse event
-> should show the controls. So we capture mouse events that bubble up to the
-> player and report activity when that happens.
-> 
-> With touch events it isn't as easy. We can't rely on touch events at the
-> player level, because a tap (touchstart + touchend) on the video itself on
-> mobile devices is meant to turn controls off (and on). User activity is
-> checked asynchronously, so what could happen is a tap event on the video
-> turns the controls off, then the touchend event bubbles up to the player,
-> which if it reported user activity, would turn the controls right back on.
-> (We also don't want to completely block touch events from bubbling up)
-> 
-> Also a touchmove, touch+hold, and anything other than a tap is not supposed
-> to turn the controls back on on a mobile device.
-> 
-> Here we're setting the default component behavior to report user activity
-> whenever touch events happen, and this can be turned off by components that
-> want touch events to act differently.
-
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
-
----
-
-### getChild( name )
-> Returns a child component with the provided name
-
-##### PARAMETERS: 
-* __name__ 
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L330](https://github.com/videojs/video.js/blob/master/src/js/component.js#L330)
-
----
-
-### getChildById( id )
-> Returns a child component with the provided ID
-
-##### PARAMETERS: 
-* __id__ 
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L313](https://github.com/videojs/video.js/blob/master/src/js/component.js#L313)
-
----
-
-### hasClass( classToCheck )
-> Check if a component's element has a CSS class name
-
-##### PARAMETERS: 
-* __classToCheck__ `String` Classname to check
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
-
----
-
-### height( [num], [skipListeners] )
-> Get or set the height of the component (CSS values)
-> 
-> Setting the video tag dimension values only works with values in pixels.
-> Percent values will not work.
-> Some percents can be used, but width()/height() will return the number + %,
-> not the actual computed width/height.
-
-##### PARAMETERS: 
-* __num__ `Number|String` _(OPTIONAL)_ New component height
-* __skipListeners__ `Boolean` _(OPTIONAL)_ Skip the resize event trigger
-
-##### RETURNS: 
-* `vjs.Component` This component, when setting the height
-* `Number|String` The height, when getting
-
-_inherited from_: [src/js/component.js#L927](https://github.com/videojs/video.js/blob/master/src/js/component.js#L927)
-
----
-
-### hide()
-> Hide the component element if currently showing
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L857](https://github.com/videojs/video.js/blob/master/src/js/component.js#L857)
-
----
-
-### id()
-> Get the component's ID
-> 
->     var id = myComponent.id();
-
-##### RETURNS: 
-* `String` 
-
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
-
----
-
-### init( player, options )
-
-##### PARAMETERS: 
-* __player__ 
-* __options__ 
-
-_defined in_: [src/js/tracks.js#L980](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L980)
-
----
-
-### initChildren()
-> Add and initialize default child components from options
-> 
->     // when an instance of MyComponent is created, all children in options
->     // will be added to the instance by their name strings and options
->     MyComponent.prototype.options_.children = {
->       myChildComponent: {
->         myChildOption: true
->       }
->     }
-> 
->     // Or when creating the component
->     var myComp = new MyComponent(player, {
->       children: {
->         myChildComponent: {
->           myChildOption: true
->         }
->       }
->     });
-> 
-> The children option can also be an Array of child names or
-> child options objects (that also include a 'name' key).
-> 
->     var myComp = new MyComponent(player, {
->       children: [
->         'button',
->         {
->           name: 'button',
->           someOtherOption: true
->         }
->       ]
->     });
-
-_inherited from_: [src/js/component.js#L481](https://github.com/videojs/video.js/blob/master/src/js/component.js#L481)
-
----
-
-### name()
-> Get the component's name. The name is often used to reference the component.
-> 
->     var name = myComponent.name();
-
-##### RETURNS: 
-* `String` 
-
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
-
----
-
-### off( [first], [second], [third] )
-> Remove an event listener from this component's element
-> 
->     myComponent.off('eventType', myFunc);
-> 
-> If myFunc is excluded, ALL listeners for the event type will be removed.
-> If eventType is excluded, ALL listeners will be removed from the component.
-> 
-> Alternatively you can use `off` to remove listeners that were added to other
-> elements or components using `myComponent.on(otherComponent...`.
-> In this case both the event type and listener function are REQUIRED.
-> 
->     myComponent.off(otherElement, 'eventType', myFunc);
->     myComponent.off(otherComponent, 'eventType', myFunc);
-
-##### PARAMETERS: 
-* __first__ `String|vjs.Component` _(OPTIONAL)_ The event type or other component
-* __second__ `Function|String` _(OPTIONAL)_ The listener function or event type
-* __third__ `Function` _(OPTIONAL)_ The listener for other component
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js/blob/master/src/js/component.js#L646)
-
----
-
-### on( first, second, third )
-> Add an event listener to this component's element
-> 
->     var myFunc = function(){
->       var myComponent = this;
->       // Do something when the event is fired
->     };
-> 
->     myComponent.on('eventType', myFunc);
-> 
-> The context of myFunc will be myComponent unless previously bound.
-> 
-> Alternatively, you can add a listener to another element or component.
-> 
->     myComponent.on(otherElement, 'eventName', myFunc);
->     myComponent.on(otherComponent, 'eventName', myFunc);
-> 
-> The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
-> and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
-> It will also bind myComponent as the context of myFunc.
-> 
-> **NOTE**: When using this on elements in the page other than window
-> and document (both permanent), if you remove the element from the DOM
-> you need to call `vjs.trigger(el, 'dispose')` on it to clean up
-> references to it and allow the browser to garbage collect it.
-
-##### PARAMETERS: 
-* __first__ `String|vjs.Component` The event type or other component
-* __second__ `Function|String` The event handler or event type
-* __third__ `Function` The event handler
-
-##### RETURNS: 
-* `vjs.Component` self
-
-_inherited from_: [src/js/component.js#L577](https://github.com/videojs/video.js/blob/master/src/js/component.js#L577)
-
----
-
-### onClick()
-> Handle a click on the menu item, and set it to selected
-
-_inherited from_: [src/js/menu.js#L74](https://github.com/videojs/video.js/blob/master/src/js/menu.js#L74)
-
----
-
-### one( first, second, [third] )
-> Add an event listener to be triggered only once and then removed
-> 
->     myComponent.one('eventName', myFunc);
-> 
-> Alternatively you can add a listener to another element or component
-> that will be triggered only once.
-> 
->     myComponent.one(otherElement, 'eventName', myFunc);
->     myComponent.one(otherComponent, 'eventName', myFunc);
-
-##### PARAMETERS: 
-* __first__ `String|vjs.Component` The event type or other component
-* __second__ `Function|String` The listener function or event type
-* __third__ `Function` _(OPTIONAL)_ The listener function for other component
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
-
----
-
-### options( obj )
-> Deep merge of options objects
-> 
-> Whenever a property is an object on both options objects
-> the two properties will be merged using vjs.obj.deepMerge.
-> 
-> This is used for merging options for child components. We
-> want it to be easy to override individual options on a child
-> component without having to rewrite all the other default options.
-> 
->     Parent.prototype.options_ = {
->       children: {
->         'childOne': { 'foo': 'bar', 'asdf': 'fdsa' },
->         'childTwo': {},
->         'childThree': {}
->       }
->     }
->     newOptions = {
->       children: {
->         'childOne': { 'foo': 'baz', 'abc': '123' }
->         'childTwo': null,
->         'childFour': {}
->       }
->     }
-> 
->     this.options(newOptions);
-> 
-> RESULT
-> 
->     {
->       children: {
->         'childOne': { 'foo': 'baz', 'asdf': 'fdsa', 'abc': '123' },
->         'childTwo': null, // Disabled. Won't be initialized.
->         'childThree': {},
->         'childFour': {}
->       }
->     }
-
-##### PARAMETERS: 
-* __obj__ `Object` Object of new option values
-
-##### RETURNS: 
-* `Object` A NEW object of this.options_ and obj merged
-
-_inherited from_: [src/js/component.js#L179](https://github.com/videojs/video.js/blob/master/src/js/component.js#L179)
-
----
-
-### player()
-> Return the component's player
-
-##### RETURNS: 
-* `vjs.Player` 
-
-_inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js/blob/master/src/js/component.js#L126)
-
----
-
-### ready( fn )
-> Bind a listener to the component's ready state
-> 
-> Different from event listeners in that if the ready event has already happend
-> it will trigger the function immediately.
-
-##### PARAMETERS: 
-* __fn__ `Function` Ready listener
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L769](https://github.com/videojs/video.js/blob/master/src/js/component.js#L769)
-
----
-
-### removeChild( component )
-> Remove a child component from this component's list of children, and the
-> child component's element from this component's element
-
-##### PARAMETERS: 
-* __component__ `vjs.Component` Component to remove
-
-_inherited from_: [src/js/component.js#L420](https://github.com/videojs/video.js/blob/master/src/js/component.js#L420)
-
----
-
-### removeClass( classToRemove )
-> Remove a CSS class name from the component's element
-
-##### PARAMETERS: 
-* __classToRemove__ `String` Classname to remove
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js/blob/master/src/js/component.js#L837)
-
----
-
-### selected( selected )
-> Set this menu item as selected or not
-
-##### PARAMETERS: 
-* __selected__ `Boolean` 
-
-_inherited from_: [src/js/menu.js#L82](https://github.com/videojs/video.js/blob/master/src/js/menu.js#L82)
-
----
-
-### show()
-> Show the component element if hidden
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L847](https://github.com/videojs/video.js/blob/master/src/js/component.js#L847)
-
----
-
-### trigger( event )
-> Trigger an event on an element
-> 
->     myComponent.trigger('eventName');
->     myComponent.trigger({'type':'eventName'});
-
-##### PARAMETERS: 
-* __event__ `Event|Object|String` A string (the type) or an event object with a type attribute
-
-##### RETURNS: 
-* `vjs.Component` self
-
-_inherited from_: [src/js/component.js#L724](https://github.com/videojs/video.js/blob/master/src/js/component.js#L724)
-
----
-
-### triggerReady()
-> Trigger the ready listeners
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L788](https://github.com/videojs/video.js/blob/master/src/js/component.js#L788)
-
----
-
-### width( [num], skipListeners )
-> Set or get the width of the component (CSS values)
-> 
-> Setting the video tag dimension values only works with values in pixels.
-> Percent values will not work.
-> Some percents can be used, but width()/height() will return the number + %,
-> not the actual computed width/height.
-
-##### PARAMETERS: 
-* __num__ `Number|String` _(OPTIONAL)_ Optional width number
-* __skipListeners__ `Boolean` Skip the 'resize' event trigger
-
-##### RETURNS: 
-* `vjs.Component` This component, when setting the width
-* `Number|String` The width, when getting
-
-_inherited from_: [src/js/component.js#L910](https://github.com/videojs/video.js/blob/master/src/js/component.js#L910)
-
----
-
-## EVENTS
-
-### resize `EVENT`
-> Fired when the width and/or height of the component changes
-
-_inherited from_: [src/js/component.js#L1020](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1020)
+__DEFINED IN__: [src/js/tracks/text-track-controls.js#L550](https://github.com/videojs/video.js/blob/master/src/js/tracks/text-track-controls.js#L550)  
 
 ---
 

docs/api/vjs.Component.md

@@ -36,6 +36,8 @@ Components are also event emitters.
   - [addClass](#addclass-classtoadd-)
   - [buildCSSClass](#buildcssclass)
   - [children](#children)
+  - [clearInterval](#clearinterval-intervalid-)
+  - [clearTimeout](#cleartimeout-timeoutid-)
   - [contentEl](#contentel)
   - [createEl](#createel-tagname-attributes-)
   - [dimensions](#dimensions-width-height-)
@@ -59,6 +61,8 @@ Components are also event emitters.
   - [ready](#ready-fn-)
   - [removeChild](#removechild-component-)
   - [removeClass](#removeclass-classtoremove-)
+  - [setInterval](#setinterval-fn-interval-)
+  - [setTimeout](#settimeout-fn-timeout-)
   - [show](#show)
   - [trigger](#trigger-event-)
   - [triggerReady](#triggerready)
@@ -140,6 +144,32 @@ _defined in_: [src/js/component.js#L296](https://github.com/videojs/video.js/blo
 
 ---
 
+### clearInterval( intervalId )
+> Clears an interval and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __intervalId__ `Number` The id of the interval to clear
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_defined in_: [src/js/component.js#L1223](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1223)
+
+---
+
+### clearTimeout( timeoutId )
+> Clears a timeout and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __timeoutId__ `Number` The id of the timeout to clear
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_defined in_: [src/js/component.js#L1185](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1185)
+
+---
+
 ### contentEl()
 > Return the component's DOM element for embedding content.
 > Will either be el_ or a new element defined in createEl.
@@ -221,7 +251,7 @@ _defined in_: [src/js/component.js#L220](https://github.com/videojs/video.js/blo
 > whenever touch events happen, and this can be turned off by components that
 > want touch events to act differently.
 
-_defined in_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
+_defined in_: [src/js/component.js#L1124](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1124)
 
 ---
 
@@ -413,7 +443,7 @@ _defined in_: [src/js/component.js#L646](https://github.com/videojs/video.js/blo
 > 
 > The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
 > and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
+> will be automatically cleaned up when either component is disposed.
 > It will also bind myComponent as the context of myFunc.
 > 
 > **NOTE**: When using this on elements in the page other than window
@@ -517,7 +547,7 @@ _defined in_: [src/js/component.js#L126](https://github.com/videojs/video.js/blo
 ### ready( fn )
 > Bind a listener to the component's ready state
 > 
-> Different from event listeners in that if the ready event has already happend
+> Different from event listeners in that if the ready event has already happened
 > it will trigger the function immediately.
 
 ##### PARAMETERS: 
@@ -554,6 +584,34 @@ _defined in_: [src/js/component.js#L837](https://github.com/videojs/video.js/blo
 
 ---
 
+### setInterval( fn, interval )
+> Creates an interval and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run every N seconds.
+* __interval__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_defined in_: [src/js/component.js#L1202](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1202)
+
+---
+
+### setTimeout( fn, timeout )
+> Creates timeout and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run after the timeout.
+* __timeout__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_defined in_: [src/js/component.js#L1162](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1162)
+
+---
+
 ### show()
 > Show the component element if hidden
 

docs/api/vjs.ControlBar.md

@@ -16,6 +16,8 @@ Container of main controls
   - [addClass](#addclass-classtoadd-) _`inherited`_
   - [buildCSSClass](#buildcssclass) _`inherited`_
   - [children](#children) _`inherited`_
+  - [clearInterval](#clearinterval-intervalid-) _`inherited`_
+  - [clearTimeout](#cleartimeout-timeoutid-) _`inherited`_
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
@@ -39,6 +41,8 @@ Container of main controls
   - [ready](#ready-fn-) _`inherited`_
   - [removeChild](#removechild-component-) _`inherited`_
   - [removeClass](#removeclass-classtoremove-) _`inherited`_
+  - [setInterval](#setinterval-fn-interval-) _`inherited`_
+  - [setTimeout](#settimeout-fn-timeout-) _`inherited`_
   - [show](#show) _`inherited`_
   - [trigger](#trigger-event-) _`inherited`_
   - [triggerReady](#triggerready) _`inherited`_
@@ -120,6 +124,32 @@ _inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js
 
 ---
 
+### clearInterval( intervalId )
+> Clears an interval and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __intervalId__ `Number` The id of the interval to clear
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1223](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1223)
+
+---
+
+### clearTimeout( timeoutId )
+> Clears a timeout and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __timeoutId__ `Number` The id of the timeout to clear
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1185](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1185)
+
+---
+
 ### contentEl()
 > Return the component's DOM element for embedding content.
 > Will either be el_ or a new element defined in createEl.
@@ -201,7 +231,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 > whenever touch events happen, and this can be turned off by components that
 > want touch events to act differently.
 
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
+_inherited from_: [src/js/component.js#L1124](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1124)
 
 ---
 
@@ -393,7 +423,7 @@ _inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js
 > 
 > The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
 > and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
+> will be automatically cleaned up when either component is disposed.
 > It will also bind myComponent as the context of myFunc.
 > 
 > **NOTE**: When using this on elements in the page other than window
@@ -497,7 +527,7 @@ _inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js
 ### ready( fn )
 > Bind a listener to the component's ready state
 > 
-> Different from event listeners in that if the ready event has already happend
+> Different from event listeners in that if the ready event has already happened
 > it will trigger the function immediately.
 
 ##### PARAMETERS: 
@@ -534,6 +564,34 @@ _inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js
 
 ---
 
+### setInterval( fn, interval )
+> Creates an interval and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run every N seconds.
+* __interval__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1202](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1202)
+
+---
+
+### setTimeout( fn, timeout )
+> Creates timeout and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run after the timeout.
+* __timeout__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1162](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1162)
+
+---
+
 ### show()
 > Show the component element if hidden
 

docs/api/vjs.CoreObject.md

@@ -4,7 +4,7 @@
 
 __DEFINED IN__: [src/js/core-object.js#L52](https://github.com/videojs/video.js/blob/master/src/js/core-object.js#L52)  
 
-Core Object/Class for objects that use inheritance + contstructors
+Core Object/Class for objects that use inheritance + constructors
 
 To create a class that can be subclassed itself, extend the CoreObject class.
 
@@ -64,7 +64,7 @@ Methods and properties can be overridden in subclasses.
 ## METHODS
 
 ### create() `STATIC`
-> Create a new instace of this Object class
+> Create a new instance of this Object class
 > 
 >     var myAnimal = Animal.create();
 

docs/api/vjs.CurrentTimeDisplay.md

@@ -17,6 +17,8 @@ Displays the current time
   - [addClass](#addclass-classtoadd-) _`inherited`_
   - [buildCSSClass](#buildcssclass) _`inherited`_
   - [children](#children) _`inherited`_
+  - [clearInterval](#clearinterval-intervalid-) _`inherited`_
+  - [clearTimeout](#cleartimeout-timeoutid-) _`inherited`_
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
@@ -39,6 +41,8 @@ Displays the current time
   - [ready](#ready-fn-) _`inherited`_
   - [removeChild](#removechild-component-) _`inherited`_
   - [removeClass](#removeclass-classtoremove-) _`inherited`_
+  - [setInterval](#setinterval-fn-interval-) _`inherited`_
+  - [setTimeout](#settimeout-fn-timeout-) _`inherited`_
   - [show](#show) _`inherited`_
   - [trigger](#trigger-event-) _`inherited`_
   - [triggerReady](#triggerready) _`inherited`_
@@ -120,6 +124,32 @@ _inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js
 
 ---
 
+### clearInterval( intervalId )
+> Clears an interval and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __intervalId__ `Number` The id of the interval to clear
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1223](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1223)
+
+---
+
+### clearTimeout( timeoutId )
+> Clears a timeout and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __timeoutId__ `Number` The id of the timeout to clear
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1185](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1185)
+
+---
+
 ### contentEl()
 > Return the component's DOM element for embedding content.
 > Will either be el_ or a new element defined in createEl.
@@ -201,7 +231,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 > whenever touch events happen, and this can be turned off by components that
 > want touch events to act differently.
 
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
+_inherited from_: [src/js/component.js#L1124](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1124)
 
 ---
 
@@ -391,7 +421,7 @@ _inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js
 > 
 > The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
 > and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
+> will be automatically cleaned up when either component is disposed.
 > It will also bind myComponent as the context of myFunc.
 > 
 > **NOTE**: When using this on elements in the page other than window
@@ -495,7 +525,7 @@ _inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js
 ### ready( fn )
 > Bind a listener to the component's ready state
 > 
-> Different from event listeners in that if the ready event has already happend
+> Different from event listeners in that if the ready event has already happened
 > it will trigger the function immediately.
 
 ##### PARAMETERS: 
@@ -532,6 +562,34 @@ _inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js
 
 ---
 
+### setInterval( fn, interval )
+> Creates an interval and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run every N seconds.
+* __interval__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1202](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1202)
+
+---
+
+### setTimeout( fn, timeout )
+> Creates timeout and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run after the timeout.
+* __timeout__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1162](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1162)
+
+---
+
 ### show()
 > Show the component element if hidden
 

docs/api/vjs.DurationDisplay.md

@@ -17,6 +17,8 @@ Displays the duration
   - [addClass](#addclass-classtoadd-) _`inherited`_
   - [buildCSSClass](#buildcssclass) _`inherited`_
   - [children](#children) _`inherited`_
+  - [clearInterval](#clearinterval-intervalid-) _`inherited`_
+  - [clearTimeout](#cleartimeout-timeoutid-) _`inherited`_
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
@@ -39,6 +41,8 @@ Displays the duration
   - [ready](#ready-fn-) _`inherited`_
   - [removeChild](#removechild-component-) _`inherited`_
   - [removeClass](#removeclass-classtoremove-) _`inherited`_
+  - [setInterval](#setinterval-fn-interval-) _`inherited`_
+  - [setTimeout](#settimeout-fn-timeout-) _`inherited`_
   - [show](#show) _`inherited`_
   - [trigger](#trigger-event-) _`inherited`_
   - [triggerReady](#triggerready) _`inherited`_
@@ -120,6 +124,32 @@ _inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js
 
 ---
 
+### clearInterval( intervalId )
+> Clears an interval and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __intervalId__ `Number` The id of the interval to clear
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1223](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1223)
+
+---
+
+### clearTimeout( timeoutId )
+> Clears a timeout and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __timeoutId__ `Number` The id of the timeout to clear
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1185](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1185)
+
+---
+
 ### contentEl()
 > Return the component's DOM element for embedding content.
 > Will either be el_ or a new element defined in createEl.
@@ -201,7 +231,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 > whenever touch events happen, and this can be turned off by components that
 > want touch events to act differently.
 
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
+_inherited from_: [src/js/component.js#L1124](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1124)
 
 ---
 
@@ -391,7 +421,7 @@ _inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js
 > 
 > The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
 > and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
+> will be automatically cleaned up when either component is disposed.
 > It will also bind myComponent as the context of myFunc.
 > 
 > **NOTE**: When using this on elements in the page other than window
@@ -495,7 +525,7 @@ _inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js
 ### ready( fn )
 > Bind a listener to the component's ready state
 > 
-> Different from event listeners in that if the ready event has already happend
+> Different from event listeners in that if the ready event has already happened
 > it will trigger the function immediately.
 
 ##### PARAMETERS: 
@@ -532,6 +562,34 @@ _inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js
 
 ---
 
+### setInterval( fn, interval )
+> Creates an interval and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run every N seconds.
+* __interval__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1202](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1202)
+
+---
+
+### setTimeout( fn, timeout )
+> Creates timeout and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run after the timeout.
+* __timeout__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1162](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1162)
+
+---
+
 ### show()
 > Show the component element if hidden
 

docs/api/vjs.Flash.md

@@ -13,284 +13,15 @@ Flash Media Controller - Wrapper for fallback SWF API
 
 - [METHODS](#methods)
   - [init](#init-player-options-ready-)
-  - [addChild](#addchild-child-options-) _`inherited`_
-  - [addClass](#addclass-classtoadd-) _`inherited`_
-  - [buildCSSClass](#buildcssclass) _`inherited`_
-  - [children](#children) _`inherited`_
-  - [contentEl](#contentel) _`inherited`_
-  - [createEl](#createel-tagname-attributes-) _`inherited`_
-  - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [dispose](#dispose) _`inherited`_
-  - [el](#el) _`inherited`_
-  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
-  - [getChild](#getchild-name-) _`inherited`_
-  - [getChildById](#getchildbyid-id-) _`inherited`_
-  - [hasClass](#hasclass-classtocheck-) _`inherited`_
-  - [height](#height-num-skiplisteners-) _`inherited`_
-  - [hide](#hide) _`inherited`_
-  - [id](#id) _`inherited`_
-  - [initChildren](#initchildren) _`inherited`_
-  - [initControlsListeners](#initcontrolslisteners) _`inherited`_
-  - [name](#name) _`inherited`_
-  - [off](#off-first-second-third-) _`inherited`_
-  - [on](#on-first-second-third-) _`inherited`_
-  - [onClick](#onclick-event-) _`inherited`_
-  - [onTap](#ontap) _`inherited`_
-  - [one](#one-first-second-third-) _`inherited`_
-  - [options](#options-obj-) _`inherited`_
-  - [player](#player) _`inherited`_
-  - [ready](#ready-fn-) _`inherited`_
-  - [removeChild](#removechild-component-) _`inherited`_
-  - [removeClass](#removeclass-classtoremove-) _`inherited`_
-  - [removeControlsListeners](#removecontrolslisteners) _`inherited`_
-  - [setPoster](#setposter) _`inherited`_
-  - [show](#show) _`inherited`_
-  - [trigger](#trigger-event-) _`inherited`_
-  - [triggerReady](#triggerready) _`inherited`_
-  - [width](#width-num-skiplisteners-) _`inherited`_
 
-- [EVENTS](#events)
-  - [resize](#resize-event) _`inherited`_
+- [UNDEFINED](#undefined)
+  - [nativeSourceHandler](#nativesourcehandler-static)
+  - [rtmpSourceHandler](#rtmpsourcehandler-static)
 
 ---
 
 ## METHODS
 
-### addChild( child, [options] )
-> Adds a child component inside this component
-> 
->     myComponent.el();
->     // -> <div class='my-component'></div>
->     myComonent.children();
->     // [empty array]
-> 
->     var myButton = myComponent.addChild('MyButton');
->     // -> <div class='my-component'><div class="my-button">myButton<div></div>
->     // -> myButton === myComonent.children()[0];
-> 
-> Pass in options for child constructors and options for children of the child
-> 
->     var myButton = myComponent.addChild('MyButton', {
->       text: 'Press Me',
->       children: {
->         buttonChildExample: {
->           buttonChildOption: true
->         }
->       }
->     });
-
-##### PARAMETERS: 
-* __child__ `String|vjs.Component` The class name or instance of a child to add
-* __options__ `Object` _(OPTIONAL)_ Options, including options to be passed to children of the child.
-
-##### RETURNS: 
-* `vjs.Component` The child component (created by this process if a string was used)
-
-_inherited from_: [src/js/component.js#L362](https://github.com/videojs/video.js/blob/master/src/js/component.js#L362)
-
----
-
-### addClass( classToAdd )
-> Add a CSS class name to the component's element
-
-##### PARAMETERS: 
-* __classToAdd__ `String` Classname to add
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L826](https://github.com/videojs/video.js/blob/master/src/js/component.js#L826)
-
----
-
-### buildCSSClass()
-> Allows sub components to stack CSS class names
-
-##### RETURNS: 
-* `String` The constructed class name
-
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
-
----
-
-### children()
-> Get an array of all child components
-> 
->     var kids = myComponent.children();
-
-##### RETURNS: 
-* `Array` The children
-
-_inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js/blob/master/src/js/component.js#L296)
-
----
-
-### contentEl()
-> Return the component's DOM element for embedding content.
-> Will either be el_ or a new element defined in createEl.
-
-##### RETURNS: 
-* `Element` 
-
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
-
----
-
-### createEl( [tagName], [attributes] )
-> Create the component's DOM element
-
-##### PARAMETERS: 
-* __tagName__ `String` _(OPTIONAL)_ Element's node type. e.g. 'div'
-* __attributes__ `Object` _(OPTIONAL)_ An object of element attributes that should be set on the element
-
-##### RETURNS: 
-* `Element` 
-
-_inherited from_: [src/js/component.js#L200](https://github.com/videojs/video.js/blob/master/src/js/component.js#L200)
-
----
-
-### dimensions( width, height )
-> Set both width and height at the same time
-
-##### PARAMETERS: 
-* __width__ `Number|String` 
-* __height__ `Number|String` 
-
-##### RETURNS: 
-* `vjs.Component` The component
-
-_inherited from_: [src/js/component.js#L938](https://github.com/videojs/video.js/blob/master/src/js/component.js#L938)
-
----
-
-### dispose()
-> Dispose of the component and all child components
-
-_inherited from_: [src/js/component.js#L84](https://github.com/videojs/video.js/blob/master/src/js/component.js#L84)
-
----
-
-### el()
-> Get the component's DOM element
-> 
->     var domEl = myComponent.el();
-
-##### RETURNS: 
-* `Element` 
-
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
-
----
-
-### enableTouchActivity()
-> Report user touch activity when touch events occur
-> 
-> User activity is used to determine when controls should show/hide. It's
-> relatively simple when it comes to mouse events, because any mouse event
-> should show the controls. So we capture mouse events that bubble up to the
-> player and report activity when that happens.
-> 
-> With touch events it isn't as easy. We can't rely on touch events at the
-> player level, because a tap (touchstart + touchend) on the video itself on
-> mobile devices is meant to turn controls off (and on). User activity is
-> checked asynchronously, so what could happen is a tap event on the video
-> turns the controls off, then the touchend event bubbles up to the player,
-> which if it reported user activity, would turn the controls right back on.
-> (We also don't want to completely block touch events from bubbling up)
-> 
-> Also a touchmove, touch+hold, and anything other than a tap is not supposed
-> to turn the controls back on on a mobile device.
-> 
-> Here we're setting the default component behavior to report user activity
-> whenever touch events happen, and this can be turned off by components that
-> want touch events to act differently.
-
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
-
----
-
-### getChild( name )
-> Returns a child component with the provided name
-
-##### PARAMETERS: 
-* __name__ 
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L330](https://github.com/videojs/video.js/blob/master/src/js/component.js#L330)
-
----
-
-### getChildById( id )
-> Returns a child component with the provided ID
-
-##### PARAMETERS: 
-* __id__ 
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L313](https://github.com/videojs/video.js/blob/master/src/js/component.js#L313)
-
----
-
-### hasClass( classToCheck )
-> Check if a component's element has a CSS class name
-
-##### PARAMETERS: 
-* __classToCheck__ `String` Classname to check
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
-
----
-
-### height( [num], [skipListeners] )
-> Get or set the height of the component (CSS values)
-> 
-> Setting the video tag dimension values only works with values in pixels.
-> Percent values will not work.
-> Some percents can be used, but width()/height() will return the number + %,
-> not the actual computed width/height.
-
-##### PARAMETERS: 
-* __num__ `Number|String` _(OPTIONAL)_ New component height
-* __skipListeners__ `Boolean` _(OPTIONAL)_ Skip the resize event trigger
-
-##### RETURNS: 
-* `vjs.Component` This component, when setting the height
-* `Number|String` The height, when getting
-
-_inherited from_: [src/js/component.js#L927](https://github.com/videojs/video.js/blob/master/src/js/component.js#L927)
-
----
-
-### hide()
-> Hide the component element if currently showing
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L857](https://github.com/videojs/video.js/blob/master/src/js/component.js#L857)
-
----
-
-### id()
-> Get the component's ID
-> 
->     var id = myComponent.id();
-
-##### RETURNS: 
-* `String` 
-
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
-
----
-
 ### init( player, options, ready )
 
 ##### PARAMETERS: 
@@ -302,364 +33,24 @@ _defined in_: [src/js/media/flash.js#L17](https://github.com/videojs/video.js/bl
 
 ---
 
-### initChildren()
-> Add and initialize default child components from options
-> 
->     // when an instance of MyComponent is created, all children in options
->     // will be added to the instance by their name strings and options
->     MyComponent.prototype.options_.children = {
->       myChildComponent: {
->         myChildOption: true
->       }
->     }
-> 
->     // Or when creating the component
->     var myComp = new MyComponent(player, {
->       children: {
->         myChildComponent: {
->           myChildOption: true
->         }
->       }
->     });
-> 
-> The children option can also be an Array of child names or
-> child options objects (that also include a 'name' key).
-> 
->     var myComp = new MyComponent(player, {
->       children: [
->         'button',
->         {
->           name: 'button',
->           someOtherOption: true
->         }
->       ]
->     });
+## UNDEFINED
 
-_inherited from_: [src/js/component.js#L481](https://github.com/videojs/video.js/blob/master/src/js/component.js#L481)
-
----
-
-### initControlsListeners()
-> Set up click and touch listeners for the playback element
-> On desktops, a click on the video itself will toggle playback,
-> on a mobile device a click on the video toggles controls.
-> (toggling controls is done by toggling the user state between active and
-> inactive)
-> 
-> A tap can signal that a user has become active, or has become inactive
-> e.g. a quick tap on an iPhone movie should reveal the controls. Another
-> quick tap should hide them again (signaling the user is in an inactive
-> viewing state)
-> 
-> In addition to this, we still want the user to be considered inactive after
-> a few seconds of inactivity.
-> 
-> Note: the only part of iOS interaction we can't mimic with this setup
-> is a touch and hold on the video element counting as activity in order to
-> keep the controls showing, but that shouldn't be an issue. A touch and hold on
-> any controls will still keep the user active
-
-_inherited from_: [src/js/media/media.js#L55](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L55)
-
----
-
-### name()
-> Get the component's name. The name is often used to reference the component.
-> 
->     var name = myComponent.name();
-
-##### RETURNS: 
-* `String` 
-
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
-
----
-
-### off( [first], [second], [third] )
-> Remove an event listener from this component's element
-> 
->     myComponent.off('eventType', myFunc);
-> 
-> If myFunc is excluded, ALL listeners for the event type will be removed.
-> If eventType is excluded, ALL listeners will be removed from the component.
-> 
-> Alternatively you can use `off` to remove listeners that were added to other
-> elements or components using `myComponent.on(otherComponent...`.
-> In this case both the event type and listener function are REQUIRED.
-> 
->     myComponent.off(otherElement, 'eventType', myFunc);
->     myComponent.off(otherComponent, 'eventType', myFunc);
+### nativeSourceHandler `STATIC`
+> The default native source handler.
+> This simply passes the source to the video element. Nothing fancy.
 
 ##### PARAMETERS: 
-* __first__ `String|vjs.Component` _(OPTIONAL)_ The event type or other component
-* __second__ `Function|String` _(OPTIONAL)_ The listener function or event type
-* __third__ `Function` _(OPTIONAL)_ The listener for other component
+* __source__ `Object` The source object
+* __tech__ `vjs.Flash` The instance of the Flash tech
 
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js/blob/master/src/js/component.js#L646)
+_defined in_: [src/js/media/flash.js#L223](https://github.com/videojs/video.js/blob/master/src/js/media/flash.js#L223)
 
 ---
 
-### on( first, second, third )
-> Add an event listener to this component's element
-> 
->     var myFunc = function(){
->       var myComponent = this;
->       // Do something when the event is fired
->     };
-> 
->     myComponent.on('eventType', myFunc);
-> 
-> The context of myFunc will be myComponent unless previously bound.
-> 
-> Alternatively, you can add a listener to another element or component.
-> 
->     myComponent.on(otherElement, 'eventName', myFunc);
->     myComponent.on(otherComponent, 'eventName', myFunc);
-> 
-> The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
-> and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
-> It will also bind myComponent as the context of myFunc.
-> 
-> **NOTE**: When using this on elements in the page other than window
-> and document (both permanent), if you remove the element from the DOM
-> you need to call `vjs.trigger(el, 'dispose')` on it to clean up
-> references to it and allow the browser to garbage collect it.
+### rtmpSourceHandler `STATIC`
+> A source handler for RTMP urls
 
-##### PARAMETERS: 
-* __first__ `String|vjs.Component` The event type or other component
-* __second__ `Function|String` The event handler or event type
-* __third__ `Function` The event handler
-
-##### RETURNS: 
-* `vjs.Component` self
-
-_inherited from_: [src/js/component.js#L577](https://github.com/videojs/video.js/blob/master/src/js/component.js#L577)
-
----
-
-### onClick( event )
-> Handle a click on the media element. By default will play/pause the media.
-
-##### PARAMETERS: 
-* __event__ 
-
-_inherited from_: [src/js/media/media.js#L139](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L139)
-
----
-
-### onTap()
-> Handle a tap on the media element. By default it will toggle the user
-> activity state, which hides and shows the controls.
-
-_inherited from_: [src/js/media/media.js#L159](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L159)
-
----
-
-### one( first, second, [third] )
-> Add an event listener to be triggered only once and then removed
-> 
->     myComponent.one('eventName', myFunc);
-> 
-> Alternatively you can add a listener to another element or component
-> that will be triggered only once.
-> 
->     myComponent.one(otherElement, 'eventName', myFunc);
->     myComponent.one(otherComponent, 'eventName', myFunc);
-
-##### PARAMETERS: 
-* __first__ `String|vjs.Component` The event type or other component
-* __second__ `Function|String` The listener function or event type
-* __third__ `Function` _(OPTIONAL)_ The listener function for other component
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
-
----
-
-### options( obj )
-> Deep merge of options objects
-> 
-> Whenever a property is an object on both options objects
-> the two properties will be merged using vjs.obj.deepMerge.
-> 
-> This is used for merging options for child components. We
-> want it to be easy to override individual options on a child
-> component without having to rewrite all the other default options.
-> 
->     Parent.prototype.options_ = {
->       children: {
->         'childOne': { 'foo': 'bar', 'asdf': 'fdsa' },
->         'childTwo': {},
->         'childThree': {}
->       }
->     }
->     newOptions = {
->       children: {
->         'childOne': { 'foo': 'baz', 'abc': '123' }
->         'childTwo': null,
->         'childFour': {}
->       }
->     }
-> 
->     this.options(newOptions);
-> 
-> RESULT
-> 
->     {
->       children: {
->         'childOne': { 'foo': 'baz', 'asdf': 'fdsa', 'abc': '123' },
->         'childTwo': null, // Disabled. Won't be initialized.
->         'childThree': {},
->         'childFour': {}
->       }
->     }
-
-##### PARAMETERS: 
-* __obj__ `Object` Object of new option values
-
-##### RETURNS: 
-* `Object` A NEW object of this.options_ and obj merged
-
-_inherited from_: [src/js/component.js#L179](https://github.com/videojs/video.js/blob/master/src/js/component.js#L179)
-
----
-
-### player()
-> Return the component's player
-
-##### RETURNS: 
-* `vjs.Player` 
-
-_inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js/blob/master/src/js/component.js#L126)
-
----
-
-### ready( fn )
-> Bind a listener to the component's ready state
-> 
-> Different from event listeners in that if the ready event has already happend
-> it will trigger the function immediately.
-
-##### PARAMETERS: 
-* __fn__ `Function` Ready listener
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L769](https://github.com/videojs/video.js/blob/master/src/js/component.js#L769)
-
----
-
-### removeChild( component )
-> Remove a child component from this component's list of children, and the
-> child component's element from this component's element
-
-##### PARAMETERS: 
-* __component__ `vjs.Component` Component to remove
-
-_inherited from_: [src/js/component.js#L420](https://github.com/videojs/video.js/blob/master/src/js/component.js#L420)
-
----
-
-### removeClass( classToRemove )
-> Remove a CSS class name from the component's element
-
-##### PARAMETERS: 
-* __classToRemove__ `String` Classname to remove
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js/blob/master/src/js/component.js#L837)
-
----
-
-### removeControlsListeners()
-> Remove the listeners used for click and tap controls. This is needed for
-> toggling to controls disabled, where a tap/touch should do nothing.
-
-_inherited from_: [src/js/media/media.js#L123](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L123)
-
----
-
-### setPoster()
-> Provide a default setPoster method for techs
-> 
-> Poster support for techs should be optional, so we don't want techs to
-> break if they don't have a way to set a poster.
-
-_inherited from_: [src/js/media/media.js#L261](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L261)
-
----
-
-### show()
-> Show the component element if hidden
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L847](https://github.com/videojs/video.js/blob/master/src/js/component.js#L847)
-
----
-
-### trigger( event )
-> Trigger an event on an element
-> 
->     myComponent.trigger('eventName');
->     myComponent.trigger({'type':'eventName'});
-
-##### PARAMETERS: 
-* __event__ `Event|Object|String` A string (the type) or an event object with a type attribute
-
-##### RETURNS: 
-* `vjs.Component` self
-
-_inherited from_: [src/js/component.js#L724](https://github.com/videojs/video.js/blob/master/src/js/component.js#L724)
-
----
-
-### triggerReady()
-> Trigger the ready listeners
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L788](https://github.com/videojs/video.js/blob/master/src/js/component.js#L788)
-
----
-
-### width( [num], skipListeners )
-> Set or get the width of the component (CSS values)
-> 
-> Setting the video tag dimension values only works with values in pixels.
-> Percent values will not work.
-> Some percents can be used, but width()/height() will return the number + %,
-> not the actual computed width/height.
-
-##### PARAMETERS: 
-* __num__ `Number|String` _(OPTIONAL)_ Optional width number
-* __skipListeners__ `Boolean` Skip the 'resize' event trigger
-
-##### RETURNS: 
-* `vjs.Component` This component, when setting the width
-* `Number|String` The width, when getting
-
-_inherited from_: [src/js/component.js#L910](https://github.com/videojs/video.js/blob/master/src/js/component.js#L910)
-
----
-
-## EVENTS
-
-### resize `EVENT`
-> Fired when the width and/or height of the component changes
-
-_inherited from_: [src/js/component.js#L1020](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1020)
+_defined in_: [src/js/media/flash.rtmp.js#L58](https://github.com/videojs/video.js/blob/master/src/js/media/flash.rtmp.js#L58)
 
 ---
 

docs/api/vjs.FullscreenToggle.md

@@ -17,6 +17,8 @@ Toggle fullscreen video
   - [addClass](#addclass-classtoadd-) _`inherited`_
   - [buildCSSClass](#buildcssclass) _`inherited`_
   - [children](#children) _`inherited`_
+  - [clearInterval](#clearinterval-intervalid-) _`inherited`_
+  - [clearTimeout](#cleartimeout-timeoutid-) _`inherited`_
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
@@ -39,6 +41,8 @@ Toggle fullscreen video
   - [ready](#ready-fn-) _`inherited`_
   - [removeChild](#removechild-component-) _`inherited`_
   - [removeClass](#removeclass-classtoremove-) _`inherited`_
+  - [setInterval](#setinterval-fn-interval-) _`inherited`_
+  - [setTimeout](#settimeout-fn-timeout-) _`inherited`_
   - [show](#show) _`inherited`_
   - [trigger](#trigger-event-) _`inherited`_
   - [triggerReady](#triggerready) _`inherited`_
@@ -120,6 +124,32 @@ _inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js
 
 ---
 
+### clearInterval( intervalId )
+> Clears an interval and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __intervalId__ `Number` The id of the interval to clear
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1223](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1223)
+
+---
+
+### clearTimeout( timeoutId )
+> Clears a timeout and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __timeoutId__ `Number` The id of the timeout to clear
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1185](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1185)
+
+---
+
 ### contentEl()
 > Return the component's DOM element for embedding content.
 > Will either be el_ or a new element defined in createEl.
@@ -201,7 +231,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 > whenever touch events happen, and this can be turned off by components that
 > want touch events to act differently.
 
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
+_inherited from_: [src/js/component.js#L1124](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1124)
 
 ---
 
@@ -391,7 +421,7 @@ _inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js
 > 
 > The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
 > and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
+> will be automatically cleaned up when either component is disposed.
 > It will also bind myComponent as the context of myFunc.
 > 
 > **NOTE**: When using this on elements in the page other than window
@@ -495,7 +525,7 @@ _inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js
 ### ready( fn )
 > Bind a listener to the component's ready state
 > 
-> Different from event listeners in that if the ready event has already happend
+> Different from event listeners in that if the ready event has already happened
 > it will trigger the function immediately.
 
 ##### PARAMETERS: 
@@ -532,6 +562,34 @@ _inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js
 
 ---
 
+### setInterval( fn, interval )
+> Creates an interval and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run every N seconds.
+* __interval__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1202](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1202)
+
+---
+
+### setTimeout( fn, timeout )
+> Creates timeout and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run after the timeout.
+* __timeout__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1162](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1162)
+
+---
+
 ### show()
 > Show the component element if hidden
 

docs/api/vjs.Html5.md

@@ -12,282 +12,38 @@ HTML5 Media Controller - Wrapper for HTML5 Media API
 ## INDEX
 
 - [METHODS](#methods)
+  - [canControlPlaybackRate](#cancontrolplaybackrate-static)
+  - [canControlVolume](#cancontrolvolume-static)
   - [init](#init-player-options-ready-)
-  - [addChild](#addchild-child-options-) _`inherited`_
-  - [addClass](#addclass-classtoadd-) _`inherited`_
-  - [buildCSSClass](#buildcssclass) _`inherited`_
-  - [children](#children) _`inherited`_
-  - [contentEl](#contentel) _`inherited`_
-  - [createEl](#createel-tagname-attributes-) _`inherited`_
-  - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [dispose](#dispose) _`inherited`_
-  - [el](#el) _`inherited`_
-  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
-  - [getChild](#getchild-name-) _`inherited`_
-  - [getChildById](#getchildbyid-id-) _`inherited`_
-  - [hasClass](#hasclass-classtocheck-) _`inherited`_
-  - [height](#height-num-skiplisteners-) _`inherited`_
-  - [hide](#hide) _`inherited`_
-  - [id](#id) _`inherited`_
-  - [initChildren](#initchildren) _`inherited`_
-  - [initControlsListeners](#initcontrolslisteners) _`inherited`_
-  - [name](#name) _`inherited`_
-  - [off](#off-first-second-third-) _`inherited`_
-  - [on](#on-first-second-third-) _`inherited`_
-  - [onClick](#onclick-event-) _`inherited`_
-  - [onTap](#ontap) _`inherited`_
-  - [one](#one-first-second-third-) _`inherited`_
-  - [options](#options-obj-) _`inherited`_
-  - [player](#player) _`inherited`_
-  - [ready](#ready-fn-) _`inherited`_
-  - [removeChild](#removechild-component-) _`inherited`_
-  - [removeClass](#removeclass-classtoremove-) _`inherited`_
-  - [removeControlsListeners](#removecontrolslisteners) _`inherited`_
-  - [setPoster](#setposter) _`inherited`_
-  - [show](#show) _`inherited`_
-  - [trigger](#trigger-event-) _`inherited`_
-  - [triggerReady](#triggerready) _`inherited`_
-  - [width](#width-num-skiplisteners-) _`inherited`_
+  - [isSupported](#issupported-static)
+  - [supportsNativeTextTracks](#supportsnativetexttracks-static)
 
-- [EVENTS](#events)
-  - [resize](#resize-event) _`inherited`_
+- [UNDEFINED](#undefined)
+  - [nativeSourceHandler](#nativesourcehandler-static)
 
 ---
 
 ## METHODS
 
-### addChild( child, [options] )
-> Adds a child component inside this component
-> 
->     myComponent.el();
->     // -> <div class='my-component'></div>
->     myComonent.children();
->     // [empty array]
-> 
->     var myButton = myComponent.addChild('MyButton');
->     // -> <div class='my-component'><div class="my-button">myButton<div></div>
->     // -> myButton === myComonent.children()[0];
-> 
-> Pass in options for child constructors and options for children of the child
-> 
->     var myButton = myComponent.addChild('MyButton', {
->       text: 'Press Me',
->       children: {
->         buttonChildExample: {
->           buttonChildOption: true
->         }
->       }
->     });
-
-##### PARAMETERS: 
-* __child__ `String|vjs.Component` The class name or instance of a child to add
-* __options__ `Object` _(OPTIONAL)_ Options, including options to be passed to children of the child.
+### canControlPlaybackRate() `STATIC`
+> Check if playbackRate is supported in this browser/device.
 
 ##### RETURNS: 
-* `vjs.Component` The child component (created by this process if a string was used)
+* `[type]` [description]
 
-_inherited from_: [src/js/component.js#L362](https://github.com/videojs/video.js/blob/master/src/js/component.js#L362)
+_defined in_: [src/js/media/html5.js#L542](https://github.com/videojs/video.js/blob/master/src/js/media/html5.js#L542)
 
 ---
 
-### addClass( classToAdd )
-> Add a CSS class name to the component's element
-
-##### PARAMETERS: 
-* __classToAdd__ `String` Classname to add
+### canControlVolume() `STATIC`
+> Check if the volume can be changed in this browser/device.
+> Volume cannot be changed in a lot of mobile devices.
+> Specifically, it can't be changed from 1 on iOS.
 
 ##### RETURNS: 
-* `vjs.Component` 
+* `Boolean` 
 
-_inherited from_: [src/js/component.js#L826](https://github.com/videojs/video.js/blob/master/src/js/component.js#L826)
-
----
-
-### buildCSSClass()
-> Allows sub components to stack CSS class names
-
-##### RETURNS: 
-* `String` The constructed class name
-
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
-
----
-
-### children()
-> Get an array of all child components
-> 
->     var kids = myComponent.children();
-
-##### RETURNS: 
-* `Array` The children
-
-_inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js/blob/master/src/js/component.js#L296)
-
----
-
-### contentEl()
-> Return the component's DOM element for embedding content.
-> Will either be el_ or a new element defined in createEl.
-
-##### RETURNS: 
-* `Element` 
-
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
-
----
-
-### createEl( [tagName], [attributes] )
-> Create the component's DOM element
-
-##### PARAMETERS: 
-* __tagName__ `String` _(OPTIONAL)_ Element's node type. e.g. 'div'
-* __attributes__ `Object` _(OPTIONAL)_ An object of element attributes that should be set on the element
-
-##### RETURNS: 
-* `Element` 
-
-_inherited from_: [src/js/component.js#L200](https://github.com/videojs/video.js/blob/master/src/js/component.js#L200)
-
----
-
-### dimensions( width, height )
-> Set both width and height at the same time
-
-##### PARAMETERS: 
-* __width__ `Number|String` 
-* __height__ `Number|String` 
-
-##### RETURNS: 
-* `vjs.Component` The component
-
-_inherited from_: [src/js/component.js#L938](https://github.com/videojs/video.js/blob/master/src/js/component.js#L938)
-
----
-
-### dispose()
-> Dispose of the component and all child components
-
-_inherited from_: [src/js/component.js#L84](https://github.com/videojs/video.js/blob/master/src/js/component.js#L84)
-
----
-
-### el()
-> Get the component's DOM element
-> 
->     var domEl = myComponent.el();
-
-##### RETURNS: 
-* `Element` 
-
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
-
----
-
-### enableTouchActivity()
-> Report user touch activity when touch events occur
-> 
-> User activity is used to determine when controls should show/hide. It's
-> relatively simple when it comes to mouse events, because any mouse event
-> should show the controls. So we capture mouse events that bubble up to the
-> player and report activity when that happens.
-> 
-> With touch events it isn't as easy. We can't rely on touch events at the
-> player level, because a tap (touchstart + touchend) on the video itself on
-> mobile devices is meant to turn controls off (and on). User activity is
-> checked asynchronously, so what could happen is a tap event on the video
-> turns the controls off, then the touchend event bubbles up to the player,
-> which if it reported user activity, would turn the controls right back on.
-> (We also don't want to completely block touch events from bubbling up)
-> 
-> Also a touchmove, touch+hold, and anything other than a tap is not supposed
-> to turn the controls back on on a mobile device.
-> 
-> Here we're setting the default component behavior to report user activity
-> whenever touch events happen, and this can be turned off by components that
-> want touch events to act differently.
-
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
-
----
-
-### getChild( name )
-> Returns a child component with the provided name
-
-##### PARAMETERS: 
-* __name__ 
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L330](https://github.com/videojs/video.js/blob/master/src/js/component.js#L330)
-
----
-
-### getChildById( id )
-> Returns a child component with the provided ID
-
-##### PARAMETERS: 
-* __id__ 
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L313](https://github.com/videojs/video.js/blob/master/src/js/component.js#L313)
-
----
-
-### hasClass( classToCheck )
-> Check if a component's element has a CSS class name
-
-##### PARAMETERS: 
-* __classToCheck__ `String` Classname to check
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
-
----
-
-### height( [num], [skipListeners] )
-> Get or set the height of the component (CSS values)
-> 
-> Setting the video tag dimension values only works with values in pixels.
-> Percent values will not work.
-> Some percents can be used, but width()/height() will return the number + %,
-> not the actual computed width/height.
-
-##### PARAMETERS: 
-* __num__ `Number|String` _(OPTIONAL)_ New component height
-* __skipListeners__ `Boolean` _(OPTIONAL)_ Skip the resize event trigger
-
-##### RETURNS: 
-* `vjs.Component` This component, when setting the height
-* `Number|String` The height, when getting
-
-_inherited from_: [src/js/component.js#L927](https://github.com/videojs/video.js/blob/master/src/js/component.js#L927)
-
----
-
-### hide()
-> Hide the component element if currently showing
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L857](https://github.com/videojs/video.js/blob/master/src/js/component.js#L857)
-
----
-
-### id()
-> Get the component's ID
-> 
->     var id = myComponent.id();
-
-##### RETURNS: 
-* `String` 
-
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_defined in_: [src/js/media/html5.js#L532](https://github.com/videojs/video.js/blob/master/src/js/media/html5.js#L532)
 
 ---
 
@@ -302,364 +58,37 @@ _defined in_: [src/js/media/html5.js#L14](https://github.com/videojs/video.js/bl
 
 ---
 
-### initChildren()
-> Add and initialize default child components from options
-> 
->     // when an instance of MyComponent is created, all children in options
->     // will be added to the instance by their name strings and options
->     MyComponent.prototype.options_.children = {
->       myChildComponent: {
->         myChildOption: true
->       }
->     }
-> 
->     // Or when creating the component
->     var myComp = new MyComponent(player, {
->       children: {
->         myChildComponent: {
->           myChildOption: true
->         }
->       }
->     });
-> 
-> The children option can also be an Array of child names or
-> child options objects (that also include a 'name' key).
-> 
->     var myComp = new MyComponent(player, {
->       children: [
->         'button',
->         {
->           name: 'button',
->           someOtherOption: true
->         }
->       ]
->     });
-
-_inherited from_: [src/js/component.js#L481](https://github.com/videojs/video.js/blob/master/src/js/component.js#L481)
-
----
-
-### initControlsListeners()
-> Set up click and touch listeners for the playback element
-> On desktops, a click on the video itself will toggle playback,
-> on a mobile device a click on the video toggles controls.
-> (toggling controls is done by toggling the user state between active and
-> inactive)
-> 
-> A tap can signal that a user has become active, or has become inactive
-> e.g. a quick tap on an iPhone movie should reveal the controls. Another
-> quick tap should hide them again (signaling the user is in an inactive
-> viewing state)
-> 
-> In addition to this, we still want the user to be considered inactive after
-> a few seconds of inactivity.
-> 
-> Note: the only part of iOS interaction we can't mimic with this setup
-> is a touch and hold on the video element counting as activity in order to
-> keep the controls showing, but that shouldn't be an issue. A touch and hold on
-> any controls will still keep the user active
-
-_inherited from_: [src/js/media/media.js#L55](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L55)
-
----
-
-### name()
-> Get the component's name. The name is often used to reference the component.
-> 
->     var name = myComponent.name();
+### isSupported() `STATIC`
+> Check if HTML5 video is supported by this browser/device
 
 ##### RETURNS: 
-* `String` 
+* `Boolean` 
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_defined in_: [src/js/media/html5.js#L452](https://github.com/videojs/video.js/blob/master/src/js/media/html5.js#L452)
 
 ---
 
-### off( [first], [second], [third] )
-> Remove an event listener from this component's element
-> 
->     myComponent.off('eventType', myFunc);
-> 
-> If myFunc is excluded, ALL listeners for the event type will be removed.
-> If eventType is excluded, ALL listeners will be removed from the component.
-> 
-> Alternatively you can use `off` to remove listeners that were added to other
-> elements or components using `myComponent.on(otherComponent...`.
-> In this case both the event type and listener function are REQUIRED.
-> 
->     myComponent.off(otherElement, 'eventType', myFunc);
->     myComponent.off(otherComponent, 'eventType', myFunc);
+### supportsNativeTextTracks() `STATIC`
+> Check to see if native text tracks are supported by this browser/device
+
+##### RETURNS: 
+* `Boolean` 
+
+_defined in_: [src/js/media/html5.js#L552](https://github.com/videojs/video.js/blob/master/src/js/media/html5.js#L552)
+
+---
+
+## UNDEFINED
+
+### nativeSourceHandler `STATIC`
+> The default native source handler.
+> This simply passes the source to the video element. Nothing fancy.
 
 ##### PARAMETERS: 
-* __first__ `String|vjs.Component` _(OPTIONAL)_ The event type or other component
-* __second__ `Function|String` _(OPTIONAL)_ The listener function or event type
-* __third__ `Function` _(OPTIONAL)_ The listener for other component
+* __source__ `Object` The source object
+* __tech__ `vjs.Html5` The instance of the HTML5 tech
 
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js/blob/master/src/js/component.js#L646)
-
----
-
-### on( first, second, third )
-> Add an event listener to this component's element
-> 
->     var myFunc = function(){
->       var myComponent = this;
->       // Do something when the event is fired
->     };
-> 
->     myComponent.on('eventType', myFunc);
-> 
-> The context of myFunc will be myComponent unless previously bound.
-> 
-> Alternatively, you can add a listener to another element or component.
-> 
->     myComponent.on(otherElement, 'eventName', myFunc);
->     myComponent.on(otherComponent, 'eventName', myFunc);
-> 
-> The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
-> and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
-> It will also bind myComponent as the context of myFunc.
-> 
-> **NOTE**: When using this on elements in the page other than window
-> and document (both permanent), if you remove the element from the DOM
-> you need to call `vjs.trigger(el, 'dispose')` on it to clean up
-> references to it and allow the browser to garbage collect it.
-
-##### PARAMETERS: 
-* __first__ `String|vjs.Component` The event type or other component
-* __second__ `Function|String` The event handler or event type
-* __third__ `Function` The event handler
-
-##### RETURNS: 
-* `vjs.Component` self
-
-_inherited from_: [src/js/component.js#L577](https://github.com/videojs/video.js/blob/master/src/js/component.js#L577)
-
----
-
-### onClick( event )
-> Handle a click on the media element. By default will play/pause the media.
-
-##### PARAMETERS: 
-* __event__ 
-
-_inherited from_: [src/js/media/media.js#L139](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L139)
-
----
-
-### onTap()
-> Handle a tap on the media element. By default it will toggle the user
-> activity state, which hides and shows the controls.
-
-_inherited from_: [src/js/media/media.js#L159](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L159)
-
----
-
-### one( first, second, [third] )
-> Add an event listener to be triggered only once and then removed
-> 
->     myComponent.one('eventName', myFunc);
-> 
-> Alternatively you can add a listener to another element or component
-> that will be triggered only once.
-> 
->     myComponent.one(otherElement, 'eventName', myFunc);
->     myComponent.one(otherComponent, 'eventName', myFunc);
-
-##### PARAMETERS: 
-* __first__ `String|vjs.Component` The event type or other component
-* __second__ `Function|String` The listener function or event type
-* __third__ `Function` _(OPTIONAL)_ The listener function for other component
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
-
----
-
-### options( obj )
-> Deep merge of options objects
-> 
-> Whenever a property is an object on both options objects
-> the two properties will be merged using vjs.obj.deepMerge.
-> 
-> This is used for merging options for child components. We
-> want it to be easy to override individual options on a child
-> component without having to rewrite all the other default options.
-> 
->     Parent.prototype.options_ = {
->       children: {
->         'childOne': { 'foo': 'bar', 'asdf': 'fdsa' },
->         'childTwo': {},
->         'childThree': {}
->       }
->     }
->     newOptions = {
->       children: {
->         'childOne': { 'foo': 'baz', 'abc': '123' }
->         'childTwo': null,
->         'childFour': {}
->       }
->     }
-> 
->     this.options(newOptions);
-> 
-> RESULT
-> 
->     {
->       children: {
->         'childOne': { 'foo': 'baz', 'asdf': 'fdsa', 'abc': '123' },
->         'childTwo': null, // Disabled. Won't be initialized.
->         'childThree': {},
->         'childFour': {}
->       }
->     }
-
-##### PARAMETERS: 
-* __obj__ `Object` Object of new option values
-
-##### RETURNS: 
-* `Object` A NEW object of this.options_ and obj merged
-
-_inherited from_: [src/js/component.js#L179](https://github.com/videojs/video.js/blob/master/src/js/component.js#L179)
-
----
-
-### player()
-> Return the component's player
-
-##### RETURNS: 
-* `vjs.Player` 
-
-_inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js/blob/master/src/js/component.js#L126)
-
----
-
-### ready( fn )
-> Bind a listener to the component's ready state
-> 
-> Different from event listeners in that if the ready event has already happend
-> it will trigger the function immediately.
-
-##### PARAMETERS: 
-* __fn__ `Function` Ready listener
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L769](https://github.com/videojs/video.js/blob/master/src/js/component.js#L769)
-
----
-
-### removeChild( component )
-> Remove a child component from this component's list of children, and the
-> child component's element from this component's element
-
-##### PARAMETERS: 
-* __component__ `vjs.Component` Component to remove
-
-_inherited from_: [src/js/component.js#L420](https://github.com/videojs/video.js/blob/master/src/js/component.js#L420)
-
----
-
-### removeClass( classToRemove )
-> Remove a CSS class name from the component's element
-
-##### PARAMETERS: 
-* __classToRemove__ `String` Classname to remove
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js/blob/master/src/js/component.js#L837)
-
----
-
-### removeControlsListeners()
-> Remove the listeners used for click and tap controls. This is needed for
-> toggling to controls disabled, where a tap/touch should do nothing.
-
-_inherited from_: [src/js/media/media.js#L123](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L123)
-
----
-
-### setPoster()
-> Provide a default setPoster method for techs
-> 
-> Poster support for techs should be optional, so we don't want techs to
-> break if they don't have a way to set a poster.
-
-_inherited from_: [src/js/media/media.js#L261](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L261)
-
----
-
-### show()
-> Show the component element if hidden
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L847](https://github.com/videojs/video.js/blob/master/src/js/component.js#L847)
-
----
-
-### trigger( event )
-> Trigger an event on an element
-> 
->     myComponent.trigger('eventName');
->     myComponent.trigger({'type':'eventName'});
-
-##### PARAMETERS: 
-* __event__ `Event|Object|String` A string (the type) or an event object with a type attribute
-
-##### RETURNS: 
-* `vjs.Component` self
-
-_inherited from_: [src/js/component.js#L724](https://github.com/videojs/video.js/blob/master/src/js/component.js#L724)
-
----
-
-### triggerReady()
-> Trigger the ready listeners
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L788](https://github.com/videojs/video.js/blob/master/src/js/component.js#L788)
-
----
-
-### width( [num], skipListeners )
-> Set or get the width of the component (CSS values)
-> 
-> Setting the video tag dimension values only works with values in pixels.
-> Percent values will not work.
-> Some percents can be used, but width()/height() will return the number + %,
-> not the actual computed width/height.
-
-##### PARAMETERS: 
-* __num__ `Number|String` _(OPTIONAL)_ Optional width number
-* __skipListeners__ `Boolean` Skip the 'resize' event trigger
-
-##### RETURNS: 
-* `vjs.Component` This component, when setting the width
-* `Number|String` The width, when getting
-
-_inherited from_: [src/js/component.js#L910](https://github.com/videojs/video.js/blob/master/src/js/component.js#L910)
-
----
-
-## EVENTS
-
-### resize `EVENT`
-> Fired when the width and/or height of the component changes
-
-_inherited from_: [src/js/component.js#L1020](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1020)
+_defined in_: [src/js/media/html5.js#L472](https://github.com/videojs/video.js/blob/master/src/js/media/html5.js#L472)
 
 ---
 

docs/api/vjs.LoadProgressBar.md

@@ -3,7 +3,7 @@
 # vjs.LoadProgressBar
 
 __EXTENDS__: [vjs.Component](vjs.Component.md)  
-__DEFINED IN__: [src/js/control-bar/progress-control.js#L117](https://github.com/videojs/video.js/blob/master/src/js/control-bar/progress-control.js#L117)  
+__DEFINED IN__: [src/js/control-bar/progress-control.js#L119](https://github.com/videojs/video.js/blob/master/src/js/control-bar/progress-control.js#L119)  
 
 Shows load progress
 
@@ -17,6 +17,8 @@ Shows load progress
   - [addClass](#addclass-classtoadd-) _`inherited`_
   - [buildCSSClass](#buildcssclass) _`inherited`_
   - [children](#children) _`inherited`_
+  - [clearInterval](#clearinterval-intervalid-) _`inherited`_
+  - [clearTimeout](#cleartimeout-timeoutid-) _`inherited`_
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
@@ -39,6 +41,8 @@ Shows load progress
   - [ready](#ready-fn-) _`inherited`_
   - [removeChild](#removechild-component-) _`inherited`_
   - [removeClass](#removeclass-classtoremove-) _`inherited`_
+  - [setInterval](#setinterval-fn-interval-) _`inherited`_
+  - [setTimeout](#settimeout-fn-timeout-) _`inherited`_
   - [show](#show) _`inherited`_
   - [trigger](#trigger-event-) _`inherited`_
   - [triggerReady](#triggerready) _`inherited`_
@@ -120,6 +124,32 @@ _inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js
 
 ---
 
+### clearInterval( intervalId )
+> Clears an interval and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __intervalId__ `Number` The id of the interval to clear
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1223](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1223)
+
+---
+
+### clearTimeout( timeoutId )
+> Clears a timeout and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __timeoutId__ `Number` The id of the timeout to clear
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1185](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1185)
+
+---
+
 ### contentEl()
 > Return the component's DOM element for embedding content.
 > Will either be el_ or a new element defined in createEl.
@@ -201,7 +231,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 > whenever touch events happen, and this can be turned off by components that
 > want touch events to act differently.
 
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
+_inherited from_: [src/js/component.js#L1124](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1124)
 
 ---
 
@@ -292,7 +322,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 * __player__ 
 * __options__ 
 
-_defined in_: [src/js/control-bar/progress-control.js#L119](https://github.com/videojs/video.js/blob/master/src/js/control-bar/progress-control.js#L119)
+_defined in_: [src/js/control-bar/progress-control.js#L121](https://github.com/videojs/video.js/blob/master/src/js/control-bar/progress-control.js#L121)
 
 ---
 
@@ -391,7 +421,7 @@ _inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js
 > 
 > The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
 > and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
+> will be automatically cleaned up when either component is disposed.
 > It will also bind myComponent as the context of myFunc.
 > 
 > **NOTE**: When using this on elements in the page other than window
@@ -495,7 +525,7 @@ _inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js
 ### ready( fn )
 > Bind a listener to the component's ready state
 > 
-> Different from event listeners in that if the ready event has already happend
+> Different from event listeners in that if the ready event has already happened
 > it will trigger the function immediately.
 
 ##### PARAMETERS: 
@@ -532,6 +562,34 @@ _inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js
 
 ---
 
+### setInterval( fn, interval )
+> Creates an interval and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run every N seconds.
+* __interval__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1202](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1202)
+
+---
+
+### setTimeout( fn, timeout )
+> Creates timeout and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run after the timeout.
+* __timeout__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1162](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1162)
+
+---
+
 ### show()
 > Show the component element if hidden
 

docs/api/vjs.LoadingSpinner.md

@@ -17,6 +17,8 @@ Loading spinner for waiting events
   - [addClass](#addclass-classtoadd-) _`inherited`_
   - [buildCSSClass](#buildcssclass) _`inherited`_
   - [children](#children) _`inherited`_
+  - [clearInterval](#clearinterval-intervalid-) _`inherited`_
+  - [clearTimeout](#cleartimeout-timeoutid-) _`inherited`_
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
@@ -39,6 +41,8 @@ Loading spinner for waiting events
   - [ready](#ready-fn-) _`inherited`_
   - [removeChild](#removechild-component-) _`inherited`_
   - [removeClass](#removeclass-classtoremove-) _`inherited`_
+  - [setInterval](#setinterval-fn-interval-) _`inherited`_
+  - [setTimeout](#settimeout-fn-timeout-) _`inherited`_
   - [show](#show) _`inherited`_
   - [trigger](#trigger-event-) _`inherited`_
   - [triggerReady](#triggerready) _`inherited`_
@@ -120,6 +124,32 @@ _inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js
 
 ---
 
+### clearInterval( intervalId )
+> Clears an interval and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __intervalId__ `Number` The id of the interval to clear
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1223](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1223)
+
+---
+
+### clearTimeout( timeoutId )
+> Clears a timeout and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __timeoutId__ `Number` The id of the timeout to clear
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1185](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1185)
+
+---
+
 ### contentEl()
 > Return the component's DOM element for embedding content.
 > Will either be el_ or a new element defined in createEl.
@@ -201,7 +231,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 > whenever touch events happen, and this can be turned off by components that
 > want touch events to act differently.
 
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
+_inherited from_: [src/js/component.js#L1124](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1124)
 
 ---
 
@@ -391,7 +421,7 @@ _inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js
 > 
 > The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
 > and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
+> will be automatically cleaned up when either component is disposed.
 > It will also bind myComponent as the context of myFunc.
 > 
 > **NOTE**: When using this on elements in the page other than window
@@ -495,7 +525,7 @@ _inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js
 ### ready( fn )
 > Bind a listener to the component's ready state
 > 
-> Different from event listeners in that if the ready event has already happend
+> Different from event listeners in that if the ready event has already happened
 > it will trigger the function immediately.
 
 ##### PARAMETERS: 
@@ -532,6 +562,34 @@ _inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js
 
 ---
 
+### setInterval( fn, interval )
+> Creates an interval and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run every N seconds.
+* __interval__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1202](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1202)
+
+---
+
+### setTimeout( fn, timeout )
+> Creates timeout and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run after the timeout.
+* __timeout__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1162](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1162)
+
+---
+
 ### show()
 > Show the component element if hidden
 

docs/api/vjs.MediaLoader.md

@@ -18,6 +18,8 @@ when the player is initialized.
   - [addClass](#addclass-classtoadd-) _`inherited`_
   - [buildCSSClass](#buildcssclass) _`inherited`_
   - [children](#children) _`inherited`_
+  - [clearInterval](#clearinterval-intervalid-) _`inherited`_
+  - [clearTimeout](#cleartimeout-timeoutid-) _`inherited`_
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
@@ -40,6 +42,8 @@ when the player is initialized.
   - [ready](#ready-fn-) _`inherited`_
   - [removeChild](#removechild-component-) _`inherited`_
   - [removeClass](#removeclass-classtoremove-) _`inherited`_
+  - [setInterval](#setinterval-fn-interval-) _`inherited`_
+  - [setTimeout](#settimeout-fn-timeout-) _`inherited`_
   - [show](#show) _`inherited`_
   - [trigger](#trigger-event-) _`inherited`_
   - [triggerReady](#triggerready) _`inherited`_
@@ -121,6 +125,32 @@ _inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js
 
 ---
 
+### clearInterval( intervalId )
+> Clears an interval and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __intervalId__ `Number` The id of the interval to clear
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1223](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1223)
+
+---
+
+### clearTimeout( timeoutId )
+> Clears a timeout and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __timeoutId__ `Number` The id of the timeout to clear
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1185](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1185)
+
+---
+
 ### contentEl()
 > Return the component's DOM element for embedding content.
 > Will either be el_ or a new element defined in createEl.
@@ -202,7 +232,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 > whenever touch events happen, and this can be turned off by components that
 > want touch events to act differently.
 
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
+_inherited from_: [src/js/component.js#L1124](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1124)
 
 ---
 
@@ -393,7 +423,7 @@ _inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js
 > 
 > The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
 > and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
+> will be automatically cleaned up when either component is disposed.
 > It will also bind myComponent as the context of myFunc.
 > 
 > **NOTE**: When using this on elements in the page other than window
@@ -497,7 +527,7 @@ _inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js
 ### ready( fn )
 > Bind a listener to the component's ready state
 > 
-> Different from event listeners in that if the ready event has already happend
+> Different from event listeners in that if the ready event has already happened
 > it will trigger the function immediately.
 
 ##### PARAMETERS: 
@@ -534,6 +564,34 @@ _inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js
 
 ---
 
+### setInterval( fn, interval )
+> Creates an interval and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run every N seconds.
+* __interval__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1202](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1202)
+
+---
+
+### setTimeout( fn, timeout )
+> Creates timeout and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run after the timeout.
+* __timeout__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1162](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1162)
+
+---
+
 ### show()
 > Show the component element if hidden
 

docs/api/vjs.MediaTechController.md

@@ -2,8 +2,7 @@
 
 # vjs.MediaTechController
 
-__EXTENDS__: [vjs.Component](vjs.Component.md)  
-__DEFINED IN__: [src/js/media/media.js#L12](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L12)  
+__DEFINED IN__: [src/js/media/media.js#L14](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L14)  
 
 Base class for media (HTML5 Video, Flash) controllers
 
@@ -12,654 +11,23 @@ Base class for media (HTML5 Video, Flash) controllers
 ## INDEX
 
 - [METHODS](#methods)
-  - [init](#init-player-options-ready-)
-  - [initControlsListeners](#initcontrolslisteners)
-  - [onClick](#onclick-event-)
-  - [onTap](#ontap)
-  - [removeControlsListeners](#removecontrolslisteners)
-  - [setPoster](#setposter)
-  - [addChild](#addchild-child-options-) _`inherited`_
-  - [addClass](#addclass-classtoadd-) _`inherited`_
-  - [buildCSSClass](#buildcssclass) _`inherited`_
-  - [children](#children) _`inherited`_
-  - [contentEl](#contentel) _`inherited`_
-  - [createEl](#createel-tagname-attributes-) _`inherited`_
-  - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [dispose](#dispose) _`inherited`_
-  - [el](#el) _`inherited`_
-  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
-  - [getChild](#getchild-name-) _`inherited`_
-  - [getChildById](#getchildbyid-id-) _`inherited`_
-  - [hasClass](#hasclass-classtocheck-) _`inherited`_
-  - [height](#height-num-skiplisteners-) _`inherited`_
-  - [hide](#hide) _`inherited`_
-  - [id](#id) _`inherited`_
-  - [initChildren](#initchildren) _`inherited`_
-  - [name](#name) _`inherited`_
-  - [off](#off-first-second-third-) _`inherited`_
-  - [on](#on-first-second-third-) _`inherited`_
-  - [one](#one-first-second-third-) _`inherited`_
-  - [options](#options-obj-) _`inherited`_
-  - [player](#player) _`inherited`_
-  - [ready](#ready-fn-) _`inherited`_
-  - [removeChild](#removechild-component-) _`inherited`_
-  - [removeClass](#removeclass-classtoremove-) _`inherited`_
-  - [show](#show) _`inherited`_
-  - [trigger](#trigger-event-) _`inherited`_
-  - [triggerReady](#triggerready) _`inherited`_
-  - [width](#width-num-skiplisteners-) _`inherited`_
-
-- [EVENTS](#events)
-  - [resize](#resize-event) _`inherited`_
+  - [withSourceHandlers](#withsourcehandlers-tech--static)
 
 ---
 
 ## METHODS
 
-### addChild( child, [options] )
-> Adds a child component inside this component
+### withSourceHandlers( Tech ) `STATIC`
+> A functional mixin for techs that want to use the Source Handler pattern.
 > 
->     myComponent.el();
->     // -> <div class='my-component'></div>
->     myComonent.children();
->     // [empty array]
+> ##### EXAMPLE:
 > 
->     var myButton = myComponent.addChild('MyButton');
->     // -> <div class='my-component'><div class="my-button">myButton<div></div>
->     // -> myButton === myComonent.children()[0];
-> 
-> Pass in options for child constructors and options for children of the child
-> 
->     var myButton = myComponent.addChild('MyButton', {
->       text: 'Press Me',
->       children: {
->         buttonChildExample: {
->           buttonChildOption: true
->         }
->       }
->     });
+>   videojs.MediaTechController.withSourceHandlers.call(MyTech);
 
 ##### PARAMETERS: 
-* __child__ `String|vjs.Component` The class name or instance of a child to add
-* __options__ `Object` _(OPTIONAL)_ Options, including options to be passed to children of the child.
+* __Tech__ 
 
-##### RETURNS: 
-* `vjs.Component` The child component (created by this process if a string was used)
-
-_inherited from_: [src/js/component.js#L362](https://github.com/videojs/video.js/blob/master/src/js/component.js#L362)
-
----
-
-### addClass( classToAdd )
-> Add a CSS class name to the component's element
-
-##### PARAMETERS: 
-* __classToAdd__ `String` Classname to add
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L826](https://github.com/videojs/video.js/blob/master/src/js/component.js#L826)
-
----
-
-### buildCSSClass()
-> Allows sub components to stack CSS class names
-
-##### RETURNS: 
-* `String` The constructed class name
-
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
-
----
-
-### children()
-> Get an array of all child components
-> 
->     var kids = myComponent.children();
-
-##### RETURNS: 
-* `Array` The children
-
-_inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js/blob/master/src/js/component.js#L296)
-
----
-
-### contentEl()
-> Return the component's DOM element for embedding content.
-> Will either be el_ or a new element defined in createEl.
-
-##### RETURNS: 
-* `Element` 
-
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
-
----
-
-### createEl( [tagName], [attributes] )
-> Create the component's DOM element
-
-##### PARAMETERS: 
-* __tagName__ `String` _(OPTIONAL)_ Element's node type. e.g. 'div'
-* __attributes__ `Object` _(OPTIONAL)_ An object of element attributes that should be set on the element
-
-##### RETURNS: 
-* `Element` 
-
-_inherited from_: [src/js/component.js#L200](https://github.com/videojs/video.js/blob/master/src/js/component.js#L200)
-
----
-
-### dimensions( width, height )
-> Set both width and height at the same time
-
-##### PARAMETERS: 
-* __width__ `Number|String` 
-* __height__ `Number|String` 
-
-##### RETURNS: 
-* `vjs.Component` The component
-
-_inherited from_: [src/js/component.js#L938](https://github.com/videojs/video.js/blob/master/src/js/component.js#L938)
-
----
-
-### dispose()
-> Dispose of the component and all child components
-
-_inherited from_: [src/js/component.js#L84](https://github.com/videojs/video.js/blob/master/src/js/component.js#L84)
-
----
-
-### el()
-> Get the component's DOM element
-> 
->     var domEl = myComponent.el();
-
-##### RETURNS: 
-* `Element` 
-
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
-
----
-
-### enableTouchActivity()
-> Report user touch activity when touch events occur
-> 
-> User activity is used to determine when controls should show/hide. It's
-> relatively simple when it comes to mouse events, because any mouse event
-> should show the controls. So we capture mouse events that bubble up to the
-> player and report activity when that happens.
-> 
-> With touch events it isn't as easy. We can't rely on touch events at the
-> player level, because a tap (touchstart + touchend) on the video itself on
-> mobile devices is meant to turn controls off (and on). User activity is
-> checked asynchronously, so what could happen is a tap event on the video
-> turns the controls off, then the touchend event bubbles up to the player,
-> which if it reported user activity, would turn the controls right back on.
-> (We also don't want to completely block touch events from bubbling up)
-> 
-> Also a touchmove, touch+hold, and anything other than a tap is not supposed
-> to turn the controls back on on a mobile device.
-> 
-> Here we're setting the default component behavior to report user activity
-> whenever touch events happen, and this can be turned off by components that
-> want touch events to act differently.
-
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
-
----
-
-### getChild( name )
-> Returns a child component with the provided name
-
-##### PARAMETERS: 
-* __name__ 
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L330](https://github.com/videojs/video.js/blob/master/src/js/component.js#L330)
-
----
-
-### getChildById( id )
-> Returns a child component with the provided ID
-
-##### PARAMETERS: 
-* __id__ 
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L313](https://github.com/videojs/video.js/blob/master/src/js/component.js#L313)
-
----
-
-### hasClass( classToCheck )
-> Check if a component's element has a CSS class name
-
-##### PARAMETERS: 
-* __classToCheck__ `String` Classname to check
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
-
----
-
-### height( [num], [skipListeners] )
-> Get or set the height of the component (CSS values)
-> 
-> Setting the video tag dimension values only works with values in pixels.
-> Percent values will not work.
-> Some percents can be used, but width()/height() will return the number + %,
-> not the actual computed width/height.
-
-##### PARAMETERS: 
-* __num__ `Number|String` _(OPTIONAL)_ New component height
-* __skipListeners__ `Boolean` _(OPTIONAL)_ Skip the resize event trigger
-
-##### RETURNS: 
-* `vjs.Component` This component, when setting the height
-* `Number|String` The height, when getting
-
-_inherited from_: [src/js/component.js#L927](https://github.com/videojs/video.js/blob/master/src/js/component.js#L927)
-
----
-
-### hide()
-> Hide the component element if currently showing
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L857](https://github.com/videojs/video.js/blob/master/src/js/component.js#L857)
-
----
-
-### id()
-> Get the component's ID
-> 
->     var id = myComponent.id();
-
-##### RETURNS: 
-* `String` 
-
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
-
----
-
-### init( player, options, ready )
-
-##### PARAMETERS: 
-* __player__ 
-* __options__ 
-* __ready__ 
-
-_defined in_: [src/js/media/media.js#L14](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L14)
-
----
-
-### initChildren()
-> Add and initialize default child components from options
-> 
->     // when an instance of MyComponent is created, all children in options
->     // will be added to the instance by their name strings and options
->     MyComponent.prototype.options_.children = {
->       myChildComponent: {
->         myChildOption: true
->       }
->     }
-> 
->     // Or when creating the component
->     var myComp = new MyComponent(player, {
->       children: {
->         myChildComponent: {
->           myChildOption: true
->         }
->       }
->     });
-> 
-> The children option can also be an Array of child names or
-> child options objects (that also include a 'name' key).
-> 
->     var myComp = new MyComponent(player, {
->       children: [
->         'button',
->         {
->           name: 'button',
->           someOtherOption: true
->         }
->       ]
->     });
-
-_inherited from_: [src/js/component.js#L481](https://github.com/videojs/video.js/blob/master/src/js/component.js#L481)
-
----
-
-### initControlsListeners()
-> Set up click and touch listeners for the playback element
-> On desktops, a click on the video itself will toggle playback,
-> on a mobile device a click on the video toggles controls.
-> (toggling controls is done by toggling the user state between active and
-> inactive)
-> 
-> A tap can signal that a user has become active, or has become inactive
-> e.g. a quick tap on an iPhone movie should reveal the controls. Another
-> quick tap should hide them again (signaling the user is in an inactive
-> viewing state)
-> 
-> In addition to this, we still want the user to be considered inactive after
-> a few seconds of inactivity.
-> 
-> Note: the only part of iOS interaction we can't mimic with this setup
-> is a touch and hold on the video element counting as activity in order to
-> keep the controls showing, but that shouldn't be an issue. A touch and hold on
-> any controls will still keep the user active
-
-_defined in_: [src/js/media/media.js#L55](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L55)
-
----
-
-### name()
-> Get the component's name. The name is often used to reference the component.
-> 
->     var name = myComponent.name();
-
-##### RETURNS: 
-* `String` 
-
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
-
----
-
-### off( [first], [second], [third] )
-> Remove an event listener from this component's element
-> 
->     myComponent.off('eventType', myFunc);
-> 
-> If myFunc is excluded, ALL listeners for the event type will be removed.
-> If eventType is excluded, ALL listeners will be removed from the component.
-> 
-> Alternatively you can use `off` to remove listeners that were added to other
-> elements or components using `myComponent.on(otherComponent...`.
-> In this case both the event type and listener function are REQUIRED.
-> 
->     myComponent.off(otherElement, 'eventType', myFunc);
->     myComponent.off(otherComponent, 'eventType', myFunc);
-
-##### PARAMETERS: 
-* __first__ `String|vjs.Component` _(OPTIONAL)_ The event type or other component
-* __second__ `Function|String` _(OPTIONAL)_ The listener function or event type
-* __third__ `Function` _(OPTIONAL)_ The listener for other component
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js/blob/master/src/js/component.js#L646)
-
----
-
-### on( first, second, third )
-> Add an event listener to this component's element
-> 
->     var myFunc = function(){
->       var myComponent = this;
->       // Do something when the event is fired
->     };
-> 
->     myComponent.on('eventType', myFunc);
-> 
-> The context of myFunc will be myComponent unless previously bound.
-> 
-> Alternatively, you can add a listener to another element or component.
-> 
->     myComponent.on(otherElement, 'eventName', myFunc);
->     myComponent.on(otherComponent, 'eventName', myFunc);
-> 
-> The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
-> and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
-> It will also bind myComponent as the context of myFunc.
-> 
-> **NOTE**: When using this on elements in the page other than window
-> and document (both permanent), if you remove the element from the DOM
-> you need to call `vjs.trigger(el, 'dispose')` on it to clean up
-> references to it and allow the browser to garbage collect it.
-
-##### PARAMETERS: 
-* __first__ `String|vjs.Component` The event type or other component
-* __second__ `Function|String` The event handler or event type
-* __third__ `Function` The event handler
-
-##### RETURNS: 
-* `vjs.Component` self
-
-_inherited from_: [src/js/component.js#L577](https://github.com/videojs/video.js/blob/master/src/js/component.js#L577)
-
----
-
-### onClick( event )
-> Handle a click on the media element. By default will play/pause the media.
-
-##### PARAMETERS: 
-* __event__ 
-
-_defined in_: [src/js/media/media.js#L139](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L139)
-
----
-
-### onTap()
-> Handle a tap on the media element. By default it will toggle the user
-> activity state, which hides and shows the controls.
-
-_defined in_: [src/js/media/media.js#L159](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L159)
-
----
-
-### one( first, second, [third] )
-> Add an event listener to be triggered only once and then removed
-> 
->     myComponent.one('eventName', myFunc);
-> 
-> Alternatively you can add a listener to another element or component
-> that will be triggered only once.
-> 
->     myComponent.one(otherElement, 'eventName', myFunc);
->     myComponent.one(otherComponent, 'eventName', myFunc);
-
-##### PARAMETERS: 
-* __first__ `String|vjs.Component` The event type or other component
-* __second__ `Function|String` The listener function or event type
-* __third__ `Function` _(OPTIONAL)_ The listener function for other component
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
-
----
-
-### options( obj )
-> Deep merge of options objects
-> 
-> Whenever a property is an object on both options objects
-> the two properties will be merged using vjs.obj.deepMerge.
-> 
-> This is used for merging options for child components. We
-> want it to be easy to override individual options on a child
-> component without having to rewrite all the other default options.
-> 
->     Parent.prototype.options_ = {
->       children: {
->         'childOne': { 'foo': 'bar', 'asdf': 'fdsa' },
->         'childTwo': {},
->         'childThree': {}
->       }
->     }
->     newOptions = {
->       children: {
->         'childOne': { 'foo': 'baz', 'abc': '123' }
->         'childTwo': null,
->         'childFour': {}
->       }
->     }
-> 
->     this.options(newOptions);
-> 
-> RESULT
-> 
->     {
->       children: {
->         'childOne': { 'foo': 'baz', 'asdf': 'fdsa', 'abc': '123' },
->         'childTwo': null, // Disabled. Won't be initialized.
->         'childThree': {},
->         'childFour': {}
->       }
->     }
-
-##### PARAMETERS: 
-* __obj__ `Object` Object of new option values
-
-##### RETURNS: 
-* `Object` A NEW object of this.options_ and obj merged
-
-_inherited from_: [src/js/component.js#L179](https://github.com/videojs/video.js/blob/master/src/js/component.js#L179)
-
----
-
-### player()
-> Return the component's player
-
-##### RETURNS: 
-* `vjs.Player` 
-
-_inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js/blob/master/src/js/component.js#L126)
-
----
-
-### ready( fn )
-> Bind a listener to the component's ready state
-> 
-> Different from event listeners in that if the ready event has already happend
-> it will trigger the function immediately.
-
-##### PARAMETERS: 
-* __fn__ `Function` Ready listener
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L769](https://github.com/videojs/video.js/blob/master/src/js/component.js#L769)
-
----
-
-### removeChild( component )
-> Remove a child component from this component's list of children, and the
-> child component's element from this component's element
-
-##### PARAMETERS: 
-* __component__ `vjs.Component` Component to remove
-
-_inherited from_: [src/js/component.js#L420](https://github.com/videojs/video.js/blob/master/src/js/component.js#L420)
-
----
-
-### removeClass( classToRemove )
-> Remove a CSS class name from the component's element
-
-##### PARAMETERS: 
-* __classToRemove__ `String` Classname to remove
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js/blob/master/src/js/component.js#L837)
-
----
-
-### removeControlsListeners()
-> Remove the listeners used for click and tap controls. This is needed for
-> toggling to controls disabled, where a tap/touch should do nothing.
-
-_defined in_: [src/js/media/media.js#L123](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L123)
-
----
-
-### setPoster()
-> Provide a default setPoster method for techs
-> 
-> Poster support for techs should be optional, so we don't want techs to
-> break if they don't have a way to set a poster.
-
-_defined in_: [src/js/media/media.js#L261](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L261)
-
----
-
-### show()
-> Show the component element if hidden
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L847](https://github.com/videojs/video.js/blob/master/src/js/component.js#L847)
-
----
-
-### trigger( event )
-> Trigger an event on an element
-> 
->     myComponent.trigger('eventName');
->     myComponent.trigger({'type':'eventName'});
-
-##### PARAMETERS: 
-* __event__ `Event|Object|String` A string (the type) or an event object with a type attribute
-
-##### RETURNS: 
-* `vjs.Component` self
-
-_inherited from_: [src/js/component.js#L724](https://github.com/videojs/video.js/blob/master/src/js/component.js#L724)
-
----
-
-### triggerReady()
-> Trigger the ready listeners
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L788](https://github.com/videojs/video.js/blob/master/src/js/component.js#L788)
-
----
-
-### width( [num], skipListeners )
-> Set or get the width of the component (CSS values)
-> 
-> Setting the video tag dimension values only works with values in pixels.
-> Percent values will not work.
-> Some percents can be used, but width()/height() will return the number + %,
-> not the actual computed width/height.
-
-##### PARAMETERS: 
-* __num__ `Number|String` _(OPTIONAL)_ Optional width number
-* __skipListeners__ `Boolean` Skip the 'resize' event trigger
-
-##### RETURNS: 
-* `vjs.Component` This component, when setting the width
-* `Number|String` The width, when getting
-
-_inherited from_: [src/js/component.js#L910](https://github.com/videojs/video.js/blob/master/src/js/component.js#L910)
-
----
-
-## EVENTS
-
-### resize `EVENT`
-> Fired when the width and/or height of the component changes
-
-_inherited from_: [src/js/component.js#L1020](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1020)
+_defined in_: [src/js/media/media.js#L428](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L428)
 
 ---
 

docs/api/vjs.Menu.md

@@ -19,6 +19,8 @@ captions selection menus.
   - [addClass](#addclass-classtoadd-) _`inherited`_
   - [buildCSSClass](#buildcssclass) _`inherited`_
   - [children](#children) _`inherited`_
+  - [clearInterval](#clearinterval-intervalid-) _`inherited`_
+  - [clearTimeout](#cleartimeout-timeoutid-) _`inherited`_
   - [contentEl](#contentel) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
   - [dispose](#dispose) _`inherited`_
@@ -41,6 +43,8 @@ captions selection menus.
   - [ready](#ready-fn-) _`inherited`_
   - [removeChild](#removechild-component-) _`inherited`_
   - [removeClass](#removeclass-classtoremove-) _`inherited`_
+  - [setInterval](#setinterval-fn-interval-) _`inherited`_
+  - [setTimeout](#settimeout-fn-timeout-) _`inherited`_
   - [show](#show) _`inherited`_
   - [trigger](#trigger-event-) _`inherited`_
   - [triggerReady](#triggerready) _`inherited`_
@@ -132,6 +136,32 @@ _inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js
 
 ---
 
+### clearInterval( intervalId )
+> Clears an interval and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __intervalId__ `Number` The id of the interval to clear
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1223](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1223)
+
+---
+
+### clearTimeout( timeoutId )
+> Clears a timeout and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __timeoutId__ `Number` The id of the timeout to clear
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1185](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1185)
+
+---
+
 ### contentEl()
 > Return the component's DOM element for embedding content.
 > Will either be el_ or a new element defined in createEl.
@@ -210,7 +240,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 > whenever touch events happen, and this can be turned off by components that
 > want touch events to act differently.
 
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
+_inherited from_: [src/js/component.js#L1124](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1124)
 
 ---
 
@@ -402,7 +432,7 @@ _inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js
 > 
 > The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
 > and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
+> will be automatically cleaned up when either component is disposed.
 > It will also bind myComponent as the context of myFunc.
 > 
 > **NOTE**: When using this on elements in the page other than window
@@ -506,7 +536,7 @@ _inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js
 ### ready( fn )
 > Bind a listener to the component's ready state
 > 
-> Different from event listeners in that if the ready event has already happend
+> Different from event listeners in that if the ready event has already happened
 > it will trigger the function immediately.
 
 ##### PARAMETERS: 
@@ -543,6 +573,34 @@ _inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js
 
 ---
 
+### setInterval( fn, interval )
+> Creates an interval and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run every N seconds.
+* __interval__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1202](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1202)
+
+---
+
+### setTimeout( fn, timeout )
+> Creates timeout and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run after the timeout.
+* __timeout__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1162](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1162)
+
+---
+
 ### show()
 > Show the component element if hidden
 

docs/api/vjs.MenuButton.md

@@ -18,6 +18,8 @@ A button class with a popup menu
   - [addChild](#addchild-child-options-) _`inherited`_
   - [addClass](#addclass-classtoadd-) _`inherited`_
   - [children](#children) _`inherited`_
+  - [clearInterval](#clearinterval-intervalid-) _`inherited`_
+  - [clearTimeout](#cleartimeout-timeoutid-) _`inherited`_
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
@@ -40,6 +42,8 @@ A button class with a popup menu
   - [ready](#ready-fn-) _`inherited`_
   - [removeChild](#removechild-component-) _`inherited`_
   - [removeClass](#removeclass-classtoremove-) _`inherited`_
+  - [setInterval](#setinterval-fn-interval-) _`inherited`_
+  - [setTimeout](#settimeout-fn-timeout-) _`inherited`_
   - [show](#show) _`inherited`_
   - [trigger](#trigger-event-) _`inherited`_
   - [triggerReady](#triggerready) _`inherited`_
@@ -102,7 +106,7 @@ _inherited from_: [src/js/component.js#L826](https://github.com/videojs/video.js
 ### buildCSSClass()
 > Allows sub components to stack CSS class names
 
-_defined in_: [src/js/menu.js#L157](https://github.com/videojs/video.js/blob/master/src/js/menu.js#L157)
+_defined in_: [src/js/menu.js#L166](https://github.com/videojs/video.js/blob/master/src/js/menu.js#L166)
 
 ---
 
@@ -118,6 +122,32 @@ _inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js
 
 ---
 
+### clearInterval( intervalId )
+> Clears an interval and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __intervalId__ `Number` The id of the interval to clear
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1223](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1223)
+
+---
+
+### clearTimeout( timeoutId )
+> Clears a timeout and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __timeoutId__ `Number` The id of the timeout to clear
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1185](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1185)
+
+---
+
 ### contentEl()
 > Return the component's DOM element for embedding content.
 > Will either be el_ or a new element defined in createEl.
@@ -146,7 +176,7 @@ _inherited from_: [src/js/component.js#L200](https://github.com/videojs/video.js
 ### createItems()
 > Create the list of menu items. Specific to each subclass.
 
-_defined in_: [src/js/menu.js#L154](https://github.com/videojs/video.js/blob/master/src/js/menu.js#L154)
+_defined in_: [src/js/menu.js#L163](https://github.com/videojs/video.js/blob/master/src/js/menu.js#L163)
 
 ---
 
@@ -206,7 +236,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 > whenever touch events happen, and this can be turned off by components that
 > want touch events to act differently.
 
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
+_inherited from_: [src/js/component.js#L1124](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1124)
 
 ---
 
@@ -396,7 +426,7 @@ _inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js
 > 
 > The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
 > and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
+> will be automatically cleaned up when either component is disposed.
 > It will also bind myComponent as the context of myFunc.
 > 
 > **NOTE**: When using this on elements in the page other than window
@@ -500,7 +530,7 @@ _inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js
 ### ready( fn )
 > Bind a listener to the component's ready state
 > 
-> Different from event listeners in that if the ready event has already happend
+> Different from event listeners in that if the ready event has already happened
 > it will trigger the function immediately.
 
 ##### PARAMETERS: 
@@ -537,6 +567,34 @@ _inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js
 
 ---
 
+### setInterval( fn, interval )
+> Creates an interval and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run every N seconds.
+* __interval__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1202](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1202)
+
+---
+
+### setTimeout( fn, timeout )
+> Creates timeout and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run after the timeout.
+* __timeout__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1162](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1162)
+
+---
+
 ### show()
 > Show the component element if hidden
 

docs/api/vjs.MenuItem.md

@@ -20,6 +20,8 @@ The component for a menu item. `<li>`
   - [addClass](#addclass-classtoadd-) _`inherited`_
   - [buildCSSClass](#buildcssclass) _`inherited`_
   - [children](#children) _`inherited`_
+  - [clearInterval](#clearinterval-intervalid-) _`inherited`_
+  - [clearTimeout](#cleartimeout-timeoutid-) _`inherited`_
   - [contentEl](#contentel) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
   - [dispose](#dispose) _`inherited`_
@@ -41,6 +43,8 @@ The component for a menu item. `<li>`
   - [ready](#ready-fn-) _`inherited`_
   - [removeChild](#removechild-component-) _`inherited`_
   - [removeClass](#removeclass-classtoremove-) _`inherited`_
+  - [setInterval](#setinterval-fn-interval-) _`inherited`_
+  - [setTimeout](#settimeout-fn-timeout-) _`inherited`_
   - [show](#show) _`inherited`_
   - [trigger](#trigger-event-) _`inherited`_
   - [triggerReady](#triggerready) _`inherited`_
@@ -122,6 +126,32 @@ _inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js
 
 ---
 
+### clearInterval( intervalId )
+> Clears an interval and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __intervalId__ `Number` The id of the interval to clear
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1223](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1223)
+
+---
+
+### clearTimeout( timeoutId )
+> Clears a timeout and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __timeoutId__ `Number` The id of the timeout to clear
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1185](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1185)
+
+---
+
 ### contentEl()
 > Return the component's DOM element for embedding content.
 > Will either be el_ or a new element defined in createEl.
@@ -200,7 +230,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 > whenever touch events happen, and this can be turned off by components that
 > want touch events to act differently.
 
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
+_inherited from_: [src/js/component.js#L1124](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1124)
 
 ---
 
@@ -390,7 +420,7 @@ _inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js
 > 
 > The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
 > and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
+> will be automatically cleaned up when either component is disposed.
 > It will also bind myComponent as the context of myFunc.
 > 
 > **NOTE**: When using this on elements in the page other than window
@@ -501,7 +531,7 @@ _inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js
 ### ready( fn )
 > Bind a listener to the component's ready state
 > 
-> Different from event listeners in that if the ready event has already happend
+> Different from event listeners in that if the ready event has already happened
 > it will trigger the function immediately.
 
 ##### PARAMETERS: 
@@ -548,6 +578,34 @@ _defined in_: [src/js/menu.js#L82](https://github.com/videojs/video.js/blob/mast
 
 ---
 
+### setInterval( fn, interval )
+> Creates an interval and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run every N seconds.
+* __interval__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1202](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1202)
+
+---
+
+### setTimeout( fn, timeout )
+> Creates timeout and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run after the timeout.
+* __timeout__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1162](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1162)
+
+---
+
 ### show()
 > Show the component element if hidden
 

docs/api/vjs.MuteToggle.md

@@ -17,6 +17,8 @@ A button component for muting the audio
   - [addClass](#addclass-classtoadd-) _`inherited`_
   - [buildCSSClass](#buildcssclass) _`inherited`_
   - [children](#children) _`inherited`_
+  - [clearInterval](#clearinterval-intervalid-) _`inherited`_
+  - [clearTimeout](#cleartimeout-timeoutid-) _`inherited`_
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
@@ -39,6 +41,8 @@ A button component for muting the audio
   - [ready](#ready-fn-) _`inherited`_
   - [removeChild](#removechild-component-) _`inherited`_
   - [removeClass](#removeclass-classtoremove-) _`inherited`_
+  - [setInterval](#setinterval-fn-interval-) _`inherited`_
+  - [setTimeout](#settimeout-fn-timeout-) _`inherited`_
   - [show](#show) _`inherited`_
   - [trigger](#trigger-event-) _`inherited`_
   - [triggerReady](#triggerready) _`inherited`_
@@ -120,6 +124,32 @@ _inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js
 
 ---
 
+### clearInterval( intervalId )
+> Clears an interval and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __intervalId__ `Number` The id of the interval to clear
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1223](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1223)
+
+---
+
+### clearTimeout( timeoutId )
+> Clears a timeout and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __timeoutId__ `Number` The id of the timeout to clear
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1185](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1185)
+
+---
+
 ### contentEl()
 > Return the component's DOM element for embedding content.
 > Will either be el_ or a new element defined in createEl.
@@ -201,7 +231,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 > whenever touch events happen, and this can be turned off by components that
 > want touch events to act differently.
 
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
+_inherited from_: [src/js/component.js#L1124](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1124)
 
 ---
 
@@ -391,7 +421,7 @@ _inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js
 > 
 > The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
 > and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
+> will be automatically cleaned up when either component is disposed.
 > It will also bind myComponent as the context of myFunc.
 > 
 > **NOTE**: When using this on elements in the page other than window
@@ -495,7 +525,7 @@ _inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js
 ### ready( fn )
 > Bind a listener to the component's ready state
 > 
-> Different from event listeners in that if the ready event has already happend
+> Different from event listeners in that if the ready event has already happened
 > it will trigger the function immediately.
 
 ##### PARAMETERS: 
@@ -532,6 +562,34 @@ _inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js
 
 ---
 
+### setInterval( fn, interval )
+> Creates an interval and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run every N seconds.
+* __interval__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1202](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1202)
+
+---
+
+### setTimeout( fn, timeout )
+> Creates timeout and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run after the timeout.
+* __timeout__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1162](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1162)
+
+---
+
 ### show()
 > Show the component element if hidden
 

docs/api/vjs.OffTextTrackMenuItem.md

@@ -2,614 +2,9 @@
 
 # vjs.OffTextTrackMenuItem
 
-__EXTENDS__: [vjs.TextTrackMenuItem](vjs.TextTrackMenuItem.md)  
-__DEFINED IN__: [src/js/tracks.js#L754](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L754)  
+__DEFINED IN__: [src/js/tracks/text-track-controls.js#L296](https://github.com/videojs/video.js/blob/master/src/js/tracks/text-track-controls.js#L296)  
 
 A special menu item for turning of a specific type of text track
 
 ---
 
-## INDEX
-
-- [METHODS](#methods)
-  - [init](#init-player-options-)
-  - [addChild](#addchild-child-options-) _`inherited`_
-  - [addClass](#addclass-classtoadd-) _`inherited`_
-  - [buildCSSClass](#buildcssclass) _`inherited`_
-  - [children](#children) _`inherited`_
-  - [contentEl](#contentel) _`inherited`_
-  - [createEl](#createel-tagname-attributes-) _`inherited`_
-  - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [dispose](#dispose) _`inherited`_
-  - [el](#el) _`inherited`_
-  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
-  - [getChild](#getchild-name-) _`inherited`_
-  - [getChildById](#getchildbyid-id-) _`inherited`_
-  - [hasClass](#hasclass-classtocheck-) _`inherited`_
-  - [height](#height-num-skiplisteners-) _`inherited`_
-  - [hide](#hide) _`inherited`_
-  - [id](#id) _`inherited`_
-  - [initChildren](#initchildren) _`inherited`_
-  - [name](#name) _`inherited`_
-  - [off](#off-first-second-third-) _`inherited`_
-  - [on](#on-first-second-third-) _`inherited`_
-  - [onClick](#onclick) _`inherited`_
-  - [one](#one-first-second-third-) _`inherited`_
-  - [options](#options-obj-) _`inherited`_
-  - [player](#player) _`inherited`_
-  - [ready](#ready-fn-) _`inherited`_
-  - [removeChild](#removechild-component-) _`inherited`_
-  - [removeClass](#removeclass-classtoremove-) _`inherited`_
-  - [selected](#selected-selected-) _`inherited`_
-  - [show](#show) _`inherited`_
-  - [trigger](#trigger-event-) _`inherited`_
-  - [triggerReady](#triggerready) _`inherited`_
-  - [width](#width-num-skiplisteners-) _`inherited`_
-
-- [EVENTS](#events)
-  - [resize](#resize-event) _`inherited`_
-
----
-
-## METHODS
-
-### addChild( child, [options] )
-> Adds a child component inside this component
-> 
->     myComponent.el();
->     // -> <div class='my-component'></div>
->     myComonent.children();
->     // [empty array]
-> 
->     var myButton = myComponent.addChild('MyButton');
->     // -> <div class='my-component'><div class="my-button">myButton<div></div>
->     // -> myButton === myComonent.children()[0];
-> 
-> Pass in options for child constructors and options for children of the child
-> 
->     var myButton = myComponent.addChild('MyButton', {
->       text: 'Press Me',
->       children: {
->         buttonChildExample: {
->           buttonChildOption: true
->         }
->       }
->     });
-
-##### PARAMETERS: 
-* __child__ `String|vjs.Component` The class name or instance of a child to add
-* __options__ `Object` _(OPTIONAL)_ Options, including options to be passed to children of the child.
-
-##### RETURNS: 
-* `vjs.Component` The child component (created by this process if a string was used)
-
-_inherited from_: [src/js/component.js#L362](https://github.com/videojs/video.js/blob/master/src/js/component.js#L362)
-
----
-
-### addClass( classToAdd )
-> Add a CSS class name to the component's element
-
-##### PARAMETERS: 
-* __classToAdd__ `String` Classname to add
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L826](https://github.com/videojs/video.js/blob/master/src/js/component.js#L826)
-
----
-
-### buildCSSClass()
-> Allows sub components to stack CSS class names
-
-##### RETURNS: 
-* `String` The constructed class name
-
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
-
----
-
-### children()
-> Get an array of all child components
-> 
->     var kids = myComponent.children();
-
-##### RETURNS: 
-* `Array` The children
-
-_inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js/blob/master/src/js/component.js#L296)
-
----
-
-### contentEl()
-> Return the component's DOM element for embedding content.
-> Will either be el_ or a new element defined in createEl.
-
-##### RETURNS: 
-* `Element` 
-
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
-
----
-
-### createEl( [tagName], [attributes] )
-> Create the component's DOM element
-
-##### PARAMETERS: 
-* __tagName__ `String` _(OPTIONAL)_ Element's node type. e.g. 'div'
-* __attributes__ `Object` _(OPTIONAL)_ An object of element attributes that should be set on the element
-
-_inherited from_: [src/js/menu.js#L64](https://github.com/videojs/video.js/blob/master/src/js/menu.js#L64)
-
----
-
-### dimensions( width, height )
-> Set both width and height at the same time
-
-##### PARAMETERS: 
-* __width__ `Number|String` 
-* __height__ `Number|String` 
-
-##### RETURNS: 
-* `vjs.Component` The component
-
-_inherited from_: [src/js/component.js#L938](https://github.com/videojs/video.js/blob/master/src/js/component.js#L938)
-
----
-
-### dispose()
-> Dispose of the component and all child components
-
-_inherited from_: [src/js/component.js#L84](https://github.com/videojs/video.js/blob/master/src/js/component.js#L84)
-
----
-
-### el()
-> Get the component's DOM element
-> 
->     var domEl = myComponent.el();
-
-##### RETURNS: 
-* `Element` 
-
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
-
----
-
-### enableTouchActivity()
-> Report user touch activity when touch events occur
-> 
-> User activity is used to determine when controls should show/hide. It's
-> relatively simple when it comes to mouse events, because any mouse event
-> should show the controls. So we capture mouse events that bubble up to the
-> player and report activity when that happens.
-> 
-> With touch events it isn't as easy. We can't rely on touch events at the
-> player level, because a tap (touchstart + touchend) on the video itself on
-> mobile devices is meant to turn controls off (and on). User activity is
-> checked asynchronously, so what could happen is a tap event on the video
-> turns the controls off, then the touchend event bubbles up to the player,
-> which if it reported user activity, would turn the controls right back on.
-> (We also don't want to completely block touch events from bubbling up)
-> 
-> Also a touchmove, touch+hold, and anything other than a tap is not supposed
-> to turn the controls back on on a mobile device.
-> 
-> Here we're setting the default component behavior to report user activity
-> whenever touch events happen, and this can be turned off by components that
-> want touch events to act differently.
-
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
-
----
-
-### getChild( name )
-> Returns a child component with the provided name
-
-##### PARAMETERS: 
-* __name__ 
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L330](https://github.com/videojs/video.js/blob/master/src/js/component.js#L330)
-
----
-
-### getChildById( id )
-> Returns a child component with the provided ID
-
-##### PARAMETERS: 
-* __id__ 
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L313](https://github.com/videojs/video.js/blob/master/src/js/component.js#L313)
-
----
-
-### hasClass( classToCheck )
-> Check if a component's element has a CSS class name
-
-##### PARAMETERS: 
-* __classToCheck__ `String` Classname to check
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
-
----
-
-### height( [num], [skipListeners] )
-> Get or set the height of the component (CSS values)
-> 
-> Setting the video tag dimension values only works with values in pixels.
-> Percent values will not work.
-> Some percents can be used, but width()/height() will return the number + %,
-> not the actual computed width/height.
-
-##### PARAMETERS: 
-* __num__ `Number|String` _(OPTIONAL)_ New component height
-* __skipListeners__ `Boolean` _(OPTIONAL)_ Skip the resize event trigger
-
-##### RETURNS: 
-* `vjs.Component` This component, when setting the height
-* `Number|String` The height, when getting
-
-_inherited from_: [src/js/component.js#L927](https://github.com/videojs/video.js/blob/master/src/js/component.js#L927)
-
----
-
-### hide()
-> Hide the component element if currently showing
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L857](https://github.com/videojs/video.js/blob/master/src/js/component.js#L857)
-
----
-
-### id()
-> Get the component's ID
-> 
->     var id = myComponent.id();
-
-##### RETURNS: 
-* `String` 
-
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
-
----
-
-### init( player, options )
-
-##### PARAMETERS: 
-* __player__ 
-* __options__ 
-
-_defined in_: [src/js/tracks.js#L756](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L756)
-
----
-
-### initChildren()
-> Add and initialize default child components from options
-> 
->     // when an instance of MyComponent is created, all children in options
->     // will be added to the instance by their name strings and options
->     MyComponent.prototype.options_.children = {
->       myChildComponent: {
->         myChildOption: true
->       }
->     }
-> 
->     // Or when creating the component
->     var myComp = new MyComponent(player, {
->       children: {
->         myChildComponent: {
->           myChildOption: true
->         }
->       }
->     });
-> 
-> The children option can also be an Array of child names or
-> child options objects (that also include a 'name' key).
-> 
->     var myComp = new MyComponent(player, {
->       children: [
->         'button',
->         {
->           name: 'button',
->           someOtherOption: true
->         }
->       ]
->     });
-
-_inherited from_: [src/js/component.js#L481](https://github.com/videojs/video.js/blob/master/src/js/component.js#L481)
-
----
-
-### name()
-> Get the component's name. The name is often used to reference the component.
-> 
->     var name = myComponent.name();
-
-##### RETURNS: 
-* `String` 
-
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
-
----
-
-### off( [first], [second], [third] )
-> Remove an event listener from this component's element
-> 
->     myComponent.off('eventType', myFunc);
-> 
-> If myFunc is excluded, ALL listeners for the event type will be removed.
-> If eventType is excluded, ALL listeners will be removed from the component.
-> 
-> Alternatively you can use `off` to remove listeners that were added to other
-> elements or components using `myComponent.on(otherComponent...`.
-> In this case both the event type and listener function are REQUIRED.
-> 
->     myComponent.off(otherElement, 'eventType', myFunc);
->     myComponent.off(otherComponent, 'eventType', myFunc);
-
-##### PARAMETERS: 
-* __first__ `String|vjs.Component` _(OPTIONAL)_ The event type or other component
-* __second__ `Function|String` _(OPTIONAL)_ The listener function or event type
-* __third__ `Function` _(OPTIONAL)_ The listener for other component
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js/blob/master/src/js/component.js#L646)
-
----
-
-### on( first, second, third )
-> Add an event listener to this component's element
-> 
->     var myFunc = function(){
->       var myComponent = this;
->       // Do something when the event is fired
->     };
-> 
->     myComponent.on('eventType', myFunc);
-> 
-> The context of myFunc will be myComponent unless previously bound.
-> 
-> Alternatively, you can add a listener to another element or component.
-> 
->     myComponent.on(otherElement, 'eventName', myFunc);
->     myComponent.on(otherComponent, 'eventName', myFunc);
-> 
-> The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
-> and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
-> It will also bind myComponent as the context of myFunc.
-> 
-> **NOTE**: When using this on elements in the page other than window
-> and document (both permanent), if you remove the element from the DOM
-> you need to call `vjs.trigger(el, 'dispose')` on it to clean up
-> references to it and allow the browser to garbage collect it.
-
-##### PARAMETERS: 
-* __first__ `String|vjs.Component` The event type or other component
-* __second__ `Function|String` The event handler or event type
-* __third__ `Function` The event handler
-
-##### RETURNS: 
-* `vjs.Component` self
-
-_inherited from_: [src/js/component.js#L577](https://github.com/videojs/video.js/blob/master/src/js/component.js#L577)
-
----
-
-### onClick()
-> Handle a click on the menu item, and set it to selected
-
-_inherited from_: [src/js/menu.js#L74](https://github.com/videojs/video.js/blob/master/src/js/menu.js#L74)
-
----
-
-### one( first, second, [third] )
-> Add an event listener to be triggered only once and then removed
-> 
->     myComponent.one('eventName', myFunc);
-> 
-> Alternatively you can add a listener to another element or component
-> that will be triggered only once.
-> 
->     myComponent.one(otherElement, 'eventName', myFunc);
->     myComponent.one(otherComponent, 'eventName', myFunc);
-
-##### PARAMETERS: 
-* __first__ `String|vjs.Component` The event type or other component
-* __second__ `Function|String` The listener function or event type
-* __third__ `Function` _(OPTIONAL)_ The listener function for other component
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
-
----
-
-### options( obj )
-> Deep merge of options objects
-> 
-> Whenever a property is an object on both options objects
-> the two properties will be merged using vjs.obj.deepMerge.
-> 
-> This is used for merging options for child components. We
-> want it to be easy to override individual options on a child
-> component without having to rewrite all the other default options.
-> 
->     Parent.prototype.options_ = {
->       children: {
->         'childOne': { 'foo': 'bar', 'asdf': 'fdsa' },
->         'childTwo': {},
->         'childThree': {}
->       }
->     }
->     newOptions = {
->       children: {
->         'childOne': { 'foo': 'baz', 'abc': '123' }
->         'childTwo': null,
->         'childFour': {}
->       }
->     }
-> 
->     this.options(newOptions);
-> 
-> RESULT
-> 
->     {
->       children: {
->         'childOne': { 'foo': 'baz', 'asdf': 'fdsa', 'abc': '123' },
->         'childTwo': null, // Disabled. Won't be initialized.
->         'childThree': {},
->         'childFour': {}
->       }
->     }
-
-##### PARAMETERS: 
-* __obj__ `Object` Object of new option values
-
-##### RETURNS: 
-* `Object` A NEW object of this.options_ and obj merged
-
-_inherited from_: [src/js/component.js#L179](https://github.com/videojs/video.js/blob/master/src/js/component.js#L179)
-
----
-
-### player()
-> Return the component's player
-
-##### RETURNS: 
-* `vjs.Player` 
-
-_inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js/blob/master/src/js/component.js#L126)
-
----
-
-### ready( fn )
-> Bind a listener to the component's ready state
-> 
-> Different from event listeners in that if the ready event has already happend
-> it will trigger the function immediately.
-
-##### PARAMETERS: 
-* __fn__ `Function` Ready listener
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L769](https://github.com/videojs/video.js/blob/master/src/js/component.js#L769)
-
----
-
-### removeChild( component )
-> Remove a child component from this component's list of children, and the
-> child component's element from this component's element
-
-##### PARAMETERS: 
-* __component__ `vjs.Component` Component to remove
-
-_inherited from_: [src/js/component.js#L420](https://github.com/videojs/video.js/blob/master/src/js/component.js#L420)
-
----
-
-### removeClass( classToRemove )
-> Remove a CSS class name from the component's element
-
-##### PARAMETERS: 
-* __classToRemove__ `String` Classname to remove
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js/blob/master/src/js/component.js#L837)
-
----
-
-### selected( selected )
-> Set this menu item as selected or not
-
-##### PARAMETERS: 
-* __selected__ `Boolean` 
-
-_inherited from_: [src/js/menu.js#L82](https://github.com/videojs/video.js/blob/master/src/js/menu.js#L82)
-
----
-
-### show()
-> Show the component element if hidden
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L847](https://github.com/videojs/video.js/blob/master/src/js/component.js#L847)
-
----
-
-### trigger( event )
-> Trigger an event on an element
-> 
->     myComponent.trigger('eventName');
->     myComponent.trigger({'type':'eventName'});
-
-##### PARAMETERS: 
-* __event__ `Event|Object|String` A string (the type) or an event object with a type attribute
-
-##### RETURNS: 
-* `vjs.Component` self
-
-_inherited from_: [src/js/component.js#L724](https://github.com/videojs/video.js/blob/master/src/js/component.js#L724)
-
----
-
-### triggerReady()
-> Trigger the ready listeners
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L788](https://github.com/videojs/video.js/blob/master/src/js/component.js#L788)
-
----
-
-### width( [num], skipListeners )
-> Set or get the width of the component (CSS values)
-> 
-> Setting the video tag dimension values only works with values in pixels.
-> Percent values will not work.
-> Some percents can be used, but width()/height() will return the number + %,
-> not the actual computed width/height.
-
-##### PARAMETERS: 
-* __num__ `Number|String` _(OPTIONAL)_ Optional width number
-* __skipListeners__ `Boolean` Skip the 'resize' event trigger
-
-##### RETURNS: 
-* `vjs.Component` This component, when setting the width
-* `Number|String` The width, when getting
-
-_inherited from_: [src/js/component.js#L910](https://github.com/videojs/video.js/blob/master/src/js/component.js#L910)
-
----
-
-## EVENTS
-
-### resize `EVENT`
-> Fired when the width and/or height of the component changes
-
-_inherited from_: [src/js/component.js#L1020](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1020)
-
----
-

docs/api/vjs.PlayProgressBar.md

@@ -3,7 +3,7 @@
 # vjs.PlayProgressBar
 
 __EXTENDS__: [vjs.Component](vjs.Component.md)  
-__DEFINED IN__: [src/js/control-bar/progress-control.js#L175](https://github.com/videojs/video.js/blob/master/src/js/control-bar/progress-control.js#L175)  
+__DEFINED IN__: [src/js/control-bar/progress-control.js#L177](https://github.com/videojs/video.js/blob/master/src/js/control-bar/progress-control.js#L177)  
 
 Shows play progress
 
@@ -17,6 +17,8 @@ Shows play progress
   - [addClass](#addclass-classtoadd-) _`inherited`_
   - [buildCSSClass](#buildcssclass) _`inherited`_
   - [children](#children) _`inherited`_
+  - [clearInterval](#clearinterval-intervalid-) _`inherited`_
+  - [clearTimeout](#cleartimeout-timeoutid-) _`inherited`_
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
@@ -39,6 +41,8 @@ Shows play progress
   - [ready](#ready-fn-) _`inherited`_
   - [removeChild](#removechild-component-) _`inherited`_
   - [removeClass](#removeclass-classtoremove-) _`inherited`_
+  - [setInterval](#setinterval-fn-interval-) _`inherited`_
+  - [setTimeout](#settimeout-fn-timeout-) _`inherited`_
   - [show](#show) _`inherited`_
   - [trigger](#trigger-event-) _`inherited`_
   - [triggerReady](#triggerready) _`inherited`_
@@ -120,6 +124,32 @@ _inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js
 
 ---
 
+### clearInterval( intervalId )
+> Clears an interval and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __intervalId__ `Number` The id of the interval to clear
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1223](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1223)
+
+---
+
+### clearTimeout( timeoutId )
+> Clears a timeout and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __timeoutId__ `Number` The id of the timeout to clear
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1185](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1185)
+
+---
+
 ### contentEl()
 > Return the component's DOM element for embedding content.
 > Will either be el_ or a new element defined in createEl.
@@ -201,7 +231,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 > whenever touch events happen, and this can be turned off by components that
 > want touch events to act differently.
 
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
+_inherited from_: [src/js/component.js#L1124](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1124)
 
 ---
 
@@ -292,7 +322,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 * __player__ 
 * __options__ 
 
-_defined in_: [src/js/control-bar/progress-control.js#L177](https://github.com/videojs/video.js/blob/master/src/js/control-bar/progress-control.js#L177)
+_defined in_: [src/js/control-bar/progress-control.js#L179](https://github.com/videojs/video.js/blob/master/src/js/control-bar/progress-control.js#L179)
 
 ---
 
@@ -391,7 +421,7 @@ _inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js
 > 
 > The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
 > and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
+> will be automatically cleaned up when either component is disposed.
 > It will also bind myComponent as the context of myFunc.
 > 
 > **NOTE**: When using this on elements in the page other than window
@@ -495,7 +525,7 @@ _inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js
 ### ready( fn )
 > Bind a listener to the component's ready state
 > 
-> Different from event listeners in that if the ready event has already happend
+> Different from event listeners in that if the ready event has already happened
 > it will trigger the function immediately.
 
 ##### PARAMETERS: 
@@ -532,6 +562,34 @@ _inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js
 
 ---
 
+### setInterval( fn, interval )
+> Creates an interval and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run every N seconds.
+* __interval__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1202](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1202)
+
+---
+
+### setTimeout( fn, timeout )
+> Creates timeout and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run after the timeout.
+* __timeout__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1162](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1162)
+
+---
+
 ### show()
 > Show the component element if hidden
 

docs/api/vjs.PlayToggle.md

@@ -17,6 +17,8 @@ Button to toggle between play and pause
   - [addClass](#addclass-classtoadd-) _`inherited`_
   - [buildCSSClass](#buildcssclass) _`inherited`_
   - [children](#children) _`inherited`_
+  - [clearInterval](#clearinterval-intervalid-) _`inherited`_
+  - [clearTimeout](#cleartimeout-timeoutid-) _`inherited`_
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
@@ -39,6 +41,8 @@ Button to toggle between play and pause
   - [ready](#ready-fn-) _`inherited`_
   - [removeChild](#removechild-component-) _`inherited`_
   - [removeClass](#removeclass-classtoremove-) _`inherited`_
+  - [setInterval](#setinterval-fn-interval-) _`inherited`_
+  - [setTimeout](#settimeout-fn-timeout-) _`inherited`_
   - [show](#show) _`inherited`_
   - [trigger](#trigger-event-) _`inherited`_
   - [triggerReady](#triggerready) _`inherited`_
@@ -120,6 +124,32 @@ _inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js
 
 ---
 
+### clearInterval( intervalId )
+> Clears an interval and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __intervalId__ `Number` The id of the interval to clear
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1223](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1223)
+
+---
+
+### clearTimeout( timeoutId )
+> Clears a timeout and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __timeoutId__ `Number` The id of the timeout to clear
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1185](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1185)
+
+---
+
 ### contentEl()
 > Return the component's DOM element for embedding content.
 > Will either be el_ or a new element defined in createEl.
@@ -201,7 +231,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 > whenever touch events happen, and this can be turned off by components that
 > want touch events to act differently.
 
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
+_inherited from_: [src/js/component.js#L1124](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1124)
 
 ---
 
@@ -391,7 +421,7 @@ _inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js
 > 
 > The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
 > and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
+> will be automatically cleaned up when either component is disposed.
 > It will also bind myComponent as the context of myFunc.
 > 
 > **NOTE**: When using this on elements in the page other than window
@@ -495,7 +525,7 @@ _inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js
 ### ready( fn )
 > Bind a listener to the component's ready state
 > 
-> Different from event listeners in that if the ready event has already happend
+> Different from event listeners in that if the ready event has already happened
 > it will trigger the function immediately.
 
 ##### PARAMETERS: 
@@ -532,6 +562,34 @@ _inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js
 
 ---
 
+### setInterval( fn, interval )
+> Creates an interval and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run every N seconds.
+* __interval__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1202](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1202)
+
+---
+
+### setTimeout( fn, timeout )
+> Creates timeout and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run after the timeout.
+* __timeout__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1162](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1162)
+
+---
+
 ### show()
 > Show the component element if hidden
 

docs/api/vjs.Player.md

@@ -26,6 +26,7 @@ After an instance has been created it can be accessed globally using `Video('exa
 ## INDEX
 
 - [METHODS](#methods)
+  - [addTextTrack](#addtexttrack-kind-label-language-)
   - [autoplay](#autoplay-value-)
   - [buffered](#buffered)
   - [bufferedEnd](#bufferedend)
@@ -47,22 +48,27 @@ After an instance has been created it can be accessed globally using `Video('exa
   - [load](#load)
   - [loop](#loop-value-)
   - [muted](#muted-muted-)
+  - [networkState](#networkstate)
   - [pause](#pause)
   - [paused](#paused)
   - [play](#play)
   - [playbackRate](#playbackrate-rate-)
   - [poster](#poster-src-)
   - [preload](#preload-value-)
+  - [readyState](#readystate)
   - [remainingTime](#remainingtime)
   - [requestFullScreen](#requestfullscreen) _`deprecated`_
   - [requestFullscreen](#requestfullscreen)
   - [seeking](#seeking)
   - [src](#src-source-)
+  - [textTracks](#texttracks)
   - [volume](#volume-percentasdecimal-)
   - [addChild](#addchild-child-options-) _`inherited`_
   - [addClass](#addclass-classtoadd-) _`inherited`_
   - [buildCSSClass](#buildcssclass) _`inherited`_
   - [children](#children) _`inherited`_
+  - [clearInterval](#clearinterval-intervalid-) _`inherited`_
+  - [clearTimeout](#cleartimeout-timeoutid-) _`inherited`_
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
@@ -84,6 +90,8 @@ After an instance has been created it can be accessed globally using `Video('exa
   - [ready](#ready-fn-) _`inherited`_
   - [removeChild](#removechild-component-) _`inherited`_
   - [removeClass](#removeclass-classtoremove-) _`inherited`_
+  - [setInterval](#setinterval-fn-interval-) _`inherited`_
+  - [setTimeout](#settimeout-fn-timeout-) _`inherited`_
   - [show](#show) _`inherited`_
   - [trigger](#trigger-event-) _`inherited`_
   - [triggerReady](#triggerready) _`inherited`_
@@ -92,6 +100,7 @@ After an instance has been created it can be accessed globally using `Video('exa
 - [EVENTS](#events)
   - [durationchange](#durationchange-event)
   - [ended](#ended-event)
+  - [error](#error-event)
   - [firstplay](#firstplay-event)
   - [fullscreenchange](#fullscreenchange-event)
   - [loadedalldata](#loadedalldata-event)
@@ -159,6 +168,20 @@ _inherited from_: [src/js/component.js#L826](https://github.com/videojs/video.js
 
 ---
 
+### addTextTrack( kind, [label], [language] )
+> Add a text track
+> In addition to the W3C settings we allow adding additional info through options.
+> http://www.w3.org/html/wg/drafts/html/master/embedded-content-0.html#dom-media-addtexttrack
+
+##### PARAMETERS: 
+* __kind__ `String` Captions, subtitles, chapters, descriptions, or metadata
+* __label__ `String` _(OPTIONAL)_ Optional label
+* __language__ `String` _(OPTIONAL)_ Optional language
+
+_defined in_: [src/js/player.js#L1722](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1722)
+
+---
+
 ### autoplay( value )
 > Get or set the autoplay attribute.
 
@@ -169,7 +192,7 @@ _inherited from_: [src/js/component.js#L826](https://github.com/videojs/video.js
 * `String` The autoplay attribute value when getting
 * `vjs.Player` Returns the player when setting
 
-_defined in_: [src/js/player.js#L1272](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1272)
+_defined in_: [src/js/player.js#L1263](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1263)
 
 ---
 
@@ -194,7 +217,7 @@ _defined in_: [src/js/player.js#L1272](https://github.com/videojs/video.js/blob/
 ##### RETURNS: 
 * `Object` A mock TimeRange object (following HTML spec)
 
-_defined in_: [src/js/player.js#L782](https://github.com/videojs/video.js/blob/master/src/js/player.js#L782)
+_defined in_: [src/js/player.js#L770](https://github.com/videojs/video.js/blob/master/src/js/player.js#L770)
 
 ---
 
@@ -206,7 +229,7 @@ _defined in_: [src/js/player.js#L782](https://github.com/videojs/video.js/blob/m
 ##### RETURNS: 
 * `Number` The end of the last buffered time range
 
-_defined in_: [src/js/player.js#L833](https://github.com/videojs/video.js/blob/master/src/js/player.js#L833)
+_defined in_: [src/js/player.js#L821](https://github.com/videojs/video.js/blob/master/src/js/player.js#L821)
 
 ---
 
@@ -221,7 +244,7 @@ _defined in_: [src/js/player.js#L833](https://github.com/videojs/video.js/blob/m
 ##### RETURNS: 
 * `Number` A decimal between 0 and 1 representing the percent
 
-_defined in_: [src/js/player.js#L802](https://github.com/videojs/video.js/blob/master/src/js/player.js#L802)
+_defined in_: [src/js/player.js#L790](https://github.com/videojs/video.js/blob/master/src/js/player.js#L790)
 
 ---
 
@@ -239,7 +262,7 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 > Old naming for exitFullscreen
 **Deprecated** true
 
-_defined in_: [src/js/player.js#L1038](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1038)
+_defined in_: [src/js/player.js#L1026](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1026)
 
 ---
 
@@ -255,6 +278,32 @@ _inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js
 
 ---
 
+### clearInterval( intervalId )
+> Clears an interval and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __intervalId__ `Number` The id of the interval to clear
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1223](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1223)
+
+---
+
+### clearTimeout( timeoutId )
+> Clears a timeout and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __timeoutId__ `Number` The id of the timeout to clear
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1185](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1185)
+
+---
+
 ### contentEl()
 > Return the component's DOM element for embedding content.
 > Will either be el_ or a new element defined in createEl.
@@ -275,7 +324,7 @@ _inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Boolean` Controls are showing
 
-_defined in_: [src/js/player.js#L1352](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1352)
+_defined in_: [src/js/player.js#L1343](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1343)
 
 ---
 
@@ -300,7 +349,7 @@ _inherited from_: [src/js/component.js#L200](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` The current source
 
-_defined in_: [src/js/player.js#L1239](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1239)
+_defined in_: [src/js/player.js#L1230](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1230)
 
 ---
 
@@ -320,7 +369,7 @@ _defined in_: [src/js/player.js#L1239](https://github.com/videojs/video.js/blob/
 * `Number` The time in seconds, when not setting
 * `vjs.Player` self, when the current time is set
 
-_defined in_: [src/js/player.js#L702](https://github.com/videojs/video.js/blob/master/src/js/player.js#L702)
+_defined in_: [src/js/player.js#L690](https://github.com/videojs/video.js/blob/master/src/js/player.js#L690)
 
 ---
 
@@ -332,7 +381,7 @@ _defined in_: [src/js/player.js#L702](https://github.com/videojs/video.js/blob/m
 ##### RETURNS: 
 * `String` The source MIME type
 
-_defined in_: [src/js/player.js#L1249](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1249)
+_defined in_: [src/js/player.js#L1240](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1240)
 
 ---
 
@@ -377,7 +426,7 @@ _defined in_: [src/js/player.js#L164](https://github.com/videojs/video.js/blob/m
 ##### RETURNS: 
 * `Number` The duration of the video in seconds
 
-_defined in_: [src/js/player.js#L730](https://github.com/videojs/video.js/blob/master/src/js/player.js#L730)
+_defined in_: [src/js/player.js#L718](https://github.com/videojs/video.js/blob/master/src/js/player.js#L718)
 
 ---
 
@@ -416,7 +465,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 > whenever touch events happen, and this can be turned off by components that
 > want touch events to act differently.
 
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
+_inherited from_: [src/js/component.js#L1124](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1124)
 
 ---
 
@@ -426,7 +475,7 @@ _inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.j
 ##### RETURNS: 
 * `Boolean` True if the player is in the ended state, false if not.
 
-_defined in_: [src/js/player.js#L1473](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1473)
+_defined in_: [src/js/player.js#L1464](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1464)
 
 ---
 
@@ -440,7 +489,7 @@ _defined in_: [src/js/player.js#L1473](https://github.com/videojs/video.js/blob/
 * `vjs.MediaError|null` when getting
 * `vjs.Player` when setting
 
-_defined in_: [src/js/player.js#L1437](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1437)
+_defined in_: [src/js/player.js#L1428](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1428)
 
 ---
 
@@ -452,7 +501,7 @@ _defined in_: [src/js/player.js#L1437](https://github.com/videojs/video.js/blob/
 ##### RETURNS: 
 * `vjs.Player` self
 
-_defined in_: [src/js/player.js#L1017](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1017)
+_defined in_: [src/js/player.js#L1005](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1005)
 
 ---
 
@@ -593,7 +642,7 @@ _inherited from_: [src/js/component.js#L481](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __isFS__ 
 
-_defined in_: [src/js/player.js#L940](https://github.com/videojs/video.js/blob/master/src/js/player.js#L940)
+_defined in_: [src/js/player.js#L928](https://github.com/videojs/video.js/blob/master/src/js/player.js#L928)
 
 ---
 
@@ -617,7 +666,7 @@ _defined in_: [src/js/player.js#L940](https://github.com/videojs/video.js/blob/m
 * `Boolean` true if fullscreen, false if not
 * `vjs.Player` self, when setting
 
-_defined in_: [src/js/player.js#L928](https://github.com/videojs/video.js/blob/master/src/js/player.js#L928)
+_defined in_: [src/js/player.js#L916](https://github.com/videojs/video.js/blob/master/src/js/player.js#L916)
 
 ---
 
@@ -641,7 +690,7 @@ _defined in_: [src/js/player.js#L124](https://github.com/videojs/video.js/blob/m
 ##### RETURNS: 
 * `vjs.Player` Returns the player
 
-_defined in_: [src/js/player.js#L1229](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1229)
+_defined in_: [src/js/player.js#L1220](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1220)
 
 ---
 
@@ -655,7 +704,7 @@ _defined in_: [src/js/player.js#L1229](https://github.com/videojs/video.js/blob/
 * `String` The loop attribute value when getting
 * `vjs.Player` Returns the player when setting
 
-_defined in_: [src/js/player.js#L1286](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1286)
+_defined in_: [src/js/player.js#L1277](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1277)
 
 ---
 
@@ -675,7 +724,7 @@ _defined in_: [src/js/player.js#L1286](https://github.com/videojs/video.js/blob/
 * `Boolean` True if mute is on, false if not, when getting
 * `vjs.Player` self, when setting mute
 
-_defined in_: [src/js/player.js#L890](https://github.com/videojs/video.js/blob/master/src/js/player.js#L890)
+_defined in_: [src/js/player.js#L878](https://github.com/videojs/video.js/blob/master/src/js/player.js#L878)
 
 ---
 
@@ -691,6 +740,29 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 
 ---
 
+### networkState()
+> Returns the current state of network activity for the element, from
+> the codes in the list below.
+> - NETWORK_EMPTY (numeric value 0)
+>   The element has not yet been initialised. All attributes are in
+>   their initial states.
+> - NETWORK_IDLE (numeric value 1)
+>   The element's resource selection algorithm is active and has
+>   selected a resource, but it is not actually using the network at
+>   this time.
+> - NETWORK_LOADING (numeric value 2)
+>   The user agent is actively trying to download data.
+> - NETWORK_NO_SOURCE (numeric value 3)
+>   The element's resource selection algorithm is active, but it has
+>   not yet found a resource to use.
+
+##### RETURNS: 
+* `Number` the current network activity state
+
+_defined in_: [src/js/player.js#L1662](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1662)
+
+---
+
 ### off( [first], [second], [third] )
 > Remove an event listener from this component's element
 > 
@@ -737,7 +809,7 @@ _inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js
 > 
 > The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
 > and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
+> will be automatically cleaned up when either component is disposed.
 > It will also bind myComponent as the context of myFunc.
 > 
 > **NOTE**: When using this on elements in the page other than window
@@ -836,7 +908,7 @@ _inherited from_: [src/js/component.js#L179](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` self
 
-_defined in_: [src/js/player.js#L671](https://github.com/videojs/video.js/blob/master/src/js/player.js#L671)
+_defined in_: [src/js/player.js#L659](https://github.com/videojs/video.js/blob/master/src/js/player.js#L659)
 
 ---
 
@@ -849,7 +921,7 @@ _defined in_: [src/js/player.js#L671](https://github.com/videojs/video.js/blob/m
 ##### RETURNS: 
 * `Boolean` false if the media is currently playing, or true otherwise
 
-_defined in_: [src/js/player.js#L684](https://github.com/videojs/video.js/blob/master/src/js/player.js#L684)
+_defined in_: [src/js/player.js#L672](https://github.com/videojs/video.js/blob/master/src/js/player.js#L672)
 
 ---
 
@@ -861,7 +933,7 @@ _defined in_: [src/js/player.js#L684](https://github.com/videojs/video.js/blob/m
 ##### RETURNS: 
 * `vjs.Player` self
 
-_defined in_: [src/js/player.js#L659](https://github.com/videojs/video.js/blob/master/src/js/player.js#L659)
+_defined in_: [src/js/player.js#L647](https://github.com/videojs/video.js/blob/master/src/js/player.js#L647)
 
 ---
 
@@ -875,7 +947,7 @@ _defined in_: [src/js/player.js#L659](https://github.com/videojs/video.js/blob/m
 * `Number` Returns the new playback rate when setting
 * `Number` Returns the current playback rate when getting
 
-_defined in_: [src/js/player.js#L1621](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1621)
+_defined in_: [src/js/player.js#L1606](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1606)
 
 ---
 
@@ -907,7 +979,7 @@ _inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js
 * `String` poster URL when getting
 * `vjs.Player` self when setting
 
-_defined in_: [src/js/player.js#L1317](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1317)
+_defined in_: [src/js/player.js#L1308](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1308)
 
 ---
 
@@ -921,14 +993,14 @@ _defined in_: [src/js/player.js#L1317](https://github.com/videojs/video.js/blob/
 * `String` The preload attribute value when getting
 * `vjs.Player` Returns the player when setting
 
-_defined in_: [src/js/player.js#L1258](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1258)
+_defined in_: [src/js/player.js#L1249](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1249)
 
 ---
 
 ### ready( fn )
 > Bind a listener to the component's ready state
 > 
-> Different from event listeners in that if the ready event has already happend
+> Different from event listeners in that if the ready event has already happened
 > it will trigger the function immediately.
 
 ##### PARAMETERS: 
@@ -941,6 +1013,32 @@ _inherited from_: [src/js/component.js#L769](https://github.com/videojs/video.js
 
 ---
 
+### readyState()
+> Returns a value that expresses the current state of the element
+> with respect to rendering the current playback position, from the
+> codes in the list below.
+> - HAVE_NOTHING (numeric value 0)
+>   No information regarding the media resource is available.
+> - HAVE_METADATA (numeric value 1)
+>   Enough of the resource has been obtained that the duration of the
+>   resource is available.
+> - HAVE_CURRENT_DATA (numeric value 2)
+>   Data for the immediate current playback position is available.
+> - HAVE_FUTURE_DATA (numeric value 3)
+>   Data for the immediate current playback position is available, as
+>   well as enough data for the user agent to advance the current
+>   playback position in the direction of playback.
+> - HAVE_ENOUGH_DATA (numeric value 4)
+>   The user agent estimates that enough data is available for
+>   playback to proceed uninterrupted.
+
+##### RETURNS: 
+* `Number` the current playback rendering state
+
+_defined in_: [src/js/player.js#L1687](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1687)
+
+---
+
 ### remainingTime()
 > Calculates how much time is left.
 > 
@@ -951,7 +1049,7 @@ _inherited from_: [src/js/component.js#L769](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Number` The time remaining in seconds
 
-_defined in_: [src/js/player.js#L754](https://github.com/videojs/video.js/blob/master/src/js/player.js#L754)
+_defined in_: [src/js/player.js#L742](https://github.com/videojs/video.js/blob/master/src/js/player.js#L742)
 
 ---
 
@@ -983,7 +1081,7 @@ _inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js
 > Old naming for requestFullscreen
 **Deprecated** true
 
-_defined in_: [src/js/player.js#L1004](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1004)
+_defined in_: [src/js/player.js#L992](https://github.com/videojs/video.js/blob/master/src/js/player.js#L992)
 
 ---
 
@@ -1002,7 +1100,7 @@ _defined in_: [src/js/player.js#L1004](https://github.com/videojs/video.js/blob/
 ##### RETURNS: 
 * `vjs.Player` self
 
-_defined in_: [src/js/player.js#L959](https://github.com/videojs/video.js/blob/master/src/js/player.js#L959)
+_defined in_: [src/js/player.js#L947](https://github.com/videojs/video.js/blob/master/src/js/player.js#L947)
 
 ---
 
@@ -1012,7 +1110,35 @@ _defined in_: [src/js/player.js#L959](https://github.com/videojs/video.js/blob/m
 ##### RETURNS: 
 * `Boolean` True if the player is in the seeking state, false if not.
 
-_defined in_: [src/js/player.js#L1479](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1479)
+_defined in_: [src/js/player.js#L1470](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1470)
+
+---
+
+### setInterval( fn, interval )
+> Creates an interval and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run every N seconds.
+* __interval__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1202](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1202)
+
+---
+
+### setTimeout( fn, timeout )
+> Creates timeout and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run after the timeout.
+* __timeout__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1162](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1162)
 
 ---
 
@@ -1061,7 +1187,18 @@ _inherited from_: [src/js/component.js#L847](https://github.com/videojs/video.js
 * `String` The current video source when getting
 * `String` The player when setting
 
-_defined in_: [src/js/player.js#L1148](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1148)
+_defined in_: [src/js/player.js#L1135](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1135)
+
+---
+
+### textTracks()
+> Get an array of associated text tracks. captions, subtitles, chapters, descriptions
+> http://www.w3.org/html/wg/drafts/html/master/embedded-content-0.html#dom-media-texttracks
+
+##### RETURNS: 
+* `Array` Array of track objects
+
+_defined in_: [src/js/player.js#L1704](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1704)
 
 ---
 
@@ -1109,7 +1246,7 @@ _inherited from_: [src/js/component.js#L788](https://github.com/videojs/video.js
 * `Number` The current volume, when getting
 * `vjs.Player` self, when setting
 
-_defined in_: [src/js/player.js#L860](https://github.com/videojs/video.js/blob/master/src/js/player.js#L860)
+_defined in_: [src/js/player.js#L848](https://github.com/videojs/video.js/blob/master/src/js/player.js#L848)
 
 ---
 
@@ -1138,14 +1275,21 @@ _inherited from_: [src/js/component.js#L910](https://github.com/videojs/video.js
 ### durationchange `EVENT`
 > Fired when the duration of the media resource is first known or changed
 
-_defined in_: [src/js/player.js#L554](https://github.com/videojs/video.js/blob/master/src/js/player.js#L554)
+_defined in_: [src/js/player.js#L536](https://github.com/videojs/video.js/blob/master/src/js/player.js#L536)
 
 ---
 
 ### ended `EVENT`
 > Fired when the end of the media resource is reached (currentTime == duration)
 
-_defined in_: [src/js/player.js#L541](https://github.com/videojs/video.js/blob/master/src/js/player.js#L541)
+_defined in_: [src/js/player.js#L522](https://github.com/videojs/video.js/blob/master/src/js/player.js#L522)
+
+---
+
+### error `EVENT`
+> Fired when an error occurs
+
+_defined in_: [src/js/player.js#L577](https://github.com/videojs/video.js/blob/master/src/js/player.js#L577)
 
 ---
 
@@ -1156,63 +1300,63 @@ _defined in_: [src/js/player.js#L541](https://github.com/videojs/video.js/blob/m
 > implementation yet, so use sparingly. If you don't have a reason to
 > prevent playback, use `myPlayer.one('play');` instead.
 
-_defined in_: [src/js/player.js#L498](https://github.com/videojs/video.js/blob/master/src/js/player.js#L498)
+_defined in_: [src/js/player.js#L479](https://github.com/videojs/video.js/blob/master/src/js/player.js#L479)
 
 ---
 
 ### fullscreenchange `EVENT`
 > Fired when the player switches in or out of fullscreen mode
 
-_defined in_: [src/js/player.js#L583](https://github.com/videojs/video.js/blob/master/src/js/player.js#L583)
+_defined in_: [src/js/player.js#L565](https://github.com/videojs/video.js/blob/master/src/js/player.js#L565)
 
 ---
 
 ### loadedalldata `EVENT`
 > Fired when the player has finished downloading the source data
 
-_defined in_: [src/js/player.js#L445](https://github.com/videojs/video.js/blob/master/src/js/player.js#L445)
+_defined in_: [src/js/player.js#L421](https://github.com/videojs/video.js/blob/master/src/js/player.js#L421)
 
 ---
 
 ### loadeddata `EVENT`
 > Fired when the player has downloaded data at the current playback position
 
-_defined in_: [src/js/player.js#L439](https://github.com/videojs/video.js/blob/master/src/js/player.js#L439)
+_defined in_: [src/js/player.js#L415](https://github.com/videojs/video.js/blob/master/src/js/player.js#L415)
 
 ---
 
 ### loadedmetadata `EVENT`
 > Fired when the player has initial duration and dimension information
 
-_defined in_: [src/js/player.js#L433](https://github.com/videojs/video.js/blob/master/src/js/player.js#L433)
+_defined in_: [src/js/player.js#L409](https://github.com/videojs/video.js/blob/master/src/js/player.js#L409)
 
 ---
 
 ### loadstart `EVENT`
 > Fired when the user agent begins looking for media data
 
-_defined in_: [src/js/player.js#L389](https://github.com/videojs/video.js/blob/master/src/js/player.js#L389)
+_defined in_: [src/js/player.js#L366](https://github.com/videojs/video.js/blob/master/src/js/player.js#L366)
 
 ---
 
 ### pause `EVENT`
 > Fired whenever the media has been paused
 
-_defined in_: [src/js/player.js#L512](https://github.com/videojs/video.js/blob/master/src/js/player.js#L512)
+_defined in_: [src/js/player.js#L493](https://github.com/videojs/video.js/blob/master/src/js/player.js#L493)
 
 ---
 
 ### play `EVENT`
 > Fired whenever the media begins or resumes playback
 
-_defined in_: [src/js/player.js#L451](https://github.com/videojs/video.js/blob/master/src/js/player.js#L451)
+_defined in_: [src/js/player.js#L427](https://github.com/videojs/video.js/blob/master/src/js/player.js#L427)
 
 ---
 
 ### progress `EVENT`
 > Fired while the user agent is downloading media data
 
-_defined in_: [src/js/player.js#L530](https://github.com/videojs/video.js/blob/master/src/js/player.js#L530)
+_defined in_: [src/js/player.js#L511](https://github.com/videojs/video.js/blob/master/src/js/player.js#L511)
 
 ---
 
@@ -1226,14 +1370,14 @@ _inherited from_: [src/js/component.js#L1020](https://github.com/videojs/video.j
 ### seeked `EVENT`
 > Fired when the player has finished jumping to a new time
 
-_defined in_: [src/js/player.js#L485](https://github.com/videojs/video.js/blob/master/src/js/player.js#L485)
+_defined in_: [src/js/player.js#L466](https://github.com/videojs/video.js/blob/master/src/js/player.js#L466)
 
 ---
 
 ### seeking `EVENT`
 > Fired whenever the player is jumping to a new time
 
-_defined in_: [src/js/player.js#L477](https://github.com/videojs/video.js/blob/master/src/js/player.js#L477)
+_defined in_: [src/js/player.js#L458](https://github.com/videojs/video.js/blob/master/src/js/player.js#L458)
 
 ---
 
@@ -1243,21 +1387,21 @@ _defined in_: [src/js/player.js#L477](https://github.com/videojs/video.js/blob/m
 > During playback this is fired every 15-250 milliseconds, depending on the
 > playback technology in use.
 
-_defined in_: [src/js/player.js#L524](https://github.com/videojs/video.js/blob/master/src/js/player.js#L524)
+_defined in_: [src/js/player.js#L505](https://github.com/videojs/video.js/blob/master/src/js/player.js#L505)
 
 ---
 
 ### volumechange `EVENT`
 > Fired when the volume changes
 
-_defined in_: [src/js/player.js#L577](https://github.com/videojs/video.js/blob/master/src/js/player.js#L577)
+_defined in_: [src/js/player.js#L559](https://github.com/videojs/video.js/blob/master/src/js/player.js#L559)
 
 ---
 
 ### waiting `EVENT`
-> Fired whenever the media begins wating
+> Fired whenever the media begins waiting
 
-_defined in_: [src/js/player.js#L460](https://github.com/videojs/video.js/blob/master/src/js/player.js#L460)
+_defined in_: [src/js/player.js#L441](https://github.com/videojs/video.js/blob/master/src/js/player.js#L441)
 
 ---
 

docs/api/vjs.PosterImage.md

@@ -22,6 +22,8 @@ The component that handles showing the poster image.
   - [addClass](#addclass-classtoadd-) _`inherited`_
   - [buildCSSClass](#buildcssclass) _`inherited`_
   - [children](#children) _`inherited`_
+  - [clearInterval](#clearinterval-intervalid-) _`inherited`_
+  - [clearTimeout](#cleartimeout-timeoutid-) _`inherited`_
   - [contentEl](#contentel) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
   - [el](#el) _`inherited`_
@@ -42,6 +44,8 @@ The component that handles showing the poster image.
   - [ready](#ready-fn-) _`inherited`_
   - [removeChild](#removechild-component-) _`inherited`_
   - [removeClass](#removeclass-classtoremove-) _`inherited`_
+  - [setInterval](#setinterval-fn-interval-) _`inherited`_
+  - [setTimeout](#settimeout-fn-timeout-) _`inherited`_
   - [show](#show) _`inherited`_
   - [trigger](#trigger-event-) _`inherited`_
   - [triggerReady](#triggerready) _`inherited`_
@@ -123,6 +127,32 @@ _inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js
 
 ---
 
+### clearInterval( intervalId )
+> Clears an interval and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __intervalId__ `Number` The id of the interval to clear
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1223](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1223)
+
+---
+
+### clearTimeout( timeoutId )
+> Clears a timeout and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __timeoutId__ `Number` The id of the timeout to clear
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1185](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1185)
+
+---
+
 ### contentEl()
 > Return the component's DOM element for embedding content.
 > Will either be el_ or a new element defined in createEl.
@@ -200,7 +230,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 > whenever touch events happen, and this can be turned off by components that
 > want touch events to act differently.
 
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
+_inherited from_: [src/js/component.js#L1124](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1124)
 
 ---
 
@@ -390,7 +420,7 @@ _inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js
 > 
 > The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
 > and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
+> will be automatically cleaned up when either component is disposed.
 > It will also bind myComponent as the context of myFunc.
 > 
 > **NOTE**: When using this on elements in the page other than window
@@ -413,7 +443,7 @@ _inherited from_: [src/js/component.js#L577](https://github.com/videojs/video.js
 ### onClick()
 > Event handler for clicks on the poster image
 
-_defined in_: [src/js/poster.js#L95](https://github.com/videojs/video.js/blob/master/src/js/poster.js#L95)
+_defined in_: [src/js/poster.js#L92](https://github.com/videojs/video.js/blob/master/src/js/poster.js#L92)
 
 ---
 
@@ -501,7 +531,7 @@ _inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js
 ### ready( fn )
 > Bind a listener to the component's ready state
 > 
-> Different from event listeners in that if the ready event has already happend
+> Different from event listeners in that if the ready event has already happened
 > it will trigger the function immediately.
 
 ##### PARAMETERS: 
@@ -538,13 +568,41 @@ _inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js
 
 ---
 
+### setInterval( fn, interval )
+> Creates an interval and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run every N seconds.
+* __interval__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1202](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1202)
+
+---
+
 ### setSrc( url )
 > Set the poster source depending on the display method
 
 ##### PARAMETERS: 
 * __url__ 
 
-_defined in_: [src/js/poster.js#L75](https://github.com/videojs/video.js/blob/master/src/js/poster.js#L75)
+_defined in_: [src/js/poster.js#L72](https://github.com/videojs/video.js/blob/master/src/js/poster.js#L72)
+
+---
+
+### setTimeout( fn, timeout )
+> Creates timeout and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run after the timeout.
+* __timeout__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1162](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1162)
 
 ---
 

docs/api/vjs.ProgressControl.md

@@ -18,6 +18,8 @@ and play progress
   - [addClass](#addclass-classtoadd-) _`inherited`_
   - [buildCSSClass](#buildcssclass) _`inherited`_
   - [children](#children) _`inherited`_
+  - [clearInterval](#clearinterval-intervalid-) _`inherited`_
+  - [clearTimeout](#cleartimeout-timeoutid-) _`inherited`_
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
@@ -40,6 +42,8 @@ and play progress
   - [ready](#ready-fn-) _`inherited`_
   - [removeChild](#removechild-component-) _`inherited`_
   - [removeClass](#removeclass-classtoremove-) _`inherited`_
+  - [setInterval](#setinterval-fn-interval-) _`inherited`_
+  - [setTimeout](#settimeout-fn-timeout-) _`inherited`_
   - [show](#show) _`inherited`_
   - [trigger](#trigger-event-) _`inherited`_
   - [triggerReady](#triggerready) _`inherited`_
@@ -121,6 +125,32 @@ _inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js
 
 ---
 
+### clearInterval( intervalId )
+> Clears an interval and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __intervalId__ `Number` The id of the interval to clear
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1223](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1223)
+
+---
+
+### clearTimeout( timeoutId )
+> Clears a timeout and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __timeoutId__ `Number` The id of the timeout to clear
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1185](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1185)
+
+---
+
 ### contentEl()
 > Return the component's DOM element for embedding content.
 > Will either be el_ or a new element defined in createEl.
@@ -202,7 +232,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 > whenever touch events happen, and this can be turned off by components that
 > want touch events to act differently.
 
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
+_inherited from_: [src/js/component.js#L1124](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1124)
 
 ---
 
@@ -392,7 +422,7 @@ _inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js
 > 
 > The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
 > and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
+> will be automatically cleaned up when either component is disposed.
 > It will also bind myComponent as the context of myFunc.
 > 
 > **NOTE**: When using this on elements in the page other than window
@@ -496,7 +526,7 @@ _inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js
 ### ready( fn )
 > Bind a listener to the component's ready state
 > 
-> Different from event listeners in that if the ready event has already happend
+> Different from event listeners in that if the ready event has already happened
 > it will trigger the function immediately.
 
 ##### PARAMETERS: 
@@ -533,6 +563,34 @@ _inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js
 
 ---
 
+### setInterval( fn, interval )
+> Creates an interval and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run every N seconds.
+* __interval__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1202](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1202)
+
+---
+
+### setTimeout( fn, timeout )
+> Creates timeout and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run after the timeout.
+* __timeout__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1162](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1162)
+
+---
+
 ### show()
 > Show the component element if hidden
 

docs/api/vjs.RemainingTimeDisplay.md

@@ -3,7 +3,7 @@
 # vjs.RemainingTimeDisplay
 
 __EXTENDS__: [vjs.Component](vjs.Component.md)  
-__DEFINED IN__: [src/js/control-bar/time-display.js#L108](https://github.com/videojs/video.js/blob/master/src/js/control-bar/time-display.js#L108)  
+__DEFINED IN__: [src/js/control-bar/time-display.js#L109](https://github.com/videojs/video.js/blob/master/src/js/control-bar/time-display.js#L109)  
 
 Displays the time left in the video
 
@@ -17,6 +17,8 @@ Displays the time left in the video
   - [addClass](#addclass-classtoadd-) _`inherited`_
   - [buildCSSClass](#buildcssclass) _`inherited`_
   - [children](#children) _`inherited`_
+  - [clearInterval](#clearinterval-intervalid-) _`inherited`_
+  - [clearTimeout](#cleartimeout-timeoutid-) _`inherited`_
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
@@ -39,6 +41,8 @@ Displays the time left in the video
   - [ready](#ready-fn-) _`inherited`_
   - [removeChild](#removechild-component-) _`inherited`_
   - [removeClass](#removeclass-classtoremove-) _`inherited`_
+  - [setInterval](#setinterval-fn-interval-) _`inherited`_
+  - [setTimeout](#settimeout-fn-timeout-) _`inherited`_
   - [show](#show) _`inherited`_
   - [trigger](#trigger-event-) _`inherited`_
   - [triggerReady](#triggerready) _`inherited`_
@@ -120,6 +124,32 @@ _inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js
 
 ---
 
+### clearInterval( intervalId )
+> Clears an interval and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __intervalId__ `Number` The id of the interval to clear
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1223](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1223)
+
+---
+
+### clearTimeout( timeoutId )
+> Clears a timeout and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __timeoutId__ `Number` The id of the timeout to clear
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1185](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1185)
+
+---
+
 ### contentEl()
 > Return the component's DOM element for embedding content.
 > Will either be el_ or a new element defined in createEl.
@@ -201,7 +231,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 > whenever touch events happen, and this can be turned off by components that
 > want touch events to act differently.
 
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
+_inherited from_: [src/js/component.js#L1124](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1124)
 
 ---
 
@@ -292,7 +322,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 * __player__ 
 * __options__ 
 
-_defined in_: [src/js/control-bar/time-display.js#L110](https://github.com/videojs/video.js/blob/master/src/js/control-bar/time-display.js#L110)
+_defined in_: [src/js/control-bar/time-display.js#L111](https://github.com/videojs/video.js/blob/master/src/js/control-bar/time-display.js#L111)
 
 ---
 
@@ -391,7 +421,7 @@ _inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js
 > 
 > The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
 > and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
+> will be automatically cleaned up when either component is disposed.
 > It will also bind myComponent as the context of myFunc.
 > 
 > **NOTE**: When using this on elements in the page other than window
@@ -495,7 +525,7 @@ _inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js
 ### ready( fn )
 > Bind a listener to the component's ready state
 > 
-> Different from event listeners in that if the ready event has already happend
+> Different from event listeners in that if the ready event has already happened
 > it will trigger the function immediately.
 
 ##### PARAMETERS: 
@@ -532,6 +562,34 @@ _inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js
 
 ---
 
+### setInterval( fn, interval )
+> Creates an interval and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run every N seconds.
+* __interval__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1202](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1202)
+
+---
+
+### setTimeout( fn, timeout )
+> Creates timeout and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run after the timeout.
+* __timeout__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1162](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1162)
+
+---
+
 ### show()
 > Show the component element if hidden
 

docs/api/vjs.SeekBar.md

@@ -17,6 +17,8 @@ Seek Bar and holder for the progress bars
   - [addClass](#addclass-classtoadd-) _`inherited`_
   - [buildCSSClass](#buildcssclass) _`inherited`_
   - [children](#children) _`inherited`_
+  - [clearInterval](#clearinterval-intervalid-) _`inherited`_
+  - [clearTimeout](#cleartimeout-timeoutid-) _`inherited`_
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
@@ -40,6 +42,8 @@ Seek Bar and holder for the progress bars
   - [ready](#ready-fn-) _`inherited`_
   - [removeChild](#removechild-component-) _`inherited`_
   - [removeClass](#removeclass-classtoremove-) _`inherited`_
+  - [setInterval](#setinterval-fn-interval-) _`inherited`_
+  - [setTimeout](#settimeout-fn-timeout-) _`inherited`_
   - [show](#show) _`inherited`_
   - [trigger](#trigger-event-) _`inherited`_
   - [triggerReady](#triggerready) _`inherited`_
@@ -121,6 +125,32 @@ _inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js
 
 ---
 
+### clearInterval( intervalId )
+> Clears an interval and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __intervalId__ `Number` The id of the interval to clear
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1223](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1223)
+
+---
+
+### clearTimeout( timeoutId )
+> Clears a timeout and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __timeoutId__ `Number` The id of the timeout to clear
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1185](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1185)
+
+---
+
 ### contentEl()
 > Return the component's DOM element for embedding content.
 > Will either be el_ or a new element defined in createEl.
@@ -202,7 +232,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 > whenever touch events happen, and this can be turned off by components that
 > want touch events to act differently.
 
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
+_inherited from_: [src/js/component.js#L1124](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1124)
 
 ---
 
@@ -392,7 +422,7 @@ _inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js
 > 
 > The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
 > and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
+> will be automatically cleaned up when either component is disposed.
 > It will also bind myComponent as the context of myFunc.
 > 
 > **NOTE**: When using this on elements in the page other than window
@@ -419,7 +449,7 @@ _inherited from_: [src/js/component.js#L577](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __event__ `Object` Event object
 
-_inherited from_: [src/js/slider.js#L212](https://github.com/videojs/video.js/blob/master/src/js/slider.js#L212)
+_inherited from_: [src/js/slider.js#L202](https://github.com/videojs/video.js/blob/master/src/js/slider.js#L202)
 
 ---
 
@@ -507,7 +537,7 @@ _inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js
 ### ready( fn )
 > Bind a listener to the component's ready state
 > 
-> Different from event listeners in that if the ready event has already happend
+> Different from event listeners in that if the ready event has already happened
 > it will trigger the function immediately.
 
 ##### PARAMETERS: 
@@ -544,6 +574,34 @@ _inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js
 
 ---
 
+### setInterval( fn, interval )
+> Creates an interval and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run every N seconds.
+* __interval__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1202](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1202)
+
+---
+
+### setTimeout( fn, timeout )
+> Creates timeout and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run after the timeout.
+* __timeout__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1162](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1162)
+
+---
+
 ### show()
 > Show the component element if hidden
 

docs/api/vjs.SeekHandle.md

@@ -3,7 +3,7 @@
 # vjs.SeekHandle
 
 __EXTENDS__: [vjs.SliderHandle](vjs.SliderHandle.md)  
-__DEFINED IN__: [src/js/control-bar/progress-control.js#L197](https://github.com/videojs/video.js/blob/master/src/js/control-bar/progress-control.js#L197)  
+__DEFINED IN__: [src/js/control-bar/progress-control.js#L199](https://github.com/videojs/video.js/blob/master/src/js/control-bar/progress-control.js#L199)  
 
 The Seek Handle shows the current position of the playhead during playback,
 and can be dragged to adjust the playhead.
@@ -18,6 +18,8 @@ and can be dragged to adjust the playhead.
   - [addClass](#addclass-classtoadd-) _`inherited`_
   - [buildCSSClass](#buildcssclass) _`inherited`_
   - [children](#children) _`inherited`_
+  - [clearInterval](#clearinterval-intervalid-) _`inherited`_
+  - [clearTimeout](#cleartimeout-timeoutid-) _`inherited`_
   - [contentEl](#contentel) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
   - [dispose](#dispose) _`inherited`_
@@ -40,6 +42,8 @@ and can be dragged to adjust the playhead.
   - [ready](#ready-fn-) _`inherited`_
   - [removeChild](#removechild-component-) _`inherited`_
   - [removeClass](#removeclass-classtoremove-) _`inherited`_
+  - [setInterval](#setinterval-fn-interval-) _`inherited`_
+  - [setTimeout](#settimeout-fn-timeout-) _`inherited`_
   - [show](#show) _`inherited`_
   - [trigger](#trigger-event-) _`inherited`_
   - [triggerReady](#triggerready) _`inherited`_
@@ -121,6 +125,32 @@ _inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js
 
 ---
 
+### clearInterval( intervalId )
+> Clears an interval and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __intervalId__ `Number` The id of the interval to clear
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1223](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1223)
+
+---
+
+### clearTimeout( timeoutId )
+> Clears a timeout and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __timeoutId__ `Number` The id of the timeout to clear
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1185](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1185)
+
+---
+
 ### contentEl()
 > Return the component's DOM element for embedding content.
 > Will either be el_ or a new element defined in createEl.
@@ -139,7 +169,7 @@ _inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js
 * __tagName__ `String` _(OPTIONAL)_ Element's node type. e.g. 'div'
 * __attributes__ `Object` _(OPTIONAL)_ An object of element attributes that should be set on the element
 
-_defined in_: [src/js/control-bar/progress-control.js#L213](https://github.com/videojs/video.js/blob/master/src/js/control-bar/progress-control.js#L213)
+_defined in_: [src/js/control-bar/progress-control.js#L215](https://github.com/videojs/video.js/blob/master/src/js/control-bar/progress-control.js#L215)
 
 ---
 
@@ -199,7 +229,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 > whenever touch events happen, and this can be turned off by components that
 > want touch events to act differently.
 
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
+_inherited from_: [src/js/component.js#L1124](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1124)
 
 ---
 
@@ -391,7 +421,7 @@ _inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js
 > 
 > The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
 > and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
+> will be automatically cleaned up when either component is disposed.
 > It will also bind myComponent as the context of myFunc.
 > 
 > **NOTE**: When using this on elements in the page other than window
@@ -495,7 +525,7 @@ _inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js
 ### ready( fn )
 > Bind a listener to the component's ready state
 > 
-> Different from event listeners in that if the ready event has already happend
+> Different from event listeners in that if the ready event has already happened
 > it will trigger the function immediately.
 
 ##### PARAMETERS: 
@@ -532,6 +562,34 @@ _inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js
 
 ---
 
+### setInterval( fn, interval )
+> Creates an interval and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run every N seconds.
+* __interval__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1202](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1202)
+
+---
+
+### setTimeout( fn, timeout )
+> Creates timeout and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run after the timeout.
+* __timeout__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1162](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1162)
+
+---
+
 ### show()
 > Show the component element if hidden
 

docs/api/vjs.Slider.md

@@ -18,6 +18,8 @@ The base functionality for sliders like the volume bar and seek bar
   - [addClass](#addclass-classtoadd-) _`inherited`_
   - [buildCSSClass](#buildcssclass) _`inherited`_
   - [children](#children) _`inherited`_
+  - [clearInterval](#clearinterval-intervalid-) _`inherited`_
+  - [clearTimeout](#cleartimeout-timeoutid-) _`inherited`_
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
@@ -40,6 +42,8 @@ The base functionality for sliders like the volume bar and seek bar
   - [ready](#ready-fn-) _`inherited`_
   - [removeChild](#removechild-component-) _`inherited`_
   - [removeClass](#removeclass-classtoremove-) _`inherited`_
+  - [setInterval](#setinterval-fn-interval-) _`inherited`_
+  - [setTimeout](#settimeout-fn-timeout-) _`inherited`_
   - [show](#show) _`inherited`_
   - [trigger](#trigger-event-) _`inherited`_
   - [triggerReady](#triggerready) _`inherited`_
@@ -121,6 +125,32 @@ _inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js
 
 ---
 
+### clearInterval( intervalId )
+> Clears an interval and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __intervalId__ `Number` The id of the interval to clear
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1223](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1223)
+
+---
+
+### clearTimeout( timeoutId )
+> Clears a timeout and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __timeoutId__ `Number` The id of the timeout to clear
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1185](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1185)
+
+---
+
 ### contentEl()
 > Return the component's DOM element for embedding content.
 > Will either be el_ or a new element defined in createEl.
@@ -202,7 +232,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 > whenever touch events happen, and this can be turned off by components that
 > want touch events to act differently.
 
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
+_inherited from_: [src/js/component.js#L1124](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1124)
 
 ---
 
@@ -392,7 +422,7 @@ _inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js
 > 
 > The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
 > and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
+> will be automatically cleaned up when either component is disposed.
 > It will also bind myComponent as the context of myFunc.
 > 
 > **NOTE**: When using this on elements in the page other than window
@@ -419,7 +449,7 @@ _inherited from_: [src/js/component.js#L577](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __event__ `Object` Event object
 
-_defined in_: [src/js/slider.js#L212](https://github.com/videojs/video.js/blob/master/src/js/slider.js#L212)
+_defined in_: [src/js/slider.js#L202](https://github.com/videojs/video.js/blob/master/src/js/slider.js#L202)
 
 ---
 
@@ -507,7 +537,7 @@ _inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js
 ### ready( fn )
 > Bind a listener to the component's ready state
 > 
-> Different from event listeners in that if the ready event has already happend
+> Different from event listeners in that if the ready event has already happened
 > it will trigger the function immediately.
 
 ##### PARAMETERS: 
@@ -544,6 +574,34 @@ _inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js
 
 ---
 
+### setInterval( fn, interval )
+> Creates an interval and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run every N seconds.
+* __interval__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1202](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1202)
+
+---
+
+### setTimeout( fn, timeout )
+> Creates timeout and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run after the timeout.
+* __timeout__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1162](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1162)
+
+---
+
 ### show()
 > Show the component element if hidden
 

docs/api/vjs.SliderHandle.md

@@ -3,7 +3,7 @@
 # vjs.SliderHandle
 
 __EXTENDS__: [vjs.Component](vjs.Component.md)  
-__DEFINED IN__: [src/js/slider.js#L224](https://github.com/videojs/video.js/blob/master/src/js/slider.js#L224)  
+__DEFINED IN__: [src/js/slider.js#L214](https://github.com/videojs/video.js/blob/master/src/js/slider.js#L214)  
 
 SeekBar Behavior includes play progress bar, and seek handle
 Needed so it can determine seek position based on handle position/size
@@ -18,6 +18,8 @@ Needed so it can determine seek position based on handle position/size
   - [addClass](#addclass-classtoadd-) _`inherited`_
   - [buildCSSClass](#buildcssclass) _`inherited`_
   - [children](#children) _`inherited`_
+  - [clearInterval](#clearinterval-intervalid-) _`inherited`_
+  - [clearTimeout](#cleartimeout-timeoutid-) _`inherited`_
   - [contentEl](#contentel) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
   - [dispose](#dispose) _`inherited`_
@@ -40,6 +42,8 @@ Needed so it can determine seek position based on handle position/size
   - [ready](#ready-fn-) _`inherited`_
   - [removeChild](#removechild-component-) _`inherited`_
   - [removeClass](#removeclass-classtoremove-) _`inherited`_
+  - [setInterval](#setinterval-fn-interval-) _`inherited`_
+  - [setTimeout](#settimeout-fn-timeout-) _`inherited`_
   - [show](#show) _`inherited`_
   - [trigger](#trigger-event-) _`inherited`_
   - [triggerReady](#triggerready) _`inherited`_
@@ -121,6 +125,32 @@ _inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js
 
 ---
 
+### clearInterval( intervalId )
+> Clears an interval and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __intervalId__ `Number` The id of the interval to clear
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1223](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1223)
+
+---
+
+### clearTimeout( timeoutId )
+> Clears a timeout and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __timeoutId__ `Number` The id of the timeout to clear
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1185](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1185)
+
+---
+
 ### contentEl()
 > Return the component's DOM element for embedding content.
 > Will either be el_ or a new element defined in createEl.
@@ -139,7 +169,7 @@ _inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js
 * __tagName__ `String` _(OPTIONAL)_ Element's node type. e.g. 'div'
 * __attributes__ `Object` _(OPTIONAL)_ An object of element attributes that should be set on the element
 
-_defined in_: [src/js/slider.js#L235](https://github.com/videojs/video.js/blob/master/src/js/slider.js#L235)
+_defined in_: [src/js/slider.js#L225](https://github.com/videojs/video.js/blob/master/src/js/slider.js#L225)
 
 ---
 
@@ -199,7 +229,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 > whenever touch events happen, and this can be turned off by components that
 > want touch events to act differently.
 
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
+_inherited from_: [src/js/component.js#L1124](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1124)
 
 ---
 
@@ -391,7 +421,7 @@ _inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js
 > 
 > The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
 > and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
+> will be automatically cleaned up when either component is disposed.
 > It will also bind myComponent as the context of myFunc.
 > 
 > **NOTE**: When using this on elements in the page other than window
@@ -495,7 +525,7 @@ _inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js
 ### ready( fn )
 > Bind a listener to the component's ready state
 > 
-> Different from event listeners in that if the ready event has already happend
+> Different from event listeners in that if the ready event has already happened
 > it will trigger the function immediately.
 
 ##### PARAMETERS: 
@@ -532,6 +562,34 @@ _inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js
 
 ---
 
+### setInterval( fn, interval )
+> Creates an interval and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run every N seconds.
+* __interval__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1202](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1202)
+
+---
+
+### setTimeout( fn, timeout )
+> Creates timeout and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run after the timeout.
+* __timeout__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1162](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1162)
+
+---
+
 ### show()
 > Show the component element if hidden
 

docs/api/vjs.SubtitlesButton.md

@@ -2,604 +2,9 @@
 
 # vjs.SubtitlesButton
 
-__EXTENDS__: [vjs.TextTrackButton](vjs.TextTrackButton.md)  
-__DEFINED IN__: [src/js/tracks.js#L872](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L872)  
+__DEFINED IN__: [src/js/tracks/text-track-controls.js#L433](https://github.com/videojs/video.js/blob/master/src/js/tracks/text-track-controls.js#L433)  
 
 The button component for toggling and selecting subtitles
 
 ---
 
-## INDEX
-
-- [METHODS](#methods)
-  - [init](#init-player-options-ready-)
-  - [addChild](#addchild-child-options-) _`inherited`_
-  - [addClass](#addclass-classtoadd-) _`inherited`_
-  - [buildCSSClass](#buildcssclass) _`inherited`_
-  - [children](#children) _`inherited`_
-  - [contentEl](#contentel) _`inherited`_
-  - [createEl](#createel-tagname-attributes-) _`inherited`_
-  - [createItems](#createitems) _`inherited`_
-  - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [dispose](#dispose) _`inherited`_
-  - [el](#el) _`inherited`_
-  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
-  - [getChild](#getchild-name-) _`inherited`_
-  - [getChildById](#getchildbyid-id-) _`inherited`_
-  - [hasClass](#hasclass-classtocheck-) _`inherited`_
-  - [height](#height-num-skiplisteners-) _`inherited`_
-  - [hide](#hide) _`inherited`_
-  - [id](#id) _`inherited`_
-  - [initChildren](#initchildren) _`inherited`_
-  - [name](#name) _`inherited`_
-  - [off](#off-first-second-third-) _`inherited`_
-  - [on](#on-first-second-third-) _`inherited`_
-  - [one](#one-first-second-third-) _`inherited`_
-  - [options](#options-obj-) _`inherited`_
-  - [player](#player) _`inherited`_
-  - [ready](#ready-fn-) _`inherited`_
-  - [removeChild](#removechild-component-) _`inherited`_
-  - [removeClass](#removeclass-classtoremove-) _`inherited`_
-  - [show](#show) _`inherited`_
-  - [trigger](#trigger-event-) _`inherited`_
-  - [triggerReady](#triggerready) _`inherited`_
-  - [width](#width-num-skiplisteners-) _`inherited`_
-
-- [EVENTS](#events)
-  - [resize](#resize-event) _`inherited`_
-
----
-
-## METHODS
-
-### addChild( child, [options] )
-> Adds a child component inside this component
-> 
->     myComponent.el();
->     // -> <div class='my-component'></div>
->     myComonent.children();
->     // [empty array]
-> 
->     var myButton = myComponent.addChild('MyButton');
->     // -> <div class='my-component'><div class="my-button">myButton<div></div>
->     // -> myButton === myComonent.children()[0];
-> 
-> Pass in options for child constructors and options for children of the child
-> 
->     var myButton = myComponent.addChild('MyButton', {
->       text: 'Press Me',
->       children: {
->         buttonChildExample: {
->           buttonChildOption: true
->         }
->       }
->     });
-
-##### PARAMETERS: 
-* __child__ `String|vjs.Component` The class name or instance of a child to add
-* __options__ `Object` _(OPTIONAL)_ Options, including options to be passed to children of the child.
-
-##### RETURNS: 
-* `vjs.Component` The child component (created by this process if a string was used)
-
-_inherited from_: [src/js/component.js#L362](https://github.com/videojs/video.js/blob/master/src/js/component.js#L362)
-
----
-
-### addClass( classToAdd )
-> Add a CSS class name to the component's element
-
-##### PARAMETERS: 
-* __classToAdd__ `String` Classname to add
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L826](https://github.com/videojs/video.js/blob/master/src/js/component.js#L826)
-
----
-
-### buildCSSClass()
-> Allows sub components to stack CSS class names
-
-_inherited from_: [src/js/menu.js#L157](https://github.com/videojs/video.js/blob/master/src/js/menu.js#L157)
-
----
-
-### children()
-> Get an array of all child components
-> 
->     var kids = myComponent.children();
-
-##### RETURNS: 
-* `Array` The children
-
-_inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js/blob/master/src/js/component.js#L296)
-
----
-
-### contentEl()
-> Return the component's DOM element for embedding content.
-> Will either be el_ or a new element defined in createEl.
-
-##### RETURNS: 
-* `Element` 
-
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
-
----
-
-### createEl( [tagName], [attributes] )
-> Create the component's DOM element
-
-##### PARAMETERS: 
-* __tagName__ `String` _(OPTIONAL)_ Element's node type. e.g. 'div'
-* __attributes__ `Object` _(OPTIONAL)_ An object of element attributes that should be set on the element
-
-##### RETURNS: 
-* `Element` 
-
-_inherited from_: [src/js/component.js#L200](https://github.com/videojs/video.js/blob/master/src/js/component.js#L200)
-
----
-
-### createItems()
-> Create the list of menu items. Specific to each subclass.
-
-_inherited from_: [src/js/menu.js#L154](https://github.com/videojs/video.js/blob/master/src/js/menu.js#L154)
-
----
-
-### dimensions( width, height )
-> Set both width and height at the same time
-
-##### PARAMETERS: 
-* __width__ `Number|String` 
-* __height__ `Number|String` 
-
-##### RETURNS: 
-* `vjs.Component` The component
-
-_inherited from_: [src/js/component.js#L938](https://github.com/videojs/video.js/blob/master/src/js/component.js#L938)
-
----
-
-### dispose()
-> Dispose of the component and all child components
-
-_inherited from_: [src/js/component.js#L84](https://github.com/videojs/video.js/blob/master/src/js/component.js#L84)
-
----
-
-### el()
-> Get the component's DOM element
-> 
->     var domEl = myComponent.el();
-
-##### RETURNS: 
-* `Element` 
-
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
-
----
-
-### enableTouchActivity()
-> Report user touch activity when touch events occur
-> 
-> User activity is used to determine when controls should show/hide. It's
-> relatively simple when it comes to mouse events, because any mouse event
-> should show the controls. So we capture mouse events that bubble up to the
-> player and report activity when that happens.
-> 
-> With touch events it isn't as easy. We can't rely on touch events at the
-> player level, because a tap (touchstart + touchend) on the video itself on
-> mobile devices is meant to turn controls off (and on). User activity is
-> checked asynchronously, so what could happen is a tap event on the video
-> turns the controls off, then the touchend event bubbles up to the player,
-> which if it reported user activity, would turn the controls right back on.
-> (We also don't want to completely block touch events from bubbling up)
-> 
-> Also a touchmove, touch+hold, and anything other than a tap is not supposed
-> to turn the controls back on on a mobile device.
-> 
-> Here we're setting the default component behavior to report user activity
-> whenever touch events happen, and this can be turned off by components that
-> want touch events to act differently.
-
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
-
----
-
-### getChild( name )
-> Returns a child component with the provided name
-
-##### PARAMETERS: 
-* __name__ 
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L330](https://github.com/videojs/video.js/blob/master/src/js/component.js#L330)
-
----
-
-### getChildById( id )
-> Returns a child component with the provided ID
-
-##### PARAMETERS: 
-* __id__ 
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L313](https://github.com/videojs/video.js/blob/master/src/js/component.js#L313)
-
----
-
-### hasClass( classToCheck )
-> Check if a component's element has a CSS class name
-
-##### PARAMETERS: 
-* __classToCheck__ `String` Classname to check
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
-
----
-
-### height( [num], [skipListeners] )
-> Get or set the height of the component (CSS values)
-> 
-> Setting the video tag dimension values only works with values in pixels.
-> Percent values will not work.
-> Some percents can be used, but width()/height() will return the number + %,
-> not the actual computed width/height.
-
-##### PARAMETERS: 
-* __num__ `Number|String` _(OPTIONAL)_ New component height
-* __skipListeners__ `Boolean` _(OPTIONAL)_ Skip the resize event trigger
-
-##### RETURNS: 
-* `vjs.Component` This component, when setting the height
-* `Number|String` The height, when getting
-
-_inherited from_: [src/js/component.js#L927](https://github.com/videojs/video.js/blob/master/src/js/component.js#L927)
-
----
-
-### hide()
-> Hide the component element if currently showing
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L857](https://github.com/videojs/video.js/blob/master/src/js/component.js#L857)
-
----
-
-### id()
-> Get the component's ID
-> 
->     var id = myComponent.id();
-
-##### RETURNS: 
-* `String` 
-
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
-
----
-
-### init( player, options, ready )
-
-##### PARAMETERS: 
-* __player__ 
-* __options__ 
-* __ready__ 
-
-_defined in_: [src/js/tracks.js#L874](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L874)
-
----
-
-### initChildren()
-> Add and initialize default child components from options
-> 
->     // when an instance of MyComponent is created, all children in options
->     // will be added to the instance by their name strings and options
->     MyComponent.prototype.options_.children = {
->       myChildComponent: {
->         myChildOption: true
->       }
->     }
-> 
->     // Or when creating the component
->     var myComp = new MyComponent(player, {
->       children: {
->         myChildComponent: {
->           myChildOption: true
->         }
->       }
->     });
-> 
-> The children option can also be an Array of child names or
-> child options objects (that also include a 'name' key).
-> 
->     var myComp = new MyComponent(player, {
->       children: [
->         'button',
->         {
->           name: 'button',
->           someOtherOption: true
->         }
->       ]
->     });
-
-_inherited from_: [src/js/component.js#L481](https://github.com/videojs/video.js/blob/master/src/js/component.js#L481)
-
----
-
-### name()
-> Get the component's name. The name is often used to reference the component.
-> 
->     var name = myComponent.name();
-
-##### RETURNS: 
-* `String` 
-
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
-
----
-
-### off( [first], [second], [third] )
-> Remove an event listener from this component's element
-> 
->     myComponent.off('eventType', myFunc);
-> 
-> If myFunc is excluded, ALL listeners for the event type will be removed.
-> If eventType is excluded, ALL listeners will be removed from the component.
-> 
-> Alternatively you can use `off` to remove listeners that were added to other
-> elements or components using `myComponent.on(otherComponent...`.
-> In this case both the event type and listener function are REQUIRED.
-> 
->     myComponent.off(otherElement, 'eventType', myFunc);
->     myComponent.off(otherComponent, 'eventType', myFunc);
-
-##### PARAMETERS: 
-* __first__ `String|vjs.Component` _(OPTIONAL)_ The event type or other component
-* __second__ `Function|String` _(OPTIONAL)_ The listener function or event type
-* __third__ `Function` _(OPTIONAL)_ The listener for other component
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js/blob/master/src/js/component.js#L646)
-
----
-
-### on( first, second, third )
-> Add an event listener to this component's element
-> 
->     var myFunc = function(){
->       var myComponent = this;
->       // Do something when the event is fired
->     };
-> 
->     myComponent.on('eventType', myFunc);
-> 
-> The context of myFunc will be myComponent unless previously bound.
-> 
-> Alternatively, you can add a listener to another element or component.
-> 
->     myComponent.on(otherElement, 'eventName', myFunc);
->     myComponent.on(otherComponent, 'eventName', myFunc);
-> 
-> The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
-> and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
-> It will also bind myComponent as the context of myFunc.
-> 
-> **NOTE**: When using this on elements in the page other than window
-> and document (both permanent), if you remove the element from the DOM
-> you need to call `vjs.trigger(el, 'dispose')` on it to clean up
-> references to it and allow the browser to garbage collect it.
-
-##### PARAMETERS: 
-* __first__ `String|vjs.Component` The event type or other component
-* __second__ `Function|String` The event handler or event type
-* __third__ `Function` The event handler
-
-##### RETURNS: 
-* `vjs.Component` self
-
-_inherited from_: [src/js/component.js#L577](https://github.com/videojs/video.js/blob/master/src/js/component.js#L577)
-
----
-
-### one( first, second, [third] )
-> Add an event listener to be triggered only once and then removed
-> 
->     myComponent.one('eventName', myFunc);
-> 
-> Alternatively you can add a listener to another element or component
-> that will be triggered only once.
-> 
->     myComponent.one(otherElement, 'eventName', myFunc);
->     myComponent.one(otherComponent, 'eventName', myFunc);
-
-##### PARAMETERS: 
-* __first__ `String|vjs.Component` The event type or other component
-* __second__ `Function|String` The listener function or event type
-* __third__ `Function` _(OPTIONAL)_ The listener function for other component
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
-
----
-
-### options( obj )
-> Deep merge of options objects
-> 
-> Whenever a property is an object on both options objects
-> the two properties will be merged using vjs.obj.deepMerge.
-> 
-> This is used for merging options for child components. We
-> want it to be easy to override individual options on a child
-> component without having to rewrite all the other default options.
-> 
->     Parent.prototype.options_ = {
->       children: {
->         'childOne': { 'foo': 'bar', 'asdf': 'fdsa' },
->         'childTwo': {},
->         'childThree': {}
->       }
->     }
->     newOptions = {
->       children: {
->         'childOne': { 'foo': 'baz', 'abc': '123' }
->         'childTwo': null,
->         'childFour': {}
->       }
->     }
-> 
->     this.options(newOptions);
-> 
-> RESULT
-> 
->     {
->       children: {
->         'childOne': { 'foo': 'baz', 'asdf': 'fdsa', 'abc': '123' },
->         'childTwo': null, // Disabled. Won't be initialized.
->         'childThree': {},
->         'childFour': {}
->       }
->     }
-
-##### PARAMETERS: 
-* __obj__ `Object` Object of new option values
-
-##### RETURNS: 
-* `Object` A NEW object of this.options_ and obj merged
-
-_inherited from_: [src/js/component.js#L179](https://github.com/videojs/video.js/blob/master/src/js/component.js#L179)
-
----
-
-### player()
-> Return the component's player
-
-##### RETURNS: 
-* `vjs.Player` 
-
-_inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js/blob/master/src/js/component.js#L126)
-
----
-
-### ready( fn )
-> Bind a listener to the component's ready state
-> 
-> Different from event listeners in that if the ready event has already happend
-> it will trigger the function immediately.
-
-##### PARAMETERS: 
-* __fn__ `Function` Ready listener
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L769](https://github.com/videojs/video.js/blob/master/src/js/component.js#L769)
-
----
-
-### removeChild( component )
-> Remove a child component from this component's list of children, and the
-> child component's element from this component's element
-
-##### PARAMETERS: 
-* __component__ `vjs.Component` Component to remove
-
-_inherited from_: [src/js/component.js#L420](https://github.com/videojs/video.js/blob/master/src/js/component.js#L420)
-
----
-
-### removeClass( classToRemove )
-> Remove a CSS class name from the component's element
-
-##### PARAMETERS: 
-* __classToRemove__ `String` Classname to remove
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js/blob/master/src/js/component.js#L837)
-
----
-
-### show()
-> Show the component element if hidden
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L847](https://github.com/videojs/video.js/blob/master/src/js/component.js#L847)
-
----
-
-### trigger( event )
-> Trigger an event on an element
-> 
->     myComponent.trigger('eventName');
->     myComponent.trigger({'type':'eventName'});
-
-##### PARAMETERS: 
-* __event__ `Event|Object|String` A string (the type) or an event object with a type attribute
-
-##### RETURNS: 
-* `vjs.Component` self
-
-_inherited from_: [src/js/component.js#L724](https://github.com/videojs/video.js/blob/master/src/js/component.js#L724)
-
----
-
-### triggerReady()
-> Trigger the ready listeners
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L788](https://github.com/videojs/video.js/blob/master/src/js/component.js#L788)
-
----
-
-### width( [num], skipListeners )
-> Set or get the width of the component (CSS values)
-> 
-> Setting the video tag dimension values only works with values in pixels.
-> Percent values will not work.
-> Some percents can be used, but width()/height() will return the number + %,
-> not the actual computed width/height.
-
-##### PARAMETERS: 
-* __num__ `Number|String` _(OPTIONAL)_ Optional width number
-* __skipListeners__ `Boolean` Skip the 'resize' event trigger
-
-##### RETURNS: 
-* `vjs.Component` This component, when setting the width
-* `Number|String` The width, when getting
-
-_inherited from_: [src/js/component.js#L910](https://github.com/videojs/video.js/blob/master/src/js/component.js#L910)
-
----
-
-## EVENTS
-
-### resize `EVENT`
-> Fired when the width and/or height of the component changes
-
-_inherited from_: [src/js/component.js#L1020](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1020)
-
----
-

docs/api/vjs.SubtitlesTrack.md

@@ -3,7 +3,7 @@
 # vjs.SubtitlesTrack
 
 __EXTENDS__: [vjs.TextTrack](vjs.TextTrack.md)  
-__DEFINED IN__: [src/js/tracks.js#L678](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L678)  
+__DEFINED IN__: [src/js/tracks.js#L686](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L686)  
 
 The track component for managing the hiding and showing of subtitles
 
@@ -18,6 +18,8 @@ The track component for managing the hiding and showing of subtitles
   - [addClass](#addclass-classtoadd-) _`inherited`_
   - [buildCSSClass](#buildcssclass) _`inherited`_
   - [children](#children) _`inherited`_
+  - [clearInterval](#clearinterval-intervalid-) _`inherited`_
+  - [clearTimeout](#cleartimeout-timeoutid-) _`inherited`_
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel) _`inherited`_
   - [cues](#cues) _`inherited`_
@@ -50,6 +52,8 @@ The track component for managing the hiding and showing of subtitles
   - [readyState](#readystate) _`inherited`_
   - [removeChild](#removechild-component-) _`inherited`_
   - [removeClass](#removeclass-classtoremove-) _`inherited`_
+  - [setInterval](#setinterval-fn-interval-) _`inherited`_
+  - [setTimeout](#settimeout-fn-timeout-) _`inherited`_
   - [show](#show) _`inherited`_
   - [src](#src) _`inherited`_
   - [title](#title) _`inherited`_
@@ -67,7 +71,7 @@ The track component for managing the hiding and showing of subtitles
 ### activate()
 > Turn on cue tracking. Tracks that are showing OR hidden are active.
 
-_inherited from_: [src/js/tracks.js#L373](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L373)
+_inherited from_: [src/js/tracks.js#L375](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L375)
 
 ---
 
@@ -77,7 +81,7 @@ _inherited from_: [src/js/tracks.js#L373](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `Array` 
 
-_inherited from_: [src/js/tracks.js#L268](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L268)
+_inherited from_: [src/js/tracks.js#L270](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L270)
 
 ---
 
@@ -150,6 +154,32 @@ _inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js
 
 ---
 
+### clearInterval( intervalId )
+> Clears an interval and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __intervalId__ `Number` The id of the interval to clear
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1219](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1219)
+
+---
+
+### clearTimeout( timeoutId )
+> Clears a timeout and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __timeoutId__ `Number` The id of the timeout to clear
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1181](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1181)
+
+---
+
 ### contentEl()
 > Return the component's DOM element for embedding content.
 > Will either be el_ or a new element defined in createEl.
@@ -167,7 +197,7 @@ _inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/tracks.js#L313](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L313)
+_inherited from_: [src/js/tracks.js#L315](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L315)
 
 ---
 
@@ -177,14 +207,14 @@ _inherited from_: [src/js/tracks.js#L313](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `Array` 
 
-_inherited from_: [src/js/tracks.js#L253](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L253)
+_inherited from_: [src/js/tracks.js#L255](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L255)
 
 ---
 
 ### deactivate()
 > Turn off cue tracking.
 
-_inherited from_: [src/js/tracks.js#L396](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L396)
+_inherited from_: [src/js/tracks.js#L398](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L398)
 
 ---
 
@@ -194,7 +224,7 @@ _inherited from_: [src/js/tracks.js#L396](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `Boolean` 
 
-_inherited from_: [src/js/tracks.js#L194](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L194)
+_inherited from_: [src/js/tracks.js#L196](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L196)
 
 ---
 
@@ -217,7 +247,7 @@ _inherited from_: [src/js/component.js#L938](https://github.com/videojs/video.js
 > Indicates that the text track is not active. Other than for the purposes of exposing the track in the DOM, the user agent is ignoring the text track.
 > No cues are active, no events are fired, and the user agent will not attempt to obtain the track's cues.
 
-_inherited from_: [src/js/tracks.js#L359](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L359)
+_inherited from_: [src/js/tracks.js#L361](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L361)
 
 ---
 
@@ -332,7 +362,7 @@ _inherited from_: [src/js/component.js#L927](https://github.com/videojs/video.js
 > If no attempt has yet been made to obtain the track's cues, the user agent will perform such an attempt momentarily.
 > The user agent is maintaining a list of which cues are active, and events are being fired accordingly.
 
-_inherited from_: [src/js/tracks.js#L344](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L344)
+_inherited from_: [src/js/tracks.js#L346](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L346)
 
 ---
 
@@ -401,7 +431,7 @@ _inherited from_: [src/js/component.js#L481](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/tracks.js#L165](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L165)
+_inherited from_: [src/js/tracks.js#L167](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L167)
 
 ---
 
@@ -411,7 +441,7 @@ _inherited from_: [src/js/tracks.js#L165](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/tracks.js#L238](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L238)
+_inherited from_: [src/js/tracks.js#L240](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L240)
 
 ---
 
@@ -421,7 +451,7 @@ _inherited from_: [src/js/tracks.js#L238](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/tracks.js#L223](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L223)
+_inherited from_: [src/js/tracks.js#L225](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L225)
 
 ---
 
@@ -431,7 +461,7 @@ _inherited from_: [src/js/tracks.js#L223](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `Number` 
 
-_inherited from_: [src/js/tracks.js#L305](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L305)
+_inherited from_: [src/js/tracks.js#L307](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L307)
 
 ---
 
@@ -493,7 +523,7 @@ _inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js
 > 
 > The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
 > and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
+> will be automatically cleaned up when either component is disposed.
 > It will also bind myComponent as the context of myFunc.
 > 
 > **NOTE**: When using this on elements in the page other than window
@@ -597,7 +627,7 @@ _inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js
 ### ready( fn )
 > Bind a listener to the component's ready state
 > 
-> Different from event listeners in that if the ready event has already happend
+> Different from event listeners in that if the ready event has already happened
 > it will trigger the function immediately.
 
 ##### PARAMETERS: 
@@ -616,7 +646,7 @@ _inherited from_: [src/js/component.js#L769](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Number` 
 
-_inherited from_: [src/js/tracks.js#L287](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L287)
+_inherited from_: [src/js/tracks.js#L289](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L289)
 
 ---
 
@@ -644,6 +674,34 @@ _inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js
 
 ---
 
+### setInterval( fn, interval )
+> Creates an interval and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run every N seconds.
+* __interval__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1198](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1198)
+
+---
+
+### setTimeout( fn, timeout )
+> Creates timeout and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run after the timeout.
+* __timeout__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1158](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1158)
+
+---
+
 ### show()
 > Show: Mode Showing (2)
 > Indicates that the text track is active. If no attempt has yet been made to obtain the track's cues, the user agent will perform such an attempt momentarily.
@@ -654,7 +712,7 @@ _inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js
 > The showing by default state is used in conjunction with the default attribute on track elements to indicate that the text track was enabled due to that attribute.
 > This allows the user agent to override the state if a later track is discovered that is more appropriate per the user's preferences.
 
-_inherited from_: [src/js/tracks.js#L329](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L329)
+_inherited from_: [src/js/tracks.js#L331](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L331)
 
 ---
 
@@ -664,7 +722,7 @@ _inherited from_: [src/js/tracks.js#L329](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/tracks.js#L179](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L179)
+_inherited from_: [src/js/tracks.js#L181](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L181)
 
 ---
 
@@ -674,7 +732,7 @@ _inherited from_: [src/js/tracks.js#L179](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/tracks.js#L208](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L208)
+_inherited from_: [src/js/tracks.js#L210](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L210)
 
 ---
 

docs/api/vjs.TextTrack.md

@@ -35,6 +35,8 @@ Handles the parsing, hiding, and showing of text track cues
   - [addClass](#addclass-classtoadd-) _`inherited`_
   - [buildCSSClass](#buildcssclass) _`inherited`_
   - [children](#children) _`inherited`_
+  - [clearInterval](#clearinterval-intervalid-) _`inherited`_
+  - [clearTimeout](#cleartimeout-timeoutid-) _`inherited`_
   - [contentEl](#contentel) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
   - [dispose](#dispose) _`inherited`_
@@ -55,6 +57,8 @@ Handles the parsing, hiding, and showing of text track cues
   - [ready](#ready-fn-) _`inherited`_
   - [removeChild](#removechild-component-) _`inherited`_
   - [removeClass](#removeclass-classtoremove-) _`inherited`_
+  - [setInterval](#setinterval-fn-interval-) _`inherited`_
+  - [setTimeout](#settimeout-fn-timeout-) _`inherited`_
   - [trigger](#trigger-event-) _`inherited`_
   - [triggerReady](#triggerready) _`inherited`_
   - [width](#width-num-skiplisteners-) _`inherited`_
@@ -69,7 +73,7 @@ Handles the parsing, hiding, and showing of text track cues
 ### activate()
 > Turn on cue tracking. Tracks that are showing OR hidden are active.
 
-_defined in_: [src/js/tracks.js#L373](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L373)
+_defined in_: [src/js/tracks.js#L375](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L375)
 
 ---
 
@@ -79,7 +83,7 @@ _defined in_: [src/js/tracks.js#L373](https://github.com/videojs/video.js/blob/m
 ##### RETURNS: 
 * `Array` 
 
-_defined in_: [src/js/tracks.js#L268](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L268)
+_defined in_: [src/js/tracks.js#L270](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L270)
 
 ---
 
@@ -152,6 +156,32 @@ _inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js
 
 ---
 
+### clearInterval( intervalId )
+> Clears an interval and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __intervalId__ `Number` The id of the interval to clear
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1219](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1219)
+
+---
+
+### clearTimeout( timeoutId )
+> Clears a timeout and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __timeoutId__ `Number` The id of the timeout to clear
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1181](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1181)
+
+---
+
 ### contentEl()
 > Return the component's DOM element for embedding content.
 > Will either be el_ or a new element defined in createEl.
@@ -169,7 +199,7 @@ _inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_defined in_: [src/js/tracks.js#L313](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L313)
+_defined in_: [src/js/tracks.js#L315](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L315)
 
 ---
 
@@ -179,14 +209,14 @@ _defined in_: [src/js/tracks.js#L313](https://github.com/videojs/video.js/blob/m
 ##### RETURNS: 
 * `Array` 
 
-_defined in_: [src/js/tracks.js#L253](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L253)
+_defined in_: [src/js/tracks.js#L255](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L255)
 
 ---
 
 ### deactivate()
 > Turn off cue tracking.
 
-_defined in_: [src/js/tracks.js#L396](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L396)
+_defined in_: [src/js/tracks.js#L398](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L398)
 
 ---
 
@@ -196,7 +226,7 @@ _defined in_: [src/js/tracks.js#L396](https://github.com/videojs/video.js/blob/m
 ##### RETURNS: 
 * `Boolean` 
 
-_defined in_: [src/js/tracks.js#L194](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L194)
+_defined in_: [src/js/tracks.js#L196](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L196)
 
 ---
 
@@ -219,7 +249,7 @@ _inherited from_: [src/js/component.js#L938](https://github.com/videojs/video.js
 > Indicates that the text track is not active. Other than for the purposes of exposing the track in the DOM, the user agent is ignoring the text track.
 > No cues are active, no events are fired, and the user agent will not attempt to obtain the track's cues.
 
-_defined in_: [src/js/tracks.js#L359](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L359)
+_defined in_: [src/js/tracks.js#L361](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L361)
 
 ---
 
@@ -334,7 +364,7 @@ _inherited from_: [src/js/component.js#L927](https://github.com/videojs/video.js
 > If no attempt has yet been made to obtain the track's cues, the user agent will perform such an attempt momentarily.
 > The user agent is maintaining a list of which cues are active, and events are being fired accordingly.
 
-_defined in_: [src/js/tracks.js#L344](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L344)
+_defined in_: [src/js/tracks.js#L346](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L346)
 
 ---
 
@@ -403,7 +433,7 @@ _inherited from_: [src/js/component.js#L481](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_defined in_: [src/js/tracks.js#L165](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L165)
+_defined in_: [src/js/tracks.js#L167](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L167)
 
 ---
 
@@ -413,7 +443,7 @@ _defined in_: [src/js/tracks.js#L165](https://github.com/videojs/video.js/blob/m
 ##### RETURNS: 
 * `String` 
 
-_defined in_: [src/js/tracks.js#L238](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L238)
+_defined in_: [src/js/tracks.js#L240](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L240)
 
 ---
 
@@ -423,7 +453,7 @@ _defined in_: [src/js/tracks.js#L238](https://github.com/videojs/video.js/blob/m
 ##### RETURNS: 
 * `String` 
 
-_defined in_: [src/js/tracks.js#L223](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L223)
+_defined in_: [src/js/tracks.js#L225](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L225)
 
 ---
 
@@ -433,7 +463,7 @@ _defined in_: [src/js/tracks.js#L223](https://github.com/videojs/video.js/blob/m
 ##### RETURNS: 
 * `Number` 
 
-_defined in_: [src/js/tracks.js#L305](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L305)
+_defined in_: [src/js/tracks.js#L307](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L307)
 
 ---
 
@@ -495,7 +525,7 @@ _inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js
 > 
 > The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
 > and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
+> will be automatically cleaned up when either component is disposed.
 > It will also bind myComponent as the context of myFunc.
 > 
 > **NOTE**: When using this on elements in the page other than window
@@ -599,7 +629,7 @@ _inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js
 ### ready( fn )
 > Bind a listener to the component's ready state
 > 
-> Different from event listeners in that if the ready event has already happend
+> Different from event listeners in that if the ready event has already happened
 > it will trigger the function immediately.
 
 ##### PARAMETERS: 
@@ -618,7 +648,7 @@ _inherited from_: [src/js/component.js#L769](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Number` 
 
-_defined in_: [src/js/tracks.js#L287](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L287)
+_defined in_: [src/js/tracks.js#L289](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L289)
 
 ---
 
@@ -646,6 +676,34 @@ _inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js
 
 ---
 
+### setInterval( fn, interval )
+> Creates an interval and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run every N seconds.
+* __interval__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1198](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1198)
+
+---
+
+### setTimeout( fn, timeout )
+> Creates timeout and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run after the timeout.
+* __timeout__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1158](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1158)
+
+---
+
 ### show()
 > Show: Mode Showing (2)
 > Indicates that the text track is active. If no attempt has yet been made to obtain the track's cues, the user agent will perform such an attempt momentarily.
@@ -656,7 +714,7 @@ _inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js
 > The showing by default state is used in conjunction with the default attribute on track elements to indicate that the text track was enabled due to that attribute.
 > This allows the user agent to override the state if a later track is discovered that is more appropriate per the user's preferences.
 
-_defined in_: [src/js/tracks.js#L329](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L329)
+_defined in_: [src/js/tracks.js#L331](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L331)
 
 ---
 
@@ -666,7 +724,7 @@ _defined in_: [src/js/tracks.js#L329](https://github.com/videojs/video.js/blob/m
 ##### RETURNS: 
 * `String` 
 
-_defined in_: [src/js/tracks.js#L179](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L179)
+_defined in_: [src/js/tracks.js#L181](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L181)
 
 ---
 
@@ -676,7 +734,7 @@ _defined in_: [src/js/tracks.js#L179](https://github.com/videojs/video.js/blob/m
 ##### RETURNS: 
 * `String` 
 
-_defined in_: [src/js/tracks.js#L208](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L208)
+_defined in_: [src/js/tracks.js#L210](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L210)
 
 ---
 

docs/api/vjs.TextTrackButton.md

@@ -2,603 +2,9 @@
 
 # vjs.TextTrackButton
 
-__EXTENDS__: [vjs.MenuButton](vjs.MenuButton.md)  
-__DEFINED IN__: [src/js/tracks.js#L796](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L796)  
+__DEFINED IN__: [src/js/tracks/text-track-controls.js#L337](https://github.com/videojs/video.js/blob/master/src/js/tracks/text-track-controls.js#L337)  
 
 The base class for buttons that toggle specific text track types (e.g. subtitles)
 
 ---
 
-## INDEX
-
-- [METHODS](#methods)
-  - [init](#init-player-options-)
-  - [addChild](#addchild-child-options-) _`inherited`_
-  - [addClass](#addclass-classtoadd-) _`inherited`_
-  - [buildCSSClass](#buildcssclass) _`inherited`_
-  - [children](#children) _`inherited`_
-  - [contentEl](#contentel) _`inherited`_
-  - [createEl](#createel-tagname-attributes-) _`inherited`_
-  - [createItems](#createitems) _`inherited`_
-  - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [dispose](#dispose) _`inherited`_
-  - [el](#el) _`inherited`_
-  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
-  - [getChild](#getchild-name-) _`inherited`_
-  - [getChildById](#getchildbyid-id-) _`inherited`_
-  - [hasClass](#hasclass-classtocheck-) _`inherited`_
-  - [height](#height-num-skiplisteners-) _`inherited`_
-  - [hide](#hide) _`inherited`_
-  - [id](#id) _`inherited`_
-  - [initChildren](#initchildren) _`inherited`_
-  - [name](#name) _`inherited`_
-  - [off](#off-first-second-third-) _`inherited`_
-  - [on](#on-first-second-third-) _`inherited`_
-  - [one](#one-first-second-third-) _`inherited`_
-  - [options](#options-obj-) _`inherited`_
-  - [player](#player) _`inherited`_
-  - [ready](#ready-fn-) _`inherited`_
-  - [removeChild](#removechild-component-) _`inherited`_
-  - [removeClass](#removeclass-classtoremove-) _`inherited`_
-  - [show](#show) _`inherited`_
-  - [trigger](#trigger-event-) _`inherited`_
-  - [triggerReady](#triggerready) _`inherited`_
-  - [width](#width-num-skiplisteners-) _`inherited`_
-
-- [EVENTS](#events)
-  - [resize](#resize-event) _`inherited`_
-
----
-
-## METHODS
-
-### addChild( child, [options] )
-> Adds a child component inside this component
-> 
->     myComponent.el();
->     // -> <div class='my-component'></div>
->     myComonent.children();
->     // [empty array]
-> 
->     var myButton = myComponent.addChild('MyButton');
->     // -> <div class='my-component'><div class="my-button">myButton<div></div>
->     // -> myButton === myComonent.children()[0];
-> 
-> Pass in options for child constructors and options for children of the child
-> 
->     var myButton = myComponent.addChild('MyButton', {
->       text: 'Press Me',
->       children: {
->         buttonChildExample: {
->           buttonChildOption: true
->         }
->       }
->     });
-
-##### PARAMETERS: 
-* __child__ `String|vjs.Component` The class name or instance of a child to add
-* __options__ `Object` _(OPTIONAL)_ Options, including options to be passed to children of the child.
-
-##### RETURNS: 
-* `vjs.Component` The child component (created by this process if a string was used)
-
-_inherited from_: [src/js/component.js#L362](https://github.com/videojs/video.js/blob/master/src/js/component.js#L362)
-
----
-
-### addClass( classToAdd )
-> Add a CSS class name to the component's element
-
-##### PARAMETERS: 
-* __classToAdd__ `String` Classname to add
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L826](https://github.com/videojs/video.js/blob/master/src/js/component.js#L826)
-
----
-
-### buildCSSClass()
-> Allows sub components to stack CSS class names
-
-_inherited from_: [src/js/menu.js#L157](https://github.com/videojs/video.js/blob/master/src/js/menu.js#L157)
-
----
-
-### children()
-> Get an array of all child components
-> 
->     var kids = myComponent.children();
-
-##### RETURNS: 
-* `Array` The children
-
-_inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js/blob/master/src/js/component.js#L296)
-
----
-
-### contentEl()
-> Return the component's DOM element for embedding content.
-> Will either be el_ or a new element defined in createEl.
-
-##### RETURNS: 
-* `Element` 
-
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
-
----
-
-### createEl( [tagName], [attributes] )
-> Create the component's DOM element
-
-##### PARAMETERS: 
-* __tagName__ `String` _(OPTIONAL)_ Element's node type. e.g. 'div'
-* __attributes__ `Object` _(OPTIONAL)_ An object of element attributes that should be set on the element
-
-##### RETURNS: 
-* `Element` 
-
-_inherited from_: [src/js/component.js#L200](https://github.com/videojs/video.js/blob/master/src/js/component.js#L200)
-
----
-
-### createItems()
-> Create the list of menu items. Specific to each subclass.
-
-_inherited from_: [src/js/menu.js#L154](https://github.com/videojs/video.js/blob/master/src/js/menu.js#L154)
-
----
-
-### dimensions( width, height )
-> Set both width and height at the same time
-
-##### PARAMETERS: 
-* __width__ `Number|String` 
-* __height__ `Number|String` 
-
-##### RETURNS: 
-* `vjs.Component` The component
-
-_inherited from_: [src/js/component.js#L938](https://github.com/videojs/video.js/blob/master/src/js/component.js#L938)
-
----
-
-### dispose()
-> Dispose of the component and all child components
-
-_inherited from_: [src/js/component.js#L84](https://github.com/videojs/video.js/blob/master/src/js/component.js#L84)
-
----
-
-### el()
-> Get the component's DOM element
-> 
->     var domEl = myComponent.el();
-
-##### RETURNS: 
-* `Element` 
-
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
-
----
-
-### enableTouchActivity()
-> Report user touch activity when touch events occur
-> 
-> User activity is used to determine when controls should show/hide. It's
-> relatively simple when it comes to mouse events, because any mouse event
-> should show the controls. So we capture mouse events that bubble up to the
-> player and report activity when that happens.
-> 
-> With touch events it isn't as easy. We can't rely on touch events at the
-> player level, because a tap (touchstart + touchend) on the video itself on
-> mobile devices is meant to turn controls off (and on). User activity is
-> checked asynchronously, so what could happen is a tap event on the video
-> turns the controls off, then the touchend event bubbles up to the player,
-> which if it reported user activity, would turn the controls right back on.
-> (We also don't want to completely block touch events from bubbling up)
-> 
-> Also a touchmove, touch+hold, and anything other than a tap is not supposed
-> to turn the controls back on on a mobile device.
-> 
-> Here we're setting the default component behavior to report user activity
-> whenever touch events happen, and this can be turned off by components that
-> want touch events to act differently.
-
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
-
----
-
-### getChild( name )
-> Returns a child component with the provided name
-
-##### PARAMETERS: 
-* __name__ 
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L330](https://github.com/videojs/video.js/blob/master/src/js/component.js#L330)
-
----
-
-### getChildById( id )
-> Returns a child component with the provided ID
-
-##### PARAMETERS: 
-* __id__ 
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L313](https://github.com/videojs/video.js/blob/master/src/js/component.js#L313)
-
----
-
-### hasClass( classToCheck )
-> Check if a component's element has a CSS class name
-
-##### PARAMETERS: 
-* __classToCheck__ `String` Classname to check
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
-
----
-
-### height( [num], [skipListeners] )
-> Get or set the height of the component (CSS values)
-> 
-> Setting the video tag dimension values only works with values in pixels.
-> Percent values will not work.
-> Some percents can be used, but width()/height() will return the number + %,
-> not the actual computed width/height.
-
-##### PARAMETERS: 
-* __num__ `Number|String` _(OPTIONAL)_ New component height
-* __skipListeners__ `Boolean` _(OPTIONAL)_ Skip the resize event trigger
-
-##### RETURNS: 
-* `vjs.Component` This component, when setting the height
-* `Number|String` The height, when getting
-
-_inherited from_: [src/js/component.js#L927](https://github.com/videojs/video.js/blob/master/src/js/component.js#L927)
-
----
-
-### hide()
-> Hide the component element if currently showing
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L857](https://github.com/videojs/video.js/blob/master/src/js/component.js#L857)
-
----
-
-### id()
-> Get the component's ID
-> 
->     var id = myComponent.id();
-
-##### RETURNS: 
-* `String` 
-
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
-
----
-
-### init( player, options )
-
-##### PARAMETERS: 
-* __player__ 
-* __options__ 
-
-_defined in_: [src/js/tracks.js#L798](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L798)
-
----
-
-### initChildren()
-> Add and initialize default child components from options
-> 
->     // when an instance of MyComponent is created, all children in options
->     // will be added to the instance by their name strings and options
->     MyComponent.prototype.options_.children = {
->       myChildComponent: {
->         myChildOption: true
->       }
->     }
-> 
->     // Or when creating the component
->     var myComp = new MyComponent(player, {
->       children: {
->         myChildComponent: {
->           myChildOption: true
->         }
->       }
->     });
-> 
-> The children option can also be an Array of child names or
-> child options objects (that also include a 'name' key).
-> 
->     var myComp = new MyComponent(player, {
->       children: [
->         'button',
->         {
->           name: 'button',
->           someOtherOption: true
->         }
->       ]
->     });
-
-_inherited from_: [src/js/component.js#L481](https://github.com/videojs/video.js/blob/master/src/js/component.js#L481)
-
----
-
-### name()
-> Get the component's name. The name is often used to reference the component.
-> 
->     var name = myComponent.name();
-
-##### RETURNS: 
-* `String` 
-
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
-
----
-
-### off( [first], [second], [third] )
-> Remove an event listener from this component's element
-> 
->     myComponent.off('eventType', myFunc);
-> 
-> If myFunc is excluded, ALL listeners for the event type will be removed.
-> If eventType is excluded, ALL listeners will be removed from the component.
-> 
-> Alternatively you can use `off` to remove listeners that were added to other
-> elements or components using `myComponent.on(otherComponent...`.
-> In this case both the event type and listener function are REQUIRED.
-> 
->     myComponent.off(otherElement, 'eventType', myFunc);
->     myComponent.off(otherComponent, 'eventType', myFunc);
-
-##### PARAMETERS: 
-* __first__ `String|vjs.Component` _(OPTIONAL)_ The event type or other component
-* __second__ `Function|String` _(OPTIONAL)_ The listener function or event type
-* __third__ `Function` _(OPTIONAL)_ The listener for other component
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js/blob/master/src/js/component.js#L646)
-
----
-
-### on( first, second, third )
-> Add an event listener to this component's element
-> 
->     var myFunc = function(){
->       var myComponent = this;
->       // Do something when the event is fired
->     };
-> 
->     myComponent.on('eventType', myFunc);
-> 
-> The context of myFunc will be myComponent unless previously bound.
-> 
-> Alternatively, you can add a listener to another element or component.
-> 
->     myComponent.on(otherElement, 'eventName', myFunc);
->     myComponent.on(otherComponent, 'eventName', myFunc);
-> 
-> The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
-> and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
-> It will also bind myComponent as the context of myFunc.
-> 
-> **NOTE**: When using this on elements in the page other than window
-> and document (both permanent), if you remove the element from the DOM
-> you need to call `vjs.trigger(el, 'dispose')` on it to clean up
-> references to it and allow the browser to garbage collect it.
-
-##### PARAMETERS: 
-* __first__ `String|vjs.Component` The event type or other component
-* __second__ `Function|String` The event handler or event type
-* __third__ `Function` The event handler
-
-##### RETURNS: 
-* `vjs.Component` self
-
-_inherited from_: [src/js/component.js#L577](https://github.com/videojs/video.js/blob/master/src/js/component.js#L577)
-
----
-
-### one( first, second, [third] )
-> Add an event listener to be triggered only once and then removed
-> 
->     myComponent.one('eventName', myFunc);
-> 
-> Alternatively you can add a listener to another element or component
-> that will be triggered only once.
-> 
->     myComponent.one(otherElement, 'eventName', myFunc);
->     myComponent.one(otherComponent, 'eventName', myFunc);
-
-##### PARAMETERS: 
-* __first__ `String|vjs.Component` The event type or other component
-* __second__ `Function|String` The listener function or event type
-* __third__ `Function` _(OPTIONAL)_ The listener function for other component
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
-
----
-
-### options( obj )
-> Deep merge of options objects
-> 
-> Whenever a property is an object on both options objects
-> the two properties will be merged using vjs.obj.deepMerge.
-> 
-> This is used for merging options for child components. We
-> want it to be easy to override individual options on a child
-> component without having to rewrite all the other default options.
-> 
->     Parent.prototype.options_ = {
->       children: {
->         'childOne': { 'foo': 'bar', 'asdf': 'fdsa' },
->         'childTwo': {},
->         'childThree': {}
->       }
->     }
->     newOptions = {
->       children: {
->         'childOne': { 'foo': 'baz', 'abc': '123' }
->         'childTwo': null,
->         'childFour': {}
->       }
->     }
-> 
->     this.options(newOptions);
-> 
-> RESULT
-> 
->     {
->       children: {
->         'childOne': { 'foo': 'baz', 'asdf': 'fdsa', 'abc': '123' },
->         'childTwo': null, // Disabled. Won't be initialized.
->         'childThree': {},
->         'childFour': {}
->       }
->     }
-
-##### PARAMETERS: 
-* __obj__ `Object` Object of new option values
-
-##### RETURNS: 
-* `Object` A NEW object of this.options_ and obj merged
-
-_inherited from_: [src/js/component.js#L179](https://github.com/videojs/video.js/blob/master/src/js/component.js#L179)
-
----
-
-### player()
-> Return the component's player
-
-##### RETURNS: 
-* `vjs.Player` 
-
-_inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js/blob/master/src/js/component.js#L126)
-
----
-
-### ready( fn )
-> Bind a listener to the component's ready state
-> 
-> Different from event listeners in that if the ready event has already happend
-> it will trigger the function immediately.
-
-##### PARAMETERS: 
-* __fn__ `Function` Ready listener
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L769](https://github.com/videojs/video.js/blob/master/src/js/component.js#L769)
-
----
-
-### removeChild( component )
-> Remove a child component from this component's list of children, and the
-> child component's element from this component's element
-
-##### PARAMETERS: 
-* __component__ `vjs.Component` Component to remove
-
-_inherited from_: [src/js/component.js#L420](https://github.com/videojs/video.js/blob/master/src/js/component.js#L420)
-
----
-
-### removeClass( classToRemove )
-> Remove a CSS class name from the component's element
-
-##### PARAMETERS: 
-* __classToRemove__ `String` Classname to remove
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js/blob/master/src/js/component.js#L837)
-
----
-
-### show()
-> Show the component element if hidden
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L847](https://github.com/videojs/video.js/blob/master/src/js/component.js#L847)
-
----
-
-### trigger( event )
-> Trigger an event on an element
-> 
->     myComponent.trigger('eventName');
->     myComponent.trigger({'type':'eventName'});
-
-##### PARAMETERS: 
-* __event__ `Event|Object|String` A string (the type) or an event object with a type attribute
-
-##### RETURNS: 
-* `vjs.Component` self
-
-_inherited from_: [src/js/component.js#L724](https://github.com/videojs/video.js/blob/master/src/js/component.js#L724)
-
----
-
-### triggerReady()
-> Trigger the ready listeners
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L788](https://github.com/videojs/video.js/blob/master/src/js/component.js#L788)
-
----
-
-### width( [num], skipListeners )
-> Set or get the width of the component (CSS values)
-> 
-> Setting the video tag dimension values only works with values in pixels.
-> Percent values will not work.
-> Some percents can be used, but width()/height() will return the number + %,
-> not the actual computed width/height.
-
-##### PARAMETERS: 
-* __num__ `Number|String` _(OPTIONAL)_ Optional width number
-* __skipListeners__ `Boolean` Skip the 'resize' event trigger
-
-##### RETURNS: 
-* `vjs.Component` This component, when setting the width
-* `Number|String` The width, when getting
-
-_inherited from_: [src/js/component.js#L910](https://github.com/videojs/video.js/blob/master/src/js/component.js#L910)
-
----
-
-## EVENTS
-
-### resize `EVENT`
-> Fired when the width and/or height of the component changes
-
-_inherited from_: [src/js/component.js#L1020](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1020)
-
----
-

docs/api/vjs.TextTrackDisplay.md

@@ -2,599 +2,9 @@
 
 # vjs.TextTrackDisplay
 
-__EXTENDS__: [vjs.Component](vjs.Component.md)  
-__DEFINED IN__: [src/js/tracks.js#L699](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L699)  
+__DEFINED IN__: [src/js/tracks/text-track-controls.js#L13](https://github.com/videojs/video.js/blob/master/src/js/tracks/text-track-controls.js#L13)  
 
 The component for displaying text track cues
 
 ---
 
-## INDEX
-
-- [METHODS](#methods)
-  - [init](#init-player-options-ready-)
-  - [addChild](#addchild-child-options-) _`inherited`_
-  - [addClass](#addclass-classtoadd-) _`inherited`_
-  - [buildCSSClass](#buildcssclass) _`inherited`_
-  - [children](#children) _`inherited`_
-  - [contentEl](#contentel) _`inherited`_
-  - [createEl](#createel-tagname-attributes-) _`inherited`_
-  - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [dispose](#dispose) _`inherited`_
-  - [el](#el) _`inherited`_
-  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
-  - [getChild](#getchild-name-) _`inherited`_
-  - [getChildById](#getchildbyid-id-) _`inherited`_
-  - [hasClass](#hasclass-classtocheck-) _`inherited`_
-  - [height](#height-num-skiplisteners-) _`inherited`_
-  - [hide](#hide) _`inherited`_
-  - [id](#id) _`inherited`_
-  - [initChildren](#initchildren) _`inherited`_
-  - [name](#name) _`inherited`_
-  - [off](#off-first-second-third-) _`inherited`_
-  - [on](#on-first-second-third-) _`inherited`_
-  - [one](#one-first-second-third-) _`inherited`_
-  - [options](#options-obj-) _`inherited`_
-  - [player](#player) _`inherited`_
-  - [ready](#ready-fn-) _`inherited`_
-  - [removeChild](#removechild-component-) _`inherited`_
-  - [removeClass](#removeclass-classtoremove-) _`inherited`_
-  - [show](#show) _`inherited`_
-  - [trigger](#trigger-event-) _`inherited`_
-  - [triggerReady](#triggerready) _`inherited`_
-  - [width](#width-num-skiplisteners-) _`inherited`_
-
-- [EVENTS](#events)
-  - [resize](#resize-event) _`inherited`_
-
----
-
-## METHODS
-
-### addChild( child, [options] )
-> Adds a child component inside this component
-> 
->     myComponent.el();
->     // -> <div class='my-component'></div>
->     myComonent.children();
->     // [empty array]
-> 
->     var myButton = myComponent.addChild('MyButton');
->     // -> <div class='my-component'><div class="my-button">myButton<div></div>
->     // -> myButton === myComonent.children()[0];
-> 
-> Pass in options for child constructors and options for children of the child
-> 
->     var myButton = myComponent.addChild('MyButton', {
->       text: 'Press Me',
->       children: {
->         buttonChildExample: {
->           buttonChildOption: true
->         }
->       }
->     });
-
-##### PARAMETERS: 
-* __child__ `String|vjs.Component` The class name or instance of a child to add
-* __options__ `Object` _(OPTIONAL)_ Options, including options to be passed to children of the child.
-
-##### RETURNS: 
-* `vjs.Component` The child component (created by this process if a string was used)
-
-_inherited from_: [src/js/component.js#L362](https://github.com/videojs/video.js/blob/master/src/js/component.js#L362)
-
----
-
-### addClass( classToAdd )
-> Add a CSS class name to the component's element
-
-##### PARAMETERS: 
-* __classToAdd__ `String` Classname to add
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L826](https://github.com/videojs/video.js/blob/master/src/js/component.js#L826)
-
----
-
-### buildCSSClass()
-> Allows sub components to stack CSS class names
-
-##### RETURNS: 
-* `String` The constructed class name
-
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
-
----
-
-### children()
-> Get an array of all child components
-> 
->     var kids = myComponent.children();
-
-##### RETURNS: 
-* `Array` The children
-
-_inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js/blob/master/src/js/component.js#L296)
-
----
-
-### contentEl()
-> Return the component's DOM element for embedding content.
-> Will either be el_ or a new element defined in createEl.
-
-##### RETURNS: 
-* `Element` 
-
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
-
----
-
-### createEl( [tagName], [attributes] )
-> Create the component's DOM element
-
-##### PARAMETERS: 
-* __tagName__ `String` _(OPTIONAL)_ Element's node type. e.g. 'div'
-* __attributes__ `Object` _(OPTIONAL)_ An object of element attributes that should be set on the element
-
-##### RETURNS: 
-* `Element` 
-
-_inherited from_: [src/js/component.js#L200](https://github.com/videojs/video.js/blob/master/src/js/component.js#L200)
-
----
-
-### dimensions( width, height )
-> Set both width and height at the same time
-
-##### PARAMETERS: 
-* __width__ `Number|String` 
-* __height__ `Number|String` 
-
-##### RETURNS: 
-* `vjs.Component` The component
-
-_inherited from_: [src/js/component.js#L938](https://github.com/videojs/video.js/blob/master/src/js/component.js#L938)
-
----
-
-### dispose()
-> Dispose of the component and all child components
-
-_inherited from_: [src/js/component.js#L84](https://github.com/videojs/video.js/blob/master/src/js/component.js#L84)
-
----
-
-### el()
-> Get the component's DOM element
-> 
->     var domEl = myComponent.el();
-
-##### RETURNS: 
-* `Element` 
-
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
-
----
-
-### enableTouchActivity()
-> Report user touch activity when touch events occur
-> 
-> User activity is used to determine when controls should show/hide. It's
-> relatively simple when it comes to mouse events, because any mouse event
-> should show the controls. So we capture mouse events that bubble up to the
-> player and report activity when that happens.
-> 
-> With touch events it isn't as easy. We can't rely on touch events at the
-> player level, because a tap (touchstart + touchend) on the video itself on
-> mobile devices is meant to turn controls off (and on). User activity is
-> checked asynchronously, so what could happen is a tap event on the video
-> turns the controls off, then the touchend event bubbles up to the player,
-> which if it reported user activity, would turn the controls right back on.
-> (We also don't want to completely block touch events from bubbling up)
-> 
-> Also a touchmove, touch+hold, and anything other than a tap is not supposed
-> to turn the controls back on on a mobile device.
-> 
-> Here we're setting the default component behavior to report user activity
-> whenever touch events happen, and this can be turned off by components that
-> want touch events to act differently.
-
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
-
----
-
-### getChild( name )
-> Returns a child component with the provided name
-
-##### PARAMETERS: 
-* __name__ 
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L330](https://github.com/videojs/video.js/blob/master/src/js/component.js#L330)
-
----
-
-### getChildById( id )
-> Returns a child component with the provided ID
-
-##### PARAMETERS: 
-* __id__ 
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L313](https://github.com/videojs/video.js/blob/master/src/js/component.js#L313)
-
----
-
-### hasClass( classToCheck )
-> Check if a component's element has a CSS class name
-
-##### PARAMETERS: 
-* __classToCheck__ `String` Classname to check
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
-
----
-
-### height( [num], [skipListeners] )
-> Get or set the height of the component (CSS values)
-> 
-> Setting the video tag dimension values only works with values in pixels.
-> Percent values will not work.
-> Some percents can be used, but width()/height() will return the number + %,
-> not the actual computed width/height.
-
-##### PARAMETERS: 
-* __num__ `Number|String` _(OPTIONAL)_ New component height
-* __skipListeners__ `Boolean` _(OPTIONAL)_ Skip the resize event trigger
-
-##### RETURNS: 
-* `vjs.Component` This component, when setting the height
-* `Number|String` The height, when getting
-
-_inherited from_: [src/js/component.js#L927](https://github.com/videojs/video.js/blob/master/src/js/component.js#L927)
-
----
-
-### hide()
-> Hide the component element if currently showing
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L857](https://github.com/videojs/video.js/blob/master/src/js/component.js#L857)
-
----
-
-### id()
-> Get the component's ID
-> 
->     var id = myComponent.id();
-
-##### RETURNS: 
-* `String` 
-
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
-
----
-
-### init( player, options, ready )
-
-##### PARAMETERS: 
-* __player__ 
-* __options__ 
-* __ready__ 
-
-_defined in_: [src/js/tracks.js#L701](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L701)
-
----
-
-### initChildren()
-> Add and initialize default child components from options
-> 
->     // when an instance of MyComponent is created, all children in options
->     // will be added to the instance by their name strings and options
->     MyComponent.prototype.options_.children = {
->       myChildComponent: {
->         myChildOption: true
->       }
->     }
-> 
->     // Or when creating the component
->     var myComp = new MyComponent(player, {
->       children: {
->         myChildComponent: {
->           myChildOption: true
->         }
->       }
->     });
-> 
-> The children option can also be an Array of child names or
-> child options objects (that also include a 'name' key).
-> 
->     var myComp = new MyComponent(player, {
->       children: [
->         'button',
->         {
->           name: 'button',
->           someOtherOption: true
->         }
->       ]
->     });
-
-_inherited from_: [src/js/component.js#L481](https://github.com/videojs/video.js/blob/master/src/js/component.js#L481)
-
----
-
-### name()
-> Get the component's name. The name is often used to reference the component.
-> 
->     var name = myComponent.name();
-
-##### RETURNS: 
-* `String` 
-
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
-
----
-
-### off( [first], [second], [third] )
-> Remove an event listener from this component's element
-> 
->     myComponent.off('eventType', myFunc);
-> 
-> If myFunc is excluded, ALL listeners for the event type will be removed.
-> If eventType is excluded, ALL listeners will be removed from the component.
-> 
-> Alternatively you can use `off` to remove listeners that were added to other
-> elements or components using `myComponent.on(otherComponent...`.
-> In this case both the event type and listener function are REQUIRED.
-> 
->     myComponent.off(otherElement, 'eventType', myFunc);
->     myComponent.off(otherComponent, 'eventType', myFunc);
-
-##### PARAMETERS: 
-* __first__ `String|vjs.Component` _(OPTIONAL)_ The event type or other component
-* __second__ `Function|String` _(OPTIONAL)_ The listener function or event type
-* __third__ `Function` _(OPTIONAL)_ The listener for other component
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js/blob/master/src/js/component.js#L646)
-
----
-
-### on( first, second, third )
-> Add an event listener to this component's element
-> 
->     var myFunc = function(){
->       var myComponent = this;
->       // Do something when the event is fired
->     };
-> 
->     myComponent.on('eventType', myFunc);
-> 
-> The context of myFunc will be myComponent unless previously bound.
-> 
-> Alternatively, you can add a listener to another element or component.
-> 
->     myComponent.on(otherElement, 'eventName', myFunc);
->     myComponent.on(otherComponent, 'eventName', myFunc);
-> 
-> The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
-> and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
-> It will also bind myComponent as the context of myFunc.
-> 
-> **NOTE**: When using this on elements in the page other than window
-> and document (both permanent), if you remove the element from the DOM
-> you need to call `vjs.trigger(el, 'dispose')` on it to clean up
-> references to it and allow the browser to garbage collect it.
-
-##### PARAMETERS: 
-* __first__ `String|vjs.Component` The event type or other component
-* __second__ `Function|String` The event handler or event type
-* __third__ `Function` The event handler
-
-##### RETURNS: 
-* `vjs.Component` self
-
-_inherited from_: [src/js/component.js#L577](https://github.com/videojs/video.js/blob/master/src/js/component.js#L577)
-
----
-
-### one( first, second, [third] )
-> Add an event listener to be triggered only once and then removed
-> 
->     myComponent.one('eventName', myFunc);
-> 
-> Alternatively you can add a listener to another element or component
-> that will be triggered only once.
-> 
->     myComponent.one(otherElement, 'eventName', myFunc);
->     myComponent.one(otherComponent, 'eventName', myFunc);
-
-##### PARAMETERS: 
-* __first__ `String|vjs.Component` The event type or other component
-* __second__ `Function|String` The listener function or event type
-* __third__ `Function` _(OPTIONAL)_ The listener function for other component
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
-
----
-
-### options( obj )
-> Deep merge of options objects
-> 
-> Whenever a property is an object on both options objects
-> the two properties will be merged using vjs.obj.deepMerge.
-> 
-> This is used for merging options for child components. We
-> want it to be easy to override individual options on a child
-> component without having to rewrite all the other default options.
-> 
->     Parent.prototype.options_ = {
->       children: {
->         'childOne': { 'foo': 'bar', 'asdf': 'fdsa' },
->         'childTwo': {},
->         'childThree': {}
->       }
->     }
->     newOptions = {
->       children: {
->         'childOne': { 'foo': 'baz', 'abc': '123' }
->         'childTwo': null,
->         'childFour': {}
->       }
->     }
-> 
->     this.options(newOptions);
-> 
-> RESULT
-> 
->     {
->       children: {
->         'childOne': { 'foo': 'baz', 'asdf': 'fdsa', 'abc': '123' },
->         'childTwo': null, // Disabled. Won't be initialized.
->         'childThree': {},
->         'childFour': {}
->       }
->     }
-
-##### PARAMETERS: 
-* __obj__ `Object` Object of new option values
-
-##### RETURNS: 
-* `Object` A NEW object of this.options_ and obj merged
-
-_inherited from_: [src/js/component.js#L179](https://github.com/videojs/video.js/blob/master/src/js/component.js#L179)
-
----
-
-### player()
-> Return the component's player
-
-##### RETURNS: 
-* `vjs.Player` 
-
-_inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js/blob/master/src/js/component.js#L126)
-
----
-
-### ready( fn )
-> Bind a listener to the component's ready state
-> 
-> Different from event listeners in that if the ready event has already happend
-> it will trigger the function immediately.
-
-##### PARAMETERS: 
-* __fn__ `Function` Ready listener
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L769](https://github.com/videojs/video.js/blob/master/src/js/component.js#L769)
-
----
-
-### removeChild( component )
-> Remove a child component from this component's list of children, and the
-> child component's element from this component's element
-
-##### PARAMETERS: 
-* __component__ `vjs.Component` Component to remove
-
-_inherited from_: [src/js/component.js#L420](https://github.com/videojs/video.js/blob/master/src/js/component.js#L420)
-
----
-
-### removeClass( classToRemove )
-> Remove a CSS class name from the component's element
-
-##### PARAMETERS: 
-* __classToRemove__ `String` Classname to remove
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js/blob/master/src/js/component.js#L837)
-
----
-
-### show()
-> Show the component element if hidden
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L847](https://github.com/videojs/video.js/blob/master/src/js/component.js#L847)
-
----
-
-### trigger( event )
-> Trigger an event on an element
-> 
->     myComponent.trigger('eventName');
->     myComponent.trigger({'type':'eventName'});
-
-##### PARAMETERS: 
-* __event__ `Event|Object|String` A string (the type) or an event object with a type attribute
-
-##### RETURNS: 
-* `vjs.Component` self
-
-_inherited from_: [src/js/component.js#L724](https://github.com/videojs/video.js/blob/master/src/js/component.js#L724)
-
----
-
-### triggerReady()
-> Trigger the ready listeners
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L788](https://github.com/videojs/video.js/blob/master/src/js/component.js#L788)
-
----
-
-### width( [num], skipListeners )
-> Set or get the width of the component (CSS values)
-> 
-> Setting the video tag dimension values only works with values in pixels.
-> Percent values will not work.
-> Some percents can be used, but width()/height() will return the number + %,
-> not the actual computed width/height.
-
-##### PARAMETERS: 
-* __num__ `Number|String` _(OPTIONAL)_ Optional width number
-* __skipListeners__ `Boolean` Skip the 'resize' event trigger
-
-##### RETURNS: 
-* `vjs.Component` This component, when setting the width
-* `Number|String` The width, when getting
-
-_inherited from_: [src/js/component.js#L910](https://github.com/videojs/video.js/blob/master/src/js/component.js#L910)
-
----
-
-## EVENTS
-
-### resize `EVENT`
-> Fired when the width and/or height of the component changes
-
-_inherited from_: [src/js/component.js#L1020](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1020)
-
----
-

docs/api/vjs.TextTrackMenuItem.md

@@ -2,614 +2,9 @@
 
 # vjs.TextTrackMenuItem
 
-__EXTENDS__: [vjs.MenuItem](vjs.MenuItem.md)  
-__DEFINED IN__: [src/js/tracks.js#L726](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L726)  
+__DEFINED IN__: [src/js/tracks/text-track-controls.js#L194](https://github.com/videojs/video.js/blob/master/src/js/tracks/text-track-controls.js#L194)  
 
 The specific menu item type for selecting a language within a text track kind
 
 ---
 
-## INDEX
-
-- [METHODS](#methods)
-  - [init](#init-player-options-)
-  - [addChild](#addchild-child-options-) _`inherited`_
-  - [addClass](#addclass-classtoadd-) _`inherited`_
-  - [buildCSSClass](#buildcssclass) _`inherited`_
-  - [children](#children) _`inherited`_
-  - [contentEl](#contentel) _`inherited`_
-  - [createEl](#createel-tagname-attributes-) _`inherited`_
-  - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [dispose](#dispose) _`inherited`_
-  - [el](#el) _`inherited`_
-  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
-  - [getChild](#getchild-name-) _`inherited`_
-  - [getChildById](#getchildbyid-id-) _`inherited`_
-  - [hasClass](#hasclass-classtocheck-) _`inherited`_
-  - [height](#height-num-skiplisteners-) _`inherited`_
-  - [hide](#hide) _`inherited`_
-  - [id](#id) _`inherited`_
-  - [initChildren](#initchildren) _`inherited`_
-  - [name](#name) _`inherited`_
-  - [off](#off-first-second-third-) _`inherited`_
-  - [on](#on-first-second-third-) _`inherited`_
-  - [onClick](#onclick) _`inherited`_
-  - [one](#one-first-second-third-) _`inherited`_
-  - [options](#options-obj-) _`inherited`_
-  - [player](#player) _`inherited`_
-  - [ready](#ready-fn-) _`inherited`_
-  - [removeChild](#removechild-component-) _`inherited`_
-  - [removeClass](#removeclass-classtoremove-) _`inherited`_
-  - [selected](#selected-selected-) _`inherited`_
-  - [show](#show) _`inherited`_
-  - [trigger](#trigger-event-) _`inherited`_
-  - [triggerReady](#triggerready) _`inherited`_
-  - [width](#width-num-skiplisteners-) _`inherited`_
-
-- [EVENTS](#events)
-  - [resize](#resize-event) _`inherited`_
-
----
-
-## METHODS
-
-### addChild( child, [options] )
-> Adds a child component inside this component
-> 
->     myComponent.el();
->     // -> <div class='my-component'></div>
->     myComonent.children();
->     // [empty array]
-> 
->     var myButton = myComponent.addChild('MyButton');
->     // -> <div class='my-component'><div class="my-button">myButton<div></div>
->     // -> myButton === myComonent.children()[0];
-> 
-> Pass in options for child constructors and options for children of the child
-> 
->     var myButton = myComponent.addChild('MyButton', {
->       text: 'Press Me',
->       children: {
->         buttonChildExample: {
->           buttonChildOption: true
->         }
->       }
->     });
-
-##### PARAMETERS: 
-* __child__ `String|vjs.Component` The class name or instance of a child to add
-* __options__ `Object` _(OPTIONAL)_ Options, including options to be passed to children of the child.
-
-##### RETURNS: 
-* `vjs.Component` The child component (created by this process if a string was used)
-
-_inherited from_: [src/js/component.js#L362](https://github.com/videojs/video.js/blob/master/src/js/component.js#L362)
-
----
-
-### addClass( classToAdd )
-> Add a CSS class name to the component's element
-
-##### PARAMETERS: 
-* __classToAdd__ `String` Classname to add
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L826](https://github.com/videojs/video.js/blob/master/src/js/component.js#L826)
-
----
-
-### buildCSSClass()
-> Allows sub components to stack CSS class names
-
-##### RETURNS: 
-* `String` The constructed class name
-
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
-
----
-
-### children()
-> Get an array of all child components
-> 
->     var kids = myComponent.children();
-
-##### RETURNS: 
-* `Array` The children
-
-_inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js/blob/master/src/js/component.js#L296)
-
----
-
-### contentEl()
-> Return the component's DOM element for embedding content.
-> Will either be el_ or a new element defined in createEl.
-
-##### RETURNS: 
-* `Element` 
-
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
-
----
-
-### createEl( [tagName], [attributes] )
-> Create the component's DOM element
-
-##### PARAMETERS: 
-* __tagName__ `String` _(OPTIONAL)_ Element's node type. e.g. 'div'
-* __attributes__ `Object` _(OPTIONAL)_ An object of element attributes that should be set on the element
-
-_inherited from_: [src/js/menu.js#L64](https://github.com/videojs/video.js/blob/master/src/js/menu.js#L64)
-
----
-
-### dimensions( width, height )
-> Set both width and height at the same time
-
-##### PARAMETERS: 
-* __width__ `Number|String` 
-* __height__ `Number|String` 
-
-##### RETURNS: 
-* `vjs.Component` The component
-
-_inherited from_: [src/js/component.js#L938](https://github.com/videojs/video.js/blob/master/src/js/component.js#L938)
-
----
-
-### dispose()
-> Dispose of the component and all child components
-
-_inherited from_: [src/js/component.js#L84](https://github.com/videojs/video.js/blob/master/src/js/component.js#L84)
-
----
-
-### el()
-> Get the component's DOM element
-> 
->     var domEl = myComponent.el();
-
-##### RETURNS: 
-* `Element` 
-
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
-
----
-
-### enableTouchActivity()
-> Report user touch activity when touch events occur
-> 
-> User activity is used to determine when controls should show/hide. It's
-> relatively simple when it comes to mouse events, because any mouse event
-> should show the controls. So we capture mouse events that bubble up to the
-> player and report activity when that happens.
-> 
-> With touch events it isn't as easy. We can't rely on touch events at the
-> player level, because a tap (touchstart + touchend) on the video itself on
-> mobile devices is meant to turn controls off (and on). User activity is
-> checked asynchronously, so what could happen is a tap event on the video
-> turns the controls off, then the touchend event bubbles up to the player,
-> which if it reported user activity, would turn the controls right back on.
-> (We also don't want to completely block touch events from bubbling up)
-> 
-> Also a touchmove, touch+hold, and anything other than a tap is not supposed
-> to turn the controls back on on a mobile device.
-> 
-> Here we're setting the default component behavior to report user activity
-> whenever touch events happen, and this can be turned off by components that
-> want touch events to act differently.
-
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
-
----
-
-### getChild( name )
-> Returns a child component with the provided name
-
-##### PARAMETERS: 
-* __name__ 
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L330](https://github.com/videojs/video.js/blob/master/src/js/component.js#L330)
-
----
-
-### getChildById( id )
-> Returns a child component with the provided ID
-
-##### PARAMETERS: 
-* __id__ 
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L313](https://github.com/videojs/video.js/blob/master/src/js/component.js#L313)
-
----
-
-### hasClass( classToCheck )
-> Check if a component's element has a CSS class name
-
-##### PARAMETERS: 
-* __classToCheck__ `String` Classname to check
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
-
----
-
-### height( [num], [skipListeners] )
-> Get or set the height of the component (CSS values)
-> 
-> Setting the video tag dimension values only works with values in pixels.
-> Percent values will not work.
-> Some percents can be used, but width()/height() will return the number + %,
-> not the actual computed width/height.
-
-##### PARAMETERS: 
-* __num__ `Number|String` _(OPTIONAL)_ New component height
-* __skipListeners__ `Boolean` _(OPTIONAL)_ Skip the resize event trigger
-
-##### RETURNS: 
-* `vjs.Component` This component, when setting the height
-* `Number|String` The height, when getting
-
-_inherited from_: [src/js/component.js#L927](https://github.com/videojs/video.js/blob/master/src/js/component.js#L927)
-
----
-
-### hide()
-> Hide the component element if currently showing
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L857](https://github.com/videojs/video.js/blob/master/src/js/component.js#L857)
-
----
-
-### id()
-> Get the component's ID
-> 
->     var id = myComponent.id();
-
-##### RETURNS: 
-* `String` 
-
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
-
----
-
-### init( player, options )
-
-##### PARAMETERS: 
-* __player__ 
-* __options__ 
-
-_defined in_: [src/js/tracks.js#L728](https://github.com/videojs/video.js/blob/master/src/js/tracks.js#L728)
-
----
-
-### initChildren()
-> Add and initialize default child components from options
-> 
->     // when an instance of MyComponent is created, all children in options
->     // will be added to the instance by their name strings and options
->     MyComponent.prototype.options_.children = {
->       myChildComponent: {
->         myChildOption: true
->       }
->     }
-> 
->     // Or when creating the component
->     var myComp = new MyComponent(player, {
->       children: {
->         myChildComponent: {
->           myChildOption: true
->         }
->       }
->     });
-> 
-> The children option can also be an Array of child names or
-> child options objects (that also include a 'name' key).
-> 
->     var myComp = new MyComponent(player, {
->       children: [
->         'button',
->         {
->           name: 'button',
->           someOtherOption: true
->         }
->       ]
->     });
-
-_inherited from_: [src/js/component.js#L481](https://github.com/videojs/video.js/blob/master/src/js/component.js#L481)
-
----
-
-### name()
-> Get the component's name. The name is often used to reference the component.
-> 
->     var name = myComponent.name();
-
-##### RETURNS: 
-* `String` 
-
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
-
----
-
-### off( [first], [second], [third] )
-> Remove an event listener from this component's element
-> 
->     myComponent.off('eventType', myFunc);
-> 
-> If myFunc is excluded, ALL listeners for the event type will be removed.
-> If eventType is excluded, ALL listeners will be removed from the component.
-> 
-> Alternatively you can use `off` to remove listeners that were added to other
-> elements or components using `myComponent.on(otherComponent...`.
-> In this case both the event type and listener function are REQUIRED.
-> 
->     myComponent.off(otherElement, 'eventType', myFunc);
->     myComponent.off(otherComponent, 'eventType', myFunc);
-
-##### PARAMETERS: 
-* __first__ `String|vjs.Component` _(OPTIONAL)_ The event type or other component
-* __second__ `Function|String` _(OPTIONAL)_ The listener function or event type
-* __third__ `Function` _(OPTIONAL)_ The listener for other component
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js/blob/master/src/js/component.js#L646)
-
----
-
-### on( first, second, third )
-> Add an event listener to this component's element
-> 
->     var myFunc = function(){
->       var myComponent = this;
->       // Do something when the event is fired
->     };
-> 
->     myComponent.on('eventType', myFunc);
-> 
-> The context of myFunc will be myComponent unless previously bound.
-> 
-> Alternatively, you can add a listener to another element or component.
-> 
->     myComponent.on(otherElement, 'eventName', myFunc);
->     myComponent.on(otherComponent, 'eventName', myFunc);
-> 
-> The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
-> and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
-> It will also bind myComponent as the context of myFunc.
-> 
-> **NOTE**: When using this on elements in the page other than window
-> and document (both permanent), if you remove the element from the DOM
-> you need to call `vjs.trigger(el, 'dispose')` on it to clean up
-> references to it and allow the browser to garbage collect it.
-
-##### PARAMETERS: 
-* __first__ `String|vjs.Component` The event type or other component
-* __second__ `Function|String` The event handler or event type
-* __third__ `Function` The event handler
-
-##### RETURNS: 
-* `vjs.Component` self
-
-_inherited from_: [src/js/component.js#L577](https://github.com/videojs/video.js/blob/master/src/js/component.js#L577)
-
----
-
-### onClick()
-> Handle a click on the menu item, and set it to selected
-
-_inherited from_: [src/js/menu.js#L74](https://github.com/videojs/video.js/blob/master/src/js/menu.js#L74)
-
----
-
-### one( first, second, [third] )
-> Add an event listener to be triggered only once and then removed
-> 
->     myComponent.one('eventName', myFunc);
-> 
-> Alternatively you can add a listener to another element or component
-> that will be triggered only once.
-> 
->     myComponent.one(otherElement, 'eventName', myFunc);
->     myComponent.one(otherComponent, 'eventName', myFunc);
-
-##### PARAMETERS: 
-* __first__ `String|vjs.Component` The event type or other component
-* __second__ `Function|String` The listener function or event type
-* __third__ `Function` _(OPTIONAL)_ The listener function for other component
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
-
----
-
-### options( obj )
-> Deep merge of options objects
-> 
-> Whenever a property is an object on both options objects
-> the two properties will be merged using vjs.obj.deepMerge.
-> 
-> This is used for merging options for child components. We
-> want it to be easy to override individual options on a child
-> component without having to rewrite all the other default options.
-> 
->     Parent.prototype.options_ = {
->       children: {
->         'childOne': { 'foo': 'bar', 'asdf': 'fdsa' },
->         'childTwo': {},
->         'childThree': {}
->       }
->     }
->     newOptions = {
->       children: {
->         'childOne': { 'foo': 'baz', 'abc': '123' }
->         'childTwo': null,
->         'childFour': {}
->       }
->     }
-> 
->     this.options(newOptions);
-> 
-> RESULT
-> 
->     {
->       children: {
->         'childOne': { 'foo': 'baz', 'asdf': 'fdsa', 'abc': '123' },
->         'childTwo': null, // Disabled. Won't be initialized.
->         'childThree': {},
->         'childFour': {}
->       }
->     }
-
-##### PARAMETERS: 
-* __obj__ `Object` Object of new option values
-
-##### RETURNS: 
-* `Object` A NEW object of this.options_ and obj merged
-
-_inherited from_: [src/js/component.js#L179](https://github.com/videojs/video.js/blob/master/src/js/component.js#L179)
-
----
-
-### player()
-> Return the component's player
-
-##### RETURNS: 
-* `vjs.Player` 
-
-_inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js/blob/master/src/js/component.js#L126)
-
----
-
-### ready( fn )
-> Bind a listener to the component's ready state
-> 
-> Different from event listeners in that if the ready event has already happend
-> it will trigger the function immediately.
-
-##### PARAMETERS: 
-* __fn__ `Function` Ready listener
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L769](https://github.com/videojs/video.js/blob/master/src/js/component.js#L769)
-
----
-
-### removeChild( component )
-> Remove a child component from this component's list of children, and the
-> child component's element from this component's element
-
-##### PARAMETERS: 
-* __component__ `vjs.Component` Component to remove
-
-_inherited from_: [src/js/component.js#L420](https://github.com/videojs/video.js/blob/master/src/js/component.js#L420)
-
----
-
-### removeClass( classToRemove )
-> Remove a CSS class name from the component's element
-
-##### PARAMETERS: 
-* __classToRemove__ `String` Classname to remove
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js/blob/master/src/js/component.js#L837)
-
----
-
-### selected( selected )
-> Set this menu item as selected or not
-
-##### PARAMETERS: 
-* __selected__ `Boolean` 
-
-_inherited from_: [src/js/menu.js#L82](https://github.com/videojs/video.js/blob/master/src/js/menu.js#L82)
-
----
-
-### show()
-> Show the component element if hidden
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L847](https://github.com/videojs/video.js/blob/master/src/js/component.js#L847)
-
----
-
-### trigger( event )
-> Trigger an event on an element
-> 
->     myComponent.trigger('eventName');
->     myComponent.trigger({'type':'eventName'});
-
-##### PARAMETERS: 
-* __event__ `Event|Object|String` A string (the type) or an event object with a type attribute
-
-##### RETURNS: 
-* `vjs.Component` self
-
-_inherited from_: [src/js/component.js#L724](https://github.com/videojs/video.js/blob/master/src/js/component.js#L724)
-
----
-
-### triggerReady()
-> Trigger the ready listeners
-
-##### RETURNS: 
-* `vjs.Component` 
-
-_inherited from_: [src/js/component.js#L788](https://github.com/videojs/video.js/blob/master/src/js/component.js#L788)
-
----
-
-### width( [num], skipListeners )
-> Set or get the width of the component (CSS values)
-> 
-> Setting the video tag dimension values only works with values in pixels.
-> Percent values will not work.
-> Some percents can be used, but width()/height() will return the number + %,
-> not the actual computed width/height.
-
-##### PARAMETERS: 
-* __num__ `Number|String` _(OPTIONAL)_ Optional width number
-* __skipListeners__ `Boolean` Skip the 'resize' event trigger
-
-##### RETURNS: 
-* `vjs.Component` This component, when setting the width
-* `Number|String` The width, when getting
-
-_inherited from_: [src/js/component.js#L910](https://github.com/videojs/video.js/blob/master/src/js/component.js#L910)
-
----
-
-## EVENTS
-
-### resize `EVENT`
-> Fired when the width and/or height of the component changes
-
-_inherited from_: [src/js/component.js#L1020](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1020)
-
----
-

docs/api/vjs.TimeDivider.md

@@ -3,7 +3,7 @@
 # vjs.TimeDivider
 
 __EXTENDS__: [vjs.Component](vjs.Component.md)  
-__DEFINED IN__: [src/js/control-bar/time-display.js#L88](https://github.com/videojs/video.js/blob/master/src/js/control-bar/time-display.js#L88)  
+__DEFINED IN__: [src/js/control-bar/time-display.js#L89](https://github.com/videojs/video.js/blob/master/src/js/control-bar/time-display.js#L89)  
 
 The separator between the current time and duration
 
@@ -19,6 +19,8 @@ Can be hidden if it's not needed in the design.
   - [addClass](#addclass-classtoadd-) _`inherited`_
   - [buildCSSClass](#buildcssclass) _`inherited`_
   - [children](#children) _`inherited`_
+  - [clearInterval](#clearinterval-intervalid-) _`inherited`_
+  - [clearTimeout](#cleartimeout-timeoutid-) _`inherited`_
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
@@ -41,6 +43,8 @@ Can be hidden if it's not needed in the design.
   - [ready](#ready-fn-) _`inherited`_
   - [removeChild](#removechild-component-) _`inherited`_
   - [removeClass](#removeclass-classtoremove-) _`inherited`_
+  - [setInterval](#setinterval-fn-interval-) _`inherited`_
+  - [setTimeout](#settimeout-fn-timeout-) _`inherited`_
   - [show](#show) _`inherited`_
   - [trigger](#trigger-event-) _`inherited`_
   - [triggerReady](#triggerready) _`inherited`_
@@ -122,6 +126,32 @@ _inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js
 
 ---
 
+### clearInterval( intervalId )
+> Clears an interval and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __intervalId__ `Number` The id of the interval to clear
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1223](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1223)
+
+---
+
+### clearTimeout( timeoutId )
+> Clears a timeout and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __timeoutId__ `Number` The id of the timeout to clear
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1185](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1185)
+
+---
+
 ### contentEl()
 > Return the component's DOM element for embedding content.
 > Will either be el_ or a new element defined in createEl.
@@ -203,7 +233,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 > whenever touch events happen, and this can be turned off by components that
 > want touch events to act differently.
 
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
+_inherited from_: [src/js/component.js#L1124](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1124)
 
 ---
 
@@ -294,7 +324,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 * __player__ 
 * __options__ 
 
-_defined in_: [src/js/control-bar/time-display.js#L90](https://github.com/videojs/video.js/blob/master/src/js/control-bar/time-display.js#L90)
+_defined in_: [src/js/control-bar/time-display.js#L91](https://github.com/videojs/video.js/blob/master/src/js/control-bar/time-display.js#L91)
 
 ---
 
@@ -393,7 +423,7 @@ _inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js
 > 
 > The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
 > and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
+> will be automatically cleaned up when either component is disposed.
 > It will also bind myComponent as the context of myFunc.
 > 
 > **NOTE**: When using this on elements in the page other than window
@@ -497,7 +527,7 @@ _inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js
 ### ready( fn )
 > Bind a listener to the component's ready state
 > 
-> Different from event listeners in that if the ready event has already happend
+> Different from event listeners in that if the ready event has already happened
 > it will trigger the function immediately.
 
 ##### PARAMETERS: 
@@ -534,6 +564,34 @@ _inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js
 
 ---
 
+### setInterval( fn, interval )
+> Creates an interval and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run every N seconds.
+* __interval__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1202](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1202)
+
+---
+
+### setTimeout( fn, timeout )
+> Creates timeout and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run after the timeout.
+* __timeout__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1162](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1162)
+
+---
+
 ### show()
 > Show the component element if hidden
 

docs/api/vjs.VolumeBar.md

@@ -17,6 +17,8 @@ The bar that contains the volume level and can be clicked on to adjust the level
   - [addClass](#addclass-classtoadd-) _`inherited`_
   - [buildCSSClass](#buildcssclass) _`inherited`_
   - [children](#children) _`inherited`_
+  - [clearInterval](#clearinterval-intervalid-) _`inherited`_
+  - [clearTimeout](#cleartimeout-timeoutid-) _`inherited`_
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
@@ -40,6 +42,8 @@ The bar that contains the volume level and can be clicked on to adjust the level
   - [ready](#ready-fn-) _`inherited`_
   - [removeChild](#removechild-component-) _`inherited`_
   - [removeClass](#removeclass-classtoremove-) _`inherited`_
+  - [setInterval](#setinterval-fn-interval-) _`inherited`_
+  - [setTimeout](#settimeout-fn-timeout-) _`inherited`_
   - [show](#show) _`inherited`_
   - [trigger](#trigger-event-) _`inherited`_
   - [triggerReady](#triggerready) _`inherited`_
@@ -121,6 +125,32 @@ _inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js
 
 ---
 
+### clearInterval( intervalId )
+> Clears an interval and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __intervalId__ `Number` The id of the interval to clear
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1223](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1223)
+
+---
+
+### clearTimeout( timeoutId )
+> Clears a timeout and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __timeoutId__ `Number` The id of the timeout to clear
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1185](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1185)
+
+---
+
 ### contentEl()
 > Return the component's DOM element for embedding content.
 > Will either be el_ or a new element defined in createEl.
@@ -202,7 +232,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 > whenever touch events happen, and this can be turned off by components that
 > want touch events to act differently.
 
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
+_inherited from_: [src/js/component.js#L1124](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1124)
 
 ---
 
@@ -392,7 +422,7 @@ _inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js
 > 
 > The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
 > and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
+> will be automatically cleaned up when either component is disposed.
 > It will also bind myComponent as the context of myFunc.
 > 
 > **NOTE**: When using this on elements in the page other than window
@@ -419,7 +449,7 @@ _inherited from_: [src/js/component.js#L577](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __event__ `Object` Event object
 
-_inherited from_: [src/js/slider.js#L212](https://github.com/videojs/video.js/blob/master/src/js/slider.js#L212)
+_inherited from_: [src/js/slider.js#L202](https://github.com/videojs/video.js/blob/master/src/js/slider.js#L202)
 
 ---
 
@@ -507,7 +537,7 @@ _inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js
 ### ready( fn )
 > Bind a listener to the component's ready state
 > 
-> Different from event listeners in that if the ready event has already happend
+> Different from event listeners in that if the ready event has already happened
 > it will trigger the function immediately.
 
 ##### PARAMETERS: 
@@ -544,6 +574,34 @@ _inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js
 
 ---
 
+### setInterval( fn, interval )
+> Creates an interval and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run every N seconds.
+* __interval__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1202](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1202)
+
+---
+
+### setTimeout( fn, timeout )
+> Creates timeout and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run after the timeout.
+* __timeout__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1162](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1162)
+
+---
+
 ### show()
 > Show the component element if hidden
 

docs/api/vjs.VolumeControl.md

@@ -17,6 +17,8 @@ The component for controlling the volume level
   - [addClass](#addclass-classtoadd-) _`inherited`_
   - [buildCSSClass](#buildcssclass) _`inherited`_
   - [children](#children) _`inherited`_
+  - [clearInterval](#clearinterval-intervalid-) _`inherited`_
+  - [clearTimeout](#cleartimeout-timeoutid-) _`inherited`_
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
@@ -39,6 +41,8 @@ The component for controlling the volume level
   - [ready](#ready-fn-) _`inherited`_
   - [removeChild](#removechild-component-) _`inherited`_
   - [removeClass](#removeclass-classtoremove-) _`inherited`_
+  - [setInterval](#setinterval-fn-interval-) _`inherited`_
+  - [setTimeout](#settimeout-fn-timeout-) _`inherited`_
   - [show](#show) _`inherited`_
   - [trigger](#trigger-event-) _`inherited`_
   - [triggerReady](#triggerready) _`inherited`_
@@ -120,6 +124,32 @@ _inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js
 
 ---
 
+### clearInterval( intervalId )
+> Clears an interval and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __intervalId__ `Number` The id of the interval to clear
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1223](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1223)
+
+---
+
+### clearTimeout( timeoutId )
+> Clears a timeout and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __timeoutId__ `Number` The id of the timeout to clear
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1185](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1185)
+
+---
+
 ### contentEl()
 > Return the component's DOM element for embedding content.
 > Will either be el_ or a new element defined in createEl.
@@ -201,7 +231,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 > whenever touch events happen, and this can be turned off by components that
 > want touch events to act differently.
 
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
+_inherited from_: [src/js/component.js#L1124](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1124)
 
 ---
 
@@ -391,7 +421,7 @@ _inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js
 > 
 > The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
 > and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
+> will be automatically cleaned up when either component is disposed.
 > It will also bind myComponent as the context of myFunc.
 > 
 > **NOTE**: When using this on elements in the page other than window
@@ -495,7 +525,7 @@ _inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js
 ### ready( fn )
 > Bind a listener to the component's ready state
 > 
-> Different from event listeners in that if the ready event has already happend
+> Different from event listeners in that if the ready event has already happened
 > it will trigger the function immediately.
 
 ##### PARAMETERS: 
@@ -532,6 +562,34 @@ _inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js
 
 ---
 
+### setInterval( fn, interval )
+> Creates an interval and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run every N seconds.
+* __interval__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1202](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1202)
+
+---
+
+### setTimeout( fn, timeout )
+> Creates timeout and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run after the timeout.
+* __timeout__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1162](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1162)
+
+---
+
 ### show()
 > Show the component element if hidden
 

docs/api/vjs.VolumeHandle.md

@@ -17,6 +17,8 @@ The volume handle can be dragged to adjust the volume level
   - [addClass](#addclass-classtoadd-) _`inherited`_
   - [buildCSSClass](#buildcssclass) _`inherited`_
   - [children](#children) _`inherited`_
+  - [clearInterval](#clearinterval-intervalid-) _`inherited`_
+  - [clearTimeout](#cleartimeout-timeoutid-) _`inherited`_
   - [contentEl](#contentel) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
   - [dispose](#dispose) _`inherited`_
@@ -39,6 +41,8 @@ The volume handle can be dragged to adjust the volume level
   - [ready](#ready-fn-) _`inherited`_
   - [removeChild](#removechild-component-) _`inherited`_
   - [removeClass](#removeclass-classtoremove-) _`inherited`_
+  - [setInterval](#setinterval-fn-interval-) _`inherited`_
+  - [setTimeout](#settimeout-fn-timeout-) _`inherited`_
   - [show](#show) _`inherited`_
   - [trigger](#trigger-event-) _`inherited`_
   - [triggerReady](#triggerready) _`inherited`_
@@ -120,6 +124,32 @@ _inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js
 
 ---
 
+### clearInterval( intervalId )
+> Clears an interval and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __intervalId__ `Number` The id of the interval to clear
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1223](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1223)
+
+---
+
+### clearTimeout( timeoutId )
+> Clears a timeout and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __timeoutId__ `Number` The id of the timeout to clear
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1185](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1185)
+
+---
+
 ### contentEl()
 > Return the component's DOM element for embedding content.
 > Will either be el_ or a new element defined in createEl.
@@ -198,7 +228,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 > whenever touch events happen, and this can be turned off by components that
 > want touch events to act differently.
 
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
+_inherited from_: [src/js/component.js#L1124](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1124)
 
 ---
 
@@ -390,7 +420,7 @@ _inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js
 > 
 > The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
 > and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
+> will be automatically cleaned up when either component is disposed.
 > It will also bind myComponent as the context of myFunc.
 > 
 > **NOTE**: When using this on elements in the page other than window
@@ -494,7 +524,7 @@ _inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js
 ### ready( fn )
 > Bind a listener to the component's ready state
 > 
-> Different from event listeners in that if the ready event has already happend
+> Different from event listeners in that if the ready event has already happened
 > it will trigger the function immediately.
 
 ##### PARAMETERS: 
@@ -531,6 +561,34 @@ _inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js
 
 ---
 
+### setInterval( fn, interval )
+> Creates an interval and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run every N seconds.
+* __interval__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1202](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1202)
+
+---
+
+### setTimeout( fn, timeout )
+> Creates timeout and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run after the timeout.
+* __timeout__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1162](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1162)
+
+---
+
 ### show()
 > Show the component element if hidden
 

docs/api/vjs.VolumeLevel.md

@@ -17,6 +17,8 @@ Shows volume level
   - [addClass](#addclass-classtoadd-) _`inherited`_
   - [buildCSSClass](#buildcssclass) _`inherited`_
   - [children](#children) _`inherited`_
+  - [clearInterval](#clearinterval-intervalid-) _`inherited`_
+  - [clearTimeout](#cleartimeout-timeoutid-) _`inherited`_
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
@@ -39,6 +41,8 @@ Shows volume level
   - [ready](#ready-fn-) _`inherited`_
   - [removeChild](#removechild-component-) _`inherited`_
   - [removeClass](#removeclass-classtoremove-) _`inherited`_
+  - [setInterval](#setinterval-fn-interval-) _`inherited`_
+  - [setTimeout](#settimeout-fn-timeout-) _`inherited`_
   - [show](#show) _`inherited`_
   - [trigger](#trigger-event-) _`inherited`_
   - [triggerReady](#triggerready) _`inherited`_
@@ -120,6 +124,32 @@ _inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js
 
 ---
 
+### clearInterval( intervalId )
+> Clears an interval and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __intervalId__ `Number` The id of the interval to clear
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1223](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1223)
+
+---
+
+### clearTimeout( timeoutId )
+> Clears a timeout and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __timeoutId__ `Number` The id of the timeout to clear
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1185](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1185)
+
+---
+
 ### contentEl()
 > Return the component's DOM element for embedding content.
 > Will either be el_ or a new element defined in createEl.
@@ -201,7 +231,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 > whenever touch events happen, and this can be turned off by components that
 > want touch events to act differently.
 
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
+_inherited from_: [src/js/component.js#L1124](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1124)
 
 ---
 
@@ -391,7 +421,7 @@ _inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js
 > 
 > The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
 > and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
+> will be automatically cleaned up when either component is disposed.
 > It will also bind myComponent as the context of myFunc.
 > 
 > **NOTE**: When using this on elements in the page other than window
@@ -495,7 +525,7 @@ _inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js
 ### ready( fn )
 > Bind a listener to the component's ready state
 > 
-> Different from event listeners in that if the ready event has already happend
+> Different from event listeners in that if the ready event has already happened
 > it will trigger the function immediately.
 
 ##### PARAMETERS: 
@@ -532,6 +562,34 @@ _inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js
 
 ---
 
+### setInterval( fn, interval )
+> Creates an interval and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run every N seconds.
+* __interval__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1202](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1202)
+
+---
+
+### setTimeout( fn, timeout )
+> Creates timeout and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run after the timeout.
+* __timeout__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1162](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1162)
+
+---
+
 ### show()
 > Show the component element if hidden
 

docs/api/vjs.VolumeMenuButton.md

@@ -17,6 +17,8 @@ Menu button with a popup for showing the volume slider.
   - [addClass](#addclass-classtoadd-) _`inherited`_
   - [buildCSSClass](#buildcssclass) _`inherited`_
   - [children](#children) _`inherited`_
+  - [clearInterval](#clearinterval-intervalid-) _`inherited`_
+  - [clearTimeout](#cleartimeout-timeoutid-) _`inherited`_
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [createItems](#createitems) _`inherited`_
@@ -40,6 +42,8 @@ Menu button with a popup for showing the volume slider.
   - [ready](#ready-fn-) _`inherited`_
   - [removeChild](#removechild-component-) _`inherited`_
   - [removeClass](#removeclass-classtoremove-) _`inherited`_
+  - [setInterval](#setinterval-fn-interval-) _`inherited`_
+  - [setTimeout](#settimeout-fn-timeout-) _`inherited`_
   - [show](#show) _`inherited`_
   - [trigger](#trigger-event-) _`inherited`_
   - [triggerReady](#triggerready) _`inherited`_
@@ -102,7 +106,7 @@ _inherited from_: [src/js/component.js#L826](https://github.com/videojs/video.js
 ### buildCSSClass()
 > Allows sub components to stack CSS class names
 
-_inherited from_: [src/js/menu.js#L157](https://github.com/videojs/video.js/blob/master/src/js/menu.js#L157)
+_inherited from_: [src/js/menu.js#L166](https://github.com/videojs/video.js/blob/master/src/js/menu.js#L166)
 
 ---
 
@@ -118,6 +122,32 @@ _inherited from_: [src/js/component.js#L296](https://github.com/videojs/video.js
 
 ---
 
+### clearInterval( intervalId )
+> Clears an interval and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __intervalId__ `Number` The id of the interval to clear
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1223](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1223)
+
+---
+
+### clearTimeout( timeoutId )
+> Clears a timeout and removes the associated dispose listener
+
+##### PARAMETERS: 
+* __timeoutId__ `Number` The id of the timeout to clear
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1185](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1185)
+
+---
+
 ### contentEl()
 > Return the component's DOM element for embedding content.
 > Will either be el_ or a new element defined in createEl.
@@ -146,7 +176,7 @@ _inherited from_: [src/js/component.js#L200](https://github.com/videojs/video.js
 ### createItems()
 > Create the list of menu items. Specific to each subclass.
 
-_inherited from_: [src/js/menu.js#L154](https://github.com/videojs/video.js/blob/master/src/js/menu.js#L154)
+_inherited from_: [src/js/menu.js#L163](https://github.com/videojs/video.js/blob/master/src/js/menu.js#L163)
 
 ---
 
@@ -206,7 +236,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 > whenever touch events happen, and this can be turned off by components that
 > want touch events to act differently.
 
-_inherited from_: [src/js/component.js#L1120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1120)
+_inherited from_: [src/js/component.js#L1124](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1124)
 
 ---
 
@@ -396,7 +426,7 @@ _inherited from_: [src/js/component.js#L646](https://github.com/videojs/video.js
 > 
 > The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
 > and `otherComponent.on('eventName', myFunc)` is that this way the listeners
-> will be automatically cleaned up when either component is diposed.
+> will be automatically cleaned up when either component is disposed.
 > It will also bind myComponent as the context of myFunc.
 > 
 > **NOTE**: When using this on elements in the page other than window
@@ -500,7 +530,7 @@ _inherited from_: [src/js/component.js#L126](https://github.com/videojs/video.js
 ### ready( fn )
 > Bind a listener to the component's ready state
 > 
-> Different from event listeners in that if the ready event has already happend
+> Different from event listeners in that if the ready event has already happened
 > it will trigger the function immediately.
 
 ##### PARAMETERS: 
@@ -537,6 +567,34 @@ _inherited from_: [src/js/component.js#L837](https://github.com/videojs/video.js
 
 ---
 
+### setInterval( fn, interval )
+> Creates an interval and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run every N seconds.
+* __interval__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the interval ID
+
+_inherited from_: [src/js/component.js#L1202](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1202)
+
+---
+
+### setTimeout( fn, timeout )
+> Creates timeout and sets up disposal automatically.
+
+##### PARAMETERS: 
+* __fn__ `Function` The function to run after the timeout.
+* __timeout__ `Number` Number of ms to delay before executing specified function.
+
+##### RETURNS: 
+* `Number` Returns the timeout ID
+
+_inherited from_: [src/js/component.js#L1162](https://github.com/videojs/video.js/blob/master/src/js/component.js#L1162)
+
+---
+
 ### show()
 > Show the component element if hidden
 

docs/api/vjs.md

@@ -25,15 +25,14 @@ The `vjs` function can be used to initialize or retrieve a player.
   - [addLanguage](#addlanguage-code-data-)
   - [parseUrl](#parseurl-url-)
   - [plugin](#plugin-name-init-)
+  - [xhr](#xhr-options-callback-)
 
 - CLASSES
   - [BigPlayButton](vjs.BigPlayButton.md)
   - [Button](vjs.Button.md)
-  - [CaptionsButton](vjs.CaptionsButton.md)
-  - [CaptionsTrack](vjs.CaptionsTrack.md)
-  - [ChaptersButton](vjs.ChaptersButton.md)
-  - [ChaptersTrack](vjs.ChaptersTrack.md)
-  - [ChaptersTrackMenuItem](vjs.ChaptersTrackMenuItem.md)
+  - [CaptionsButton](undefined.md)
+  - [ChaptersButton](undefined.md)
+  - [ChaptersTrackMenuItem](undefined.md)
   - [Component](vjs.Component.md)
   - [ControlBar](vjs.ControlBar.md)
   - [CoreObject](vjs.CoreObject.md)
@@ -48,12 +47,12 @@ The `vjs` function can be used to initialize or retrieve a player.
   - [LoadingSpinner](vjs.LoadingSpinner.md)
   - [MediaError](vjs.MediaError.md)
   - [MediaLoader](vjs.MediaLoader.md)
-  - [MediaTechController](vjs.MediaTechController.md)
+  - [MediaTechController](undefined.md)
   - [Menu](vjs.Menu.md)
   - [MenuButton](vjs.MenuButton.md)
   - [MenuItem](vjs.MenuItem.md)
   - [MuteToggle](vjs.MuteToggle.md)
-  - [OffTextTrackMenuItem](vjs.OffTextTrackMenuItem.md)
+  - [OffTextTrackMenuItem](undefined.md)
   - [PlayProgressBar](vjs.PlayProgressBar.md)
   - [PlayToggle](vjs.PlayToggle.md)
   - [PlaybackRateMenuButton](vjs.PlaybackRateMenuButton.md)
@@ -66,12 +65,10 @@ The `vjs` function can be used to initialize or retrieve a player.
   - [SeekHandle](vjs.SeekHandle.md)
   - [Slider](vjs.Slider.md)
   - [SliderHandle](vjs.SliderHandle.md)
-  - [SubtitlesButton](vjs.SubtitlesButton.md)
-  - [SubtitlesTrack](vjs.SubtitlesTrack.md)
-  - [TextTrack](vjs.TextTrack.md)
-  - [TextTrackButton](vjs.TextTrackButton.md)
-  - [TextTrackDisplay](vjs.TextTrackDisplay.md)
-  - [TextTrackMenuItem](vjs.TextTrackMenuItem.md)
+  - [SubtitlesButton](undefined.md)
+  - [TextTrackButton](undefined.md)
+  - [TextTrackDisplay](undefined.md)
+  - [TextTrackMenuItem](undefined.md)
   - [TimeDivider](vjs.TimeDivider.md)
   - [VolumeBar](vjs.VolumeBar.md)
   - [VolumeControl](vjs.VolumeControl.md)
@@ -93,14 +90,14 @@ The `vjs` function can be used to initialize or retrieve a player.
 > All options should use string keys so they avoid
 > renaming by closure compiler
 
-_defined in_: [src/js/core.js#L76](https://github.com/videojs/video.js/blob/master/src/js/core.js#L76)
+_defined in_: [src/js/core.js#L92](https://github.com/videojs/video.js/blob/master/src/js/core.js#L92)
 
 ---
 
 ### players
 > Global player list
 
-_defined in_: [src/js/core.js#L147](https://github.com/videojs/video.js/blob/master/src/js/core.js#L147)
+_defined in_: [src/js/core.js#L164](https://github.com/videojs/video.js/blob/master/src/js/core.js#L164)
 
 ---
 
@@ -119,7 +116,7 @@ _defined in_: [src/js/core.js#L147](https://github.com/videojs/video.js/blob/mas
 ##### RETURNS: 
 * `Object` The resulting global languages dictionary object
 
-_defined in_: [src/js/core.js#L134](https://github.com/videojs/video.js/blob/master/src/js/core.js#L134)
+_defined in_: [src/js/core.js#L151](https://github.com/videojs/video.js/blob/master/src/js/core.js#L151)
 
 ---
 
@@ -132,7 +129,7 @@ _defined in_: [src/js/core.js#L134](https://github.com/videojs/video.js/blob/mas
 ##### RETURNS: 
 * `Object` An object of url details
 
-_defined in_: [src/js/lib.js#L746](https://github.com/videojs/video.js/blob/master/src/js/lib.js#L746)
+_defined in_: [src/js/lib.js#L676](https://github.com/videojs/video.js/blob/master/src/js/lib.js#L676)
 
 ---
 
@@ -147,3 +144,40 @@ _defined in_: [src/js/plugins.js#L7](https://github.com/videojs/video.js/blob/ma
 
 ---
 
+### xhr( options, callback )
+> Simple http request for retrieving external files (e.g. text tracks)
+> 
+> ##### Example
+> 
+>     // using url string
+>     videojs.xhr('http://example.com/myfile.vtt', function(error, response, responseBody){});
+> 
+>     // or options block
+>     videojs.xhr({
+>       uri: 'http://example.com/myfile.vtt',
+>       method: 'GET',
+>       responseType: 'text'
+>     }, function(error, response, responseBody){
+>       if (error) {
+>         // log the error
+>       } else {
+>         // successful, do something with the response
+>       }
+>     });
+> 
+> 
+> API is modeled after the Raynos/xhr, which we hope to use after
+> getting browserify implemented.
+> https://github.com/Raynos/xhr/blob/master/index.js
+
+##### PARAMETERS: 
+* __options__ `Object|String` Options block or URL string
+* __callback__ `Function` The callback function
+
+##### RETURNS: 
+* `Object` The request
+
+_defined in_: [src/js/xhr.js#L31](https://github.com/videojs/video.js/blob/master/src/js/xhr.js#L31)
+
+---
+

docs/guides/languages.md

@@ -1,11 +1,11 @@
 Languages
 =========
 
-Multiple language support allows for users of non-English locales to natively interact with the displayed player. Video.js will compile multiple langauge files (see below) and instantiate with a global dictionary of language key/value support. Video.js player instances can be created with per-player language support that amends/overrides this default values. Player instances can also hard-set default languges to values other than English as of version 4.7.
+Multiple language support allows for users of non-English locales to natively interact with the displayed player. Video.js will compile multiple language files (see below) and instantiate with a global dictionary of language key/value support. Video.js player instances can be created with per-player language support that amends/overrides these default values. Player instances can also hard-set default languages to values other than English as of version 4.7.
 
 Creating the Language File
 --------------------------
-Video.js uses key/value object dictionaries in JSON form. A sample dictionary for Spanish ['es'] would look as follows;
+Video.js uses key/value object dictionaries in JSON form. A sample dictionary for Spanish `['es']` would look as follows;
 
 ```JSON
 {
@@ -38,14 +38,14 @@ Video.js uses key/value object dictionaries in JSON form. A sample dictionary fo
 
 Notes:
  
-- The file name should always be in the format XX.json, where XX is the two letter value of the language reported to the browser (for options see the bottom of this document).
-- For automatic inclusion at build time, add your language file to the /lang directory (see 'Adding Languages to Video.js below').
+- The file name should always be in the format `XX.json`, where `XX` is the two letter value of the language reported to the browser (for options see the bottom of this document).
+- For automatic inclusion at build time, add your language file to the `/lang` directory (see 'Adding Languages to Video.js below').
 
 Adding Languages to Video.js
 ----------------------------
 Additional language support can be added to Video.js in multiple ways.
 
-1. Create language scripts out of your JSON objects by using our custom grunt task `vjslanguages`. This task is automatically run as part of the default grunt task in Video.JS, but can be configured to match your src/dist directories if different. Once these scripts are created, just add them to your DOM like any other script. 
+1. Create language scripts out of your JSON objects by using our custom grunt task `vjslanguages`. This task is automatically run as part of the default grunt task in Video.JS, but can be configured to match your `src`/`dist` directories if different. Once these scripts are created, just add them to your DOM like any other script. 
 
 NOTE: These need to be added after the core Video.js script.
 
@@ -86,7 +86,7 @@ NOTE: These need to be added after the core Video.js script.
 </head>
 ```
 
-3. During a Video.js player instantiation. Adding the languages to the configuration object provided in the data-setup attribute.
+3. During a Video.js player instantiation. Adding the languages to the configuration object provided in the `data-setup` attribute.
 
 ```html
 <video id="example_video_1" class="video-js vjs-default-skin"  
@@ -102,12 +102,12 @@ NOTE: These need to be added after the core Video.js script.
 ```
 
 Notes:
-- This will add your language key/values to the videojs player instances individually. If these values already exist in the global dictionary via the process above, those will be overridden for the player instance in question.
+- This will add your language key/values to the Video.js player instances individually. If these values already exist in the global dictionary via the process above, those will be overridden for the player instance in question.
 
 
 Setting Default Language in a Video.js Player
 ---------------------------------------------
-During a Video.js player instantiation you can force it to localize to a specific language by including the locale value into the configuration object via the data-setup attribute. Valid options listed at the bottom of the page for reference.
+During a Video.js player instantiation you can force it to localize to a specific language by including the locale value into the configuration object via the `data-setup` attribute. Valid options listed at the bottom of the page for reference.
 
 ```html
 <video id="example_video_1" class="video-js vjs-default-skin"  
@@ -122,6 +122,15 @@ During a Video.js player instantiation you can force it to localize to a specifi
 </video>
 ```
 
+Localization in Plugins
+-----------------------
+
+When you're developing a plugin, you can also introduce new localized strings. Simply wrap the string with the player's `localize` function:
+
+```javascript
+var details = '<div class="vjs-errors-details">' + player.localize('Technical details') + '</div>';
+```
+
 Language Codes
 --------------
 The following is a list of official language codes. 

docs/guides/options.md

@@ -88,7 +88,7 @@ or
 
 
 ### loop ###
-The loop attribute causes the video to start over as soon as it ends. This could be used for a visual affect like clouds in the background.
+The loop attribute causes the video to start over as soon as it ends. This could be used for a visual effect like clouds in the background.
 ```html
 <video loop ...>
 or
@@ -149,5 +149,5 @@ notation.
 <video ... data-setup='{ "children": { "controlBar": { "children": { "muteToggle": false } } } }'></video>
 ```
 
-The [components guide](/blob/master/docs/guides/components.md) has an excellent breakdown of the structure of a player, you
+The [components guide](components.md) has an excellent breakdown of the structure of a player, you
 just need to remember to nest child components in a `children` object for each level.

docs/guides/plugins.md

@@ -23,7 +23,7 @@ Step 2: Registering A Plugin
 -------------------------------
 It's time to give the rest of the world the opportunity to be awed by your genius. When your plugin is loaded, it needs to let Video.js know this amazing new functionality is now available:
 
-    vjs.plugin('examplePlugin', examplePlugin);
+    videojs.plugin('examplePlugin', examplePlugin);
 
 From this point on, your plugin will be added to the Video.js prototype and will show up as a property on every instance created. Make sure you choose a unique name that doesn't clash with any of the properties already in Video.js. Which leads us to...
 
@@ -31,7 +31,7 @@ Step 3: Using A Plugin
 ----------------------
 There are two ways to initialize a plugin. If you're creating your video tag dynamically, you can specify the plugins you'd like to initialize with it and any options you want to pass to them:
 
-    vjs('vidId', {
+    videojs('vidId', {
       plugins: {
         examplePlugin: {
           exampleOption: true
@@ -41,6 +41,7 @@ There are two ways to initialize a plugin. If you're creating your video tag dyn
 
 If you've already initialized your video tag, you can activate a plugin at any time by calling its setup function directly:
 
+    var video = videojs('cool-vid');
     video.examplePlugin({ exampleOption: true });
 
-That's it. Head on over to the Video.js wiki and add your plugin to the list so everyone else can check it out.
+That's it. Head on over to the [Video.js wiki](https://github.com/videojs/video.js/wiki/Plugins) and add your plugin to the list so everyone else can check it out.

docs/guides/removing-players.md

@@ -0,0 +1,41 @@
+Removing Players
+================
+
+Sometimes, you want to remove players after page load (in single page apps or modals, for instance). It's easy to manage, but there are some simple rules you need to follow.
+
+Call `.dispose()`
+-----------------
+
+To remove the html associated with your videojs player from the page always call the player's [`dispose()`](https://github.com/videojs/video.js/blob/stable/docs/api/vjs.Player.md#dispose) method:
+
+```javascript```
+var oldPlayer = document.getElementById('my-player');
+videojs(oldPlayer).dispose(); 
+```
+
+This method will:
+
+  1. reset the internal state of videojs
+  2. remove the player's dom from the page
+
+Showing / Hiding a Player
+-------------------------
+
+For instance, if you have a modal that a player appears in, you should create the player when the modal pops up. When the modal hides, dispose the player. If you try to hide the Flash tech, things will go poorly. Even with other tech, calling `dispose()` on a player that's not needed will free up resources for the browser.
+
+Why Is This Needed?
+-------------------
+
+VideoJS internally tracks all players and their associated data by html id attribute. If you plan to create new players with the same id as previously created players, you'll need to call the player's dispose() method to clear VideoJS's internal state before creating the new player.
+
+Signs You Did It Wrong
+-------------------------
+
+```
+TypeError: this.el_.vjs_getProperty is not a function
+"VIDEOJS:" "Video.js: buffered unavailable on Hls playback technology element." TypeError: this.el_.vjs_getProperty is not a function
+Stack trace:
+...
+```
+
+If you encounter a console error in the browser similar to the above, you've probably forgotten to `dispose()` a player before removing it from the dom. This would happen when using the [contrib-hls](https://github.com/videojs/videojs-contrib-hls) plugin.

docs/guides/setup.md

@@ -20,10 +20,24 @@ You can download the Video.js source and host it on your own servers, or use the
 
 ### CDN Version ###
 ```html
-<link href="//vjs.zencdn.net/4.10/video-js.css" rel="stylesheet">
-<script src="//vjs.zencdn.net/4.10/video.js"></script>
+<link href="//vjs.zencdn.net/4.12/video-js.css" rel="stylesheet">
+<script src="//vjs.zencdn.net/4.12/video.js"></script>
 ```
 
+
+## Install via package manager
+
+### NPM
+```
+$ npm install --save video.js
+```
+
+### Bower
+```
+$ bower install --save video.js
+```
+
+
 ### Self Hosted. ###
 To entirely self-host, you'll need to pull in the font files and let Video.js know where the swf is located. If you simply copy the dist folder or zip file contents into your project everything
 should Just Work™, but the paths can easily be changed by editing the LESS file and re-building, or by modifying the generated CSS file.
@@ -41,6 +55,8 @@ Step 2: Add an HTML5 video tag to your page.
 --------------------------------------------
 With Video.js you just use an HTML5 video tag to embed a video. Video.js will then read the tag and make it work in all browsers, not just ones that support HTML5 video. Beyond the basic markup, Video.js needs a few extra pieces.
 
+> Note: The `data-setup` attribute described here should not be used if you use the alternative setup described in the next section.
+
   1. The 'data-setup' Attribute tells Video.js to automatically set up the video when the page is ready, and read any options (in JSON format) from the attribute (see [options](options.md)). There are other methods for initializing the player, but this is the easiest.
 
   2. The 'id' Attribute: Should be used and unique for every video on the same page.

docs/index.md

@@ -30,6 +30,8 @@ There are two categories of docs: [Guides](./guides/) and [API docs](./api/). Gu
 
 * [Glossary](./guides/glossary.md) - Some helpful definitions.
 
+* [Removing Players](./guides/removing-players.md) - Helpful for using VideoJS in single page apps.
+
 ## API Docs
 - The most relevant API doc is the [player API doc](./api/vjs.Player.md).
 - [Full list of API Docs](./api/)

lang/ar.json

@@ -0,0 +1,26 @@
+{
+  "Play": "تشغيل",
+  "Pause": "ايقاف",
+  "Current Time": "الوقت الحالي",
+  "Duration Time": "Dauer",
+  "Remaining Time": "الوقت المتبقي",
+  "Stream Type": "نوع التيار",
+  "LIVE": "مباشر",
+  "Loaded": "تم التحميل",
+  "Progress": "التقدم",
+  "Fullscreen": "ملء الشاشة",
+  "Non-Fullscreen": "غير ملء الشاشة",
+  "Mute": "صامت",
+  "Unmuted": "غير الصامت",
+  "Playback Rate": "معدل التشغيل",
+  "Subtitles": "الترجمة",
+  "subtitles off": "ايقاف الترجمة",
+  "Captions": "التعليقات",
+  "captions off": "ايقاف التعليقات",
+  "Chapters": "فصول",
+  "You aborted the video playback": "لقد ألغيت تشغيل الفيديو",
+  "A network error caused the video download to fail part-way.": "تسبب خطأ في الشبكة بفشل تحميل الفيديو بالكامل.",
+  "The video could not be loaded, either because the server or network failed or because the format is not supported.": "لا يمكن تحميل الفيديو بسبب فشل في الخادم أو الشبكة ، أو فشل بسبب عدم امكانية قراءة تنسيق الفيديو.",
+  "The video playback was aborted due to a corruption problem or because the video used features your browser did not support.": "تم ايقاف تشغيل الفيديو بسبب مشكلة فساد أو لأن الفيديو المستخدم يستخدم ميزات غير مدعومة من متصفحك.",
+  "No compatible source was found for this video.": "فشل العثور على أي مصدر متوافق مع هذا الفيديو."
+}

lang/bg.json

@@ -0,0 +1,26 @@
+{
+  "Play": "Възпроизвеждане",
+  "Pause": "Пауза",
+  "Current Time": "Текущо време",
+  "Duration Time": "Продължителност",
+  "Remaining Time": "Оставащо време",
+  "Stream Type": "Тип на потока",
+  "LIVE": "НА ЖИВО",
+  "Loaded": "Заредено",
+  "Progress": "Прогрес",
+  "Fullscreen": "Цял екран",
+  "Non-Fullscreen": "Спиране на цял екран",
+  "Mute": "Без звук",
+  "Unmuted": "Със звук",
+  "Playback Rate": "Скорост на възпроизвеждане",
+  "Subtitles": "Субтитри",
+  "subtitles off": "Спряни субтитри",
+  "Captions": "Аудио надписи",
+  "captions off": "Спряни аудио надписи",
+  "Chapters": "Глави",
+  "You aborted the video playback": "Спряхте възпроизвеждането на видеото",
+  "A network error caused the video download to fail part-way.": "Грешка в мрежата провали изтеглянето на видеото.",
+  "The video could not be loaded, either because the server or network failed or because the format is not supported.": "Видеото не може да бъде заредено заради проблем със сървъра или мрежата или защото този формат не е поддържан.",
+  "The video playback was aborted due to a corruption problem or because the video used features your browser did not support.": "Възпроизвеждането на видеото беше прекъснато заради проблем с файла или защото видеото използва опции които браузърът Ви не поддържа.",
+  "No compatible source was found for this video.": "Не беше намерен съвместим източник за това видео."
+}

lang/ca.json

@@ -0,0 +1,26 @@
+{
+  "Play": "Reproducció",
+  "Pause": "Pausa",
+  "Current Time": "Temps reproduït",
+  "Duration Time": "Durada total",
+  "Remaining Time": "Temps restant",
+  "Stream Type": "Tipus de seqüència",
+  "LIVE": "EN DIRECTE",
+  "Loaded": "Carregat",
+  "Progress": "Progrés",
+  "Fullscreen": "Pantalla completa",
+  "Non-Fullscreen": "Pantalla no completa",
+  "Mute": "Silencia",
+  "Unmuted": "Amb so",
+  "Playback Rate": "Velocitat de reproducció",
+  "Subtitles": "Subtítols",
+  "subtitles off": "Subtítols desactivats",
+  "Captions": "Llegendes",
+  "captions off": "Llegendes desactivades",
+  "Chapters": "Capítols",
+  "You aborted the video playback": "Heu interromput la reproducció del vídeo.",
+  "A network error caused the video download to fail part-way.": "Un error de la xarxa ha interromput la baixada del vídeo.",
+  "The video could not be loaded, either because the server or network failed or because the format is not supported.": "No s'ha pogut carregar el vídeo perquè el servidor o la xarxa han fallat, o bé perquè el seu format no és compatible.",
+  "The video playback was aborted due to a corruption problem or because the video used features your browser did not support.": "La reproducció de vídeo s'ha interrumput per un problema de corrupció de dades o bé perquè el vídeo demanava funcions que el vostre navegador no ofereix.",
+  "No compatible source was found for this video.": "No s'ha trobat cap font compatible amb el vídeo."
+}

lang/cs.json

@@ -0,0 +1,26 @@
+{
+  "Play": "Přehrát",
+  "Pause": "Pauza",
+  "Current Time": "Aktuální čas",
+  "Duration Time": "Doba trvání",
+  "Remaining Time": "Zbývající čas",
+  "Stream Type": "Stream Type",
+  "LIVE": "ŽIVĚ",
+  "Loaded": "Načteno",
+  "Progress": "Stav",
+  "Fullscreen": "Celá obrazovka",
+  "Non-Fullscreen": "Zmenšená obrazovka",
+  "Mute": "Ztlumit zvuk",
+  "Unmuted": "Přehrát zvuk",
+  "Playback Rate": "Rychlost přehrávání",
+  "Subtitles": "Titulky",
+  "subtitles off": "Titulky vypnuty",
+  "Captions": "Popisky",
+  "captions off": "Popisky vypnuty",
+  "Chapters": "Kapitoly",
+  "You aborted the video playback": "Přehrávání videa je přerušeno.",
+  "A network error caused the video download to fail part-way.": "Video nemohlo být načteno, kvůli chybě v síti.",
+  "The video could not be loaded, either because the server or network failed or because the format is not supported.": "Video nemohlo být načteno, buď kvůli chybě serveru nebo sítě nebo proto, že daný formát není podporován.",
+  "The video playback was aborted due to a corruption problem or because the video used features your browser did not support.": "Váš prohlížeč nepodporuje formát videa.",
+  "No compatible source was found for this video.": "Špatně zadaný zdroj videa."
+}

lang/hu.json

@@ -0,0 +1,26 @@
+{
+  "Play": "Lejátszás",
+  "Pause": "Szünet",
+  "Current Time": "Aktuális időpont",
+  "Duration Time": "Hossz",
+  "Remaining Time": "Hátralévő idő",
+  "Stream Type": "Adatfolyam típusa",
+  "LIVE": "ÉLŐ",
+  "Loaded": "Betöltve",
+  "Progress": "Állapot",
+  "Fullscreen": "Teljes képernyő",
+  "Non-Fullscreen": "Normál méret",
+  "Mute": "Némítás",
+  "Unmuted": "Némítás kikapcsolva",
+  "Playback Rate": "Lejátszási sebesség",
+  "Subtitles": "Feliratok",
+  "subtitles off": "Feliratok kikapcsolva",
+  "Captions": "Magyarázó szöveg",
+  "captions off": "Magyarázó szöveg kikapcsolva",
+  "Chapters": "Fejezetek",
+  "You aborted the video playback": "Leállította a lejátszást",
+  "A network error caused the video download to fail part-way.": "Hálózati hiba miatt a videó részlegesen töltődött le.",
+  "The video could not be loaded, either because the server or network failed or because the format is not supported.": "A videó nem tölthető be hálózati vagy kiszolgálói hiba miatt, vagy a formátuma nem támogatott.",
+  "The video playback was aborted due to a corruption problem or because the video used features your browser did not support.": "A lejátszás adatsérülés miatt leállt, vagy a videó egyes tulajdonságait a böngészője nem támogatja.",
+  "No compatible source was found for this video.": "Nincs kompatibilis forrás ehhez a videóhoz."
+}

lang/tr.json

@@ -0,0 +1,26 @@
+{
+ "Play": "Oynat",
+ "Pause": "Duraklat",
+ "Current Time": "Süre",
+ "Duration Time": "Toplam Süre",
+ "Remaining Time": "Kalan Süre",
+ "Stream Type": "Yayın Tipi",
+ "LIVE": "CANLI",
+ "Loaded": "Yüklendi",
+ "Progress": "Yükleniyor",
+ "Fullscreen": "Tam Ekran",
+ "Non-Fullscreen": "Küçük Ekran",
+ "Mute": "Ses Kapa",
+ "Unmuted": "Ses Aç",
+ "Playback Rate": "Oynatma Hızı",
+ "Subtitles": "Altyazı",
+ "subtitles off": "Altyazı Kapat",
+ "Captions": "Ek Açıklamalar",
+ "captions off": "Ek Açıklamalar Kapalı",
+ "Chapters": "Bölümler",
+ "You aborted the video playback": "Video oynatmayı iptal ettiniz",
+ "A network error caused the video download to fail part-way.": "Video indirilirken bağlantı sorunu oluştu.",
+ "The video could not be loaded, either because the server or network failed or because the format is not supported.": "Video oynatılamadı, Ağ yada sunucu hattası veya belirtilen format desteklenmiyor.",
+ "The video playback was aborted due to a corruption problem or because the video used features your browser did not support.": "Tarayıcınız desteklemediği için videoda hata oluştu.",
+ "No compatible source was found for this video.": "Video için kaynak bulunamadı."
+}

lang/vi.json

@@ -0,0 +1,26 @@
+{
+  "Play": "Phát",
+  "Pause": "Tạm dừng",
+  "Current Time": "Thời gian hiện tại",
+  "Duration Time": "Độ dài",
+  "Remaining Time": "Thời gian còn lại",
+  "Stream Type": "Kiểu Stream",
+  "LIVE": "TRỰC TIẾP",
+  "Loaded": "Đã tải",
+  "Progress": "Tiến trình",
+  "Fullscreen": "Toàn màn hình",
+  "Non-Fullscreen": "Thoát toàn màn hình",
+  "Mute": "Tắt tiếng",
+  "Unmuted": "Bật âm thanh",
+  "Playback Rate": "Tốc độ phát",
+  "Subtitles": "Phụ đề",
+  "subtitles off": "Tắt phụ đề",
+  "Captions": "Chú thích",
+  "captions off": "Tắt chú thích",
+  "Chapters": "Chương",
+  "You aborted the video playback": "Bạn đã hủy việc phát video.",
+  "A network error caused the video download to fail part-way.": "Một lỗi mạng dẫn đến việc tải video bị lỗi.",
+  "The video could not be loaded, either because the server or network failed or because the format is not supported.": "Video không tải được, mạng hay server có lỗi hoặc định dạng không được hỗ trợ.",
+  "The video playback was aborted due to a corruption problem or because the video used features your browser did not support.": "Phát video đã bị hủy do một sai lỗi hoặc video sử dụng những tính năng trình duyệt không hỗ trợ.",
+  "No compatible source was found for this video.": "Không có nguồn tương thích cho video này."
+}

lang/zh-TW.json

@@ -0,0 +1,28 @@
+{
+  "Play": "播放",
+  "Pause": "暫停",
+  "Current Time": "目前時間",
+  "Duration Time": "總共時間",
+  "Remaining Time": "剩餘時間",
+  "Stream Type": "串流類型",
+  "LIVE": "直播",
+  "Loaded": "載入完畢",
+  "Progress": "進度",
+  "Fullscreen": "全螢幕",
+  "Non-Fullscreen": "退出全螢幕",
+  "Mute": "靜音",
+  "Unmuted": "取消靜音",
+  "Playback Rate": " 播放速率",
+  "Subtitles": "字幕",
+  "subtitles off": "關閉字幕",
+  "Captions": "內嵌字幕",
+  "captions off": "關閉內嵌字幕",
+  "Chapters": "章節",
+  "You aborted the video playback": "影片播放已終止",
+  "A network error caused the video download to fail part-way.": "網路錯誤導致影片下載失敗。",
+  "The video could not be loaded, either because the server or network failed or because the format is not supported.": "影片因格式不支援或者伺服器或網路的問題無法載入。",
+  "The video playback was aborted due to a corruption problem or because the video used features your browser did not support.": "由於影片檔案損毀或是該影片使用了您的瀏覽器不支援的功能，播放終止。",
+  "No compatible source was found for this video.": "無法找到相容此影片的來源。",
+  "The video is encrypted and we do not have the keys to decrypt it.": "影片已加密，無法解密。"
+}
+

package.json

@@ -1,7 +1,7 @@
 {
   "name": "video.js",
   "description": "An HTML5 and Flash video player with a common API and skin for both.",
-  "version": "4.10.2",
+  "version": "4.12.7",
   "copyright": "Copyright 2014 Brightcove, Inc. https://github.com/videojs/video.js/blob/master/LICENSE",
   "keywords": [
     "videojs",
@@ -21,14 +21,16 @@
   },
   "main": "./dist/video-js/video.js",
   "dependencies": {
-    "videojs-swf": "4.5.1"
+    "videojs-swf": "4.7.0",
+    "vtt.js": "git+https://github.com/gkatsev/vtt.js.git#shim-build"
   },
   "devDependencies": {
     "calcdeps": "~0.1.7",
-    "chg": "~0.1.8",
+    "chg": "~0.2.0",
     "contribflow": "~0.2.0",
     "github": "~0.1.14",
     "grunt": "^0.4.4",
+    "grunt-aws-s3": "^0.12.1",
     "grunt-banner": "~0.2.0",
     "grunt-cli": "~0.1.0",
     "grunt-contrib-clean": "~0.4.0a",
@@ -39,10 +41,12 @@
     "grunt-contrib-less": "~0.6.4",
     "grunt-contrib-qunit": "~0.2.1",
     "grunt-contrib-watch": "~0.1.4",
+    "grunt-fastly": "^0.1.3",
+    "grunt-github-releaser": "^0.1.17",
     "grunt-karma": "^0.8.3",
     "grunt-s3": "~0.2.0-alpha",
-    "grunt-tagrelease": "~0.3.3",
     "grunt-version": "~0.3.0",
+    "grunt-videojs-languages": "0.0.4",
     "grunt-zip": "0.10.2",
     "karma": "^0.12.14",
     "karma-chrome-launcher": "^0.1.3",
@@ -57,10 +61,8 @@
     "mocha": "~1.8.1",
     "open": "0.0.4",
     "qunitjs": "~1.14.0",
-    "semver": "~1.1.4",
     "sinon": "~1.9.1",
     "uglify-js": "~2.3.6",
-    "videojs-doc-generator": "0.0.1",
-    "grunt-videojs-languages": "0.0.4"
+    "videojs-doc-generator": "0.0.1"
   }
 }

src/css/video-js.less

@@ -1,4 +1,4 @@
-/*!
+ /*!
 Video.js Default Styles (http://videojs.com)
 Version GENERATED_AT_BUILD
 Create your own skin at http://designer.videojs.com
@@ -9,7 +9,7 @@ Create your own skin at http://designer.videojs.com
 // (This file uses LESS. Learn more at http://lesscss.org/)
 
 // The base font size controls the size of everything, not just text. All
-// diminensions use em-based sizes so that the scale along with the font size.
+// dimensions use em-based sizes so that the scale along with the font size.
 // Try increasing it to 20px and see what happens.
 @base-font-size: 10px;
 @touch-device-font-size: 15px;
@@ -60,7 +60,7 @@ Create your own skin at http://designer.videojs.com
 /* SKIN
 ================================================================================
 The main class name for all skin-specific styles. To make your own skin,
-replace all occurances of 'vjs-default-skin' with a new name. Then add your new
+replace all occurrences of 'vjs-default-skin' with a new name. Then add your new
 skin name to your video tag instead of the default skin.
 e.g. <video class="video-js my-skin-name">
 */
@@ -73,13 +73,14 @@ e.g. <video class="video-js my-skin-name">
 The control icons are from a custom font. Each icon corresponds to a character
 (e.g. "\e001"). Font icons allow for easy scaling and coloring of icons.
 */
+@vjs-font-path: 'font';
 @font-face{
   font-family: 'VideoJS';
-  src: url('font/vjs.eot');
-  src: url('font/vjs.eot?#iefix') format('embedded-opentype'),
-  url('font/vjs.woff') format('woff'),
-  url('font/vjs.ttf') format('truetype'),
-  url('font/vjs.svg#icomoon') format('svg');
+  src: url('@{vjs-font-path}/vjs.eot');
+  src: url('@{vjs-font-path}/vjs.eot?#iefix') format('embedded-opentype'),
+  url('@{vjs-font-path}/vjs.woff') format('woff'),
+  url('@{vjs-font-path}/vjs.ttf') format('truetype'),
+  url('@{vjs-font-path}/vjs.svg#icomoon') format('svg');
 
   font-weight: normal;
   font-style: normal;
@@ -111,7 +112,7 @@ The control icons are from a custom font. Each icon corresponds to a character
 
 /* Slider - used for Volume bar and Seek bar */
 .vjs-default-skin .vjs-slider {
-  /* Replace browser focus hightlight with handle highlight *///
+  /* Replace browser focus highlight with handle highlight *///
   outline: 0;
   position: relative;
   cursor: pointer;
@@ -777,6 +778,10 @@ easily in the skin designer. http://designer.videojs.com/
 .vjs-default-skin .vjs-control-content .vjs-menu.vjs-lock-showing {
   display: block;
 }
+/* prevent menus from opening while scrubbing (FF, IE) */
+.vjs-default-skin.vjs-scrubbing .vjs-menu-button:hover .vjs-control-content .vjs-menu {
+  display: none;
+}
 .vjs-default-skin .vjs-menu-button ul li {
   list-style: none;
   margin: 0;
@@ -855,7 +860,7 @@ control positioning and full window mode. **
   /* Start with 10px for base font size so other dimensions can be em based and
      easily calculable. */
   font-size: @base-font-size;
-  /* Allow poster to be vertially aligned. */
+  /* Allow poster to be vertically aligned. */
   vertical-align: middle;
   /*  display: table-cell; */ /*This works in Safari but not Firefox.*/
 
@@ -919,6 +924,7 @@ body.vjs-full-window {
   background-repeat: no-repeat;
   background-position: 50% 50%;
   background-size: contain;
+  background-color: #000000;
   cursor: pointer;
   margin: 0;
   padding: 0;
@@ -960,37 +966,92 @@ body.vjs-full-window {
 /* Text Track Styles */
 /* Overall track holder for both captions and subtitles */
 .video-js .vjs-text-track-display {
-  text-align: center;
   position: absolute;
-  bottom: 4em;
-  /* Leave padding on left and right *///
-  left: 1em;
+  top: 0;
+  left: 0;
+  bottom: 3em;
+  right: 0;
+  pointer-events: none;
+}
+
+/* Captions Settings Dialog */
+.vjs-caption-settings {
+  position: relative;
+  top: 1em;
+  background-color: #000;
+  opacity: 0.75;
+  color: #FFF;
+  margin: 0 auto;
+  padding: 0.5em;
+  height: 15em;
+  font-family: Arial, Helvetica, sans-serif;
+  font-size: 12px;
+  width: 40em;
+}
+
+.vjs-caption-settings .vjs-tracksettings {
+  top: 0;
+  bottom: 2em;
+  left: 0;
+  right: 0;
+  position: absolute;
+  overflow: auto;
+}
+
+.vjs-caption-settings .vjs-tracksettings-colors,
+.vjs-caption-settings .vjs-tracksettings-font {
+  float: left;
+}
+.vjs-caption-settings .vjs-tracksettings-colors:after,
+.vjs-caption-settings .vjs-tracksettings-font:after,
+.vjs-caption-settings .vjs-tracksettings-controls:after {
+  clear: both;
+}
+
+.vjs-caption-settings .vjs-tracksettings-controls {
+  position: absolute;
+  bottom: 1em;
   right: 1em;
 }
 
-/* Move captions down when controls aren't being shown */
-.video-js.vjs-user-inactive.vjs-playing .vjs-text-track-display {
-  bottom: 1em;
+.vjs-caption-settings .vjs-tracksetting {
+  margin: 5px;
+  padding: 3px;
+  min-height: 40px;
+}
+.vjs-caption-settings .vjs-tracksetting label {
+  display: block;
+  width: 100px;
+  margin-bottom: 5px;
 }
 
-/* Individual tracks */
-.video-js .vjs-text-track {
-  display: none;
-  font-size: 1.4em;
-  text-align: center;
-  margin-bottom: 0.1em;
-  /* Transparent black background, or fallback to all black (oldIE) *///
-  .background-color-with-alpha(rgb(0, 0, 0), 0.5);
+.vjs-caption-settings .vjs-tracksetting span {
+  display: inline;
+  margin-left: 5px;
 }
-.video-js .vjs-subtitles { color: #fff /* Subtitles are white */; }
-.video-js .vjs-captions { color: #fc6 /* Captions are yellow */; }
-.vjs-tt-cue { display: block; }
 
-/* Increase font-size when fullscreen */
-.video-js.vjs-fullscreen .vjs-text-track { font-size: 3em; }
+.vjs-caption-settings .vjs-tracksetting > div {
+  margin-bottom: 5px;
+  min-height: 20px;
+}
+
+.vjs-caption-settings .vjs-tracksetting > div:last-child {
+  margin-bottom: 0;
+  padding-bottom: 0;
+  min-height: 0;
+}
+
+.vjs-caption-settings label > input {
+  margin-right: 10px;
+}
+
+.vjs-caption-settings input[type="button"] {
+  width: 40px;
+  height: 40px;
+}
 
 /* Hide disabled or unsupported controls */
-.vjs-default-skin .vjs-hidden { display: none; }
+.vjs-hidden { display: none !important; }
 
 .vjs-lock-showing {
   display: block !important;
@@ -1003,15 +1064,15 @@ body.vjs-full-window {
     This optional paragraph inside the video tag can provide a message to users
     about what's required to play video. */
 .vjs-no-js {
-  padding: 20px;
+  padding: 2em;
   color: #ccc;
   background-color: #333;
-  font-size: 18px;
+  font-size: 1.8em;
   font-family: Arial, sans-serif;
   text-align: center;
-  width: 300px;
-  height: 150px;
-  margin: 0px auto;
+  width: 30em;
+  height: 15em;
+  margin: 0 auto;
 }
 
 .vjs-no-js a, .vjs-no-js a:visited {

src/js/cdn.js

@@ -11,6 +11,12 @@
 ;(function(i,w,n,e,l){
   l=w.location;
 
+  // Google Analytics has a limit of 10 million hits per month for free accounts.
+  // The Video.js CDN goes over this (by a lot) and they've asked us to stop.
+  if (Math.random() > 0.01) {
+    return;
+  }
+
   // Setting the source of an image will load the URL even without adding to dom
   // Using //www, still seems to work for https even though ssl.google is used by google
   i.src='//www.google-analytics.com/__utm.gif'

src/js/component.js

@@ -435,8 +435,8 @@ vjs.Component.prototype.removeChild = function(component){
 
   if (!childFound) return;
 
-  this.childIndex_[component.id] = null;
-  this.childNameIndex_[component.name] = null;
+  this.childIndex_[component.id()] = null;
+  this.childNameIndex_[component.name()] = null;
 
   var compEl = component.el();
   if (compEl && compEl.parentNode === this.contentEl()) {
@@ -561,7 +561,7 @@ vjs.Component.prototype.buildCSSClass = function(){
  *
  * The benefit of using this over `vjs.on(otherElement, 'eventName', myFunc)`
  * and `otherComponent.on('eventName', myFunc)` is that this way the listeners
- * will be automatically cleaned up when either component is diposed.
+ * will be automatically cleaned up when either component is disposed.
  * It will also bind myComponent as the context of myFunc.
  *
  * **NOTE**: When using this on elements in the page other than window
@@ -742,7 +742,7 @@ vjs.Component.prototype.isReady_;
  *
  * Allows for delaying ready. Override on a sub class prototype.
  * If you set this.isReadyOnInitFinish_ it will affect all components.
- * Specially used when waiting for the Flash player to asynchrnously load.
+ * Specially used when waiting for the Flash player to asynchronously load.
  *
  * @type {Boolean}
  * @private
@@ -760,7 +760,7 @@ vjs.Component.prototype.readyQueue_;
 /**
  * Bind a listener to the component's ready state
  *
- * Different from event listeners in that if the ready event has already happend
+ * Different from event listeners in that if the ready event has already happened
  * it will trigger the function immediately.
  *
  * @param  {Function} fn Ready listener
@@ -845,7 +845,7 @@ vjs.Component.prototype.removeClass = function(classToRemove){
  * @return {vjs.Component}
  */
 vjs.Component.prototype.show = function(){
-  this.el_.style.display = 'block';
+  this.removeClass('vjs-hidden');
   return this;
 };
 
@@ -855,7 +855,7 @@ vjs.Component.prototype.show = function(){
  * @return {vjs.Component}
  */
 vjs.Component.prototype.hide = function(){
-  this.el_.style.display = 'none';
+  this.addClass('vjs-hidden');
   return this;
 };
 
@@ -886,7 +886,7 @@ vjs.Component.prototype.unlockShowing = function(){
 /**
  * Disable component by making it unshowable
  *
- * Currently private because we're movign towards more css-based states.
+ * Currently private because we're moving towards more css-based states.
  * @private
  */
 vjs.Component.prototype.disable = function(){
@@ -1024,26 +1024,30 @@ vjs.Component.prototype.onResize;
  *
  * This is used to support toggling the controls through a tap on the video.
  *
- * We're requireing them to be enabled because otherwise every component would
+ * We're requiring them to be enabled because otherwise every component would
  * have this extra overhead unnecessarily, on mobile devices where extra
  * overhead is especially bad.
  * @private
  */
 vjs.Component.prototype.emitTapEvents = function(){
   var touchStart, firstTouch, touchTime, couldBeTap, noTap,
-      xdiff, ydiff, touchDistance, tapMovementThreshold;
+      xdiff, ydiff, touchDistance, tapMovementThreshold, touchTimeThreshold;
 
   // Track the start time so we can determine how long the touch lasted
   touchStart = 0;
   firstTouch = null;
 
   // Maximum movement allowed during a touch event to still be considered a tap
-  tapMovementThreshold = 22;
+  // Other popular libs use anywhere from 2 (hammer.js) to 15, so 10 seems like a nice, round number.
+  tapMovementThreshold = 10;
+
+  // The maximum length a touch can be while still being considered a tap
+  touchTimeThreshold = 200;
 
   this.on('touchstart', function(event) {
     // If more than one finger, don't consider treating this as a click
     if (event.touches.length === 1) {
-      firstTouch = event.touches[0];
+      firstTouch = vjs.obj.copy(event.touches[0]);
       // Record start time so we can detect a tap vs. "touch and hold"
       touchStart = new Date().getTime();
       // Reset couldBeTap tracking
@@ -1082,8 +1086,8 @@ vjs.Component.prototype.emitTapEvents = function(){
     if (couldBeTap === true) {
       // Measure how long the touch lasted
       touchTime = new Date().getTime() - touchStart;
-      // The touch needs to be quick in order to consider it a tap
-      if (touchTime < 250) {
+      // Make sure the touch was less than the threshold to be considered a tap
+      if (touchTime < touchTimeThreshold) {
         event.preventDefault(); // Don't let browser turn this into a click
         this.trigger('tap');
         // It may be good to copy the touchend event object and change the
@@ -1133,15 +1137,15 @@ vjs.Component.prototype.enableTouchActivity = function() {
     // For as long as the they are touching the device or have their mouse down,
     // we consider them active even if they're not moving their finger or mouse.
     // So we want to continue to update that they are active
-    clearInterval(touchHolding);
+    this.clearInterval(touchHolding);
     // report at the same interval as activityCheck
-    touchHolding = setInterval(report, 250);
+    touchHolding = this.setInterval(report, 250);
   });
 
   touchEnd = function(event) {
     report();
     // stop the interval that maintains activity if the touch is holding
-    clearInterval(touchHolding);
+    this.clearInterval(touchHolding);
   };
 
   this.on('touchmove', report);
@@ -1149,3 +1153,80 @@ vjs.Component.prototype.enableTouchActivity = function() {
   this.on('touchcancel', touchEnd);
 };
 
+/**
+ * Creates timeout and sets up disposal automatically.
+ * @param {Function} fn The function to run after the timeout.
+ * @param {Number} timeout Number of ms to delay before executing specified function.
+ * @return {Number} Returns the timeout ID
+ */
+vjs.Component.prototype.setTimeout = function(fn, timeout) {
+  fn = vjs.bind(this, fn);
+
+  // window.setTimeout would be preferable here, but due to some bizarre issue with Sinon and/or Phantomjs, we can't.
+  var timeoutId = setTimeout(fn, timeout);
+
+  var disposeFn = function() {
+    this.clearTimeout(timeoutId);
+  };
+
+  disposeFn.guid = 'vjs-timeout-'+ timeoutId;
+
+  this.on('dispose', disposeFn);
+
+  return timeoutId;
+};
+
+
+/**
+ * Clears a timeout and removes the associated dispose listener
+ * @param {Number} timeoutId The id of the timeout to clear
+ * @return {Number} Returns the timeout ID
+ */
+vjs.Component.prototype.clearTimeout = function(timeoutId) {
+  clearTimeout(timeoutId);
+
+  var disposeFn = function(){};
+  disposeFn.guid = 'vjs-timeout-'+ timeoutId;
+
+  this.off('dispose', disposeFn);
+
+  return timeoutId;
+};
+
+/**
+ * Creates an interval and sets up disposal automatically.
+ * @param {Function} fn The function to run every N seconds.
+ * @param {Number} interval Number of ms to delay before executing specified function.
+ * @return {Number} Returns the interval ID
+ */
+vjs.Component.prototype.setInterval = function(fn, interval) {
+  fn = vjs.bind(this, fn);
+
+  var intervalId = setInterval(fn, interval);
+
+  var disposeFn = function() {
+    this.clearInterval(intervalId);
+  };
+
+  disposeFn.guid = 'vjs-interval-'+ intervalId;
+
+  this.on('dispose', disposeFn);
+
+  return intervalId;
+};
+
+/**
+ * Clears an interval and removes the associated dispose listener
+ * @param {Number} intervalId The id of the interval to clear
+ * @return {Number} Returns the interval ID
+ */
+vjs.Component.prototype.clearInterval = function(intervalId) {
+  clearInterval(intervalId);
+
+  var disposeFn = function(){};
+  disposeFn.guid = 'vjs-interval-'+ intervalId;
+
+  this.off('dispose', disposeFn);
+
+  return intervalId;
+};

src/js/control-bar/control-bar.js

@@ -22,7 +22,10 @@ vjs.ControlBar.prototype.options_ = {
     'volumeControl': {},
     'muteToggle': {},
     // 'volumeMenuButton': {},
-    'playbackRateMenuButton': {}
+    'playbackRateMenuButton': {},
+    'subtitlesButton': {},
+    'captionsButton': {},
+    'chaptersButton': {}
   }
 };
 

src/js/control-bar/playback-rate-menu-button.js

@@ -18,11 +18,11 @@ vjs.PlaybackRateMenuButton = vjs.MenuButton.extend({
   }
 });
 
+vjs.PlaybackRateMenuButton.prototype.buttonText = 'Playback Rate';
+vjs.PlaybackRateMenuButton.prototype.className = 'vjs-playback-rate';
+
 vjs.PlaybackRateMenuButton.prototype.createEl = function(){
-  var el = vjs.Component.prototype.createEl.call(this, 'div', {
-    className: 'vjs-playback-rate vjs-menu-button vjs-control',
-    innerHTML: '<div class="vjs-control-content"><span class="vjs-control-text">' + this.localize('Playback Rate') + '</span></div>'
-  });
+  var el = vjs.MenuButton.prototype.createEl.call(this);
 
   this.labelEl_ = vjs.createEl('div', {
     className: 'vjs-playback-rate-value',
@@ -44,7 +44,7 @@ vjs.PlaybackRateMenuButton.prototype.createMenu = function(){
       menu.addChild(
         new vjs.PlaybackRateMenuItem(this.player(), { 'rate': rates[i] + 'x'})
         );
-    };
+    }
   }
 
   return menu;
@@ -66,7 +66,7 @@ vjs.PlaybackRateMenuButton.prototype.onClick = function(){
       newRate = rates[i];
       break;
     }
-  };
+  }
   this.player().playbackRate(newRate);
 };
 

src/js/control-bar/progress-control.js

@@ -75,6 +75,7 @@ vjs.SeekBar.prototype.onMouseDown = function(event){
   vjs.Slider.prototype.onMouseDown.call(this, event);
 
   this.player_.scrubbing = true;
+  this.player_.addClass('vjs-scrubbing');
 
   this.videoWasPlaying = !this.player_.paused();
   this.player_.pause();
@@ -94,6 +95,7 @@ vjs.SeekBar.prototype.onMouseUp = function(event){
   vjs.Slider.prototype.onMouseUp.call(this, event);
 
   this.player_.scrubbing = false;
+  this.player_.removeClass('vjs-scrubbing');
   if (this.videoWasPlaying) {
     this.player_.play();
   }
@@ -151,13 +153,13 @@ vjs.LoadProgressBar.prototype.update = function(){
     part = children[i];
 
     if (!part) {
-      part = this.el_.appendChild(vjs.createEl())
-    };
+      part = this.el_.appendChild(vjs.createEl());
+    }
 
     // set the percent based on the width of the progress bar (bufferedEnd)
     part.style.left = percentify(start, bufferedEnd);
     part.style.width = percentify(end - start, bufferedEnd);
-  };
+  }
 
   // remove unused buffered range elements
   for (i = children.length; i > buffered.length; i--) {

src/js/control-bar/time-display.js

@@ -51,6 +51,7 @@ vjs.DurationDisplay = vjs.Component.extend({
     // Once the order of durationchange and this.player_.duration() being set is figured out,
     // this can be updated.
     this.on(player, 'timeupdate', this.updateContent);
+    this.on(player, 'loadedmetadata', this.updateContent);
   }
 });