Release 4.4.2

Added patch process to contrib.json

.jshintrc

@@ -18,7 +18,10 @@
         "goog",
         "console",
 
-        "require",        
+        "require",
+        "define",
+        "module",
+        "exports",
 
         "PlayerTest",
         "asyncTest",

.npmignore

@@ -0,0 +1,2 @@
+# .npmignore needed so dist dir won't be ignored
+# https://npmjs.org/doc/developers.html#Keeping-files-out-of-your-package

CHANGELOG.md

@@ -1,11 +1,40 @@
 CHANGELOG
 =========
 
-## Unreleased (HEAD)
+## HEAD (Unreleased)
 _(none)_
 
 --------------------
 
+## 4.4.2 (2014-02-24)
+* Fixed module.exports in minified version ([view](https://github.com/videojs/video.js/pull/1038))
+
+## 4.4.1 (2014-02-18)
+* Added .npmignore so dist files wouldn't be ignored in packages
+
+## 4.4.0 (2014-02-18)
+* Made the poster updateable after initialization ([view](https://github.com/videojs/video.js/pull/838))
+* Exported more textTrack functions ([view](https://github.com/videojs/video.js/pull/815))
+* Moved player ID generation to support video tags with no IDs ([view](https://github.com/videojs/video.js/pull/845))
+* Moved to using QUnit as a dependency ([view](https://github.com/videojs/video.js/pull/850))
+* Added the util namespace for public utility functions ([view](https://github.com/videojs/video.js/pull/862))
+* Fixed an issue with calling duration before Flash is loaded ([view](https://github.com/videojs/video.js/pull/861))
+* Added player methods to externs so they can be overridden ([view](https://github.com/videojs/video.js/pull/878))
+* Fixed html5 playback when switching between media techs ([view](https://github.com/videojs/video.js/pull/887))
+* Fixed Firefox+Flash mousemove events so controls don't hide permanently ([view](https://github.com/videojs/video.js/pull/899))
+* Fixed a test for touch detection ([view](https://github.com/videojs/video.js/pull/962))
+* Updated the src file list for karma tests ([view](https://github.com/videojs/video.js/pull/948))
+* Added more tests for API properties after minification ([view](https://github.com/videojs/video.js/pull/906))
+* Updated projet to use npm version of videojs-swf ([view](https://github.com/videojs/video.js/pull/930))
+* Added support for dist zipping on windows ([view](https://github.com/videojs/video.js/pull/944))
+* Fixed iOS fullscreen issue ([view](https://github.com/videojs/video.js/pull/977))
+* Fixed touch event bubbling ([view](https://github.com/videojs/video.js/pull/992))
+* Fixed ARIA role attribute for button and slider ([view](https://github.com/videojs/video.js/pull/988))
+* Fixed an issue where a component's dispose event would bubble up ([view](https://github.com/videojs/video.js/pull/981))
+* Quieted down deprecation warnings ([view](https://github.com/videojs/video.js/pull/971))
+* Updated the seek handle to contain the current time ([view](https://github.com/videojs/video.js/pull/902))
+* Added requirejs and browserify support (UMD) ([view](https://github.com/videojs/video.js/pull/998))
+
 ## 4.3.0 (2013-11-04)
 * Added Karma for cross-browser unit testing ([view](https://github.com/videojs/video.js/pull/714))
 * Unmuting when the volume is changed ([view](https://github.com/videojs/video.js/pull/720))

Gruntfile.js

@@ -52,12 +52,12 @@ module.exports = function(grunt) {
     minify: {
       source:{
         src: ['build/files/combined.video.js', 'build/compiler/goog.base.js', 'src/js/exports.js'],
-        externs: ['src/js/media/flash.externs.js'],
+        externs: ['src/js/player.externs.js', 'src/js/media/flash.externs.js'],
         dest: 'build/files/minified.video.js'
       },
       tests: {
-        src: ['build/files/combined.video.js', 'build/compiler/goog.base.js', 'src/js/exports.js', 'test/unit/*.js', '!test/unit/api.js'],
-        externs: ['src/js/media/flash.externs.js', 'test/qunit/qunit-externs.js'],
+        src: ['build/files/combined.video.js', 'build/compiler/goog.base.js', 'src/js/exports.js', 'test/unit/*.js'],
+        externs: ['src/js/player.externs.js', 'src/js/media/flash.externs.js', 'test/qunit-externs.js'],
         dest: 'build/files/test.minified.video.js'
       }
     },
@@ -147,6 +147,39 @@ module.exports = function(grunt) {
           baseURL: 'https://github.com/videojs/video.js/blob/master/'
         }
       }
+    },
+    zip: {
+      dist: {
+        router: function (filepath) {
+          var path = require('path');
+          return path.relative('dist', filepath);
+        },
+        compression: 'DEFLATE',
+        src: ['dist/video-js/**/*'],
+        dest: 'dist/video-js-' + version.full + '.zip'
+      }
+    },
+    usebanner: {
+      dist: {
+        options: {
+          position: 'top',
+          banner: '/*! Video.js v' + version.full + ' <%= pkg.copyright %> */ ',
+          linebreak: true
+        },
+        files: {
+          src: [ 'build/files/minified.video.js']
+        }
+      }
+    },
+    bump: {
+      files: ['package.json'],
+      updateConfigs: ['pkg']
+    },
+    tagrelease: {
+      file: 'package.json',
+      commit:  true,
+      message: 'Release %version%',
+      prefix:  'v'
     }
   });
 
@@ -161,15 +194,20 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('contribflow');
   grunt.loadNpmTasks('grunt-karma');
   grunt.loadNpmTasks('videojs-doc-generator');
+  grunt.loadNpmTasks('grunt-zip');
+  grunt.loadNpmTasks('grunt-banner');
+  grunt.loadNpmTasks('grunt-bump');
+  grunt.loadNpmTasks('grunt-tagrelease');
+  grunt.loadNpmTasks('chg');
 
   // grunt.loadTasks('./docs/tasks/');
   // grunt.loadTasks('../videojs-doc-generator/tasks/');
 
   // Default task.
-  grunt.registerTask('default', ['jshint', 'less', 'build', 'minify', 'dist']);
+  grunt.registerTask('default', ['jshint', 'less', 'build', 'minify', 'usebanner', 'dist']);
   // Development watch task
   grunt.registerTask('dev', ['jshint', 'less', 'build', 'qunit:source']);
-  grunt.registerTask('test', ['jshint', 'less', 'build', 'minify', 'qunit']);
+  grunt.registerTask('test', ['jshint', 'less', 'build', 'minify', 'usebanner', 'qunit']);
 
   var fs = require('fs'),
       gzip = require('zlib').gzip;
@@ -192,7 +230,7 @@ module.exports = function(grunt) {
 
     // Copy over other files
     // grunt.file.copy('src/css/video-js.png', 'build/files/video-js.png');
-    grunt.file.copy('src/swf/video-js.swf', 'build/files/video-js.swf');
+    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');
@@ -236,7 +274,7 @@ module.exports = function(grunt) {
                 + ' --js_output_file=' + dest
                 + ' --create_source_map ' + dest + '.map --source_map_format=V3'
                 + ' --jscomp_warning=checkTypes --warning_level=VERBOSE'
-                + ' --output_wrapper "/*! Video.js v' + version.full + ' ' + pkg.copyright + ' */ (function() {%output%})();"';
+                + ' --output_wrapper "(function() {%output%})();"';
                 //@ sourceMappingURL=video.js.map
 
     // Add each js file
@@ -265,9 +303,7 @@ module.exports = function(grunt) {
     });
   });
 
-  grunt.registerTask('dist', 'Creating distribution', function(){
-    var exec = require('child_process').exec;
-    var done = this.async();
+  grunt.registerTask('dist-copy', 'Assembling distribution', function(){
     var css, jsmin, jsdev, cdnjs;
 
     // Manually copy each source file
@@ -275,7 +311,7 @@ module.exports = function(grunt) {
     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('build/files/video-js.swf', 'dist/video-js/video-js.swf');
+    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');
 
@@ -287,11 +323,16 @@ module.exports = function(grunt) {
       }
     });
 
+    // 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('build/files/video-js.swf', 'dist/cdn/video-js.swf');
+    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');
 
@@ -305,21 +346,20 @@ module.exports = function(grunt) {
     // 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);
-
-    // Zip up into video-js-VERSION.zip
-    exec('cd dist && zip -r video-js-'+version.full+'.zip video-js && cd ..', { maxBuffer: 500*1024 }, function(err, stdout, stderr){
-
-      if (err) {
-        grunt.warn(err);
-        done(false);
-      }
-
-      if (stdout) {
-        grunt.log.writeln(stdout);
-      }
-
-      done();
-    });
   });
 
+  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']);
+
 };

bower.json

@@ -0,0 +1,16 @@
+{
+  "name": "video.js",
+  "description": "An HTML5 and Flash video player with a common API and skin for both.",
+  "version": "4.4.0",
+  "main": [
+    "dist/video-js/video.js", 
+    "dist/video-js/video-js.css"
+  ],
+  "keywords": [
+    "videojs",
+    "html5",
+    "flash",
+    "video",
+    "player"
+  ]
+}

build/source-loader.js

@@ -19,6 +19,7 @@ var sourceFiles = [
   "src/js/core-object.js",
   "src/js/events.js",
   "src/js/lib.js",
+  "src/js/util.js",
   "src/js/component.js",
   "src/js/button.js",
   "src/js/slider.js",

contrib.json

@@ -1,7 +1,264 @@
 {
-  "owner": "videojs",
-  "project": "video.js",
-  "developmentBranch": "master",
-  "releaseBranch": "stable",
-  "remote": "origin"
+  "project": {
+    "owner": "videojs",
+    "name": "video.js",
+    "urls": {
+      "git": "https://github.com/videojs/video.js.git"
+    },
+    "requirements": [
+      {
+        "name": "git",
+        "info": "http://git-scm.com",
+        "test": "which git"
+      },
+      {
+        "name": "node.js",
+        "info": "http://nodejs.org",
+        "test": "which node"
+      }
+    ]
+  },
+
+  "install": {
+    "steps": [
+      {
+        "desc": "Get all git branches",
+        "exec": "git fetch origin"
+      },
+      {
+        "desc": "Create the stable branch for patches",
+        "exec": "git checkout -b stable origin/stable"
+      },
+      {
+        "desc": "Add the upstream project as a remote so new changes can be pulled",
+        "exec": "git remote add upstream <%= project.urls.git %>"
+      },
+      {
+        "desc": "Get all upstream branches and changes",
+        "exec": "git fetch upstream"
+      },
+      {
+        "contrib": "update"
+      }
+    ]
+  },
+
+  "update": {
+    "steps": [
+      {
+        "desc": "Switch to the development branch",
+        "exec": "git checkout master"
+      },
+      {
+        "desc": "Get any changes to master in the main project",
+        "exec": "git pull upstream master"
+      },
+      {
+        "desc": "Switch to the release branch",
+        "exec": "git checkout stable"
+      },
+      {
+        "desc": "Get any changes to stable in the main project",
+        "exec": "git pull upstream stable"
+      },
+      {
+        "desc": "Install dependencies",
+        "exec": "npm install"
+      },
+      {
+        "desc": "Build the distribution",
+        "exec": "grunt"
+      }
+    ]
+  },
+
+  "test": {
+    "desc": "Run automated tests",
+    "steps": ["grunt test"]
+  },
+
+  "contributions": {
+
+    "patch": {
+      "desc": "Urgent fixes for the latest stable version",
+      "new": {
+        "desc": "Start a new patch",
+        "steps": [
+          {
+            "id": "name",
+            "desc": "Name the patch branch",
+            "prompt": {
+              "type": "text",
+              "message": "name"
+            }
+          },
+          {
+            "desc": "Check out the release branch and get any updates",
+            "exec": "git checkout stable && git pull upstream stable"
+          },
+          {
+            "desc": "Create the patch branch",
+            "exec": "git checkout -b patch/<%= name %>"
+          },
+          {
+            "desc": "Push the branch to the origin repo",
+            "exec": "git push -u origin patch/<%= name %>"
+          }
+        ]
+      },
+      "submit": {
+        "desc": "Submit a pull request for a patch when it's finished",
+        "steps": [
+          {
+            "desc": "Run tests",
+            "contrib": "test"
+          },
+          {
+            "desc": "Check for any unadded changes",
+            "exec": "git diff --exit-code",
+            "fail": "Add and commit all changes before submitting a pull request"
+          },
+          {
+            "desc": "Check for any uncomitted changes",
+            "exec": "git diff --cached --exit-code",
+            "fail": "Add and commit all changes before submitting a pull request"
+          },
+          {
+            "id": "branch",
+            "desc": "Which branch should be submitted? (e.g. 'patch/my-patch')",
+            "prompt": {
+              "type": "text",
+              "message": "branch"
+            }
+          },
+          {
+            "id": "user",
+            "desc": "Which github user or org are you submitting from?",
+            "prompt": {
+              "type": "text",
+              "message": "user"
+            }
+          },
+          {
+            "desc": "Open the github pull request page",
+            "open": "https://github.com/videojs/video.js/compare/videojs:stable...<%= user %>:<%= branch %>"
+          }
+        ]
+      },
+      "delete": {
+        "desc": "Delete the current patch branch",
+        "steps": [
+          {
+            "id": "name",
+            "guide": false,
+            "desc": "Get the current branch name",
+            "exec": "git rev-parse --abbrev-ref HEAD"
+          },
+          {
+            "desc": "Confirm you are deleting the correct branch",
+            "prompt": "Delete branch '<%= name %>'?"
+          },
+          {
+            "desc": "Delete the local copy of the branch",
+            "exec": "git branch -D <%= name %>"
+          },
+          {
+            "desc": "Delete the remote copy of the branch",
+            "exec": "git push origin :<%= name %>"
+          }
+        ]
+      }
+    },
+
+    "release": {
+      "desc": "Create and publish a release",
+      "steps": [
+        {
+          "desc": "Ensure there's no unadded changes",
+          "exec": "git diff --exit-code"
+        },
+        {
+          "desc": "Ensure there's no added changes",
+          "exec": "git diff --cached --exit-code"
+        },
+        {
+          "desc": "Have the changes been merged into the release branch (stable)?",
+          "prompt": "confirm"
+        },
+        {
+          "desc": "Provide the release type",
+          "prompt": {
+            "id": "type",
+            "message": "release type",
+            "default": "patch",
+            "type": "text"
+          }
+        },
+        {
+          "desc": "Checkout and update the release branch",
+          "exec": "git checkout stable & git pull"
+        },
+        {
+          "desc": "Run tests",
+          "exec": "grunt test"
+        },
+        {
+          "desc": "Update the changelog with the new release",
+          "exec": "grunt chg-release:<%= type %>"
+        },
+        {
+          "desc": "Bump the package version",
+          "exec": "grunt bump-only:<%= type %>"
+        },
+        {
+          "desc": "Build the release",
+          "exec": "grunt dist"
+        },
+        {
+          "desc": "Add the (otherwise ignored) release files",
+          "exec": "git add dist/video-js --force"
+        },
+        {
+          "desc": "Rebuild the docs",
+          "exec": "grunt vjsdocs"
+        },
+        {
+          "desc": "Update the cdn urls in the docs",
+          "exec": "grunt cdn-links"
+        },
+        {
+          "desc": "Tag the release",
+          "exec": "grunt tagrelease"
+        },
+        {
+          "desc": "Push changes to the remote",
+          "exec": "git push origin stable"
+        },
+        {
+          "desc": "Push tags to the remote",
+          "exec": "git push --tags"
+        },
+        {
+          "desc": "Publish to npm",
+          "exec": "npm publish"
+        },
+        {
+          "desc": "Checkout the development branch (master) and merge changes",
+          "exec": "git checkout master && git merge stable"
+        },
+        {
+          "desc": "Remove built dist files to re-ignore them",
+          "exec": "grunt clean:dist"
+        },
+        {
+          "desc": "Commit the removed dist files",
+          "exec": "git add -u && git commit -m 'Removed dist files'"
+        },
+        {
+          "desc": "Push development branch changes",
+          "exec": "git push origin master"
+        }
+      ]
+    }
+  }
 }

dist/video-js/demo.captions.vtt

@@ -0,0 +1,41 @@
+WEBVTT
+
+00:00.700 --> 00:04.110
+Captions describe all relevant audio for the hearing impaired.
+[ Heroic music playing for a seagull ]
+
+00:04.500 --> 00:05.000
+[ Splash!!! ]
+
+00:05.100 --> 00:06.000
+[ Sploosh!!! ]
+
+00:08.000 --> 00:09.225
+[ Splash...splash...splash splash splash ]
+
+00:10.525 --> 00:11.255
+[ Splash, Sploosh again ]
+
+00:13.500 --> 00:14.984
+Dolphin: eeeEEEEEeeee!
+
+00:14.984 --> 00:16.984
+Dolphin: Squawk! eeeEEE?
+
+00:25.000 --> 00:28.284
+[ A whole ton of splashes ]
+
+00:29.500 --> 00:31.000
+Mine. Mine. Mine.
+
+00:34.300 --> 00:36.000
+Shark: Chomp
+
+00:36.800 --> 00:37.900
+Shark: CHOMP!!!
+
+00:37.861 --> 00:41.193
+EEEEEEOOOOOOOOOOWHALENOISE
+
+00:42.593 --> 00:45.611
+[ BIG SPLASH ]

dist/video-js/demo.html

@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Video.js | HTML5 Video Player</title>
+
+  <!-- Chang URLs to wherever Video.js files will be hosted -->
+  <link href="video-js.css" rel="stylesheet" type="text/css">
+  <!-- video.js must be in the <head> for older IEs to work. -->
+  <script src="video.js"></script>
+
+  <!-- Unless using the CDN hosted version, update the URL to the Flash SWF -->
+  <script>
+    videojs.options.flash.swf = "video-js.swf";
+  </script>
+
+
+</head>
+<body>
+
+  <video id="example_video_1" class="video-js vjs-default-skin" controls preload="none" width="640" height="264"
+      poster="http://video-js.zencoder.com/oceans-clip.png"
+      data-setup="{}">
+    <source src="http://video-js.zencoder.com/oceans-clip.mp4" type='video/mp4' />
+    <source src="http://video-js.zencoder.com/oceans-clip.webm" type='video/webm' />
+    <source src="http://video-js.zencoder.com/oceans-clip.ogv" type='video/ogg' />
+    <track kind="captions" src="demo.captions.vtt" srclang="en" label="English"></track><!-- Tracks need an ending tag thanks to IE9 -->
+    <track kind="subtitles" src="demo.captions.vtt" srclang="en" label="English"></track><!-- Tracks need an ending tag thanks to IE9 -->
+  </video>
+
+</body>
+</html>

dist/video-js/font/vjs.svg

@@ -0,0 +1,65 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>
+This is a custom SVG font generated by IcoMoon.
+<iconset grid="16"></iconset>
+</metadata>
+<defs>
+<font id="VideoJS" horiz-adv-x="512" >
+<font-face units-per-em="512" ascent="480" descent="-32" />
+<missing-glyph horiz-adv-x="512" />
+<glyph class="hidden" unicode="&#xf000;" d="M0,480L 512 -32L0 -32 z" horiz-adv-x="0" />
+<glyph unicode="&#xe002;" d="M 64,416L 224,416L 224,32L 64,32zM 288,416L 448,416L 448,32L 288,32z"  />
+<glyph unicode="&#xe003;" d="M 200.666,440.666 C 213.5,453.5 224,449.15 224,431 L 224,17 C 224-1.15 213.5-5.499 200.666,7.335 L 80,128 L 0,128 L 0,320 L 80,320 L 200.666,440.666 Z"  />
+<glyph unicode="&#xe004;" d="M 274.51,109.49c-6.143,0-12.284,2.343-16.971,7.029c-9.373,9.373-9.373,24.568,0,33.941
+		c 40.55,40.55, 40.55,106.529,0,147.078c-9.373,9.373-9.373,24.569,0,33.941c 9.373,9.372, 24.568,9.372, 33.941,0
+		c 59.265-59.265, 59.265-155.696,0-214.961C 286.794,111.833, 280.652,109.49, 274.51,109.49zM 200.666,440.666 C 213.5,453.5 224,449.15 224,431 L 224,17 C 224-1.15 213.5-5.499 200.666,7.335 L 80,128 L 0,128 L 0,320 L 80,320 L 200.666,440.666 Z"  />
+<glyph unicode="&#xe005;" d="M 359.765,64.235c-6.143,0-12.284,2.343-16.971,7.029c-9.372,9.372-9.372,24.568,0,33.941
+		c 65.503,65.503, 65.503,172.085,0,237.588c-9.372,9.373-9.372,24.569,0,33.941c 9.372,9.371, 24.569,9.372, 33.941,0
+		C 417.532,335.938, 440,281.696, 440,224c0-57.695-22.468-111.938-63.265-152.735C 372.049,66.578, 365.907,64.235, 359.765,64.235zM 274.51,109.49c-6.143,0-12.284,2.343-16.971,7.029c-9.373,9.373-9.373,24.568,0,33.941
+		c 40.55,40.55, 40.55,106.529,0,147.078c-9.373,9.373-9.373,24.569,0,33.941c 9.373,9.372, 24.568,9.372, 33.941,0
+		c 59.265-59.265, 59.265-155.696,0-214.961C 286.794,111.833, 280.652,109.49, 274.51,109.49zM 200.666,440.666 C 213.5,453.5 224,449.15 224,431 L 224,17 C 224-1.15 213.5-5.499 200.666,7.335 L 80,128 L 0,128 L 0,320 L 80,320 L 200.666,440.666 Z"  />
+<glyph unicode="&#xe006;" d="M 445.020,18.98c-6.143,0-12.284,2.343-16.971,7.029c-9.372,9.373-9.372,24.568,0,33.941
+		C 471.868,103.771, 496.001,162.030, 496.001,224c0,61.969-24.133,120.229-67.952,164.049c-9.372,9.373-9.372,24.569,0,33.941
+		c 9.372,9.372, 24.569,9.372, 33.941,0c 52.885-52.886, 82.011-123.2, 82.011-197.99c0-74.791-29.126-145.104-82.011-197.99
+		C 457.304,21.323, 451.162,18.98, 445.020,18.98zM 359.765,64.235c-6.143,0-12.284,2.343-16.971,7.029c-9.372,9.372-9.372,24.568,0,33.941
+		c 65.503,65.503, 65.503,172.085,0,237.588c-9.372,9.373-9.372,24.569,0,33.941c 9.372,9.371, 24.569,9.372, 33.941,0
+		C 417.532,335.938, 440,281.696, 440,224c0-57.695-22.468-111.938-63.265-152.735C 372.049,66.578, 365.907,64.235, 359.765,64.235zM 274.51,109.49c-6.143,0-12.284,2.343-16.971,7.029c-9.373,9.373-9.373,24.568,0,33.941
+		c 40.55,40.55, 40.55,106.529,0,147.078c-9.373,9.373-9.373,24.569,0,33.941c 9.373,9.372, 24.568,9.372, 33.941,0
+		c 59.265-59.265, 59.265-155.696,0-214.961C 286.794,111.833, 280.652,109.49, 274.51,109.49zM 200.666,440.666 C 213.5,453.5 224,449.15 224,431 L 224,17 C 224-1.15 213.5-5.499 200.666,7.335 L 80,128 L 0,128 L 0,320 L 80,320 L 200.666,440.666 Z" horiz-adv-x="544"  />
+<glyph unicode="&#xe007;" d="M 256,480L 96,224L 256-32L 416,224 z"  />
+<glyph unicode="&#xe008;" d="M 0,480 L 687.158,480 L 687.158-35.207 L 0-35.207 L 0,480 z M 622.731,224.638 C 621.878,314.664 618.46,353.922 597.131,381.656 C 593.291,387.629 586.038,391.042 580.065,395.304 C 559.158,410.669 460.593,416.211 346.247,416.211 C 231.896,416.211 128.642,410.669 108.162,395.304 C 101.762,391.042 94.504,387.629 90.242,381.656 C 69.331,353.922 66.349,314.664 65.069,224.638 C 66.349,134.607 69.331,95.353 90.242,67.62 C 94.504,61.22 101.762,58.233 108.162,53.967 C 128.642,38.18 231.896,33.060 346.247,32.207 C 460.593,33.060 559.158,38.18 580.065,53.967 C 586.038,58.233 593.291,61.22 597.131,67.62 C 618.46,95.353 621.878,134.607 622.731,224.638 z M 331.179,247.952 C 325.389,318.401 287.924,359.905 220.901,359.905 C 159.672,359.905 111.54,304.689 111.54,215.965 C 111.54,126.859 155.405,71.267 227.907,71.267 C 285.79,71.267 326.306,113.916 332.701,184.742 L 263.55,184.742 C 260.81,158.468 249.843,138.285 226.69,138.285 C 190.136,138.285 183.435,174.462 183.435,212.92 C 183.435,265.854 198.665,292.886 223.951,292.886 C 246.492,292.886 260.81,276.511 262.939,247.952 L 331.179,247.952 z M 570.013,247.952 C 564.228,318.401 526.758,359.905 459.74,359.905 C 398.507,359.905 350.379,304.689 350.379,215.965 C 350.379,126.859 394.244,71.267 466.746,71.267 C 524.625,71.267 565.14,113.916 571.536,184.742 L 502.384,184.742 C 499.649,158.468 488.682,138.285 465.529,138.285 C 428.971,138.285 422.27,174.462 422.27,212.92 C 422.27,265.854 437.504,292.886 462.785,292.886 C 485.327,292.886 499.649,276.511 501.778,247.952 L 570.013,247.952 z " horiz-adv-x="687.158"  />
+<glyph unicode="&#xe009;" d="M 64,416L 448,416L 448,32L 64,32z"  />
+<glyph unicode="&#xe00a;" d="M 192,416A64,64 12780 1 1 320,416A64,64 12780 1 1 192,416zM 327.765,359.765A64,64 12780 1 1 455.765,359.765A64,64 12780 1 1 327.765,359.765zM 416,224A32,32 12780 1 1 480,224A32,32 12780 1 1 416,224zM 359.765,88.235A32,32 12780 1 1 423.765,88.23500000000001A32,32 12780 1 1 359.765,88.23500000000001zM 224.001,32A32,32 12780 1 1 288.001,32A32,32 12780 1 1 224.001,32zM 88.236,88.235A32,32 12780 1 1 152.236,88.23500000000001A32,32 12780 1 1 88.236,88.23500000000001zM 72.236,359.765A48,48 12780 1 1 168.236,359.765A48,48 12780 1 1 72.236,359.765zM 28,224A36,36 12780 1 1 100,224A36,36 12780 1 1 28,224z"  />
+<glyph unicode="&#xe00b;" d="M 224,192 L 224-16 L 144,64 L 48-32 L 0,16 L 96,112 L 16,192 ZM 512,432 L 416,336 L 496,256 L 288,256 L 288,464 L 368,384 L 464,480 Z"  />
+<glyph unicode="&#xe00c;" d="M 256,448 C 397.385,448 512,354.875 512,240 C 512,125.124 397.385,32 256,32 C 242.422,32 229.095,32.867 216.088,34.522 C 161.099-20.467 95.463-30.328 32-31.776 L 32-18.318 C 66.268-1.529 96,29.052 96,64 C 96,68.877 95.621,73.665 94.918,78.348 C 37.020,116.48 0,174.725 0,240 C 0,354.875 114.615,448 256,448 Z"  />
+<glyph unicode="&#xe00d;" d="M 256,480C 114.615,480,0,365.385,0,224s 114.615-256, 256-256s 256,114.615, 256,256S 397.385,480, 256,480z M 256,352
+	c 70.692,0, 128-57.308, 128-128s-57.308-128-128-128s-128,57.308-128,128S 185.308,352, 256,352z M 408.735,71.265
+	C 367.938,30.468, 313.695,8, 256,8c-57.696,0-111.938,22.468-152.735,63.265C 62.468,112.062, 40,166.304, 40,224
+	c0,57.695, 22.468,111.938, 63.265,152.735l 33.941-33.941c0,0,0,0,0,0c-65.503-65.503-65.503-172.085,0-237.588
+	C 168.937,73.475, 211.125,56, 256,56c 44.874,0, 87.062,17.475, 118.794,49.206c 65.503,65.503, 65.503,172.084,0,237.588l 33.941,33.941
+	C 449.532,335.938, 472,281.695, 472,224C 472,166.304, 449.532,112.062, 408.735,71.265z"  />
+<glyph unicode="&#xe01e;" d="M 512,224c-0.639,33.431-7.892,66.758-21.288,97.231c-13.352,30.5-32.731,58.129-56.521,80.96
+	c-23.776,22.848-51.972,40.91-82.492,52.826C 321.197,466.979, 288.401,472.693, 256,472c-32.405-0.641-64.666-7.687-94.167-20.678
+	c-29.524-12.948-56.271-31.735-78.367-54.788c-22.112-23.041-39.58-50.354-51.093-79.899C 20.816,287.104, 15.309,255.375, 16,224
+	c 0.643-31.38, 7.482-62.574, 20.067-91.103c 12.544-28.55, 30.738-54.414, 53.055-75.774c 22.305-21.377, 48.736-38.252, 77.307-49.36
+	C 194.988-3.389, 225.652-8.688, 256-8c 30.354,0.645, 60.481,7.277, 88.038,19.457c 27.575,12.141, 52.558,29.74, 73.183,51.322
+	c 20.641,21.57, 36.922,47.118, 47.627,74.715c 6.517,16.729, 10.94,34.2, 13.271,51.899c 0.623-0.036, 1.249-0.060, 1.881-0.060
+	c 17.673,0, 32,14.326, 32,32c0,0.898-0.047,1.786-0.119,2.666L 512,223.999 z M 461.153,139.026c-11.736-26.601-28.742-50.7-49.589-70.59
+	c-20.835-19.905-45.5-35.593-72.122-45.895C 312.828,12.202, 284.297,7.315, 256,8c-28.302,0.649-56.298,6.868-81.91,18.237
+	c-25.625,11.333-48.842,27.745-67.997,47.856c-19.169,20.099-34.264,43.882-44.161,69.529C 51.997,169.264, 47.318,196.729, 48,224
+	c 0.651,27.276, 6.664,54.206, 17.627,78.845c 10.929,24.65, 26.749,46.985, 46.123,65.405c 19.365,18.434, 42.265,32.935, 66.937,42.428
+	C 203.356,420.208, 229.755,424.681, 256,424c 26.25-0.653, 52.114-6.459, 75.781-17.017c 23.676-10.525, 45.128-25.751, 62.812-44.391
+	c 17.698-18.629, 31.605-40.647, 40.695-64.344C 444.412,274.552, 448.679,249.219, 448,224l 0.119,0 c-0.072-0.88-0.119-1.768-0.119-2.666
+	c0-16.506, 12.496-30.087, 28.543-31.812C 473.431,172.111, 468.278,155.113, 461.153,139.026z"  />
+<glyph unicode="&#xe01f;" d="M 256,480 C 116.626,480 3.271,368.619 0.076,230.013 C 3.036,350.945 94.992,448 208,448 C 322.875,448 416,347.712 416,224 C 416,197.49 437.49,176 464,176 C 490.51,176 512,197.49 512,224 C 512,365.385 397.385,480 256,480 ZM 256-32 C 395.374-32 508.729,79.381 511.924,217.987 C 508.964,97.055 417.008,0 304,0 C 189.125,0 96,100.288 96,224 C 96,250.51 74.51,272 48,272 C 21.49,272 0,250.51 0,224 C 0,82.615 114.615-32 256-32 Z"  />
+<glyph unicode="&#xe00e;" d="M 432,128c-22.58,0-42.96-9.369-57.506-24.415L 158.992,211.336C 159.649,215.462, 160,219.689, 160,224
+	s-0.351,8.538-1.008,12.663l 215.502,107.751C 389.040,329.369, 409.42,320, 432,320c 44.183,0, 80,35.817, 80,80S 476.183,480, 432,480
+	s-80-35.817-80-80c0-4.311, 0.352-8.538, 1.008-12.663L 137.506,279.585C 122.96,294.63, 102.58,304, 80,304c-44.183,0-80-35.818-80-80
+	c0-44.184, 35.817-80, 80-80c 22.58,0, 42.96,9.369, 57.506,24.414l 215.502-107.751C 352.352,56.538, 352,52.311, 352,48
+	c0-44.184, 35.817-80, 80-80s 80,35.816, 80,80C 512,92.182, 476.183,128, 432,128z"  />
+<glyph unicode="&#xe001;" d="M 96,416L 416,224L 96,32 z"  />
+<glyph unicode="&#xe000;" d="M 512,480 L 512,272 L 432,352 L 336,256 L 288,304 L 384,400 L 304,480 ZM 224,144 L 128,48 L 208-32 L 0-32 L 0,176 L 80,96 L 176,192 Z"  />
+<glyph unicode="&#x20;" horiz-adv-x="256" />
+</font></defs></svg>

dist/video-js/video-js.css

@@ -0,0 +1,766 @@
+/*!
+Video.js Default Styles (http://videojs.com)
+Version 4.4.1
+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
+skin name to your video tag instead of the default skin.
+e.g. <video class="video-js my-skin-name">
+*/
+.vjs-default-skin {
+  color: #cccccc;
+}
+/* Custom Icon Font
+--------------------------------------------------------------------------------
+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.
+*/
+@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');
+  font-weight: normal;
+  font-style: normal;
+}
+/* Base UI Component Classes
+--------------------------------------------------------------------------------
+*/
+/* Slider - used for Volume bar and Seek bar */
+.vjs-default-skin .vjs-slider {
+  /* Replace browser focus hightlight with handle highlight */
+  outline: 0;
+  position: relative;
+  cursor: pointer;
+  padding: 0;
+  /* background-color-with-alpha */
+  background-color: #333333;
+  background-color: rgba(51, 51, 51, 0.9);
+}
+.vjs-default-skin .vjs-slider:focus {
+  /* box-shadow */
+  -webkit-box-shadow: 0 0 2em #ffffff;
+  -moz-box-shadow: 0 0 2em #ffffff;
+  box-shadow: 0 0 2em #ffffff;
+}
+.vjs-default-skin .vjs-slider-handle {
+  position: absolute;
+  /* Needed for IE6 */
+  left: 0;
+  top: 0;
+}
+.vjs-default-skin .vjs-slider-handle:before {
+  content: "\e009";
+  font-family: VideoJS;
+  font-size: 1em;
+  line-height: 1;
+  text-align: center;
+  text-shadow: 0em 0em 1em #fff;
+  position: absolute;
+  top: 0;
+  left: 0;
+  /* Rotate the square icon to make a diamond */
+  /* transform */
+  -webkit-transform: rotate(-45deg);
+  -moz-transform: rotate(-45deg);
+  -ms-transform: rotate(-45deg);
+  -o-transform: rotate(-45deg);
+  transform: rotate(-45deg);
+}
+/* Control Bar
+--------------------------------------------------------------------------------
+The default control bar that is a container for most of the controls.
+*/
+.vjs-default-skin .vjs-control-bar {
+  /* Start hidden */
+  display: none;
+  position: absolute;
+  /* Place control bar at the bottom of the player box/video.
+     If you want more margin below the control bar, add more height. */
+  bottom: 0;
+  /* Use left/right to stretch to 100% width of player div */
+  left: 0;
+  right: 0;
+  /* Height includes any margin you want above or below control items */
+  height: 3.0em;
+  /* background-color-with-alpha */
+  background-color: #07141e;
+  background-color: rgba(7, 20, 30, 0.7);
+}
+/* Show the control bar only once the video has started playing */
+.vjs-default-skin.vjs-has-started .vjs-control-bar {
+  display: block;
+  /* Visibility needed to make sure things hide in older browsers too. */
+
+  visibility: visible;
+  opacity: 1;
+  /* transition */
+  -webkit-transition: visibility 0.1s, opacity 0.1s;
+  -moz-transition: visibility 0.1s, opacity 0.1s;
+  -o-transition: visibility 0.1s, opacity 0.1s;
+  transition: visibility 0.1s, opacity 0.1s;
+}
+/* Hide the control bar when the video is playing and the user is inactive  */
+.vjs-default-skin.vjs-has-started.vjs-user-inactive.vjs-playing .vjs-control-bar {
+  display: block;
+  visibility: hidden;
+  opacity: 0;
+  /* transition */
+  -webkit-transition: visibility 1s, opacity 1s;
+  -moz-transition: visibility 1s, opacity 1s;
+  -o-transition: visibility 1s, opacity 1s;
+  transition: visibility 1s, opacity 1s;
+}
+.vjs-default-skin.vjs-controls-disabled .vjs-control-bar {
+  display: none;
+}
+.vjs-default-skin.vjs-using-native-controls .vjs-control-bar {
+  display: none;
+}
+/* IE8 is flakey with fonts, and you have to change the actual content to force
+fonts to show/hide properly.
+  - "\9" IE8 hack didn't work for this
+  - Found in XP IE8 from http://modern.ie. Does not show up in "IE8 mode" in IE9
+*/
+@media \0screen {
+  .vjs-default-skin.vjs-user-inactive.vjs-playing .vjs-control-bar :before {
+    content: "";
+  }
+}
+/* General styles for individual controls. */
+.vjs-default-skin .vjs-control {
+  outline: none;
+  position: relative;
+  float: left;
+  text-align: center;
+  margin: 0;
+  padding: 0;
+  height: 3.0em;
+  width: 4em;
+}
+/* FontAwsome button icons */
+.vjs-default-skin .vjs-control:before {
+  font-family: VideoJS;
+  font-size: 1.5em;
+  line-height: 2;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  text-align: center;
+  text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
+}
+/* Replacement for focus outline */
+.vjs-default-skin .vjs-control:focus:before,
+.vjs-default-skin .vjs-control:hover:before {
+  text-shadow: 0em 0em 1em #ffffff;
+}
+.vjs-default-skin .vjs-control:focus {
+  /*  outline: 0; */
+  /* keyboard-only users cannot see the focus on several of the UI elements when
+  this is set to 0 */
+
+}
+/* Hide control text visually, but have it available for screenreaders */
+.vjs-default-skin .vjs-control-text {
+  /* hide-visually */
+  border: 0;
+  clip: rect(0 0 0 0);
+  height: 1px;
+  margin: -1px;
+  overflow: hidden;
+  padding: 0;
+  position: absolute;
+  width: 1px;
+}
+/* Play/Pause
+--------------------------------------------------------------------------------
+*/
+.vjs-default-skin .vjs-play-control {
+  width: 5em;
+  cursor: pointer;
+}
+.vjs-default-skin .vjs-play-control:before {
+  content: "\e001";
+}
+.vjs-default-skin.vjs-playing .vjs-play-control:before {
+  content: "\e002";
+}
+/* Volume/Mute
+-------------------------------------------------------------------------------- */
+.vjs-default-skin .vjs-mute-control,
+.vjs-default-skin .vjs-volume-menu-button {
+  cursor: pointer;
+  float: right;
+}
+.vjs-default-skin .vjs-mute-control:before,
+.vjs-default-skin .vjs-volume-menu-button:before {
+  content: "\e006";
+}
+.vjs-default-skin .vjs-mute-control.vjs-vol-0:before,
+.vjs-default-skin .vjs-volume-menu-button.vjs-vol-0:before {
+  content: "\e003";
+}
+.vjs-default-skin .vjs-mute-control.vjs-vol-1:before,
+.vjs-default-skin .vjs-volume-menu-button.vjs-vol-1:before {
+  content: "\e004";
+}
+.vjs-default-skin .vjs-mute-control.vjs-vol-2:before,
+.vjs-default-skin .vjs-volume-menu-button.vjs-vol-2:before {
+  content: "\e005";
+}
+.vjs-default-skin .vjs-volume-control {
+  width: 5em;
+  float: right;
+}
+.vjs-default-skin .vjs-volume-bar {
+  width: 5em;
+  height: 0.6em;
+  margin: 1.1em auto 0;
+}
+.vjs-default-skin .vjs-volume-menu-button .vjs-menu-content {
+  height: 2.9em;
+}
+.vjs-default-skin .vjs-volume-level {
+  position: absolute;
+  top: 0;
+  left: 0;
+  height: 0.5em;
+  background: #66a8cc url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAP0lEQVQIHWWMAQoAIAgDR/QJ/Ub//04+w7ZICBwcOg5FZi5iBB82AGzixEglJrd4TVK5XUJpskSTEvpdFzX9AB2pGziSQcvAAAAAAElFTkSuQmCC) -50% 0 repeat;
+}
+.vjs-default-skin .vjs-volume-bar .vjs-volume-handle {
+  width: 0.5em;
+  height: 0.5em;
+}
+.vjs-default-skin .vjs-volume-handle:before {
+  font-size: 0.9em;
+  top: -0.2em;
+  left: -0.2em;
+  width: 1em;
+  height: 1em;
+}
+.vjs-default-skin .vjs-volume-menu-button .vjs-menu .vjs-menu-content {
+  width: 6em;
+  left: -4em;
+}
+/* Progress
+--------------------------------------------------------------------------------
+*/
+.vjs-default-skin .vjs-progress-control {
+  position: absolute;
+  left: 0;
+  right: 0;
+  width: auto;
+  font-size: 0.3em;
+  height: 1em;
+  /* Set above the rest of the controls. */
+  top: -1em;
+  /* Shrink the bar slower than it grows. */
+  /* transition */
+  -webkit-transition: all 0.4s;
+  -moz-transition: all 0.4s;
+  -o-transition: all 0.4s;
+  transition: all 0.4s;
+}
+/* On hover, make the progress bar grow to something that's more clickable.
+    This simply changes the overall font for the progress bar, and this
+    updates both the em-based widths and heights, as wells as the icon font */
+.vjs-default-skin:hover .vjs-progress-control {
+  font-size: .9em;
+  /* Even though we're not changing the top/height, we need to include them in
+      the transition so they're handled correctly. */
+
+  /* transition */
+  -webkit-transition: all 0.2s;
+  -moz-transition: all 0.2s;
+  -o-transition: all 0.2s;
+  transition: all 0.2s;
+}
+/* Box containing play and load progresses. Also acts as seek scrubber. */
+.vjs-default-skin .vjs-progress-holder {
+  height: 100%;
+}
+/* Progress Bars */
+.vjs-default-skin .vjs-progress-holder .vjs-play-progress,
+.vjs-default-skin .vjs-progress-holder .vjs-load-progress {
+  position: absolute;
+  display: block;
+  height: 100%;
+  margin: 0;
+  padding: 0;
+  /* Needed for IE6 */
+  left: 0;
+  top: 0;
+}
+.vjs-default-skin .vjs-play-progress {
+  /*
+    Using a data URI to create the white diagonal lines with a transparent
+      background. Surprisingly works in IE8.
+      Created using http://www.patternify.com
+    Changing the first color value will change the bar color.
+    Also using a paralax effect to make the lines move backwards.
+      The -50% left position makes that happen.
+  */
+
+  background: #66a8cc url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAP0lEQVQIHWWMAQoAIAgDR/QJ/Ub//04+w7ZICBwcOg5FZi5iBB82AGzixEglJrd4TVK5XUJpskSTEvpdFzX9AB2pGziSQcvAAAAAAElFTkSuQmCC) -50% 0 repeat;
+}
+.vjs-default-skin .vjs-load-progress {
+  background: #646464 /* IE8- Fallback */;
+  background: rgba(255, 255, 255, 0.4);
+}
+.vjs-default-skin .vjs-seek-handle {
+  width: 1.5em;
+  height: 100%;
+}
+.vjs-default-skin .vjs-seek-handle:before {
+  padding-top: 0.1em /* Minor adjustment */;
+}
+/* Time Display
+--------------------------------------------------------------------------------
+*/
+.vjs-default-skin .vjs-time-controls {
+  font-size: 1em;
+  /* Align vertically by making the line height the same as the control bar */
+  line-height: 3em;
+}
+.vjs-default-skin .vjs-current-time {
+  float: left;
+}
+.vjs-default-skin .vjs-duration {
+  float: left;
+}
+/* Remaining time is in the HTML, but not included in default design */
+.vjs-default-skin .vjs-remaining-time {
+  display: none;
+  float: left;
+}
+.vjs-time-divider {
+  float: left;
+  line-height: 3em;
+}
+/* Fullscreen
+--------------------------------------------------------------------------------
+*/
+.vjs-default-skin .vjs-fullscreen-control {
+  width: 3.8em;
+  cursor: pointer;
+  float: right;
+}
+.vjs-default-skin .vjs-fullscreen-control:before {
+  content: "\e000";
+}
+/* Switch to the exit icon when the player is in fullscreen */
+.vjs-default-skin.vjs-fullscreen .vjs-fullscreen-control:before {
+  content: "\e00b";
+}
+/* Big Play Button (play button at start)
+--------------------------------------------------------------------------------
+Positioning of the play button in the center or other corners can be done more
+easily in the skin designer. http://designer.videojs.com/
+*/
+.vjs-default-skin .vjs-big-play-button {
+  left: 0.5em;
+  top: 0.5em;
+  font-size: 3em;
+  display: block;
+  z-index: 2;
+  position: absolute;
+  width: 4em;
+  height: 2.6em;
+  text-align: center;
+  vertical-align: middle;
+  cursor: pointer;
+  opacity: 1;
+  /* Need a slightly gray bg so it can be seen on black backgrounds */
+  /* background-color-with-alpha */
+  background-color: #07141e;
+  background-color: rgba(7, 20, 30, 0.7);
+  border: 0.1em solid #3b4249;
+  /* border-radius */
+  -webkit-border-radius: 0.8em;
+  -moz-border-radius: 0.8em;
+  border-radius: 0.8em;
+  /* box-shadow */
+  -webkit-box-shadow: 0px 0px 1em rgba(255, 255, 255, 0.25);
+  -moz-box-shadow: 0px 0px 1em rgba(255, 255, 255, 0.25);
+  box-shadow: 0px 0px 1em rgba(255, 255, 255, 0.25);
+  /* transition */
+  -webkit-transition: all 0.4s;
+  -moz-transition: all 0.4s;
+  -o-transition: all 0.4s;
+  transition: all 0.4s;
+}
+/* Optionally center */
+.vjs-default-skin.vjs-big-play-centered .vjs-big-play-button {
+  /* Center it horizontally */
+  left: 50%;
+  margin-left: -2.1em;
+  /* Center it vertically */
+  top: 50%;
+  margin-top: -1.4000000000000001em;
+}
+/* Hide if controls are disabled */
+.vjs-default-skin.vjs-controls-disabled .vjs-big-play-button {
+  display: none;
+}
+/* Hide when video starts playing */
+.vjs-default-skin.vjs-has-started .vjs-big-play-button {
+  display: none;
+}
+/* Hide on mobile devices. Remove when we stop using native controls
+    by default on mobile  */
+.vjs-default-skin.vjs-using-native-controls .vjs-big-play-button {
+  display: none;
+}
+.vjs-default-skin:hover .vjs-big-play-button,
+.vjs-default-skin .vjs-big-play-button:focus {
+  outline: 0;
+  border-color: #fff;
+  /* IE8 needs a non-glow hover state */
+  background-color: #505050;
+  background-color: rgba(50, 50, 50, 0.75);
+  /* box-shadow */
+  -webkit-box-shadow: 0 0 3em #ffffff;
+  -moz-box-shadow: 0 0 3em #ffffff;
+  box-shadow: 0 0 3em #ffffff;
+  /* transition */
+  -webkit-transition: all 0s;
+  -moz-transition: all 0s;
+  -o-transition: all 0s;
+  transition: all 0s;
+}
+.vjs-default-skin .vjs-big-play-button:before {
+  content: "\e001";
+  font-family: VideoJS;
+  /* In order to center the play icon vertically we need to set the line height
+     to the same as the button height */
+
+  line-height: 2.6em;
+  text-shadow: 0.05em 0.05em 0.1em #000;
+  text-align: center /* Needed for IE8 */;
+  position: absolute;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}
+/* Loading Spinner
+--------------------------------------------------------------------------------
+*/
+.vjs-loading-spinner {
+  display: none;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  font-size: 4em;
+  line-height: 1;
+  width: 1em;
+  height: 1em;
+  margin-left: -0.5em;
+  margin-top: -0.5em;
+  opacity: 0.75;
+  /* animation */
+  -webkit-animation: spin 1.5s infinite linear;
+  -moz-animation: spin 1.5s infinite linear;
+  -o-animation: spin 1.5s infinite linear;
+  animation: spin 1.5s infinite linear;
+}
+.vjs-default-skin .vjs-loading-spinner:before {
+  content: "\e01e";
+  font-family: VideoJS;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 1em;
+  height: 1em;
+  text-align: center;
+  text-shadow: 0em 0em 0.1em #000;
+}
+@-moz-keyframes spin {
+  0% {
+    -moz-transform: rotate(0deg);
+  }
+  100% {
+    -moz-transform: rotate(359deg);
+  }
+}
+@-webkit-keyframes spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(359deg);
+  }
+}
+@-o-keyframes spin {
+  0% {
+    -o-transform: rotate(0deg);
+  }
+  100% {
+    -o-transform: rotate(359deg);
+  }
+}
+@keyframes spin {
+  0% {
+    transform: rotate(0deg);
+  }
+  100% {
+    transform: rotate(359deg);
+  }
+}
+/* Menu Buttons (Captions/Subtitles/etc.)
+--------------------------------------------------------------------------------
+*/
+.vjs-default-skin .vjs-menu-button {
+  float: right;
+  cursor: pointer;
+}
+.vjs-default-skin .vjs-menu {
+  display: none;
+  position: absolute;
+  bottom: 0;
+  left: 0em;
+  /* (Width of vjs-menu - width of button) / 2 */
+
+  width: 0em;
+  height: 0em;
+  margin-bottom: 3em;
+  border-left: 2em solid transparent;
+  border-right: 2em solid transparent;
+  border-top: 1.55em solid #000000;
+  /* Same width top as ul bottom */
+
+  border-top-color: rgba(7, 40, 50, 0.5);
+  /* Same as ul background */
+
+}
+/* Button Pop-up Menu */
+.vjs-default-skin .vjs-menu-button .vjs-menu .vjs-menu-content {
+  display: block;
+  padding: 0;
+  margin: 0;
+  position: absolute;
+  width: 10em;
+  bottom: 1.5em;
+  /* Same bottom as vjs-menu border-top */
+
+  max-height: 15em;
+  overflow: auto;
+  left: -5em;
+  /* Width of menu - width of button / 2 */
+
+  /* background-color-with-alpha */
+  background-color: #07141e;
+  background-color: rgba(7, 20, 30, 0.7);
+  /* box-shadow */
+  -webkit-box-shadow: -0.2em -0.2em 0.3em rgba(255, 255, 255, 0.2);
+  -moz-box-shadow: -0.2em -0.2em 0.3em rgba(255, 255, 255, 0.2);
+  box-shadow: -0.2em -0.2em 0.3em rgba(255, 255, 255, 0.2);
+}
+.vjs-default-skin .vjs-menu-button:hover .vjs-menu {
+  display: block;
+}
+.vjs-default-skin .vjs-menu-button ul li {
+  list-style: none;
+  margin: 0;
+  padding: 0.3em 0 0.3em 0;
+  line-height: 1.4em;
+  font-size: 1.2em;
+  text-align: center;
+  text-transform: lowercase;
+}
+.vjs-default-skin .vjs-menu-button ul li.vjs-selected {
+  background-color: #000;
+}
+.vjs-default-skin .vjs-menu-button ul li:focus,
+.vjs-default-skin .vjs-menu-button ul li:hover,
+.vjs-default-skin .vjs-menu-button ul li.vjs-selected:focus,
+.vjs-default-skin .vjs-menu-button ul li.vjs-selected:hover {
+  outline: 0;
+  color: #111;
+  /* background-color-with-alpha */
+  background-color: #ffffff;
+  background-color: rgba(255, 255, 255, 0.75);
+  /* box-shadow */
+  -webkit-box-shadow: 0 0 1em #ffffff;
+  -moz-box-shadow: 0 0 1em #ffffff;
+  box-shadow: 0 0 1em #ffffff;
+}
+.vjs-default-skin .vjs-menu-button ul li.vjs-menu-title {
+  text-align: center;
+  text-transform: uppercase;
+  font-size: 1em;
+  line-height: 2em;
+  padding: 0;
+  margin: 0 0 0.3em 0;
+  font-weight: bold;
+  cursor: default;
+}
+/* Subtitles Button */
+.vjs-default-skin .vjs-subtitles-button:before {
+  content: "\e00c";
+}
+/* Captions Button */
+.vjs-default-skin .vjs-captions-button:before {
+  content: "\e008";
+}
+/* Replacement for focus outline */
+.vjs-default-skin .vjs-captions-button:focus .vjs-control-content:before,
+.vjs-default-skin .vjs-captions-button:hover .vjs-control-content:before {
+  /* box-shadow */
+  -webkit-box-shadow: 0 0 1em #ffffff;
+  -moz-box-shadow: 0 0 1em #ffffff;
+  box-shadow: 0 0 1em #ffffff;
+}
+/*
+REQUIRED STYLES (be careful overriding)
+================================================================================
+When loading the player, the video tag is replaced with a DIV,
+that will hold the video tag or object tag for other playback methods.
+The div contains the video playback element (Flash or HTML5) and controls,
+and sets the width and height of the video.
+
+** If you want to add some kind of border/padding (e.g. a frame), or special
+positioning, use another containing element. Otherwise you risk messing up
+control positioning and full window mode. **
+*/
+.video-js {
+  background-color: #000;
+  position: relative;
+  padding: 0;
+  /* Start with 10px for base font size so other dimensions can be em based and
+     easily calculable. */
+
+  font-size: 10px;
+  /* Allow poster to be vertially aligned. */
+
+  vertical-align: middle;
+  /*  display: table-cell; */
+  /*This works in Safari but not Firefox.*/
+
+  /* Provide some basic defaults for fonts */
+
+  font-weight: normal;
+  font-style: normal;
+  /* Avoiding helvetica: issue #376 */
+
+  font-family: Arial, sans-serif;
+  /* Turn off user selection (text highlighting) by default.
+     The majority of player components will not be text blocks.
+     Text areas will need to turn user selection back on. */
+
+  /* user-select */
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+/* Playback technology elements expand to the width/height of the containing div
+    <video> or <object> */
+.video-js .vjs-tech {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}
+/* Fix for Firefox 9 fullscreen (only if it is enabled). Not needed when
+   checking fullScreenEnabled. */
+.video-js:-moz-full-screen {
+  position: absolute;
+}
+/* Fullscreen Styles */
+body.vjs-full-window {
+  padding: 0;
+  margin: 0;
+  height: 100%;
+  /* Fix for IE6 full-window. http://www.cssplay.co.uk/layouts/fixed.html */
+  overflow-y: auto;
+}
+.video-js.vjs-fullscreen {
+  position: fixed;
+  overflow: hidden;
+  z-index: 1000;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  right: 0;
+  width: 100% !important;
+  height: 100% !important;
+  /* IE6 full-window (underscore hack) */
+  _position: absolute;
+}
+.video-js:-webkit-full-screen {
+  width: 100% !important;
+  height: 100% !important;
+}
+.video-js.vjs-fullscreen.vjs-user-inactive {
+  cursor: none;
+}
+/* Poster Styles */
+.vjs-poster {
+  background-repeat: no-repeat;
+  background-position: 50% 50%;
+  background-size: contain;
+  cursor: pointer;
+  height: 100%;
+  margin: 0;
+  padding: 0;
+  position: relative;
+  width: 100%;
+}
+.vjs-poster img {
+  display: block;
+  margin: 0 auto;
+  max-height: 100%;
+  padding: 0;
+  width: 100%;
+}
+/* Hide the poster when native controls are used otherwise it covers them */
+.video-js.vjs-using-native-controls .vjs-poster {
+  display: none;
+}
+/* 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;
+  right: 1em;
+}
+/* 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 {
+  display: block;
+}
+/* Hide disabled or unsupported controls */
+.vjs-default-skin .vjs-hidden {
+  display: none;
+}
+.vjs-lock-showing {
+  display: block !important;
+  opacity: 1;
+  visibility: visible;
+}
+/* -----------------------------------------------------------------------------
+The original source of this file lives at
+https://github.com/videojs/video.js/blob/master/src/css/video-js.less */

dist/video-js/video.js

@@ -0,0 +1,137 @@
+/*! Video.js v4.4.1 Copyright 2014 Brightcove, Inc. https://github.com/videojs/video.js/blob/master/LICENSE */ 
+(function() {var b=void 0,f=!0,h=null,l=!1;function m(){return function(){}}function p(a){return function(){return this[a]}}function r(a){return function(){return a}}var t;document.createElement("video");document.createElement("audio");document.createElement("track");function u(a,c,d){if("string"===typeof a){0===a.indexOf("#")&&(a=a.slice(1));if(u.va[a])return u.va[a];a=u.u(a)}if(!a||!a.nodeName)throw new TypeError("The element or ID supplied is not valid. (videojs)");return a.player||new u.Player(a,c,d)}
+var videojs=u;window.Vd=window.Wd=u;u.Qb="4.4";u.Dc="https:"==document.location.protocol?"https://":"http://";u.options={techOrder:["html5","flash"],html5:{},flash:{},width:300,height:150,defaultVolume:0,children:{mediaLoader:{},posterImage:{},textTrackDisplay:{},loadingSpinner:{},bigPlayButton:{},controlBar:{}},notSupportedMessage:'Sorry, no compatible source and playback technology were found for this video. Try using another browser like <a href="http://bit.ly/ccMUEC">Chrome</a> or download the latest <a href="http://adobe.ly/mwfN1">Adobe Flash Player</a>.'};
+"GENERATED_CDN_VSN"!==u.Qb&&(videojs.options.flash.swf=u.Dc+"vjs.zencdn.net/"+u.Qb+"/video-js.swf");u.va={};"function"===typeof define&&define.amd?define([],function(){return videojs}):"object"===typeof exports&&"object"===typeof module&&(module.exports=videojs);u.ka=u.CoreObject=m();
+u.ka.extend=function(a){var c,d;a=a||{};c=a.init||a.h||this.prototype.init||this.prototype.h||m();d=function(){c.apply(this,arguments)};d.prototype=u.k.create(this.prototype);d.prototype.constructor=d;d.extend=u.ka.extend;d.create=u.ka.create;for(var e in a)a.hasOwnProperty(e)&&(d.prototype[e]=a[e]);return d};u.ka.create=function(){var a=u.k.create(this.prototype);this.apply(a,arguments);return a};
+u.d=function(a,c,d){var e=u.getData(a);e.z||(e.z={});e.z[c]||(e.z[c]=[]);d.s||(d.s=u.s++);e.z[c].push(d);e.U||(e.disabled=l,e.U=function(c){if(!e.disabled){c=u.hc(c);var d=e.z[c.type];if(d)for(var d=d.slice(0),k=0,q=d.length;k<q&&!c.oc();k++)d[k].call(a,c)}});1==e.z[c].length&&(document.addEventListener?a.addEventListener(c,e.U,l):document.attachEvent&&a.attachEvent("on"+c,e.U))};
+u.o=function(a,c,d){if(u.lc(a)){var e=u.getData(a);if(e.z)if(c){var g=e.z[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.z[c]=[];u.dc(a,c)}}else for(g in e.z)c=g,e.z[c]=[],u.dc(a,c)}};u.dc=function(a,c){var d=u.getData(a);0===d.z[c].length&&(delete d.z[c],document.removeEventListener?a.removeEventListener(c,d.U,l):document.detachEvent&&a.detachEvent("on"+c,d.U));u.Ab(d.z)&&(delete d.z,delete d.U,delete d.disabled);u.Ab(d)&&u.sc(a)};
+u.hc=function(a){function c(){return f}function d(){return l}if(!a||!a.Bb){var e=a||window.event;a={};for(var g in e)"layerX"!==g&&("layerY"!==g&&"keyboardEvent.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.zb=c};a.zb=d;a.stopPropagation=function(){e.stopPropagation&&e.stopPropagation();
+a.cancelBubble=f;a.Bb=c};a.Bb=d;a.stopImmediatePropagation=function(){e.stopImmediatePropagation&&e.stopImmediatePropagation();a.oc=c;a.stopPropagation()};a.oc=d;if(a.clientX!=h){g=document.documentElement;var j=document.body;a.pageX=a.clientX+(g&&g.scrollLeft||j&&j.scrollLeft||0)-(g&&g.clientLeft||j&&j.clientLeft||0);a.pageY=a.clientY+(g&&g.scrollTop||j&&j.scrollTop||0)-(g&&g.clientTop||j&&j.clientTop||0)}a.which=a.charCode||a.keyCode;a.button!=h&&(a.button=a.button&1?0:a.button&4?1:a.button&2?2:
+0)}return a};u.j=function(a,c){var d=u.lc(a)?u.getData(a):{},e=a.parentNode||a.ownerDocument;"string"===typeof c&&(c={type:c,target:a});c=u.hc(c);d.U&&d.U.call(a,c);if(e&&!c.Bb()&&c.bubbles!==l)u.j(e,c);else if(!e&&!c.zb()&&(d=u.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.zb()};u.T=function(a,c,d){function e(){u.o(a,c,e);d.apply(this,arguments)}e.s=d.s=d.s||u.s++;u.d(a,c,e)};var v=Object.prototype.hasOwnProperty;
+u.e=function(a,c){var d,e;d=document.createElement(a||"div");for(e in c)v.call(c,e)&&(-1!==e.indexOf("aria-")||"role"==e?d.setAttribute(e,c[e]):d[e]=c[e]);return d};u.Y=function(a){return a.charAt(0).toUpperCase()+a.slice(1)};u.k={};u.k.create=Object.create||function(a){function c(){}c.prototype=a;return new c};u.k.ra=function(a,c,d){for(var e in a)v.call(a,e)&&c.call(d||this,e,a[e])};u.k.B=function(a,c){if(!c)return a;for(var d in c)v.call(c,d)&&(a[d]=c[d]);return a};
+u.k.Vc=function(a,c){var d,e,g;a=u.k.copy(a);for(d in c)v.call(c,d)&&(e=a[d],g=c[d],a[d]=u.k.Ma(e)&&u.k.Ma(g)?u.k.Vc(e,g):c[d]);return a};u.k.copy=function(a){return u.k.B({},a)};u.k.Ma=function(a){return!!a&&"object"===typeof a&&"[object Object]"===a.toString()&&a.constructor===Object};u.bind=function(a,c,d){function e(){return c.apply(a,arguments)}c.s||(c.s=u.s++);e.s=d?d+"_"+c.s:c.s;return e};u.pa={};u.s=1;u.expando="vdata"+(new Date).getTime();
+u.getData=function(a){var c=a[u.expando];c||(c=a[u.expando]=u.s++,u.pa[c]={});return u.pa[c]};u.lc=function(a){a=a[u.expando];return!(!a||u.Ab(u.pa[a]))};u.sc=function(a){var c=a[u.expando];if(c){delete u.pa[c];try{delete a[u.expando]}catch(d){a.removeAttribute?a.removeAttribute(u.expando):a[u.expando]=h}}};u.Ab=function(a){for(var c in a)if(a[c]!==h)return l;return f};u.n=function(a,c){-1==(" "+a.className+" ").indexOf(" "+c+" ")&&(a.className=""===a.className?c:a.className+" "+c)};
+u.t=function(a,c){var d,e;if(-1!=a.className.indexOf(c)){d=a.className.split(" ");for(e=d.length-1;0<=e;e--)d[e]===c&&d.splice(e,1);a.className=d.join(" ")}};u.ea=u.e("video");u.I=navigator.userAgent;u.Jc=/iPhone/i.test(u.I);u.Ic=/iPad/i.test(u.I);u.Kc=/iPod/i.test(u.I);u.Hc=u.Jc||u.Ic||u.Kc;var aa=u,w;var x=u.I.match(/OS (\d+)_/i);w=x&&x[1]?x[1]:b;aa.Hd=w;u.Gc=/Android/i.test(u.I);var ba=u,y;var z=u.I.match(/Android (\d+)(?:\.(\d+))?(?:\.(\d+))*/i),A,B;
+z?(A=z[1]&&parseFloat(z[1]),B=z[2]&&parseFloat(z[2]),y=A&&B?parseFloat(z[1]+"."+z[2]):A?A:h):y=h;ba.Ec=y;u.Lc=u.Gc&&/webkit/i.test(u.I)&&2.3>u.Ec;u.Tb=/Firefox/i.test(u.I);u.Id=/Chrome/i.test(u.I);u.Zb=!!("ontouchstart"in window||window.Fc&&document instanceof window.Fc);
+u.wb=function(a){var c,d,e,g;c={};if(a&&a.attributes&&0<a.attributes.length){d=a.attributes;for(var j=d.length-1;0<=j;j--){e=d[j].name;g=d[j].value;if("boolean"===typeof a[e]||-1!==",autoplay,controls,loop,muted,default,".indexOf(","+e+","))g=g!==h?f:l;c[e]=g}}return c};
+u.Md=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};u.yb=function(a,c){c.firstChild?c.insertBefore(a,c.firstChild):c.appendChild(a)};u.Nb={};u.u=function(a){0===a.indexOf("#")&&(a=a.slice(1));return document.getElementById(a)};
+u.ta=function(a,c){c=c||a;var d=Math.floor(a%60),e=Math.floor(a/60%60),g=Math.floor(a/3600),j=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<=j)&&10>e?"0"+e:e)+":")+(10>d?"0"+d:d)};u.Rc=function(){document.body.focus();document.onselectstart=r(l)};u.Cd=function(){document.onselectstart=r(f)};u.trim=function(a){return(a+"").replace(/^\s+|\s+$/g,"")};u.round=function(a,c){c||(c=0);return Math.round(a*Math.pow(10,c))/Math.pow(10,c)};
+u.sb=function(a,c){return{length:1,start:function(){return a},end:function(){return c}}};
+u.get=function(a,c,d){var e,g;"undefined"===typeof XMLHttpRequest&&(window.XMLHttpRequest=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.");});g=new XMLHttpRequest;try{g.open("GET",a)}catch(j){d(j)}e=0===a.indexOf("file:")||0===window.location.href.indexOf("file:")&&-1===a.indexOf("http");
+g.onreadystatechange=function(){4===g.readyState&&(200===g.status||e&&0===g.status?c(g.responseText):d&&d())};try{g.send()}catch(k){d&&d(k)}};u.ud=function(a){try{var c=window.localStorage||l;c&&(c.volume=a)}catch(d){22==d.code||1014==d.code?u.log("LocalStorage Full (VideoJS)",d):18==d.code?u.log("LocalStorage not allowed (VideoJS)",d):u.log("LocalStorage Error (VideoJS)",d)}};u.jc=function(a){a.match(/^https?:\/\//)||(a=u.e("div",{innerHTML:'<a href="'+a+'">x</a>'}).firstChild.href);return a};
+u.log=function(){u.log.history=u.log.history||[];u.log.history.push(arguments);window.console&&window.console.log(Array.prototype.slice.call(arguments))};u.bd=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:c.left+(window.pageXOffset||d.scrollLeft)-(a.clientLeft||d.clientLeft||0),top:c.top+(window.pageYOffset||d.scrollTop)-(a.clientTop||d.clientTop||0)}};u.ja={};
+u.ja.Fb=function(a,c){var d,e,g;a=u.k.copy(a);for(d in c)c.hasOwnProperty(d)&&(e=a[d],g=c[d],a[d]=u.k.Ma(e)&&u.k.Ma(g)?u.ja.Fb(e,g):c[d]);return a};
+u.b=u.ka.extend({h:function(a,c,d){this.c=a;this.g=u.k.copy(this.g);c=this.options(c);this.Q=c.id||(c.el&&c.el.id?c.el.id:a.id()+"_component_"+u.s++);this.jd=c.name||h;this.a=c.el||this.e();this.J=[];this.Ia={};this.Ja={};this.mc();this.H(d);if(c.tc!==l){var e,g;e=u.bind(this.C(),this.C().reportUserActivity);this.d("touchstart",function(){e();clearInterval(g);g=setInterval(e,250)});a=function(){e();clearInterval(g)};this.d("touchmove",e);this.d("touchend",a);this.d("touchcancel",a)}}});t=u.b.prototype;
+t.dispose=function(){this.j({type:"dispose",bubbles:l});if(this.J)for(var a=this.J.length-1;0<=a;a--)this.J[a].dispose&&this.J[a].dispose();this.Ja=this.Ia=this.J=h;this.o();this.a.parentNode&&this.a.parentNode.removeChild(this.a);u.sc(this.a);this.a=h};t.c=f;t.C=p("c");t.options=function(a){return a===b?this.g:this.g=u.ja.Fb(this.g,a)};t.e=function(a,c){return u.e(a,c)};t.u=p("a");t.Ka=function(){return this.F||this.a};t.id=p("Q");t.name=p("jd");t.children=p("J");t.dd=function(a){return this.Ia[a]};
+t.fa=function(a){return this.Ja[a]};t.X=function(a,c){var d,e;"string"===typeof a?(e=a,c=c||{},d=c.componentClass||u.Y(e),c.name=e,d=new window.videojs[d](this.c||this,c)):d=a;this.J.push(d);"function"===typeof d.id&&(this.Ia[d.id()]=d);(e=e||d.name&&d.name())&&(this.Ja[e]=d);"function"===typeof d.el&&d.el()&&this.Ka().appendChild(d.el());return d};
+t.removeChild=function(a){"string"===typeof a&&(a=this.fa(a));if(a&&this.J){for(var c=l,d=this.J.length-1;0<=d;d--)if(this.J[d]===a){c=f;this.J.splice(d,1);break}c&&(this.Ia[a.id]=h,this.Ja[a.name]=h,(c=a.u())&&c.parentNode===this.Ka()&&this.Ka().removeChild(a.u()))}};t.mc=function(){var a=this.g;if(a&&a.children){var c=this;u.k.ra(a.children,function(a,e){e!==l&&!e.loadEvent&&(c[a]=c.X(a,e))})}};t.P=r("");t.d=function(a,c){u.d(this.a,a,u.bind(this,c));return this};
+t.o=function(a,c){u.o(this.a,a,c);return this};t.T=function(a,c){u.T(this.a,a,u.bind(this,c));return this};t.j=function(a,c){u.j(this.a,a,c);return this};t.H=function(a){a&&(this.$?a.call(this):(this.Ta===b&&(this.Ta=[]),this.Ta.push(a)));return this};t.Wa=function(){this.$=f;var a=this.Ta;if(a&&0<a.length){for(var c=0,d=a.length;c<d;c++)a[c].call(this);this.Ta=[];this.j("ready")}};t.n=function(a){u.n(this.a,a);return this};t.t=function(a){u.t(this.a,a);return this};
+t.show=function(){this.a.style.display="block";return this};t.D=function(){this.a.style.display="none";return this};function D(a){a.t("vjs-lock-showing")}t.disable=function(){this.D();this.show=m()};t.width=function(a,c){return E(this,"width",a,c)};t.height=function(a,c){return E(this,"height",a,c)};t.Xc=function(a,c){return this.width(a,f).height(c)};
+function E(a,c,d,e){if(d!==b)return a.a.style[c]=-1!==(""+d).indexOf("%")||-1!==(""+d).indexOf("px")?d:"auto"===d?"":d+"px",e||a.j("resize"),a;if(!a.a)return 0;d=a.a.style[c];e=d.indexOf("px");return-1!==e?parseInt(d.slice(0,e),10):parseInt(a.a["offset"+u.Y(c)],10)}
+u.q=u.b.extend({h:function(a,c){u.b.call(this,a,c);var d=l;this.d("touchstart",function(a){a.preventDefault();d=f});this.d("touchmove",function(){d=l});var e=this;this.d("touchend",function(a){d&&e.p(a);a.preventDefault()});this.d("click",this.p);this.d("focus",this.Pa);this.d("blur",this.Oa)}});t=u.q.prototype;
+t.e=function(a,c){c=u.k.B({className:this.P(),innerHTML:'<div class="vjs-control-content"><span class="vjs-control-text">'+(this.oa||"Need Text")+"</span></div>",role:"button","aria-live":"polite",tabIndex:0},c);return u.b.prototype.e.call(this,a,c)};t.P=function(){return"vjs-control "+u.b.prototype.P.call(this)};t.p=m();t.Pa=function(){u.d(document,"keyup",u.bind(this,this.aa))};t.aa=function(a){if(32==a.which||13==a.which)a.preventDefault(),this.p()};
+t.Oa=function(){u.o(document,"keyup",u.bind(this,this.aa))};u.N=u.b.extend({h:function(a,c){u.b.call(this,a,c);this.Qc=this.fa(this.g.barName);this.handle=this.fa(this.g.handleName);a.d(this.qc,u.bind(this,this.update));this.d("mousedown",this.Qa);this.d("touchstart",this.Qa);this.d("focus",this.Pa);this.d("blur",this.Oa);this.d("click",this.p);this.c.d("controlsvisible",u.bind(this,this.update));a.H(u.bind(this,this.update));this.O={}}});t=u.N.prototype;
+t.e=function(a,c){c=c||{};c.className+=" vjs-slider";c=u.k.B({role:"slider","aria-valuenow":0,"aria-valuemin":0,"aria-valuemax":100,tabIndex:0},c);return u.b.prototype.e.call(this,a,c)};t.Qa=function(a){a.preventDefault();u.Rc();this.O.move=u.bind(this,this.Hb);this.O.end=u.bind(this,this.Ib);u.d(document,"mousemove",this.O.move);u.d(document,"mouseup",this.O.end);u.d(document,"touchmove",this.O.move);u.d(document,"touchend",this.O.end);this.Hb(a)};
+t.Ib=function(){u.Cd();u.o(document,"mousemove",this.O.move,l);u.o(document,"mouseup",this.O.end,l);u.o(document,"touchmove",this.O.move,l);u.o(document,"touchend",this.O.end,l);this.update()};t.update=function(){if(this.a){var a,c=this.xb(),d=this.handle,e=this.Qc;isNaN(c)&&(c=0);a=c;if(d){a=this.a.offsetWidth;var g=d.u().offsetWidth;a=g?g/a:0;c*=1-a;a=c+a/2;d.u().style.left=u.round(100*c,2)+"%"}e.u().style.width=u.round(100*a,2)+"%"}};
+function F(a,c){var d,e,g,j;d=a.a;e=u.bd(d);j=g=d.offsetWidth;d=a.handle;if(a.g.Dd)return j=e.top,e=c.changedTouches?c.changedTouches[0].pageY:c.pageY,d&&(d=d.u().offsetHeight,j+=d/2,g-=d),Math.max(0,Math.min(1,(j-e+g)/g));g=e.left;e=c.changedTouches?c.changedTouches[0].pageX:c.pageX;d&&(d=d.u().offsetWidth,g+=d/2,j-=d);return Math.max(0,Math.min(1,(e-g)/j))}t.Pa=function(){u.d(document,"keyup",u.bind(this,this.aa))};
+t.aa=function(a){37==a.which?(a.preventDefault(),this.wc()):39==a.which&&(a.preventDefault(),this.xc())};t.Oa=function(){u.o(document,"keyup",u.bind(this,this.aa))};t.p=function(a){a.stopImmediatePropagation();a.preventDefault()};u.V=u.b.extend();u.V.prototype.defaultValue=0;u.V.prototype.e=function(a,c){c=c||{};c.className+=" vjs-slider-handle";c=u.k.B({innerHTML:'<span class="vjs-control-text">'+this.defaultValue+"</span>"},c);return u.b.prototype.e.call(this,"div",c)};u.la=u.b.extend();
+function ca(a,c){a.X(c);c.d("click",u.bind(a,function(){D(this)}))}u.la.prototype.e=function(){var a=this.options().Tc||"ul";this.F=u.e(a,{className:"vjs-menu-content"});a=u.b.prototype.e.call(this,"div",{append:this.F,className:"vjs-menu"});a.appendChild(this.F);u.d(a,"click",function(a){a.preventDefault();a.stopImmediatePropagation()});return a};u.M=u.q.extend({h:function(a,c){u.q.call(this,a,c);this.selected(c.selected)}});
+u.M.prototype.e=function(a,c){return u.q.prototype.e.call(this,"li",u.k.B({className:"vjs-menu-item",innerHTML:this.g.label},c))};u.M.prototype.p=function(){this.selected(f)};u.M.prototype.selected=function(a){a?(this.n("vjs-selected"),this.a.setAttribute("aria-selected",f)):(this.t("vjs-selected"),this.a.setAttribute("aria-selected",l))};
+u.R=u.q.extend({h:function(a,c){u.q.call(this,a,c);this.ua=this.La();this.X(this.ua);this.K&&0===this.K.length&&this.D();this.d("keyup",this.aa);this.a.setAttribute("aria-haspopup",f);this.a.setAttribute("role","button")}});t=u.R.prototype;t.na=l;t.La=function(){var a=new u.la(this.c);this.options().title&&a.u().appendChild(u.e("li",{className:"vjs-menu-title",innerHTML:u.Y(this.A),Ad:-1}));if(this.K=this.createItems())for(var c=0;c<this.K.length;c++)ca(a,this.K[c]);return a};t.qa=m();
+t.P=function(){return this.className+" vjs-menu-button "+u.q.prototype.P.call(this)};t.Pa=m();t.Oa=m();t.p=function(){this.T("mouseout",u.bind(this,function(){D(this.ua);this.a.blur()}));this.na?G(this):H(this)};t.aa=function(a){a.preventDefault();32==a.which||13==a.which?this.na?G(this):H(this):27==a.which&&this.na&&G(this)};function H(a){a.na=f;a.ua.n("vjs-lock-showing");a.a.setAttribute("aria-pressed",f);a.K&&0<a.K.length&&a.K[0].u().focus()}
+function G(a){a.na=l;D(a.ua);a.a.setAttribute("aria-pressed",l)}
+u.Player=u.b.extend({h:function(a,c,d){this.L=a;a.id=a.id||"vjs_video_"+u.s++;c=u.k.B(da(a),c);this.v={};this.rc=c.poster;this.rb=c.controls;a.controls=l;c.tc=l;u.b.call(this,this,c,d);this.controls()?this.n("vjs-controls-enabled"):this.n("vjs-controls-disabled");this.T("play",function(a){u.j(this.a,{type:"firstplay",target:this.a})||(a.preventDefault(),a.stopPropagation(),a.stopImmediatePropagation())});this.d("ended",this.kd);this.d("play",this.Kb);this.d("firstplay",this.ld);this.d("pause",this.Jb);
+this.d("progress",this.nd);this.d("durationchange",this.pc);this.d("error",this.Gb);this.d("fullscreenchange",this.md);u.va[this.Q]=this;c.plugins&&u.k.ra(c.plugins,function(a,c){this[a](c)},this);var e,g,j,k;e=u.bind(this,this.reportUserActivity);this.d("mousedown",function(){e();clearInterval(g);g=setInterval(e,250)});this.d("mousemove",e);this.d("mouseup",function(){e();clearInterval(g)});this.d("keydown",e);this.d("keyup",e);j=setInterval(u.bind(this,function(){this.ia&&(this.ia=l,this.userActive(f),
+clearTimeout(k),k=setTimeout(u.bind(this,function(){this.ia||this.userActive(l)}),2E3))}),250);this.d("dispose",function(){clearInterval(j);clearTimeout(k)})}});t=u.Player.prototype;t.g=u.options;t.dispose=function(){this.j("dispose");this.o("dispose");u.va[this.Q]=h;this.L&&this.L.player&&(this.L.player=h);this.a&&this.a.player&&(this.a.player=h);clearInterval(this.Sa);this.wa();this.i&&this.i.dispose();u.b.prototype.dispose.call(this)};
+function da(a){var c={sources:[],tracks:[]};u.k.B(c,u.wb(a));if(a.hasChildNodes()){var d,e,g,j;a=a.childNodes;g=0;for(j=a.length;g<j;g++)d=a[g],e=d.nodeName.toLowerCase(),"source"===e?c.sources.push(u.wb(d)):"track"===e&&c.tracks.push(u.wb(d))}return c}
+t.e=function(){var a=this.a=u.b.prototype.e.call(this,"div"),c=this.L;c.removeAttribute("width");c.removeAttribute("height");if(c.hasChildNodes()){var d,e,g,j,k;d=c.childNodes;e=d.length;for(k=[];e--;)g=d[e],j=g.nodeName.toLowerCase(),"track"===j&&k.push(g);for(d=0;d<k.length;d++)c.removeChild(k[d])}a.id=c.id;a.className=c.className;c.id+="_html5_api";c.className="vjs-tech";c.player=a.player=this;this.n("vjs-paused");this.width(this.g.width,f);this.height(this.g.height,f);c.parentNode&&c.parentNode.insertBefore(a,
+c);u.yb(c,a);return a};
+function I(a,c,d){a.i&&(a.$=l,a.i.dispose(),a.Db&&(a.Db=l,clearInterval(a.Sa)),a.Eb&&J(a),a.i=l);"Html5"!==c&&a.L&&(u.l.fc(a.L),a.L=h);a.xa=c;a.$=l;var e=u.k.B({source:d,parentEl:a.a},a.g[c.toLowerCase()]);d&&(d.src==a.v.src&&0<a.v.currentTime&&(e.startTime=a.v.currentTime),a.v.src=d.src);a.i=new window.videojs[c](a,e);a.i.H(function(){this.c.Wa();if(!this.m.progressEvents){var a=this.c;a.Db=f;a.Sa=setInterval(u.bind(a,function(){this.v.mb<this.buffered().end(0)?this.j("progress"):1==this.bufferedPercent()&&
+(clearInterval(this.Sa),this.j("progress"))}),500);a.i.T("progress",function(){this.m.progressEvents=f;var a=this.c;a.Db=l;clearInterval(a.Sa)})}this.m.timeupdateEvents||(a=this.c,a.Eb=f,a.d("play",a.Ac),a.d("pause",a.wa),a.i.T("timeupdate",function(){this.m.timeupdateEvents=f;J(this.c)}))})}function J(a){a.Eb=l;a.wa();a.o("play",a.Ac);a.o("pause",a.wa)}t.Ac=function(){this.ec&&this.wa();this.ec=setInterval(u.bind(this,function(){this.j("timeupdate")}),250)};t.wa=function(){clearInterval(this.ec)};
+t.Kb=function(){u.t(this.a,"vjs-paused");u.n(this.a,"vjs-playing")};t.ld=function(){this.g.starttime&&this.currentTime(this.g.starttime);this.n("vjs-has-started")};t.Jb=function(){u.t(this.a,"vjs-playing");u.n(this.a,"vjs-paused")};t.nd=function(){1==this.bufferedPercent()&&this.j("loadedalldata")};t.kd=function(){this.g.loop&&(this.currentTime(0),this.play())};t.pc=function(){var a=K(this,"duration");a&&this.duration(a)};t.md=function(){this.isFullScreen()?this.n("vjs-fullscreen"):this.t("vjs-fullscreen")};
+t.Gb=function(a){u.log("Video Error",a)};function L(a,c,d){if(a.i&&!a.i.$)a.i.H(function(){this[c](d)});else try{a.i[c](d)}catch(e){throw u.log(e),e;}}function K(a,c){if(a.i&&a.i.$)try{return a.i[c]()}catch(d){throw a.i[c]===b?u.log("Video.js: "+c+" method not defined for "+a.xa+" playback technology.",d):"TypeError"==d.name?(u.log("Video.js: "+c+" unavailable on "+a.xa+" playback technology element.",d),a.i.$=l):u.log(d),d;}}t.play=function(){L(this,"play");return this};
+t.pause=function(){L(this,"pause");return this};t.paused=function(){return K(this,"paused")===l?l:f};t.currentTime=function(a){return a!==b?(L(this,"setCurrentTime",a),this.Eb&&this.j("timeupdate"),this):this.v.currentTime=K(this,"currentTime")||0};t.duration=function(a){if(a!==b)return this.v.duration=parseFloat(a),this;this.v.duration===b&&this.pc();return this.v.duration||0};
+t.buffered=function(){var a=K(this,"buffered"),c=a.length-1,d=this.v.mb=this.v.mb||0;a&&(0<=c&&a.end(c)!==d)&&(d=a.end(c),this.v.mb=d);return u.sb(0,d)};t.bufferedPercent=function(){return this.duration()?this.buffered().end(0)/this.duration():0};t.volume=function(a){if(a!==b)return a=Math.max(0,Math.min(1,parseFloat(a))),this.v.volume=a,L(this,"setVolume",a),u.ud(a),this;a=parseFloat(K(this,"volume"));return isNaN(a)?1:a};
+t.muted=function(a){return a!==b?(L(this,"setMuted",a),this):K(this,"muted")||l};t.Va=function(){return K(this,"supportsFullScreen")||l};t.nc=l;t.isFullScreen=function(a){return a!==b?(this.nc=a,this):this.nc};
+t.requestFullScreen=function(){var a=u.Nb.requestFullScreen;this.isFullScreen(f);a?(u.d(document,a.ub,u.bind(this,function(c){this.isFullScreen(document[a.isFullScreen]);this.isFullScreen()===l&&u.o(document,a.ub,arguments.callee);this.j("fullscreenchange")})),this.a[a.uc]()):this.i.Va()?L(this,"enterFullScreen"):(this.ed=f,this.Yc=document.documentElement.style.overflow,u.d(document,"keydown",u.bind(this,this.ic)),document.documentElement.style.overflow="hidden",u.n(document.body,"vjs-full-window"),
+this.j("enterFullWindow"),this.j("fullscreenchange"));return this};t.cancelFullScreen=function(){var a=u.Nb.requestFullScreen;this.isFullScreen(l);if(a)document[a.ob]();else this.i.Va()?L(this,"exitFullScreen"):(M(this),this.j("fullscreenchange"));return this};t.ic=function(a){27===a.keyCode&&(this.isFullScreen()===f?this.cancelFullScreen():M(this))};
+function M(a){a.ed=l;u.o(document,"keydown",a.ic);document.documentElement.style.overflow=a.Yc;u.t(document.body,"vjs-full-window");a.j("exitFullWindow")}
+t.src=function(a){if(a instanceof Array){var c;a:{c=a;for(var d=0,e=this.g.techOrder;d<e.length;d++){var g=u.Y(e[d]),j=window.videojs[g];if(j.isSupported())for(var k=0,q=c;k<q.length;k++){var n=q[k];if(j.canPlaySource(n)){c={source:n,i:g};break a}}}c=l}c?(a=c.source,c=c.i,c==this.xa?this.src(a):I(this,c,a)):this.a.appendChild(u.e("p",{innerHTML:this.options().notSupportedMessage}))}else a instanceof Object?window.videojs[this.xa].canPlaySource(a)?this.src(a.src):this.src([a]):(this.v.src=a,this.$?
+(L(this,"src",a),"auto"==this.g.preload&&this.load(),this.g.autoplay&&this.play()):this.H(function(){this.src(a)}));return this};t.load=function(){L(this,"load");return this};t.currentSrc=function(){return K(this,"currentSrc")||this.v.src||""};t.Ra=function(a){return a!==b?(L(this,"setPreload",a),this.g.preload=a,this):K(this,"preload")};t.autoplay=function(a){return a!==b?(L(this,"setAutoplay",a),this.g.autoplay=a,this):K(this,"autoplay")};
+t.loop=function(a){return a!==b?(L(this,"setLoop",a),this.g.loop=a,this):K(this,"loop")};t.poster=function(a){if(a===b)return this.rc;this.rc=a;L(this,"setPoster",a);this.j("posterchange")};t.controls=function(a){return a!==b?(a=!!a,this.rb!==a&&((this.rb=a)?(this.t("vjs-controls-disabled"),this.n("vjs-controls-enabled"),this.j("controlsenabled")):(this.t("vjs-controls-enabled"),this.n("vjs-controls-disabled"),this.j("controlsdisabled"))),this):this.rb};u.Player.prototype.Pb;t=u.Player.prototype;
+t.usingNativeControls=function(a){return a!==b?(a=!!a,this.Pb!==a&&((this.Pb=a)?(this.n("vjs-using-native-controls"),this.j("usingnativecontrols")):(this.t("vjs-using-native-controls"),this.j("usingcustomcontrols"))),this):this.Pb};t.error=function(){return K(this,"error")};t.ended=function(){return K(this,"ended")};t.seeking=function(){return K(this,"seeking")};t.ia=f;t.reportUserActivity=function(){this.ia=f};t.Ob=f;
+t.userActive=function(a){return a!==b?(a=!!a,a!==this.Ob&&((this.Ob=a)?(this.ia=f,this.t("vjs-user-inactive"),this.n("vjs-user-active"),this.j("useractive")):(this.ia=l,this.i.T("mousemove",function(a){a.stopPropagation();a.preventDefault()}),this.t("vjs-user-active"),this.n("vjs-user-inactive"),this.j("userinactive"))),this):this.Ob};var N,O,P;P=document.createElement("div");O={};
+P.Jd!==b?(O.uc="requestFullscreen",O.ob="exitFullscreen",O.ub="fullscreenchange",O.isFullScreen="fullScreen"):(document.mozCancelFullScreen?(N="moz",O.isFullScreen=N+"FullScreen"):(N="webkit",O.isFullScreen=N+"IsFullScreen"),P[N+"RequestFullScreen"]&&(O.uc=N+"RequestFullScreen",O.ob=N+"CancelFullScreen"),O.ub=N+"fullscreenchange");document[O.ob]&&(u.Nb.requestFullScreen=O);u.Ca=u.b.extend();
+u.Ca.prototype.g={Od:"play",children:{playToggle:{},currentTimeDisplay:{},timeDivider:{},durationDisplay:{},remainingTimeDisplay:{},progressControl:{},fullscreenToggle:{},volumeControl:{},muteToggle:{}}};u.Ca.prototype.e=function(){return u.e("div",{className:"vjs-control-bar"})};u.Wb=u.q.extend({h:function(a,c){u.q.call(this,a,c);a.d("play",u.bind(this,this.Kb));a.d("pause",u.bind(this,this.Jb))}});t=u.Wb.prototype;t.oa="Play";t.P=function(){return"vjs-play-control "+u.q.prototype.P.call(this)};
+t.p=function(){this.c.paused()?this.c.play():this.c.pause()};t.Kb=function(){u.t(this.a,"vjs-paused");u.n(this.a,"vjs-playing");this.a.children[0].children[0].innerHTML="Pause"};t.Jb=function(){u.t(this.a,"vjs-playing");u.n(this.a,"vjs-paused");this.a.children[0].children[0].innerHTML="Play"};u.$a=u.b.extend({h:function(a,c){u.b.call(this,a,c);a.d("timeupdate",u.bind(this,this.ca))}});
+u.$a.prototype.e=function(){var a=u.b.prototype.e.call(this,"div",{className:"vjs-current-time vjs-time-controls vjs-control"});this.F=u.e("div",{className:"vjs-current-time-display",innerHTML:'<span class="vjs-control-text">Current Time </span>0:00',"aria-live":"off"});a.appendChild(this.F);return a};u.$a.prototype.ca=function(){var a=this.c.Ua?this.c.v.currentTime:this.c.currentTime();this.F.innerHTML='<span class="vjs-control-text">Current Time </span>'+u.ta(a,this.c.duration())};
+u.ab=u.b.extend({h:function(a,c){u.b.call(this,a,c);a.d("timeupdate",u.bind(this,this.ca))}});u.ab.prototype.e=function(){var a=u.b.prototype.e.call(this,"div",{className:"vjs-duration vjs-time-controls vjs-control"});this.F=u.e("div",{className:"vjs-duration-display",innerHTML:'<span class="vjs-control-text">Duration Time </span>0:00',"aria-live":"off"});a.appendChild(this.F);return a};
+u.ab.prototype.ca=function(){var a=this.c.duration();a&&(this.F.innerHTML='<span class="vjs-control-text">Duration Time </span>'+u.ta(a))};u.ac=u.b.extend({h:function(a,c){u.b.call(this,a,c)}});u.ac.prototype.e=function(){return u.b.prototype.e.call(this,"div",{className:"vjs-time-divider",innerHTML:"<div><span>/</span></div>"})};u.gb=u.b.extend({h:function(a,c){u.b.call(this,a,c);a.d("timeupdate",u.bind(this,this.ca))}});
+u.gb.prototype.e=function(){var a=u.b.prototype.e.call(this,"div",{className:"vjs-remaining-time vjs-time-controls vjs-control"});this.F=u.e("div",{className:"vjs-remaining-time-display",innerHTML:'<span class="vjs-control-text">Remaining Time </span>-0:00',"aria-live":"off"});a.appendChild(this.F);return a};u.gb.prototype.ca=function(){this.c.duration()&&(this.F.innerHTML='<span class="vjs-control-text">Remaining Time </span>-'+u.ta(this.c.duration()-this.c.currentTime()))};
+u.Da=u.q.extend({h:function(a,c){u.q.call(this,a,c)}});u.Da.prototype.oa="Fullscreen";u.Da.prototype.P=function(){return"vjs-fullscreen-control "+u.q.prototype.P.call(this)};u.Da.prototype.p=function(){this.c.isFullScreen()?(this.c.cancelFullScreen(),this.a.children[0].children[0].innerHTML="Fullscreen"):(this.c.requestFullScreen(),this.a.children[0].children[0].innerHTML="Non-Fullscreen")};u.fb=u.b.extend({h:function(a,c){u.b.call(this,a,c)}});u.fb.prototype.g={children:{seekBar:{}}};
+u.fb.prototype.e=function(){return u.b.prototype.e.call(this,"div",{className:"vjs-progress-control vjs-control"})};u.Xb=u.N.extend({h:function(a,c){u.N.call(this,a,c);a.d("timeupdate",u.bind(this,this.za));a.H(u.bind(this,this.za))}});t=u.Xb.prototype;t.g={children:{loadProgressBar:{},playProgressBar:{},seekHandle:{}},barName:"playProgressBar",handleName:"seekHandle"};t.qc="timeupdate";t.e=function(){return u.N.prototype.e.call(this,"div",{className:"vjs-progress-holder","aria-label":"video progress bar"})};
+t.za=function(){var a=this.c.Ua?this.c.v.currentTime:this.c.currentTime();this.a.setAttribute("aria-valuenow",u.round(100*this.xb(),2));this.a.setAttribute("aria-valuetext",u.ta(a,this.c.duration()))};t.xb=function(){return this.c.currentTime()/this.c.duration()};t.Qa=function(a){u.N.prototype.Qa.call(this,a);this.c.Ua=f;this.Ed=!this.c.paused();this.c.pause()};t.Hb=function(a){a=F(this,a)*this.c.duration();a==this.c.duration()&&(a-=0.1);this.c.currentTime(a)};
+t.Ib=function(a){u.N.prototype.Ib.call(this,a);this.c.Ua=l;this.Ed&&this.c.play()};t.xc=function(){this.c.currentTime(this.c.currentTime()+5)};t.wc=function(){this.c.currentTime(this.c.currentTime()-5)};u.cb=u.b.extend({h:function(a,c){u.b.call(this,a,c);a.d("progress",u.bind(this,this.update))}});u.cb.prototype.e=function(){return u.b.prototype.e.call(this,"div",{className:"vjs-load-progress",innerHTML:'<span class="vjs-control-text">Loaded: 0%</span>'})};
+u.cb.prototype.update=function(){this.a.style&&(this.a.style.width=u.round(100*this.c.bufferedPercent(),2)+"%")};u.Vb=u.b.extend({h:function(a,c){u.b.call(this,a,c)}});u.Vb.prototype.e=function(){return u.b.prototype.e.call(this,"div",{className:"vjs-play-progress",innerHTML:'<span class="vjs-control-text">Progress: 0%</span>'})};u.Fa=u.V.extend({h:function(a,c){u.V.call(this,a,c);a.d("timeupdate",u.bind(this,this.ca))}});u.Fa.prototype.defaultValue="00:00";
+u.Fa.prototype.e=function(){return u.V.prototype.e.call(this,"div",{className:"vjs-seek-handle","aria-live":"off"})};u.Fa.prototype.ca=function(){var a=this.c.Ua?this.c.v.currentTime:this.c.currentTime();this.a.innerHTML='<span class="vjs-control-text">'+u.ta(a,this.c.duration())+"</span>"};u.ib=u.b.extend({h:function(a,c){u.b.call(this,a,c);a.i&&(a.i.m&&a.i.m.volumeControl===l)&&this.n("vjs-hidden");a.d("loadstart",u.bind(this,function(){a.i.m&&a.i.m.volumeControl===l?this.n("vjs-hidden"):this.t("vjs-hidden")}))}});
+u.ib.prototype.g={children:{volumeBar:{}}};u.ib.prototype.e=function(){return u.b.prototype.e.call(this,"div",{className:"vjs-volume-control vjs-control"})};u.hb=u.N.extend({h:function(a,c){u.N.call(this,a,c);a.d("volumechange",u.bind(this,this.za));a.H(u.bind(this,this.za));setTimeout(u.bind(this,this.update),0)}});t=u.hb.prototype;t.za=function(){this.a.setAttribute("aria-valuenow",u.round(100*this.c.volume(),2));this.a.setAttribute("aria-valuetext",u.round(100*this.c.volume(),2)+"%")};
+t.g={children:{volumeLevel:{},volumeHandle:{}},barName:"volumeLevel",handleName:"volumeHandle"};t.qc="volumechange";t.e=function(){return u.N.prototype.e.call(this,"div",{className:"vjs-volume-bar","aria-label":"volume level"})};t.Hb=function(a){this.c.muted()&&this.c.muted(l);this.c.volume(F(this,a))};t.xb=function(){return this.c.muted()?0:this.c.volume()};t.xc=function(){this.c.volume(this.c.volume()+0.1)};t.wc=function(){this.c.volume(this.c.volume()-0.1)};
+u.bc=u.b.extend({h:function(a,c){u.b.call(this,a,c)}});u.bc.prototype.e=function(){return u.b.prototype.e.call(this,"div",{className:"vjs-volume-level",innerHTML:'<span class="vjs-control-text"></span>'})};u.jb=u.V.extend();u.jb.prototype.defaultValue="00:00";u.jb.prototype.e=function(){return u.V.prototype.e.call(this,"div",{className:"vjs-volume-handle"})};
+u.da=u.q.extend({h:function(a,c){u.q.call(this,a,c);a.d("volumechange",u.bind(this,this.update));a.i&&(a.i.m&&a.i.m.volumeControl===l)&&this.n("vjs-hidden");a.d("loadstart",u.bind(this,function(){a.i.m&&a.i.m.volumeControl===l?this.n("vjs-hidden"):this.t("vjs-hidden")}))}});u.da.prototype.e=function(){return u.q.prototype.e.call(this,"div",{className:"vjs-mute-control vjs-control",innerHTML:'<div><span class="vjs-control-text">Mute</span></div>'})};
+u.da.prototype.p=function(){this.c.muted(this.c.muted()?l:f)};u.da.prototype.update=function(){var a=this.c.volume(),c=3;0===a||this.c.muted()?c=0:0.33>a?c=1:0.67>a&&(c=2);this.c.muted()?"Unmute"!=this.a.children[0].children[0].innerHTML&&(this.a.children[0].children[0].innerHTML="Unmute"):"Mute"!=this.a.children[0].children[0].innerHTML&&(this.a.children[0].children[0].innerHTML="Mute");for(a=0;4>a;a++)u.t(this.a,"vjs-vol-"+a);u.n(this.a,"vjs-vol-"+c)};
+u.ma=u.R.extend({h:function(a,c){u.R.call(this,a,c);a.d("volumechange",u.bind(this,this.update));a.i&&(a.i.m&&a.i.m.Bc===l)&&this.n("vjs-hidden");a.d("loadstart",u.bind(this,function(){a.i.m&&a.i.m.Bc===l?this.n("vjs-hidden"):this.t("vjs-hidden")}));this.n("vjs-menu-button")}});u.ma.prototype.La=function(){var a=new u.la(this.c,{Tc:"div"}),c=new u.hb(this.c,u.k.B({Dd:f},this.g.Xd));a.X(c);return a};u.ma.prototype.p=function(){u.da.prototype.p.call(this);u.R.prototype.p.call(this)};
+u.ma.prototype.e=function(){return u.q.prototype.e.call(this,"div",{className:"vjs-volume-menu-button vjs-menu-button vjs-control",innerHTML:'<div><span class="vjs-control-text">Mute</span></div>'})};u.ma.prototype.update=u.da.prototype.update;u.Ea=u.q.extend({h:function(a,c){u.q.call(this,a,c);a.poster()&&this.src(a.poster());(!a.poster()||!a.controls())&&this.D();a.d("posterchange",u.bind(this,function(){this.src(a.poster())}));a.d("play",u.bind(this,this.D))}});var Q="backgroundSize"in u.ea.style;
+u.Ea.prototype.e=function(){var a=u.e("div",{className:"vjs-poster",tabIndex:-1});Q||a.appendChild(u.e("img"));return a};u.Ea.prototype.src=function(a){var c=this.u();a!==b&&(Q?c.style.backgroundImage='url("'+a+'")':c.firstChild.src=a)};u.Ea.prototype.p=function(){this.C().controls()&&this.c.play()};
+u.Ub=u.b.extend({h:function(a,c){u.b.call(this,a,c);a.d("canplay",u.bind(this,this.D));a.d("canplaythrough",u.bind(this,this.D));a.d("playing",u.bind(this,this.D));a.d("seeked",u.bind(this,this.D));a.d("seeking",u.bind(this,this.show));a.d("seeked",u.bind(this,this.D));a.d("error",u.bind(this,this.show));a.d("waiting",u.bind(this,this.show))}});u.Ub.prototype.e=function(){return u.b.prototype.e.call(this,"div",{className:"vjs-loading-spinner"})};u.Ya=u.q.extend();
+u.Ya.prototype.e=function(){return u.q.prototype.e.call(this,"div",{className:"vjs-big-play-button",innerHTML:'<span aria-hidden="true"></span>',"aria-label":"play video"})};u.Ya.prototype.p=function(){this.c.play()};
+u.r=u.b.extend({h:function(a,c,d){c=c||{};c.tc=l;u.b.call(this,a,c,d);var e,g;g=this;e=this.C();a=function(){if(e.controls()&&!e.usingNativeControls()){var a;g.d("mousedown",g.p);g.d("touchstart",function(c){c.preventDefault();a=this.c.userActive()});g.d("touchmove",function(){a&&this.C().reportUserActivity()});var c,d,n,s;c=0;g.d("touchstart",function(){c=(new Date).getTime();n=f});s=function(){n=l};g.d("touchmove",s);g.d("touchleave",s);g.d("touchcancel",s);g.d("touchend",function(){n===f&&(d=(new Date).getTime()-
+c,250>d&&this.j("tap"))});g.d("tap",g.od)}};c=u.bind(g,g.rd);this.H(a);e.d("controlsenabled",a);e.d("controlsdisabled",c)}});u.r.prototype.rd=function(){this.o("tap");this.o("touchstart");this.o("touchmove");this.o("touchleave");this.o("touchcancel");this.o("touchend");this.o("click");this.o("mousedown")};u.r.prototype.p=function(a){0===a.button&&this.C().controls()&&(this.C().paused()?this.C().play():this.C().pause())};u.r.prototype.od=function(){this.C().userActive(!this.C().userActive())};
+u.r.prototype.m={volumeControl:f,fullscreenResize:l,progressEvents:l,timeupdateEvents:l};u.media={};u.media.Xa="play pause paused currentTime setCurrentTime duration buffered volume setVolume muted setMuted width height supportsFullScreen enterFullScreen src load currentSrc preload setPreload autoplay setAutoplay loop setLoop error networkState readyState seeking initialTime startOffsetTime played seekable ended videoTracks audioTracks videoWidth videoHeight textTracks defaultPlaybackRate playbackRate mediaGroup controller controls defaultMuted".split(" ");
+function ea(){var a=u.media.Xa[i];return function(){throw Error('The "'+a+"\" method is not available on the playback technology's API");}}for(var i=u.media.Xa.length-1;0<=i;i--)u.r.prototype[u.media.Xa[i]]=ea();
+u.l=u.r.extend({h:function(a,c,d){this.m.volumeControl=u.l.Sc();this.m.movingMediaElementInDOM=!u.Hc;this.m.fullscreenResize=f;u.r.call(this,a,c,d);for(d=u.l.bb.length-1;0<=d;d--)u.d(this.a,u.l.bb[d],u.bind(this.c,this.$c));(c=c.source)&&this.a.currentSrc===c.src&&0<this.a.networkState?a.j("loadstart"):c&&(this.a.src=c.src);if(u.Zb&&a.options().nativeControlsForTouch!==l){var e,g,j,k;e=this;g=this.C();c=g.controls();e.a.controls=!!c;j=function(){e.a.controls=f};k=function(){e.a.controls=l};g.d("controlsenabled",
+j);g.d("controlsdisabled",k);c=function(){g.o("controlsenabled",j);g.o("controlsdisabled",k)};e.d("dispose",c);g.d("usingcustomcontrols",c);g.usingNativeControls(f)}a.H(function(){this.L&&(this.g.autoplay&&this.paused())&&(delete this.L.poster,this.play())});this.Wa()}});t=u.l.prototype;t.dispose=function(){u.r.prototype.dispose.call(this)};
+t.e=function(){var a=this.c,c=a.L,d;if(!c||this.m.movingMediaElementInDOM===l)c?(d=c.cloneNode(l),u.l.fc(c),c=d,a.L=h):c=u.e("video",{id:a.id()+"_html5_api",className:"vjs-tech"}),c.player=a,u.yb(c,a.u());d=["autoplay","preload","loop","muted"];for(var e=d.length-1;0<=e;e--){var g=d[e];a.g[g]!==h&&(c[g]=a.g[g])}return c};t.$c=function(a){this.j(a);a.stopPropagation()};t.play=function(){this.a.play()};t.pause=function(){this.a.pause()};t.paused=function(){return this.a.paused};t.currentTime=function(){return this.a.currentTime};
+t.td=function(a){try{this.a.currentTime=a}catch(c){u.log(c,"Video is not ready. (Video.js)")}};t.duration=function(){return this.a.duration||0};t.buffered=function(){return this.a.buffered};t.volume=function(){return this.a.volume};t.yd=function(a){this.a.volume=a};t.muted=function(){return this.a.muted};t.wd=function(a){this.a.muted=a};t.width=function(){return this.a.offsetWidth};t.height=function(){return this.a.offsetHeight};
+t.Va=function(){return"function"==typeof this.a.webkitEnterFullScreen&&(/Android/.test(u.I)||!/Chrome|Mac OS X 10.5/.test(u.I))?f:l};t.gc=function(){var a=this.a;a.paused&&a.networkState<=a.Gd?(this.a.play(),setTimeout(function(){a.pause();a.webkitEnterFullScreen()},0)):a.webkitEnterFullScreen()};t.ad=function(){this.a.webkitExitFullScreen()};t.src=function(a){this.a.src=a};t.load=function(){this.a.load()};t.currentSrc=function(){return this.a.currentSrc};t.poster=function(){return this.a.poster};
+t.Ra=function(){return this.a.Ra};t.xd=function(a){this.a.Ra=a};t.autoplay=function(){return this.a.autoplay};t.sd=function(a){this.a.autoplay=a};t.controls=function(){return this.a.controls};t.loop=function(){return this.a.loop};t.vd=function(a){this.a.loop=a};t.error=function(){return this.a.error};t.seeking=function(){return this.a.seeking};t.ended=function(){return this.a.ended};u.l.isSupported=function(){return!!u.ea.canPlayType};u.l.nb=function(a){try{return!!u.ea.canPlayType(a.type)}catch(c){return""}};
+u.l.Sc=function(){var a=u.ea.volume;u.ea.volume=a/2+0.1;return a!==u.ea.volume};u.l.bb="loadstart suspend abort error emptied stalled loadedmetadata loadeddata canplay canplaythrough playing waiting seeking seeked ended durationchange timeupdate progress play pause ratechange volumechange".split(" ");u.l.fc=function(a){if(a){a.player=h;for(a.parentNode&&a.parentNode.removeChild(a);a.hasChildNodes();)a.removeChild(a.firstChild);a.removeAttribute("src");"function"===typeof a.load&&a.load()}};
+u.Lc&&(document.createElement("video").constructor.prototype.canPlayType=function(a){return a&&-1!=a.toLowerCase().indexOf("video/mp4")?"maybe":""});
+u.f=u.r.extend({h:function(a,c,d){u.r.call(this,a,c,d);var e=c.source;d=c.parentEl;var g=this.a=u.e("div",{id:a.id()+"_temp_flash"}),j=a.id()+"_flash_api";a=a.g;var k=u.k.B({readyFunction:"videojs.Flash.onReady",eventProxyFunction:"videojs.Flash.onEvent",errorEventProxyFunction:"videojs.Flash.onError",autoplay:a.autoplay,preload:a.Ra,loop:a.loop,muted:a.muted},c.flashVars),q=u.k.B({wmode:"opaque",bgcolor:"#000000"},c.params),n=u.k.B({id:j,name:j,"class":"vjs-tech"},c.attributes),s;e&&(e.type&&u.f.gd(e.type)?
+(a=u.f.yc(e.src),k.rtmpConnection=encodeURIComponent(a.qb),k.rtmpStream=encodeURIComponent(a.Mb)):k.src=encodeURIComponent(u.jc(e.src)));this.setCurrentTime=function(a){s=a;this.a.vjs_setProperty("currentTime",a)};this.currentTime=function(){return this.seeking()?s:this.a.vjs_getProperty("currentTime")};u.yb(g,d);c.startTime&&this.H(function(){this.load();this.play();this.currentTime(c.startTime)});u.Tb&&this.H(function(){u.d(this.u(),"mousemove",u.bind(this,function(){this.C().j({type:"mousemove",
+bubbles:l})}))});if(c.iFrameMode===f&&!u.Tb){var C=u.e("iframe",{id:j+"_iframe",name:j+"_iframe",className:"vjs-tech",scrolling:"no",marginWidth:0,marginHeight:0,frameBorder:0});k.readyFunction="ready";k.eventProxyFunction="events";k.errorEventProxyFunction="errors";u.d(C,"load",u.bind(this,function(){var a,d=C.contentWindow;a=C.contentDocument?C.contentDocument:C.contentWindow.document;a.write(u.f.kc(c.swf,k,q,n));d.player=this.c;d.ready=u.bind(this.c,function(c){var d=this.i;d.a=a.getElementById(c);
+u.f.pb(d)});d.events=u.bind(this.c,function(a,c){this&&"flash"===this.xa&&this.j(c)});d.errors=u.bind(this.c,function(a,c){u.log("Flash Error",c)})}));g.parentNode.replaceChild(C,g)}else u.f.Zc(c.swf,g,k,q,n)}});t=u.f.prototype;t.dispose=function(){u.r.prototype.dispose.call(this)};t.play=function(){this.a.vjs_play()};t.pause=function(){this.a.vjs_pause()};
+t.src=function(a){u.f.fd(a)?(a=u.f.yc(a),this.Sd(a.qb),this.Td(a.Mb)):(a=u.jc(a),this.a.vjs_src(a));if(this.c.autoplay()){var c=this;setTimeout(function(){c.play()},0)}};t.currentSrc=function(){var a=this.a.vjs_getProperty("currentSrc");if(a==h){var c=this.Qd(),d=this.Rd();c&&d&&(a=u.f.zd(c,d))}return a};t.load=function(){this.a.vjs_load()};t.poster=function(){this.a.vjs_getProperty("poster")};t.buffered=function(){return u.sb(0,this.a.vjs_getProperty("buffered"))};t.Va=r(l);t.gc=r(l);
+var R=u.f.prototype,S="rtmpConnection rtmpStream preload defaultPlaybackRate playbackRate autoplay loop mediaGroup controller controls volume muted defaultMuted".split(" "),T="error currentSrc networkState readyState seeking initialTime duration startOffsetTime paused played seekable ended videoTracks audioTracks videoWidth videoHeight textTracks".split(" ");function fa(){var a=S[U],c=a.charAt(0).toUpperCase()+a.slice(1);R["set"+c]=function(c){return this.a.vjs_setProperty(a,c)}}
+function V(a){R[a]=function(){return this.a.vjs_getProperty(a)}}var U;for(U=0;U<S.length;U++)V(S[U]),fa();for(U=0;U<T.length;U++)V(T[U]);u.f.isSupported=function(){return 10<=u.f.version()[0]};u.f.nb=function(a){if(!a.type)return"";a=a.type.replace(/;.*/,"").toLowerCase();if(a in u.f.cd||a in u.f.zc)return"maybe"};u.f.cd={"video/flv":"FLV","video/x-flv":"FLV","video/mp4":"MP4","video/m4v":"MP4"};u.f.zc={"rtmp/mp4":"MP4","rtmp/flv":"FLV"};
+u.f.onReady=function(a){a=u.u(a);var c=a.player||a.parentNode.player,d=c.i;a.player=c;d.a=a;u.f.pb(d)};u.f.pb=function(a){a.u().vjs_getProperty?a.Wa():setTimeout(function(){u.f.pb(a)},50)};u.f.onEvent=function(a,c){u.u(a).player.j(c)};u.f.onError=function(a,c){u.u(a).player.j("error");u.log("Flash Error",c,a)};
+u.f.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(",")};
+u.f.Zc=function(a,c,d,e,g){a=u.f.kc(a,d,e,g);a=u.e("div",{innerHTML:a}).childNodes[0];d=c.parentNode;c.parentNode.replaceChild(a,c);var j=d.childNodes[0];setTimeout(function(){j.style.display="block"},1E3)};
+u.f.kc=function(a,c,d,e){var g="",j="",k="";c&&u.k.ra(c,function(a,c){g+=a+"="+c+"&amp;"});d=u.k.B({movie:a,flashvars:g,allowScriptAccess:"always",allowNetworking:"all"},d);u.k.ra(d,function(a,c){j+='<param name="'+a+'" value="'+c+'" />'});e=u.k.B({data:a,width:"100%",height:"100%"},e);u.k.ra(e,function(a,c){k+=a+'="'+c+'" '});return'<object type="application/x-shockwave-flash"'+k+">"+j+"</object>"};u.f.zd=function(a,c){return a+"&"+c};
+u.f.yc=function(a){var c={qb:"",Mb:""};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.qb=a.substring(0,d);c.Mb=a.substring(e,a.length);return c};u.f.gd=function(a){return a in u.f.zc};u.f.Nc=/^rtmp[set]?:\/\//i;u.f.fd=function(a){return u.f.Nc.test(a)};
+u.Mc=u.b.extend({h:function(a,c,d){u.b.call(this,a,c,d);if(!a.g.sources||0===a.g.sources.length){c=0;for(d=a.g.techOrder;c<d.length;c++){var e=u.Y(d[c]),g=window.videojs[e];if(g&&g.isSupported()){I(a,e);break}}}else a.src(a.g.sources)}});u.Player.prototype.textTracks=function(){return this.ya=this.ya||[]};function W(a,c,d){for(var e=a.ya,g=0,j=e.length,k,q;g<j;g++)k=e[g],k.id()===c?(k.show(),q=k):d&&(k.G()==d&&0<k.mode())&&k.disable();(c=q?q.G():d?d:l)&&a.j(c+"trackchange")}
+u.w=u.b.extend({h:function(a,c){u.b.call(this,a,c);this.Q=c.id||"vjs_"+c.kind+"_"+c.language+"_"+u.s++;this.vc=c.src;this.Wc=c["default"]||c.dflt;this.Bd=c.title;this.Nd=c.srclang;this.hd=c.label;this.Z=[];this.kb=[];this.ga=this.ha=0;this.c.d("fullscreenchange",u.bind(this,this.Pc))}});t=u.w.prototype;t.G=p("A");t.src=p("vc");t.tb=p("Wc");t.title=p("Bd");t.label=p("hd");t.Uc=p("Z");t.Oc=p("kb");t.readyState=p("ha");t.mode=p("ga");
+t.Pc=function(){this.a.style.fontSize=this.c.isFullScreen()?140*(screen.width/this.c.width())+"%":""};t.e=function(){return u.b.prototype.e.call(this,"div",{className:"vjs-"+this.A+" vjs-text-track"})};t.show=function(){X(this);this.ga=2;u.b.prototype.show.call(this)};t.D=function(){X(this);this.ga=1;u.b.prototype.D.call(this)};
+t.disable=function(){2==this.ga&&this.D();this.c.o("timeupdate",u.bind(this,this.update,this.Q));this.c.o("ended",u.bind(this,this.reset,this.Q));this.reset();this.c.fa("textTrackDisplay").removeChild(this);this.ga=0};function X(a){0===a.ha&&a.load();0===a.ga&&(a.c.d("timeupdate",u.bind(a,a.update,a.Q)),a.c.d("ended",u.bind(a,a.reset,a.Q)),("captions"===a.A||"subtitles"===a.A)&&a.c.fa("textTrackDisplay").X(a))}
+t.load=function(){0===this.ha&&(this.ha=1,u.get(this.vc,u.bind(this,this.pd),u.bind(this,this.Gb)))};t.Gb=function(a){this.error=a;this.ha=3;this.j("error")};t.pd=function(a){var c,d;a=a.split("\n");for(var e="",g=1,j=a.length;g<j;g++)if(e=u.trim(a[g])){-1==e.indexOf("--\x3e")?(c=e,e=u.trim(a[++g])):c=this.Z.length;c={id:c,index:this.Z.length};d=e.split(" --\x3e ");c.startTime=Y(d[0]);c.sa=Y(d[1]);for(d=[];a[++g]&&(e=u.trim(a[g]));)d.push(e);c.text=d.join("<br/>");this.Z.push(c)}this.ha=2;this.j("loaded")};
+function Y(a){var c=a.split(":");a=0;var d,e,g;3==c.length?(d=c[0],e=c[1],c=c[2]):(d=0,e=c[0],c=c[1]);c=c.split(/\s+/);c=c.splice(0,1)[0];c=c.split(/\.|,/);g=parseFloat(c[1]);c=c[0];a+=3600*parseFloat(d);a+=60*parseFloat(e);a+=parseFloat(c);g&&(a+=g/1E3);return a}
+t.update=function(){if(0<this.Z.length){var a=this.c.currentTime();if(this.Lb===b||a<this.Lb||this.Na<=a){var c=this.Z,d=this.c.duration(),e=0,g=l,j=[],k,q,n,s;a>=this.Na||this.Na===b?s=this.vb!==b?this.vb:0:(g=f,s=this.Cb!==b?this.Cb:c.length-1);for(;;){n=c[s];if(n.sa<=a)e=Math.max(e,n.sa),n.Ha&&(n.Ha=l);else if(a<n.startTime){if(d=Math.min(d,n.startTime),n.Ha&&(n.Ha=l),!g)break}else g?(j.splice(0,0,n),q===b&&(q=s),k=s):(j.push(n),k===b&&(k=s),q=s),d=Math.min(d,n.sa),e=Math.max(e,n.startTime),n.Ha=
+f;if(g)if(0===s)break;else s--;else if(s===c.length-1)break;else s++}this.kb=j;this.Na=d;this.Lb=e;this.vb=k;this.Cb=q;a=this.kb;c="";d=0;for(e=a.length;d<e;d++)c+='<span class="vjs-tt-cue">'+a[d].text+"</span>";this.a.innerHTML=c;this.j("cuechange")}}};t.reset=function(){this.Na=0;this.Lb=this.c.duration();this.Cb=this.vb=0};u.Rb=u.w.extend();u.Rb.prototype.A="captions";u.Yb=u.w.extend();u.Yb.prototype.A="subtitles";u.Sb=u.w.extend();u.Sb.prototype.A="chapters";
+u.$b=u.b.extend({h:function(a,c,d){u.b.call(this,a,c,d);if(a.g.tracks&&0<a.g.tracks.length){c=this.c;a=a.g.tracks;var e;for(d=0;d<a.length;d++){e=a[d];var g=c,j=e.kind,k=e.label,q=e.language,n=e;e=g.ya=g.ya||[];n=n||{};n.kind=j;n.label=k;n.language=q;j=u.Y(j||"subtitles");g=new window.videojs[j+"Track"](g,n);e.push(g)}}}});u.$b.prototype.e=function(){return u.b.prototype.e.call(this,"div",{className:"vjs-text-track-display"})};
+u.W=u.M.extend({h:function(a,c){var d=this.ba=c.track;c.label=d.label();c.selected=d.tb();u.M.call(this,a,c);this.c.d(d.G()+"trackchange",u.bind(this,this.update))}});u.W.prototype.p=function(){u.M.prototype.p.call(this);W(this.c,this.ba.Q,this.ba.G())};u.W.prototype.update=function(){this.selected(2==this.ba.mode())};u.eb=u.W.extend({h:function(a,c){c.track={G:function(){return c.kind},C:a,label:function(){return c.kind+" off"},tb:r(l),mode:r(l)};u.W.call(this,a,c);this.selected(f)}});
+u.eb.prototype.p=function(){u.W.prototype.p.call(this);W(this.c,this.ba.Q,this.ba.G())};u.eb.prototype.update=function(){for(var a=this.c.textTracks(),c=0,d=a.length,e,g=f;c<d;c++)e=a[c],e.G()==this.ba.G()&&2==e.mode()&&(g=l);this.selected(g)};u.S=u.R.extend({h:function(a,c){u.R.call(this,a,c);1>=this.K.length&&this.D()}});
+u.S.prototype.qa=function(){var a=[],c;a.push(new u.eb(this.c,{kind:this.A}));for(var d=0;d<this.c.textTracks().length;d++)c=this.c.textTracks()[d],c.G()===this.A&&a.push(new u.W(this.c,{track:c}));return a};u.Aa=u.S.extend({h:function(a,c,d){u.S.call(this,a,c,d);this.a.setAttribute("aria-label","Captions Menu")}});u.Aa.prototype.A="captions";u.Aa.prototype.oa="Captions";u.Aa.prototype.className="vjs-captions-button";
+u.Ga=u.S.extend({h:function(a,c,d){u.S.call(this,a,c,d);this.a.setAttribute("aria-label","Subtitles Menu")}});u.Ga.prototype.A="subtitles";u.Ga.prototype.oa="Subtitles";u.Ga.prototype.className="vjs-subtitles-button";u.Ba=u.S.extend({h:function(a,c,d){u.S.call(this,a,c,d);this.a.setAttribute("aria-label","Chapters Menu")}});t=u.Ba.prototype;t.A="chapters";t.oa="Chapters";t.className="vjs-chapters-button";
+t.qa=function(){for(var a=[],c,d=0;d<this.c.textTracks().length;d++)c=this.c.textTracks()[d],c.G()===this.A&&a.push(new u.W(this.c,{track:c}));return a};
+t.La=function(){for(var a=this.c.textTracks(),c=0,d=a.length,e,g,j=this.K=[];c<d;c++)if(e=a[c],e.G()==this.A&&e.tb()){if(2>e.readyState()){this.Kd=e;e.d("loaded",u.bind(this,this.La));return}g=e;break}a=this.ua=new u.la(this.c);a.a.appendChild(u.e("li",{className:"vjs-menu-title",innerHTML:u.Y(this.A),Ad:-1}));if(g){e=g.Z;for(var k,c=0,d=e.length;c<d;c++)k=e[c],k=new u.Za(this.c,{track:g,cue:k}),j.push(k),a.X(k)}0<this.K.length&&this.show();return a};
+u.Za=u.M.extend({h:function(a,c){var d=this.ba=c.track,e=this.cue=c.cue,g=a.currentTime();c.label=e.text;c.selected=e.startTime<=g&&g<e.sa;u.M.call(this,a,c);d.d("cuechange",u.bind(this,this.update))}});u.Za.prototype.p=function(){u.M.prototype.p.call(this);this.c.currentTime(this.cue.startTime);this.update(this.cue.startTime)};u.Za.prototype.update=function(){var a=this.cue,c=this.c.currentTime();this.selected(a.startTime<=c&&c<a.sa)};
+u.k.B(u.Ca.prototype.g.children,{subtitlesButton:{},captionsButton:{},chaptersButton:{}});
+if("undefined"!==typeof window.JSON&&"function"===window.JSON.parse)u.JSON=window.JSON;else{u.JSON={};var Z=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;u.JSON.parse=function(a,c){function d(a,e){var k,q,n=a[e];if(n&&"object"===typeof n)for(k in n)Object.prototype.hasOwnProperty.call(n,k)&&(q=d(n,k),q!==b?n[k]=q:delete n[k]);return c.call(a,e,n)}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");}}
+u.cc=function(){var a,c,d=document.getElementsByTagName("video");if(d&&0<d.length)for(var e=0,g=d.length;e<g;e++)if((c=d[e])&&c.getAttribute)c.player===b&&(a=c.getAttribute("data-setup"),a!==h&&(a=u.JSON.parse(a||"{}"),videojs(c,a)));else{u.lb();break}else u.Cc||u.lb()};u.lb=function(){setTimeout(u.cc,1)};"complete"===document.readyState?u.Cc=f:u.T(window,"load",function(){u.Cc=f});u.lb();u.qd=function(a,c){u.Player.prototype[a]=c};var ga=this;ga.Fd=f;function $(a,c){var d=a.split("."),e=ga;!(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",u);$("_V_",u);$("videojs.options",u.options);$("videojs.players",u.va);$("videojs.TOUCH_ENABLED",u.Zb);$("videojs.cache",u.pa);$("videojs.Component",u.b);u.b.prototype.player=u.b.prototype.C;u.b.prototype.options=u.b.prototype.options;u.b.prototype.init=u.b.prototype.h;u.b.prototype.dispose=u.b.prototype.dispose;u.b.prototype.createEl=u.b.prototype.e;u.b.prototype.contentEl=u.b.prototype.Ka;u.b.prototype.el=u.b.prototype.u;u.b.prototype.addChild=u.b.prototype.X;
+u.b.prototype.getChild=u.b.prototype.fa;u.b.prototype.getChildById=u.b.prototype.dd;u.b.prototype.children=u.b.prototype.children;u.b.prototype.initChildren=u.b.prototype.mc;u.b.prototype.removeChild=u.b.prototype.removeChild;u.b.prototype.on=u.b.prototype.d;u.b.prototype.off=u.b.prototype.o;u.b.prototype.one=u.b.prototype.T;u.b.prototype.trigger=u.b.prototype.j;u.b.prototype.triggerReady=u.b.prototype.Wa;u.b.prototype.show=u.b.prototype.show;u.b.prototype.hide=u.b.prototype.D;
+u.b.prototype.width=u.b.prototype.width;u.b.prototype.height=u.b.prototype.height;u.b.prototype.dimensions=u.b.prototype.Xc;u.b.prototype.ready=u.b.prototype.H;u.b.prototype.addClass=u.b.prototype.n;u.b.prototype.removeClass=u.b.prototype.t;u.b.prototype.buildCSSClass=u.b.prototype.P;u.Player.prototype.ended=u.Player.prototype.ended;$("videojs.MediaLoader",u.Mc);$("videojs.TextTrackDisplay",u.$b);$("videojs.ControlBar",u.Ca);$("videojs.Button",u.q);$("videojs.PlayToggle",u.Wb);
+$("videojs.FullscreenToggle",u.Da);$("videojs.BigPlayButton",u.Ya);$("videojs.LoadingSpinner",u.Ub);$("videojs.CurrentTimeDisplay",u.$a);$("videojs.DurationDisplay",u.ab);$("videojs.TimeDivider",u.ac);$("videojs.RemainingTimeDisplay",u.gb);$("videojs.Slider",u.N);$("videojs.ProgressControl",u.fb);$("videojs.SeekBar",u.Xb);$("videojs.LoadProgressBar",u.cb);$("videojs.PlayProgressBar",u.Vb);$("videojs.SeekHandle",u.Fa);$("videojs.VolumeControl",u.ib);$("videojs.VolumeBar",u.hb);
+$("videojs.VolumeLevel",u.bc);$("videojs.VolumeMenuButton",u.ma);$("videojs.VolumeHandle",u.jb);$("videojs.MuteToggle",u.da);$("videojs.PosterImage",u.Ea);$("videojs.Menu",u.la);$("videojs.MenuItem",u.M);$("videojs.MenuButton",u.R);u.R.prototype.createItems=u.R.prototype.qa;u.S.prototype.createItems=u.S.prototype.qa;u.Ba.prototype.createItems=u.Ba.prototype.qa;$("videojs.SubtitlesButton",u.Ga);$("videojs.CaptionsButton",u.Aa);$("videojs.ChaptersButton",u.Ba);$("videojs.MediaTechController",u.r);
+u.r.prototype.features=u.r.prototype.m;u.r.prototype.m.volumeControl=u.r.prototype.m.Bc;u.r.prototype.m.fullscreenResize=u.r.prototype.m.Ld;u.r.prototype.m.progressEvents=u.r.prototype.m.Pd;u.r.prototype.m.timeupdateEvents=u.r.prototype.m.Ud;$("videojs.Html5",u.l);u.l.Events=u.l.bb;u.l.isSupported=u.l.isSupported;u.l.canPlaySource=u.l.nb;u.l.prototype.setCurrentTime=u.l.prototype.td;u.l.prototype.setVolume=u.l.prototype.yd;u.l.prototype.setMuted=u.l.prototype.wd;u.l.prototype.setPreload=u.l.prototype.xd;
+u.l.prototype.setAutoplay=u.l.prototype.sd;u.l.prototype.setLoop=u.l.prototype.vd;u.l.prototype.enterFullScreen=u.l.prototype.gc;u.l.prototype.exitFullScreen=u.l.prototype.ad;$("videojs.Flash",u.f);u.f.isSupported=u.f.isSupported;u.f.canPlaySource=u.f.nb;u.f.onReady=u.f.onReady;$("videojs.TextTrack",u.w);u.w.prototype.label=u.w.prototype.label;u.w.prototype.kind=u.w.prototype.G;u.w.prototype.mode=u.w.prototype.mode;u.w.prototype.cues=u.w.prototype.Uc;u.w.prototype.activeCues=u.w.prototype.Oc;
+$("videojs.CaptionsTrack",u.Rb);$("videojs.SubtitlesTrack",u.Yb);$("videojs.ChaptersTrack",u.Sb);$("videojs.autoSetup",u.cc);$("videojs.plugin",u.qd);$("videojs.createTimeRange",u.sb);$("videojs.util",u.ja);u.ja.mergeOptions=u.ja.Fb;})();

docs/api/vjs.BigPlayButton.md

@@ -20,9 +20,9 @@ big play button is done via CSS and player states.
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -65,14 +65,14 @@ big play button is done via CSS and player states.
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -81,7 +81,7 @@ big play button is done via CSS and player states.
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -94,7 +94,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -104,7 +104,7 @@ _inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` The constructed class name
 
-_inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_inherited from_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -116,7 +116,7 @@ _inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -127,7 +127,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -141,7 +141,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js/blob/master/src/js/component.js#L190)
+_inherited from_: [src/js/component.js#L194](https://github.com/videojs/video.js/blob/master/src/js/component.js#L194)
 
 ---
 
@@ -155,21 +155,14 @@ _inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -181,12 +174,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -194,7 +214,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -207,32 +227,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -244,12 +269,12 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
 ### init( player, options, ready )
-> the constructor funciton for the class
+> the constructor function for the class
 
 ##### PARAMETERS: 
 * __player__ 
@@ -271,7 +296,7 @@ _inherited from_: [src/js/button.js#L15](https://github.com/videojs/video.js/blo
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -283,7 +308,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -299,7 +324,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -322,7 +347,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -336,7 +361,7 @@ _inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -379,12 +404,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -394,7 +419,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -410,7 +435,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -421,7 +446,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -434,7 +459,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -444,7 +469,7 @@ _inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -460,7 +485,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -470,25 +495,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -497,7 +524,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.Button.md

@@ -20,9 +20,9 @@ Base class for all buttons
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -64,14 +64,14 @@ Base class for all buttons
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -80,7 +80,7 @@ Base class for all buttons
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -93,7 +93,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -103,7 +103,7 @@ _inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` The constructed class name
 
-_inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_inherited from_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -115,7 +115,7 @@ _inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -126,7 +126,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -140,7 +140,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js/blob/master/src/js/component.js#L190)
+_inherited from_: [src/js/component.js#L194](https://github.com/videojs/video.js/blob/master/src/js/component.js#L194)
 
 ---
 
@@ -154,21 +154,14 @@ _inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -180,12 +173,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -193,7 +213,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -206,32 +226,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -243,12 +268,12 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
 ### init( player, options, ready )
-> the constructor funciton for the class
+> the constructor function for the class
 
 ##### PARAMETERS: 
 * __player__ 
@@ -270,7 +295,7 @@ _defined in_: [src/js/button.js#L15](https://github.com/videojs/video.js/blob/ma
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -282,7 +307,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -298,7 +323,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -321,7 +346,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -335,7 +360,7 @@ _inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -378,12 +403,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -393,7 +418,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -409,7 +434,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -420,7 +445,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -433,7 +458,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -443,7 +468,7 @@ _inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -459,7 +484,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -469,25 +494,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -496,7 +523,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.CaptionsButton.md

@@ -21,9 +21,9 @@ The button component for toggling and selecting captions
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [createItems](#createitems) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -65,14 +65,14 @@ The button component for toggling and selecting captions
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -81,7 +81,7 @@ The button component for toggling and selecting captions
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -94,7 +94,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -113,7 +113,7 @@ _inherited from_: [src/js/menu.js#L157](https://github.com/videojs/video.js/blob
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -124,7 +124,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -138,7 +138,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js/blob/master/src/js/component.js#L190)
+_inherited from_: [src/js/component.js#L194](https://github.com/videojs/video.js/blob/master/src/js/component.js#L194)
 
 ---
 
@@ -159,21 +159,14 @@ _inherited from_: [src/js/menu.js#L154](https://github.com/videojs/video.js/blob
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -185,12 +178,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -198,7 +218,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -211,32 +231,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -248,7 +273,7 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
@@ -274,7 +299,7 @@ _defined in_: [src/js/tracks.js#L869](https://github.com/videojs/video.js/blob/m
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -286,7 +311,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -302,7 +327,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -325,7 +350,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -339,7 +364,7 @@ _inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -382,12 +407,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -397,7 +422,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -413,7 +438,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -424,7 +449,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -437,7 +462,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -447,7 +472,7 @@ _inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -463,7 +488,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -473,25 +498,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -500,7 +527,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.CaptionsTrack.md

@@ -28,6 +28,7 @@ The track component for managing the hiding and showing of captions
   - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -94,14 +95,14 @@ _inherited from_: [src/js/tracks.js#L264](https://github.com/videojs/video.js/bl
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -110,7 +111,7 @@ _inherited from_: [src/js/tracks.js#L264](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -123,7 +124,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -141,7 +142,7 @@ _inherited from_: [src/js/tracks.js#L309](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `String` The constructed class name
 
-_inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_inherited from_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -153,7 +154,7 @@ _inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -164,7 +165,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -215,7 +216,7 @@ _inherited from_: [src/js/tracks.js#L190](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
@@ -231,7 +232,7 @@ _inherited from_: [src/js/tracks.js#L371](https://github.com/videojs/video.js/bl
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -243,12 +244,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -256,7 +284,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -269,22 +297,27 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
@@ -306,7 +339,7 @@ _inherited from_: [src/js/tracks.js#L356](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
@@ -331,7 +364,7 @@ _inherited from_: [src/js/tracks.js#L128](https://github.com/videojs/video.js/bl
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -383,7 +416,7 @@ _inherited from_: [src/js/tracks.js#L301](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -399,7 +432,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -422,7 +455,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -436,7 +469,7 @@ _inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -479,12 +512,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -494,7 +527,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -510,7 +543,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -531,7 +564,7 @@ _inherited from_: [src/js/tracks.js#L283](https://github.com/videojs/video.js/bl
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -544,7 +577,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -594,7 +627,7 @@ _inherited from_: [src/js/tracks.js#L204](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -604,25 +637,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -631,7 +666,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.ChaptersButton.md

@@ -21,9 +21,9 @@ The button component for toggling and selecting chapters
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [createItems](#createitems) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -65,14 +65,14 @@ The button component for toggling and selecting chapters
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -81,7 +81,7 @@ The button component for toggling and selecting chapters
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -94,7 +94,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -113,7 +113,7 @@ _inherited from_: [src/js/menu.js#L157](https://github.com/videojs/video.js/blob
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -124,7 +124,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -138,7 +138,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js/blob/master/src/js/component.js#L190)
+_inherited from_: [src/js/component.js#L194](https://github.com/videojs/video.js/blob/master/src/js/component.js#L194)
 
 ---
 
@@ -159,21 +159,14 @@ _inherited from_: [src/js/menu.js#L154](https://github.com/videojs/video.js/blob
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -185,12 +178,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -198,7 +218,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -211,32 +231,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -248,7 +273,7 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
@@ -274,7 +299,7 @@ _defined in_: [src/js/tracks.js#L903](https://github.com/videojs/video.js/blob/m
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -286,7 +311,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -302,7 +327,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -325,7 +350,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -339,7 +364,7 @@ _inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -382,12 +407,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -397,7 +422,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -413,7 +438,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -424,7 +449,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -437,7 +462,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -447,7 +472,7 @@ _inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -463,7 +488,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -473,25 +498,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -500,7 +527,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.ChaptersTrack.md

@@ -28,6 +28,7 @@ The track component for managing the hiding and showing of chapters
   - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -94,14 +95,14 @@ _inherited from_: [src/js/tracks.js#L264](https://github.com/videojs/video.js/bl
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -110,7 +111,7 @@ _inherited from_: [src/js/tracks.js#L264](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -123,7 +124,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -141,7 +142,7 @@ _inherited from_: [src/js/tracks.js#L309](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `String` The constructed class name
 
-_inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_inherited from_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -153,7 +154,7 @@ _inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -164,7 +165,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -215,7 +216,7 @@ _inherited from_: [src/js/tracks.js#L190](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
@@ -231,7 +232,7 @@ _inherited from_: [src/js/tracks.js#L371](https://github.com/videojs/video.js/bl
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -243,12 +244,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -256,7 +284,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -269,22 +297,27 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
@@ -306,7 +339,7 @@ _inherited from_: [src/js/tracks.js#L356](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
@@ -331,7 +364,7 @@ _inherited from_: [src/js/tracks.js#L128](https://github.com/videojs/video.js/bl
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -383,7 +416,7 @@ _inherited from_: [src/js/tracks.js#L301](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -399,7 +432,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -422,7 +455,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -436,7 +469,7 @@ _inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -479,12 +512,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -494,7 +527,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -510,7 +543,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -531,7 +564,7 @@ _inherited from_: [src/js/tracks.js#L283](https://github.com/videojs/video.js/bl
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -544,7 +577,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -594,7 +627,7 @@ _inherited from_: [src/js/tracks.js#L204](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -604,25 +637,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -631,7 +666,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.ChaptersTrackMenuItem.md

@@ -18,9 +18,9 @@ __DEFINED IN__: [src/js/tracks.js#L987](https://github.com/videojs/video.js/blob
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -64,14 +64,14 @@ __DEFINED IN__: [src/js/tracks.js#L987](https://github.com/videojs/video.js/blob
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -80,7 +80,7 @@ __DEFINED IN__: [src/js/tracks.js#L987](https://github.com/videojs/video.js/blob
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -93,7 +93,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -103,7 +103,7 @@ _inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` The constructed class name
 
-_inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_inherited from_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -115,7 +115,7 @@ _inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -126,7 +126,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -151,21 +151,14 @@ _inherited from_: [src/js/menu.js#L64](https://github.com/videojs/video.js/blob/
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -177,12 +170,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -190,7 +210,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -203,32 +223,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -240,7 +265,7 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
@@ -265,7 +290,7 @@ _defined in_: [src/js/tracks.js#L989](https://github.com/videojs/video.js/blob/m
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -277,7 +302,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -293,7 +318,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -316,7 +341,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -337,7 +362,7 @@ _inherited from_: [src/js/menu.js#L74](https://github.com/videojs/video.js/blob/
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -380,12 +405,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -395,7 +420,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -411,7 +436,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -422,7 +447,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -435,7 +460,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -455,7 +480,7 @@ _inherited from_: [src/js/menu.js#L82](https://github.com/videojs/video.js/blob/
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -471,7 +496,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -481,25 +506,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -508,7 +535,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.Component.md

@@ -39,9 +39,9 @@ Components are also event emitters.
   - [contentEl](#contentel)
   - [createEl](#createel-tagname-attributes-)
   - [dimensions](#dimensions-width-height-)
-  - [disable](#disable)
   - [dispose](#dispose)
   - [el](#el)
+  - [enableTouchActivity](#enabletouchactivity)
   - [getChild](#getchild-name-)
   - [getChildById](#getchildbyid-id-)
   - [height](#height-num-skiplisteners-)
@@ -84,14 +84,14 @@ Components are also event emitters.
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -100,7 +100,7 @@ Components are also event emitters.
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_defined in_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_defined in_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -113,7 +113,7 @@ _defined in_: [src/js/component.js#L343](https://github.com/videojs/video.js/blo
 ##### RETURNS: 
 * `vjs.Component` 
 
-_defined in_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_defined in_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -123,7 +123,7 @@ _defined in_: [src/js/component.js#L628](https://github.com/videojs/video.js/blo
 ##### RETURNS: 
 * `String` The constructed class name
 
-_defined in_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_defined in_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -135,7 +135,7 @@ _defined in_: [src/js/component.js#L471](https://github.com/videojs/video.js/blo
 ##### RETURNS: 
 * `Array` The children
 
-_defined in_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_defined in_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -146,7 +146,7 @@ _defined in_: [src/js/component.js#L277](https://github.com/videojs/video.js/blo
 ##### RETURNS: 
 * `Element` 
 
-_defined in_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_defined in_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -160,7 +160,7 @@ _defined in_: [src/js/component.js#L220](https://github.com/videojs/video.js/blo
 ##### RETURNS: 
 * `Element` 
 
-_defined in_: [src/js/component.js#L190](https://github.com/videojs/video.js/blob/master/src/js/component.js#L190)
+_defined in_: [src/js/component.js#L194](https://github.com/videojs/video.js/blob/master/src/js/component.js#L194)
 
 ---
 
@@ -174,21 +174,14 @@ _defined in_: [src/js/component.js#L190](https://github.com/videojs/video.js/blo
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_defined in_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_defined in_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_defined in_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_defined in_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_defined in_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -200,12 +193,39 @@ _defined in_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob
 ##### RETURNS: 
 * `Element` 
 
-_defined in_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_defined in_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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.
+
+_defined in_: [src/js/component.js#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -213,7 +233,7 @@ _defined in_: [src/js/component.js#L201](https://github.com/videojs/video.js/blo
 ##### RETURNS: 
 * `vjs.Component` 
 
-_defined in_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_defined in_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -226,32 +246,37 @@ _defined in_: [src/js/component.js#L311](https://github.com/videojs/video.js/blo
 ##### RETURNS: 
 * `vjs.Component` 
 
-_defined in_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_defined in_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_defined in_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_defined in_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_defined in_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_defined in_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -263,12 +288,12 @@ _defined in_: [src/js/component.js#L659](https://github.com/videojs/video.js/blo
 ##### RETURNS: 
 * `String` 
 
-_defined in_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_defined in_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
 ### init( player, options, ready )
-> the constructor funciton for the class
+> the constructor function for the class
 
 ##### PARAMETERS: 
 * __player__ 
@@ -290,7 +315,7 @@ _defined in_: [src/js/component.js#L41](https://github.com/videojs/video.js/blob
 >       }
 >     }
 
-_defined in_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_defined in_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -302,7 +327,7 @@ _defined in_: [src/js/component.js#L439](https://github.com/videojs/video.js/blo
 ##### RETURNS: 
 * `String` 
 
-_defined in_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_defined in_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -318,7 +343,7 @@ _defined in_: [src/js/component.js#L258](https://github.com/videojs/video.js/blo
 ##### RETURNS: 
 * `vjs.Component` 
 
-_defined in_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_defined in_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -341,7 +366,7 @@ _defined in_: [src/js/component.js#L510](https://github.com/videojs/video.js/blo
 ##### RETURNS: 
 * `vjs.Component` self
 
-_defined in_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_defined in_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -355,7 +380,7 @@ _defined in_: [src/js/component.js#L496](https://github.com/videojs/video.js/blo
 ##### RETURNS: 
 * `vjs.Component` 
 
-_defined in_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_defined in_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -398,12 +423,12 @@ _defined in_: [src/js/component.js#L522](https://github.com/videojs/video.js/blo
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_defined in_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_defined in_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -413,7 +438,7 @@ _defined in_: [src/js/component.js#L169](https://github.com/videojs/video.js/blo
 ##### RETURNS: 
 * `vjs.Player` 
 
-_defined in_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_defined in_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -429,7 +454,7 @@ _defined in_: [src/js/component.js#L116](https://github.com/videojs/video.js/blo
 ##### RETURNS: 
 * `vjs.Component` 
 
-_defined in_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_defined in_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -440,7 +465,7 @@ _defined in_: [src/js/component.js#L581](https://github.com/videojs/video.js/blo
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_defined in_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_defined in_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -453,7 +478,7 @@ _defined in_: [src/js/component.js#L401](https://github.com/videojs/video.js/blo
 ##### RETURNS: 
 * `vjs.Component` 
 
-_defined in_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_defined in_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -463,7 +488,7 @@ _defined in_: [src/js/component.js#L639](https://github.com/videojs/video.js/blo
 ##### RETURNS: 
 * `vjs.Component` 
 
-_defined in_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_defined in_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -479,7 +504,7 @@ _defined in_: [src/js/component.js#L649](https://github.com/videojs/video.js/blo
 ##### RETURNS: 
 * `vjs.Component` self
 
-_defined in_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_defined in_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -489,25 +514,27 @@ _defined in_: [src/js/component.js#L536](https://github.com/videojs/video.js/blo
 ##### RETURNS: 
 * `vjs.Component` 
 
-_defined in_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_defined in_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_defined in_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_defined in_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -516,7 +543,7 @@ _defined in_: [src/js/component.js#L707](https://github.com/videojs/video.js/blo
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_defined in_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_defined in_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.ControlBar.md

@@ -19,9 +19,9 @@ Container of main controls
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -64,14 +64,14 @@ Container of main controls
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -80,7 +80,7 @@ Container of main controls
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -93,7 +93,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -103,7 +103,7 @@ _inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` The constructed class name
 
-_inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_inherited from_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -115,7 +115,7 @@ _inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -126,7 +126,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -140,7 +140,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js/blob/master/src/js/component.js#L190)
+_inherited from_: [src/js/component.js#L194](https://github.com/videojs/video.js/blob/master/src/js/component.js#L194)
 
 ---
 
@@ -154,21 +154,14 @@ _inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -180,12 +173,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -193,7 +213,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -206,32 +226,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -243,12 +268,12 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
 ### init( player, options, ready )
-> the constructor funciton for the class
+> the constructor function for the class
 
 ##### PARAMETERS: 
 * __player__ 
@@ -270,7 +295,7 @@ _inherited from_: [src/js/component.js#L41](https://github.com/videojs/video.js/
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -282,7 +307,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -298,7 +323,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -321,7 +346,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -335,7 +360,7 @@ _inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -378,12 +403,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -393,7 +418,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -409,7 +434,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -420,7 +445,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -433,7 +458,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -443,7 +468,7 @@ _inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -459,7 +484,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -469,25 +494,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -496,7 +523,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.CurrentTimeDisplay.md

@@ -20,9 +20,9 @@ Displays the current time
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -64,14 +64,14 @@ Displays the current time
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -80,7 +80,7 @@ Displays the current time
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -93,7 +93,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -103,7 +103,7 @@ _inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` The constructed class name
 
-_inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_inherited from_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -115,7 +115,7 @@ _inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -126,7 +126,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -140,7 +140,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js/blob/master/src/js/component.js#L190)
+_inherited from_: [src/js/component.js#L194](https://github.com/videojs/video.js/blob/master/src/js/component.js#L194)
 
 ---
 
@@ -154,21 +154,14 @@ _inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -180,12 +173,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -193,7 +213,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -206,32 +226,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -243,7 +268,7 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
@@ -268,7 +293,7 @@ _defined in_: [src/js/control-bar/time-display.js#L9](https://github.com/videojs
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -280,7 +305,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -296,7 +321,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -319,7 +344,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -333,7 +358,7 @@ _inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -376,12 +401,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -391,7 +416,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -407,7 +432,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -418,7 +443,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -431,7 +456,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -441,7 +466,7 @@ _inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -457,7 +482,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -467,25 +492,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -494,7 +521,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.DurationDisplay.md

@@ -20,9 +20,9 @@ Displays the duration
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -64,14 +64,14 @@ Displays the duration
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -80,7 +80,7 @@ Displays the duration
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -93,7 +93,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -103,7 +103,7 @@ _inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` The constructed class name
 
-_inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_inherited from_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -115,7 +115,7 @@ _inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -126,7 +126,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -140,7 +140,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js/blob/master/src/js/component.js#L190)
+_inherited from_: [src/js/component.js#L194](https://github.com/videojs/video.js/blob/master/src/js/component.js#L194)
 
 ---
 
@@ -154,21 +154,14 @@ _inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -180,12 +173,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -193,7 +213,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -206,32 +226,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -243,7 +268,7 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
@@ -268,7 +293,7 @@ _defined in_: [src/js/control-bar/time-display.js#L45](https://github.com/videoj
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -280,7 +305,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -296,7 +321,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -319,7 +344,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -333,7 +358,7 @@ _inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -376,12 +401,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -391,7 +416,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -407,7 +432,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -418,7 +443,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -431,7 +456,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -441,7 +466,7 @@ _inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -457,7 +482,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -467,25 +492,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -494,7 +521,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.Flash.md

@@ -20,9 +20,9 @@ Flash Media Controller - Wrapper for fallback SWF API
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -34,6 +34,7 @@ Flash Media Controller - Wrapper for fallback SWF API
   - [off](#off-type-fn-) _`inherited`_
   - [on](#on-type-fn-) _`inherited`_
   - [onClick](#onclick-event-) _`inherited`_
+  - [onTap](#ontap) _`inherited`_
   - [one](#one-type-fn-) _`inherited`_
   - [options](#options-obj-) _`inherited`_
   - [player](#player) _`inherited`_
@@ -67,14 +68,14 @@ Flash Media Controller - Wrapper for fallback SWF API
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -83,7 +84,7 @@ Flash Media Controller - Wrapper for fallback SWF API
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -96,7 +97,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -106,7 +107,7 @@ _inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` The constructed class name
 
-_inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_inherited from_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -118,7 +119,7 @@ _inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -129,7 +130,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -143,7 +144,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js/blob/master/src/js/component.js#L190)
+_inherited from_: [src/js/component.js#L194](https://github.com/videojs/video.js/blob/master/src/js/component.js#L194)
 
 ---
 
@@ -157,21 +158,14 @@ _inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -183,12 +177,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -196,7 +217,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -209,32 +230,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -246,7 +272,7 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
@@ -272,7 +298,7 @@ _defined in_: [src/js/media/flash.js#L17](https://github.com/videojs/video.js/bl
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -296,7 +322,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 > 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#L41](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L41)
+_inherited from_: [src/js/media/media.js#L45](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L45)
 
 ---
 
@@ -308,7 +334,7 @@ _inherited from_: [src/js/media/media.js#L41](https://github.com/videojs/video.j
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -324,7 +350,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -347,7 +373,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -357,7 +383,15 @@ _inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __event__ 
 
-_inherited from_: [src/js/media/media.js#L131](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L131)
+_inherited from_: [src/js/media/media.js#L118](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L118)
+
+---
+
+### 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#L138](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L138)
 
 ---
 
@@ -371,7 +405,7 @@ _inherited from_: [src/js/media/media.js#L131](https://github.com/videojs/video.
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -414,12 +448,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -429,7 +463,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -445,7 +479,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -456,7 +490,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -469,7 +503,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -477,7 +511,7 @@ _inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js
 > 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#L115](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L115)
+_inherited from_: [src/js/media/media.js#L102](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L102)
 
 ---
 
@@ -487,7 +521,7 @@ _inherited from_: [src/js/media/media.js#L115](https://github.com/videojs/video.
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -503,7 +537,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -513,25 +547,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -540,7 +576,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.FullscreenToggle.md

@@ -20,9 +20,9 @@ Toggle fullscreen video
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -64,14 +64,14 @@ Toggle fullscreen video
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -80,7 +80,7 @@ Toggle fullscreen video
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -93,7 +93,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -103,7 +103,7 @@ _inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` The constructed class name
 
-_inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_inherited from_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -115,7 +115,7 @@ _inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -126,7 +126,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -140,7 +140,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js/blob/master/src/js/component.js#L190)
+_inherited from_: [src/js/component.js#L194](https://github.com/videojs/video.js/blob/master/src/js/component.js#L194)
 
 ---
 
@@ -154,21 +154,14 @@ _inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -180,12 +173,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -193,7 +213,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -206,32 +226,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -243,7 +268,7 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
@@ -268,7 +293,7 @@ _defined in_: [src/js/control-bar/fullscreen-toggle.js#L14](https://github.com/v
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -280,7 +305,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -296,7 +321,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -319,7 +344,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -333,7 +358,7 @@ _inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -376,12 +401,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -391,7 +416,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -407,7 +432,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -418,7 +443,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -431,7 +456,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -441,7 +466,7 @@ _inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -457,7 +482,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -467,25 +492,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -494,7 +521,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.Html5.md

@@ -20,9 +20,9 @@ HTML5 Media Controller - Wrapper for HTML5 Media API
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -34,6 +34,7 @@ HTML5 Media Controller - Wrapper for HTML5 Media API
   - [off](#off-type-fn-) _`inherited`_
   - [on](#on-type-fn-) _`inherited`_
   - [onClick](#onclick-event-) _`inherited`_
+  - [onTap](#ontap) _`inherited`_
   - [one](#one-type-fn-) _`inherited`_
   - [options](#options-obj-) _`inherited`_
   - [player](#player) _`inherited`_
@@ -67,14 +68,14 @@ HTML5 Media Controller - Wrapper for HTML5 Media API
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -83,7 +84,7 @@ HTML5 Media Controller - Wrapper for HTML5 Media API
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -96,7 +97,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -106,7 +107,7 @@ _inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` The constructed class name
 
-_inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_inherited from_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -118,7 +119,7 @@ _inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -129,7 +130,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -143,7 +144,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js/blob/master/src/js/component.js#L190)
+_inherited from_: [src/js/component.js#L194](https://github.com/videojs/video.js/blob/master/src/js/component.js#L194)
 
 ---
 
@@ -157,21 +158,14 @@ _inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -183,12 +177,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -196,7 +217,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -209,32 +230,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -246,7 +272,7 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
@@ -272,7 +298,7 @@ _defined in_: [src/js/media/html5.js#L14](https://github.com/videojs/video.js/bl
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -296,7 +322,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 > 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#L41](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L41)
+_inherited from_: [src/js/media/media.js#L45](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L45)
 
 ---
 
@@ -308,7 +334,7 @@ _inherited from_: [src/js/media/media.js#L41](https://github.com/videojs/video.j
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -324,7 +350,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -347,7 +373,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -357,7 +383,15 @@ _inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __event__ 
 
-_inherited from_: [src/js/media/media.js#L131](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L131)
+_inherited from_: [src/js/media/media.js#L118](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L118)
+
+---
+
+### 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#L138](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L138)
 
 ---
 
@@ -371,7 +405,7 @@ _inherited from_: [src/js/media/media.js#L131](https://github.com/videojs/video.
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -414,12 +448,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -429,7 +463,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -445,7 +479,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -456,7 +490,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -469,7 +503,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -477,7 +511,7 @@ _inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js
 > 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#L115](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L115)
+_inherited from_: [src/js/media/media.js#L102](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L102)
 
 ---
 
@@ -487,7 +521,7 @@ _inherited from_: [src/js/media/media.js#L115](https://github.com/videojs/video.
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -503,7 +537,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -513,25 +547,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -540,7 +576,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.JSON.md

@@ -14,17 +14,17 @@
 
 ## METHODS
 
-### parse( text, reviver )
+### parse( text, [reviver] )
 > parse the json
 
 ##### PARAMETERS: 
-* __text__ 
-* __reviver__ 
+* __text__ `String` The JSON string to parse
+* __reviver__ `Function` _(OPTIONAL)_ Optional function that can transform the results
 
 ##### RETURNS: 
 * `Object|Array` The parsed JSON
 
-_defined in_: [src/js/json.js#L32](https://github.com/videojs/video.js/blob/master/src/js/json.js#L32)
+_defined in_: [src/js/json.js#L34](https://github.com/videojs/video.js/blob/master/src/js/json.js#L34)
 
 ---
 

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#L136](https://github.com/videojs/video.js/blob/master/src/js/control-bar/progress-control.js#L136)  
+__DEFINED IN__: [src/js/control-bar/progress-control.js#L118](https://github.com/videojs/video.js/blob/master/src/js/control-bar/progress-control.js#L118)  
 
 Shows load progress
 
@@ -20,9 +20,9 @@ Shows load progress
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -64,14 +64,14 @@ Shows load progress
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -80,7 +80,7 @@ Shows load progress
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -93,7 +93,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -103,7 +103,7 @@ _inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` The constructed class name
 
-_inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_inherited from_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -115,7 +115,7 @@ _inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -126,7 +126,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -140,7 +140,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js/blob/master/src/js/component.js#L190)
+_inherited from_: [src/js/component.js#L194](https://github.com/videojs/video.js/blob/master/src/js/component.js#L194)
 
 ---
 
@@ -154,21 +154,14 @@ _inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -180,12 +173,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -193,7 +213,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -206,32 +226,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -243,7 +268,7 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
@@ -253,7 +278,7 @@ _inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js
 * __player__ 
 * __options__ 
 
-_defined in_: [src/js/control-bar/progress-control.js#L138](https://github.com/videojs/video.js/blob/master/src/js/control-bar/progress-control.js#L138)
+_defined in_: [src/js/control-bar/progress-control.js#L120](https://github.com/videojs/video.js/blob/master/src/js/control-bar/progress-control.js#L120)
 
 ---
 
@@ -268,7 +293,7 @@ _defined in_: [src/js/control-bar/progress-control.js#L138](https://github.com/v
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -280,7 +305,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -296,7 +321,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -319,7 +344,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -333,7 +358,7 @@ _inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -376,12 +401,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -391,7 +416,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -407,7 +432,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -418,7 +443,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -431,7 +456,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -441,7 +466,7 @@ _inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -457,7 +482,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -467,25 +492,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -494,7 +521,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.LoadingSpinner.md

@@ -20,9 +20,9 @@ Loading spinner for waiting events
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -64,14 +64,14 @@ Loading spinner for waiting events
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -80,7 +80,7 @@ Loading spinner for waiting events
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -93,7 +93,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -103,7 +103,7 @@ _inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` The constructed class name
 
-_inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_inherited from_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -115,7 +115,7 @@ _inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -126,7 +126,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -140,7 +140,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js/blob/master/src/js/component.js#L190)
+_inherited from_: [src/js/component.js#L194](https://github.com/videojs/video.js/blob/master/src/js/component.js#L194)
 
 ---
 
@@ -154,21 +154,14 @@ _inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -180,12 +173,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -193,7 +213,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -206,32 +226,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -243,7 +268,7 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
@@ -268,7 +293,7 @@ _defined in_: [src/js/loading-spinner.js#L12](https://github.com/videojs/video.j
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -280,7 +305,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -296,7 +321,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -319,7 +344,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -333,7 +358,7 @@ _inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -376,12 +401,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -391,7 +416,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -407,7 +432,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -418,7 +443,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -431,7 +456,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -441,7 +466,7 @@ _inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -457,7 +482,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -467,25 +492,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -494,7 +521,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.MediaLoader.md

@@ -21,9 +21,9 @@ when the player is initialized.
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -65,14 +65,14 @@ when the player is initialized.
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -81,7 +81,7 @@ when the player is initialized.
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -94,7 +94,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -104,7 +104,7 @@ _inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` The constructed class name
 
-_inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_inherited from_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -116,7 +116,7 @@ _inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -127,7 +127,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -141,7 +141,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js/blob/master/src/js/component.js#L190)
+_inherited from_: [src/js/component.js#L194](https://github.com/videojs/video.js/blob/master/src/js/component.js#L194)
 
 ---
 
@@ -155,21 +155,14 @@ _inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -181,12 +174,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -194,7 +214,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -207,32 +227,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -244,7 +269,7 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
@@ -270,7 +295,7 @@ _defined in_: [src/js/media/loader.js#L9](https://github.com/videojs/video.js/bl
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -282,7 +307,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -298,7 +323,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -321,7 +346,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -335,7 +360,7 @@ _inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -378,12 +403,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -393,7 +418,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -409,7 +434,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -420,7 +445,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -433,7 +458,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -443,7 +468,7 @@ _inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -459,7 +484,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -469,25 +494,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -496,7 +523,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.MediaTechController.md

@@ -15,6 +15,7 @@ Base class for media (HTML5 Video, Flash) controllers
   - [init](#init-player-options-ready-)
   - [initControlsListeners](#initcontrolslisteners)
   - [onClick](#onclick-event-)
+  - [onTap](#ontap)
   - [removeControlsListeners](#removecontrolslisteners)
   - [addChild](#addchild-child-options-) _`inherited`_
   - [addClass](#addclass-classtoadd-) _`inherited`_
@@ -23,9 +24,9 @@ Base class for media (HTML5 Video, Flash) controllers
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -67,14 +68,14 @@ Base class for media (HTML5 Video, Flash) controllers
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -83,7 +84,7 @@ Base class for media (HTML5 Video, Flash) controllers
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -96,7 +97,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -106,7 +107,7 @@ _inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` The constructed class name
 
-_inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_inherited from_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -118,7 +119,7 @@ _inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -129,7 +130,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -143,7 +144,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js/blob/master/src/js/component.js#L190)
+_inherited from_: [src/js/component.js#L194](https://github.com/videojs/video.js/blob/master/src/js/component.js#L194)
 
 ---
 
@@ -157,21 +158,14 @@ _inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -183,12 +177,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -196,7 +217,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -209,32 +230,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -246,7 +272,7 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
@@ -272,7 +298,7 @@ _defined in_: [src/js/media/media.js#L14](https://github.com/videojs/video.js/bl
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -296,7 +322,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 > 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#L41](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L41)
+_defined in_: [src/js/media/media.js#L45](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L45)
 
 ---
 
@@ -308,7 +334,7 @@ _defined in_: [src/js/media/media.js#L41](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -324,7 +350,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -347,7 +373,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -357,7 +383,15 @@ _inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __event__ 
 
-_defined in_: [src/js/media/media.js#L131](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L131)
+_defined in_: [src/js/media/media.js#L118](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L118)
+
+---
+
+### 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#L138](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L138)
 
 ---
 
@@ -371,7 +405,7 @@ _defined in_: [src/js/media/media.js#L131](https://github.com/videojs/video.js/b
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -414,12 +448,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -429,7 +463,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -445,7 +479,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -456,7 +490,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -469,7 +503,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -477,7 +511,7 @@ _inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js
 > 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#L115](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L115)
+_defined in_: [src/js/media/media.js#L102](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L102)
 
 ---
 
@@ -487,7 +521,7 @@ _defined in_: [src/js/media/media.js#L115](https://github.com/videojs/video.js/b
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -503,7 +537,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -513,25 +547,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -540,7 +576,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.Menu.md

@@ -21,9 +21,9 @@ captions selection menus.
   - [children](#children) _`inherited`_
   - [contentEl](#contentel) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -66,14 +66,14 @@ captions selection menus.
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -82,7 +82,7 @@ captions selection menus.
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -95,7 +95,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -115,7 +115,7 @@ _defined in_: [src/js/menu.js#L18](https://github.com/videojs/video.js/blob/mast
 ##### RETURNS: 
 * `String` The constructed class name
 
-_inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_inherited from_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -127,7 +127,7 @@ _inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -138,7 +138,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -163,21 +163,14 @@ _defined in_: [src/js/menu.js#L26](https://github.com/videojs/video.js/blob/mast
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -189,12 +182,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -202,7 +222,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -215,32 +235,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -252,12 +277,12 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
 ### init( player, options, ready )
-> the constructor funciton for the class
+> the constructor function for the class
 
 ##### PARAMETERS: 
 * __player__ 
@@ -279,7 +304,7 @@ _inherited from_: [src/js/component.js#L41](https://github.com/videojs/video.js/
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -291,7 +316,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -307,7 +332,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -330,7 +355,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -344,7 +369,7 @@ _inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -387,12 +412,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -402,7 +427,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -418,7 +443,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -429,7 +454,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -442,7 +467,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -452,7 +477,7 @@ _inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -468,7 +493,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -478,25 +503,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -505,7 +532,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.MenuButton.md

@@ -21,9 +21,9 @@ A button class with a popup menu
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -65,14 +65,14 @@ A button class with a popup menu
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -81,7 +81,7 @@ A button class with a popup menu
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -94,7 +94,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -113,7 +113,7 @@ _defined in_: [src/js/menu.js#L157](https://github.com/videojs/video.js/blob/mas
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -124,7 +124,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -138,7 +138,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js/blob/master/src/js/component.js#L190)
+_inherited from_: [src/js/component.js#L194](https://github.com/videojs/video.js/blob/master/src/js/component.js#L194)
 
 ---
 
@@ -159,21 +159,14 @@ _defined in_: [src/js/menu.js#L154](https://github.com/videojs/video.js/blob/mas
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -185,12 +178,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -198,7 +218,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -211,32 +231,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -248,7 +273,7 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
@@ -273,7 +298,7 @@ _defined in_: [src/js/menu.js#L101](https://github.com/videojs/video.js/blob/mas
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -285,7 +310,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -301,7 +326,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -324,7 +349,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -338,7 +363,7 @@ _inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -381,12 +406,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -396,7 +421,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -412,7 +437,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -423,7 +448,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -436,7 +461,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -446,7 +471,7 @@ _inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -462,7 +487,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -472,25 +497,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -499,7 +526,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.MenuItem.md

@@ -22,9 +22,9 @@ The component for a menu item. `<li>`
   - [children](#children) _`inherited`_
   - [contentEl](#contentel) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -66,14 +66,14 @@ The component for a menu item. `<li>`
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -82,7 +82,7 @@ The component for a menu item. `<li>`
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -95,7 +95,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -105,7 +105,7 @@ _inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` The constructed class name
 
-_inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_inherited from_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -117,7 +117,7 @@ _inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -128,7 +128,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -153,21 +153,14 @@ _defined in_: [src/js/menu.js#L64](https://github.com/videojs/video.js/blob/mast
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -179,12 +172,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -192,7 +212,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -205,32 +225,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -242,7 +267,7 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
@@ -267,7 +292,7 @@ _defined in_: [src/js/menu.js#L57](https://github.com/videojs/video.js/blob/mast
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -279,7 +304,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -295,7 +320,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -318,7 +343,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -339,7 +364,7 @@ _defined in_: [src/js/menu.js#L74](https://github.com/videojs/video.js/blob/mast
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -382,12 +407,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -397,7 +422,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -413,7 +438,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -424,7 +449,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -437,7 +462,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -457,7 +482,7 @@ _defined in_: [src/js/menu.js#L82](https://github.com/videojs/video.js/blob/mast
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -473,7 +498,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -483,25 +508,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -510,7 +537,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.MuteToggle.md

@@ -20,9 +20,9 @@ A button component for muting the audio
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -64,14 +64,14 @@ A button component for muting the audio
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -80,7 +80,7 @@ A button component for muting the audio
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -93,7 +93,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -103,7 +103,7 @@ _inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` The constructed class name
 
-_inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_inherited from_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -115,7 +115,7 @@ _inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -126,7 +126,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -140,7 +140,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js/blob/master/src/js/component.js#L190)
+_inherited from_: [src/js/component.js#L194](https://github.com/videojs/video.js/blob/master/src/js/component.js#L194)
 
 ---
 
@@ -154,21 +154,14 @@ _inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -180,12 +173,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -193,7 +213,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -206,32 +226,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -243,7 +268,7 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
@@ -268,7 +293,7 @@ _defined in_: [src/js/control-bar/mute-toggle.js#L10](https://github.com/videojs
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -280,7 +305,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -296,7 +321,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -319,7 +344,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -333,7 +358,7 @@ _inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -376,12 +401,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -391,7 +416,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -407,7 +432,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -418,7 +443,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -431,7 +456,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -441,7 +466,7 @@ _inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -457,7 +482,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -467,25 +492,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -494,7 +521,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.OffTextTrackMenuItem.md

@@ -20,9 +20,9 @@ A special menu item for turning of a specific type of text track
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -66,14 +66,14 @@ A special menu item for turning of a specific type of text track
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -82,7 +82,7 @@ A special menu item for turning of a specific type of text track
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -95,7 +95,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -105,7 +105,7 @@ _inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` The constructed class name
 
-_inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_inherited from_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -117,7 +117,7 @@ _inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -128,7 +128,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -153,21 +153,14 @@ _inherited from_: [src/js/menu.js#L64](https://github.com/videojs/video.js/blob/
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -179,12 +172,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -192,7 +212,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -205,32 +225,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -242,7 +267,7 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
@@ -267,7 +292,7 @@ _defined in_: [src/js/tracks.js#L767](https://github.com/videojs/video.js/blob/m
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -279,7 +304,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -295,7 +320,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -318,7 +343,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -339,7 +364,7 @@ _inherited from_: [src/js/menu.js#L74](https://github.com/videojs/video.js/blob/
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -382,12 +407,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -397,7 +422,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -413,7 +438,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -424,7 +449,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -437,7 +462,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -457,7 +482,7 @@ _inherited from_: [src/js/menu.js#L82](https://github.com/videojs/video.js/blob/
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -473,7 +498,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -483,25 +508,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -510,7 +537,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

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#L163](https://github.com/videojs/video.js/blob/master/src/js/control-bar/progress-control.js#L163)  
+__DEFINED IN__: [src/js/control-bar/progress-control.js#L145](https://github.com/videojs/video.js/blob/master/src/js/control-bar/progress-control.js#L145)  
 
 Shows play progress
 
@@ -20,9 +20,9 @@ Shows play progress
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -64,14 +64,14 @@ Shows play progress
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -80,7 +80,7 @@ Shows play progress
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -93,7 +93,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -103,7 +103,7 @@ _inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` The constructed class name
 
-_inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_inherited from_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -115,7 +115,7 @@ _inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -126,7 +126,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -140,7 +140,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js/blob/master/src/js/component.js#L190)
+_inherited from_: [src/js/component.js#L194](https://github.com/videojs/video.js/blob/master/src/js/component.js#L194)
 
 ---
 
@@ -154,21 +154,14 @@ _inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -180,12 +173,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -193,7 +213,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -206,32 +226,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -243,7 +268,7 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
@@ -253,7 +278,7 @@ _inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js
 * __player__ 
 * __options__ 
 
-_defined in_: [src/js/control-bar/progress-control.js#L165](https://github.com/videojs/video.js/blob/master/src/js/control-bar/progress-control.js#L165)
+_defined in_: [src/js/control-bar/progress-control.js#L147](https://github.com/videojs/video.js/blob/master/src/js/control-bar/progress-control.js#L147)
 
 ---
 
@@ -268,7 +293,7 @@ _defined in_: [src/js/control-bar/progress-control.js#L165](https://github.com/v
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -280,7 +305,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -296,7 +321,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -319,7 +344,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -333,7 +358,7 @@ _inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -376,12 +401,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -391,7 +416,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -407,7 +432,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -418,7 +443,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -431,7 +456,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -441,7 +466,7 @@ _inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -457,7 +482,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -467,25 +492,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -494,7 +521,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.PlayToggle.md

@@ -20,9 +20,9 @@ Button to toggle between play and pause
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -64,14 +64,14 @@ Button to toggle between play and pause
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -80,7 +80,7 @@ Button to toggle between play and pause
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -93,7 +93,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -103,7 +103,7 @@ _inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` The constructed class name
 
-_inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_inherited from_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -115,7 +115,7 @@ _inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -126,7 +126,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -140,7 +140,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js/blob/master/src/js/component.js#L190)
+_inherited from_: [src/js/component.js#L194](https://github.com/videojs/video.js/blob/master/src/js/component.js#L194)
 
 ---
 
@@ -154,21 +154,14 @@ _inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -180,12 +173,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -193,7 +213,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -206,32 +226,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -243,7 +268,7 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
@@ -268,7 +293,7 @@ _defined in_: [src/js/control-bar/play-toggle.js#L10](https://github.com/videojs
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -280,7 +305,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -296,7 +321,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -319,7 +344,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -333,7 +358,7 @@ _inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -376,12 +401,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -391,7 +416,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -407,7 +432,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -418,7 +443,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -431,7 +456,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -441,7 +466,7 @@ _inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -457,7 +482,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -467,25 +492,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -494,7 +521,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.Player.md

@@ -34,6 +34,7 @@ After an instance has been created it can be accessed globally using `Video('exa
   - [dispose](#dispose)
   - [duration](#duration-seconds-)
   - [init](#init-tag-options-ready-)
+  - [isFullScreen](#isfullscreen-isfs-)
   - [muted](#muted-muted-)
   - [pause](#pause)
   - [paused](#paused)
@@ -49,8 +50,8 @@ After an instance has been created it can be accessed globally using `Video('exa
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -106,14 +107,14 @@ After an instance has been created it can be accessed globally using `Video('exa
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -122,7 +123,7 @@ After an instance has been created it can be accessed globally using `Video('exa
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -135,7 +136,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -160,7 +161,7 @@ _inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Object` A mock TimeRange object (following HTML spec)
 
-_defined in_: [src/js/player.js#L717](https://github.com/videojs/video.js/blob/master/src/js/player.js#L717)
+_defined in_: [src/js/player.js#L727](https://github.com/videojs/video.js/blob/master/src/js/player.js#L727)
 
 ---
 
@@ -175,7 +176,7 @@ _defined in_: [src/js/player.js#L717](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#L743](https://github.com/videojs/video.js/blob/master/src/js/player.js#L743)
+_defined in_: [src/js/player.js#L753](https://github.com/videojs/video.js/blob/master/src/js/player.js#L753)
 
 ---
 
@@ -185,7 +186,7 @@ _defined in_: [src/js/player.js#L743](https://github.com/videojs/video.js/blob/m
 ##### RETURNS: 
 * `String` The constructed class name
 
-_inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_inherited from_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -197,7 +198,7 @@ _inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` self
 
-_defined in_: [src/js/player.js#L864](https://github.com/videojs/video.js/blob/master/src/js/player.js#L864)
+_defined in_: [src/js/player.js#L909](https://github.com/videojs/video.js/blob/master/src/js/player.js#L909)
 
 ---
 
@@ -209,7 +210,7 @@ _defined in_: [src/js/player.js#L864](https://github.com/videojs/video.js/blob/m
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -220,7 +221,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -233,7 +234,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Boolean` Controls are showing
 
-_defined in_: [src/js/player.js#L1115](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1115)
+_defined in_: [src/js/player.js#L1167](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1167)
 
 ---
 
@@ -247,7 +248,7 @@ _defined in_: [src/js/player.js#L1115](https://github.com/videojs/video.js/blob/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js/blob/master/src/js/component.js#L190)
+_inherited from_: [src/js/component.js#L194](https://github.com/videojs/video.js/blob/master/src/js/component.js#L194)
 
 ---
 
@@ -267,7 +268,7 @@ _inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js
 * `Number` The time in seconds, when not setting
 * `vjs.Player` self, when the current time is set
 
-_defined in_: [src/js/player.js#L641](https://github.com/videojs/video.js/blob/master/src/js/player.js#L641)
+_defined in_: [src/js/player.js#L650](https://github.com/videojs/video.js/blob/master/src/js/player.js#L650)
 
 ---
 
@@ -281,14 +282,7 @@ _defined in_: [src/js/player.js#L641](https://github.com/videojs/video.js/blob/m
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
@@ -300,7 +294,7 @@ _inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js
 > This is especially helpful if you are dynamically adding and removing videos
 > to/from the DOM.
 
-_defined in_: [src/js/player.js#L128](https://github.com/videojs/video.js/blob/master/src/js/player.js#L128)
+_defined in_: [src/js/player.js#L135](https://github.com/videojs/video.js/blob/master/src/js/player.js#L135)
 
 ---
 
@@ -319,7 +313,7 @@ _defined in_: [src/js/player.js#L128](https://github.com/videojs/video.js/blob/m
 ##### RETURNS: 
 * `Number` The duration of the video in seconds
 
-_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#L681](https://github.com/videojs/video.js/blob/master/src/js/player.js#L681)
 
 ---
 
@@ -331,12 +325,39 @@ _defined in_: [src/js/player.js#L671](https://github.com/videojs/video.js/blob/m
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -344,7 +365,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -357,32 +378,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -394,7 +420,7 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
@@ -421,7 +447,31 @@ _defined in_: [src/js/player.js#L32](https://github.com/videojs/video.js/blob/ma
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
+
+---
+
+### isFullScreen( [isFS] )
+> Check if the player is in fullscreen mode
+> 
+>     // get
+>     var fullscreenOrNot = myPlayer.isFullScreen();
+> 
+>     // set
+>     myPlayer.isFullScreen(true); // tell the player it's in fullscreen
+> 
+> NOTE: As of the latest HTML5 spec, isFullScreen is no longer an official
+> property and instead document.fullscreenElement is used. But isFullScreen is
+> still a valuable property for internal player workings.
+
+##### PARAMETERS: 
+* __isFS__ `Boolean` _(OPTIONAL)_ Update the player's fullscreen state
+
+##### RETURNS: 
+* `Boolean` true if fullscreen, false if not
+* `vjs.Player` self, when setting
+
+_defined in_: [src/js/player.js#L840](https://github.com/videojs/video.js/blob/master/src/js/player.js#L840)
 
 ---
 
@@ -441,7 +491,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 * `Boolean` True if mute is on, false if not, when getting
 * `vjs.Player` self, when setting mute
 
-_defined in_: [src/js/player.js#L792](https://github.com/videojs/video.js/blob/master/src/js/player.js#L792)
+_defined in_: [src/js/player.js#L802](https://github.com/videojs/video.js/blob/master/src/js/player.js#L802)
 
 ---
 
@@ -453,7 +503,7 @@ _defined in_: [src/js/player.js#L792](https://github.com/videojs/video.js/blob/m
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -469,7 +519,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -492,7 +542,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -506,7 +556,7 @@ _inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -549,12 +599,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -566,7 +616,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` self
 
-_defined in_: [src/js/player.js#L610](https://github.com/videojs/video.js/blob/master/src/js/player.js#L610)
+_defined in_: [src/js/player.js#L619](https://github.com/videojs/video.js/blob/master/src/js/player.js#L619)
 
 ---
 
@@ -579,7 +629,7 @@ _defined in_: [src/js/player.js#L610](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#L623](https://github.com/videojs/video.js/blob/master/src/js/player.js#L623)
+_defined in_: [src/js/player.js#L632](https://github.com/videojs/video.js/blob/master/src/js/player.js#L632)
 
 ---
 
@@ -591,7 +641,7 @@ _defined in_: [src/js/player.js#L623](https://github.com/videojs/video.js/blob/m
 ##### RETURNS: 
 * `vjs.Player` self
 
-_defined in_: [src/js/player.js#L598](https://github.com/videojs/video.js/blob/master/src/js/player.js#L598)
+_defined in_: [src/js/player.js#L607](https://github.com/videojs/video.js/blob/master/src/js/player.js#L607)
 
 ---
 
@@ -601,7 +651,7 @@ _defined in_: [src/js/player.js#L598](https://github.com/videojs/video.js/blob/m
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -623,7 +673,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 * `String` poster URL when getting
 * `vjs.Player` self when setting
 
-_defined in_: [src/js/player.js#L1095](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1095)
+_defined in_: [src/js/player.js#L1140](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1140)
 
 ---
 
@@ -639,7 +689,7 @@ _defined in_: [src/js/player.js#L1095](https://github.com/videojs/video.js/blob/
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -650,7 +700,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -663,7 +713,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -682,7 +732,7 @@ _inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` self
 
-_defined in_: [src/js/player.js#L817](https://github.com/videojs/video.js/blob/master/src/js/player.js#L817)
+_defined in_: [src/js/player.js#L862](https://github.com/videojs/video.js/blob/master/src/js/player.js#L862)
 
 ---
 
@@ -692,7 +742,7 @@ _defined in_: [src/js/player.js#L817](https://github.com/videojs/video.js/blob/m
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -730,7 +780,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` self
 
-_defined in_: [src/js/player.js#L979](https://github.com/videojs/video.js/blob/master/src/js/player.js#L979)
+_defined in_: [src/js/player.js#L1024](https://github.com/videojs/video.js/blob/master/src/js/player.js#L1024)
 
 ---
 
@@ -746,7 +796,7 @@ _defined in_: [src/js/player.js#L979](https://github.com/videojs/video.js/blob/m
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -756,7 +806,7 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
@@ -778,25 +828,27 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
 * `Number` The current volume, when getting
 * `vjs.Player` self, when setting
 
-_defined in_: [src/js/player.js#L762](https://github.com/videojs/video.js/blob/master/src/js/player.js#L762)
+_defined in_: [src/js/player.js#L772](https://github.com/videojs/video.js/blob/master/src/js/player.js#L772)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -805,14 +857,14 @@ _inherited from_: [src/js/component.js#L707](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#L498](https://github.com/videojs/video.js/blob/master/src/js/player.js#L498)
+_defined in_: [src/js/player.js#L502](https://github.com/videojs/video.js/blob/master/src/js/player.js#L502)
 
 ---
 
 ### ended `EVENT`
 > Fired when the end of the media resource is reached (currentTime == duration)
 
-_defined in_: [src/js/player.js#L487](https://github.com/videojs/video.js/blob/master/src/js/player.js#L487)
+_defined in_: [src/js/player.js#L491](https://github.com/videojs/video.js/blob/master/src/js/player.js#L491)
 
 ---
 
@@ -822,7 +874,7 @@ _defined in_: [src/js/player.js#L487](https://github.com/videojs/video.js/blob/m
 ##### PARAMETERS: 
 * __e__ 
 
-_defined in_: [src/js/player.js#L525](https://github.com/videojs/video.js/blob/master/src/js/player.js#L525)
+_defined in_: [src/js/player.js#L534](https://github.com/videojs/video.js/blob/master/src/js/player.js#L534)
 
 ---
 
@@ -833,70 +885,70 @@ _defined in_: [src/js/player.js#L525](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#L444](https://github.com/videojs/video.js/blob/master/src/js/player.js#L444)
+_defined in_: [src/js/player.js#L448](https://github.com/videojs/video.js/blob/master/src/js/player.js#L448)
 
 ---
 
 ### fullscreenchange `EVENT`
 > Fired when the player switches in or out of fullscreen mode
 
-_defined in_: [src/js/player.js#L513](https://github.com/videojs/video.js/blob/master/src/js/player.js#L513)
+_defined in_: [src/js/player.js#L522](https://github.com/videojs/video.js/blob/master/src/js/player.js#L522)
 
 ---
 
 ### loadedalldata `EVENT`
 > Fired when the player has finished downloading the source data
 
-_defined in_: [src/js/player.js#L424](https://github.com/videojs/video.js/blob/master/src/js/player.js#L424)
+_defined in_: [src/js/player.js#L428](https://github.com/videojs/video.js/blob/master/src/js/player.js#L428)
 
 ---
 
 ### loadeddata `EVENT`
 > Fired when the player has downloaded data at the current playback position
 
-_defined in_: [src/js/player.js#L418](https://github.com/videojs/video.js/blob/master/src/js/player.js#L418)
+_defined in_: [src/js/player.js#L422](https://github.com/videojs/video.js/blob/master/src/js/player.js#L422)
 
 ---
 
 ### loadedmetadata `EVENT`
 > Fired when the player has initial duration and dimension information
 
-_defined in_: [src/js/player.js#L412](https://github.com/videojs/video.js/blob/master/src/js/player.js#L412)
+_defined in_: [src/js/player.js#L416](https://github.com/videojs/video.js/blob/master/src/js/player.js#L416)
 
 ---
 
 ### loadstart `EVENT`
 > Fired when the user agent begins looking for media data
 
-_defined in_: [src/js/player.js#L406](https://github.com/videojs/video.js/blob/master/src/js/player.js#L406)
+_defined in_: [src/js/player.js#L410](https://github.com/videojs/video.js/blob/master/src/js/player.js#L410)
 
 ---
 
 ### pause `EVENT`
 > Fired whenever the media has been paused
 
-_defined in_: [src/js/player.js#L458](https://github.com/videojs/video.js/blob/master/src/js/player.js#L458)
+_defined in_: [src/js/player.js#L462](https://github.com/videojs/video.js/blob/master/src/js/player.js#L462)
 
 ---
 
 ### play `EVENT`
 > Fired whenever the media begins or resumes playback
 
-_defined in_: [src/js/player.js#L430](https://github.com/videojs/video.js/blob/master/src/js/player.js#L430)
+_defined in_: [src/js/player.js#L434](https://github.com/videojs/video.js/blob/master/src/js/player.js#L434)
 
 ---
 
 ### progress `EVENT`
 > Fired while the user agent is downloading media data
 
-_defined in_: [src/js/player.js#L476](https://github.com/videojs/video.js/blob/master/src/js/player.js#L476)
+_defined in_: [src/js/player.js#L480](https://github.com/videojs/video.js/blob/master/src/js/player.js#L480)
 
 ---
 
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 
@@ -906,14 +958,14 @@ _inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js
 > During playback this is fired every 15-250 milliseconds, depnding on the
 > playback technology in use.
 
-_defined in_: [src/js/player.js#L470](https://github.com/videojs/video.js/blob/master/src/js/player.js#L470)
+_defined in_: [src/js/player.js#L474](https://github.com/videojs/video.js/blob/master/src/js/player.js#L474)
 
 ---
 
 ### volumechange `EVENT`
 > Fired when the volume changes
 
-_defined in_: [src/js/player.js#L507](https://github.com/videojs/video.js/blob/master/src/js/player.js#L507)
+_defined in_: [src/js/player.js#L516](https://github.com/videojs/video.js/blob/master/src/js/player.js#L516)
 
 ---
 

docs/api/vjs.PosterImage.md

@@ -20,9 +20,9 @@ The component that handles showing the poster image.
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -64,14 +64,14 @@ The component that handles showing the poster image.
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -80,7 +80,7 @@ The component that handles showing the poster image.
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -93,7 +93,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -103,7 +103,7 @@ _inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` The constructed class name
 
-_inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_inherited from_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -115,7 +115,7 @@ _inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -126,7 +126,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -140,7 +140,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js/blob/master/src/js/component.js#L190)
+_inherited from_: [src/js/component.js#L194](https://github.com/videojs/video.js/blob/master/src/js/component.js#L194)
 
 ---
 
@@ -154,21 +154,14 @@ _inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -180,12 +173,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -193,7 +213,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -206,32 +226,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -243,7 +268,7 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
@@ -268,7 +293,7 @@ _defined in_: [src/js/poster.js#L12](https://github.com/videojs/video.js/blob/ma
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -280,7 +305,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -296,7 +321,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -319,7 +344,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -333,7 +358,7 @@ _inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -376,12 +401,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -391,7 +416,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -407,7 +432,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -418,7 +443,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -431,7 +456,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -441,7 +466,7 @@ _inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -457,7 +482,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -467,25 +492,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -494,7 +521,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.ProgressControl.md

@@ -21,9 +21,9 @@ and play progress
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -65,14 +65,14 @@ and play progress
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -81,7 +81,7 @@ and play progress
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -94,7 +94,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -104,7 +104,7 @@ _inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` The constructed class name
 
-_inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_inherited from_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -116,7 +116,7 @@ _inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -127,7 +127,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -141,7 +141,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js/blob/master/src/js/component.js#L190)
+_inherited from_: [src/js/component.js#L194](https://github.com/videojs/video.js/blob/master/src/js/component.js#L194)
 
 ---
 
@@ -155,21 +155,14 @@ _inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -181,12 +174,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -194,7 +214,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -207,32 +227,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -244,7 +269,7 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
@@ -269,7 +294,7 @@ _defined in_: [src/js/control-bar/progress-control.js#L11](https://github.com/vi
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -281,7 +306,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -297,7 +322,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -320,7 +345,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -334,7 +359,7 @@ _inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -377,12 +402,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -392,7 +417,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -408,7 +433,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -419,7 +444,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -432,7 +457,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -442,7 +467,7 @@ _inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -458,7 +483,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -468,25 +493,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -495,7 +522,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

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#L103](https://github.com/videojs/video.js/blob/master/src/js/control-bar/time-display.js#L103)  
+__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)  
 
 Displays the time left in the video
 
@@ -20,9 +20,9 @@ Displays the time left in the video
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -64,14 +64,14 @@ Displays the time left in the video
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -80,7 +80,7 @@ Displays the time left in the video
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -93,7 +93,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -103,7 +103,7 @@ _inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` The constructed class name
 
-_inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_inherited from_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -115,7 +115,7 @@ _inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -126,7 +126,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -140,7 +140,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js/blob/master/src/js/component.js#L190)
+_inherited from_: [src/js/component.js#L194](https://github.com/videojs/video.js/blob/master/src/js/component.js#L194)
 
 ---
 
@@ -154,21 +154,14 @@ _inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -180,12 +173,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -193,7 +213,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -206,32 +226,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -243,7 +268,7 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
@@ -253,7 +278,7 @@ _inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js
 * __player__ 
 * __options__ 
 
-_defined in_: [src/js/control-bar/time-display.js#L105](https://github.com/videojs/video.js/blob/master/src/js/control-bar/time-display.js#L105)
+_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)
 
 ---
 
@@ -268,7 +293,7 @@ _defined in_: [src/js/control-bar/time-display.js#L105](https://github.com/video
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -280,7 +305,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -296,7 +321,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -319,7 +344,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -333,7 +358,7 @@ _inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -376,12 +401,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -391,7 +416,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -407,7 +432,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -418,7 +443,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -431,7 +456,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -441,7 +466,7 @@ _inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -457,7 +482,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -467,25 +492,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -494,7 +521,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.SeekBar.md

@@ -20,9 +20,9 @@ Seek Bar and holder for the progress bars
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -65,14 +65,14 @@ Seek Bar and holder for the progress bars
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -81,7 +81,7 @@ Seek Bar and holder for the progress bars
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -94,7 +94,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -104,7 +104,7 @@ _inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` The constructed class name
 
-_inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_inherited from_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -116,7 +116,7 @@ _inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -127,7 +127,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -141,7 +141,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js/blob/master/src/js/component.js#L190)
+_inherited from_: [src/js/component.js#L194](https://github.com/videojs/video.js/blob/master/src/js/component.js#L194)
 
 ---
 
@@ -155,21 +155,14 @@ _inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -181,12 +174,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -194,7 +214,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -207,32 +227,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -244,7 +269,7 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
@@ -269,7 +294,7 @@ _defined in_: [src/js/control-bar/progress-control.js#L37](https://github.com/vi
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -281,7 +306,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -297,7 +322,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -320,7 +345,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -345,7 +370,7 @@ _inherited from_: [src/js/slider.js#L200](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -388,12 +413,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -403,7 +428,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -419,7 +444,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -430,7 +455,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -443,7 +468,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -453,7 +478,7 @@ _inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -469,7 +494,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -479,25 +504,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -506,7 +533,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

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#L185](https://github.com/videojs/video.js/blob/master/src/js/control-bar/progress-control.js#L185)  
+__DEFINED IN__: [src/js/control-bar/progress-control.js#L167](https://github.com/videojs/video.js/blob/master/src/js/control-bar/progress-control.js#L167)  
 
 The Seek Handle shows the current position of the playhead during playback,
 and can be dragged to adjust the playhead.
@@ -20,9 +20,9 @@ and can be dragged to adjust the playhead.
   - [children](#children) _`inherited`_
   - [contentEl](#contentel) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -65,14 +65,14 @@ and can be dragged to adjust the playhead.
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -81,7 +81,7 @@ and can be dragged to adjust the playhead.
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -94,7 +94,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -104,7 +104,7 @@ _inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` The constructed class name
 
-_inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_inherited from_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -116,7 +116,7 @@ _inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -127,7 +127,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -138,7 +138,7 @@ _inherited from_: [src/js/component.js#L220](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#L196](https://github.com/videojs/video.js/blob/master/src/js/control-bar/progress-control.js#L196)
+_defined in_: [src/js/control-bar/progress-control.js#L183](https://github.com/videojs/video.js/blob/master/src/js/control-bar/progress-control.js#L183)
 
 ---
 
@@ -152,21 +152,14 @@ _defined in_: [src/js/control-bar/progress-control.js#L196](https://github.com/v
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -178,12 +171,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -191,7 +211,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -204,32 +224,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -241,12 +266,12 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
 ### init( player, options, ready )
-> the constructor funciton for the class
+> the constructor function for the class
 
 ##### PARAMETERS: 
 * __player__ 
@@ -268,7 +293,7 @@ _inherited from_: [src/js/component.js#L41](https://github.com/videojs/video.js/
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -280,7 +305,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -296,7 +321,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -319,7 +344,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -333,7 +358,7 @@ _inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -376,12 +401,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -391,7 +416,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -407,7 +432,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -418,7 +443,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -431,7 +456,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -441,7 +466,7 @@ _inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -457,7 +482,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -467,25 +492,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -494,7 +521,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.Slider.md

@@ -21,9 +21,9 @@ The base functionality for sliders like the volume bar and seek bar
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -65,14 +65,14 @@ The base functionality for sliders like the volume bar and seek bar
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -81,7 +81,7 @@ The base functionality for sliders like the volume bar and seek bar
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -94,7 +94,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -104,7 +104,7 @@ _inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` The constructed class name
 
-_inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_inherited from_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -116,7 +116,7 @@ _inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -127,7 +127,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -141,7 +141,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js/blob/master/src/js/component.js#L190)
+_inherited from_: [src/js/component.js#L194](https://github.com/videojs/video.js/blob/master/src/js/component.js#L194)
 
 ---
 
@@ -155,21 +155,14 @@ _inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -181,12 +174,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -194,7 +214,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -207,32 +227,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -244,7 +269,7 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
@@ -269,7 +294,7 @@ _defined in_: [src/js/slider.js#L12](https://github.com/videojs/video.js/blob/ma
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -281,7 +306,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -297,7 +322,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -320,7 +345,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -345,7 +370,7 @@ _defined in_: [src/js/slider.js#L200](https://github.com/videojs/video.js/blob/m
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -388,12 +413,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -403,7 +428,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -419,7 +444,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -430,7 +455,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -443,7 +468,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -453,7 +478,7 @@ _inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -469,7 +494,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -479,25 +504,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -506,7 +533,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.SliderHandle.md

@@ -20,9 +20,9 @@ Needed so it can determine seek position based on handle position/size
   - [children](#children) _`inherited`_
   - [contentEl](#contentel) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -65,14 +65,14 @@ Needed so it can determine seek position based on handle position/size
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -81,7 +81,7 @@ Needed so it can determine seek position based on handle position/size
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -94,7 +94,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -104,7 +104,7 @@ _inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` The constructed class name
 
-_inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_inherited from_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -116,7 +116,7 @@ _inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -127,7 +127,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -152,21 +152,14 @@ _defined in_: [src/js/slider.js#L223](https://github.com/videojs/video.js/blob/m
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -178,12 +171,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -191,7 +211,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -204,32 +224,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -241,12 +266,12 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
 ### init( player, options, ready )
-> the constructor funciton for the class
+> the constructor function for the class
 
 ##### PARAMETERS: 
 * __player__ 
@@ -268,7 +293,7 @@ _inherited from_: [src/js/component.js#L41](https://github.com/videojs/video.js/
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -280,7 +305,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -296,7 +321,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -319,7 +344,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -333,7 +358,7 @@ _inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -376,12 +401,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -391,7 +416,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -407,7 +432,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -418,7 +443,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -431,7 +456,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -441,7 +466,7 @@ _inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -457,7 +482,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -467,25 +492,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -494,7 +521,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.SubtitlesButton.md

@@ -21,9 +21,9 @@ The button component for toggling and selecting subtitles
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [createItems](#createitems) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -65,14 +65,14 @@ The button component for toggling and selecting subtitles
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -81,7 +81,7 @@ The button component for toggling and selecting subtitles
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -94,7 +94,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -113,7 +113,7 @@ _inherited from_: [src/js/menu.js#L157](https://github.com/videojs/video.js/blob
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -124,7 +124,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -138,7 +138,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js/blob/master/src/js/component.js#L190)
+_inherited from_: [src/js/component.js#L194](https://github.com/videojs/video.js/blob/master/src/js/component.js#L194)
 
 ---
 
@@ -159,21 +159,14 @@ _inherited from_: [src/js/menu.js#L154](https://github.com/videojs/video.js/blob
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -185,12 +178,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -198,7 +218,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -211,32 +231,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -248,7 +273,7 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
@@ -274,7 +299,7 @@ _defined in_: [src/js/tracks.js#L885](https://github.com/videojs/video.js/blob/m
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -286,7 +311,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -302,7 +327,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -325,7 +350,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -339,7 +364,7 @@ _inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -382,12 +407,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -397,7 +422,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -413,7 +438,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -424,7 +449,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -437,7 +462,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -447,7 +472,7 @@ _inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -463,7 +488,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -473,25 +498,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -500,7 +527,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.SubtitlesTrack.md

@@ -28,6 +28,7 @@ The track component for managing the hiding and showing of subtitles
   - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -94,14 +95,14 @@ _inherited from_: [src/js/tracks.js#L264](https://github.com/videojs/video.js/bl
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -110,7 +111,7 @@ _inherited from_: [src/js/tracks.js#L264](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -123,7 +124,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -141,7 +142,7 @@ _inherited from_: [src/js/tracks.js#L309](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `String` The constructed class name
 
-_inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_inherited from_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -153,7 +154,7 @@ _inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -164,7 +165,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -215,7 +216,7 @@ _inherited from_: [src/js/tracks.js#L190](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
@@ -231,7 +232,7 @@ _inherited from_: [src/js/tracks.js#L371](https://github.com/videojs/video.js/bl
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -243,12 +244,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -256,7 +284,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -269,22 +297,27 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
@@ -306,7 +339,7 @@ _inherited from_: [src/js/tracks.js#L356](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
@@ -331,7 +364,7 @@ _inherited from_: [src/js/tracks.js#L128](https://github.com/videojs/video.js/bl
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -383,7 +416,7 @@ _inherited from_: [src/js/tracks.js#L301](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -399,7 +432,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -422,7 +455,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -436,7 +469,7 @@ _inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -479,12 +512,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -494,7 +527,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -510,7 +543,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -531,7 +564,7 @@ _inherited from_: [src/js/tracks.js#L283](https://github.com/videojs/video.js/bl
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -544,7 +577,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -594,7 +627,7 @@ _inherited from_: [src/js/tracks.js#L204](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -604,25 +637,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -631,7 +666,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.TextTrack.md

@@ -40,6 +40,7 @@ Handles the parsing, hiding, and showing of text track cues
   - [dimensions](#dimensions-width-height-) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -96,14 +97,14 @@ _defined in_: [src/js/tracks.js#L264](https://github.com/videojs/video.js/blob/m
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -112,7 +113,7 @@ _defined in_: [src/js/tracks.js#L264](https://github.com/videojs/video.js/blob/m
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -125,7 +126,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -143,7 +144,7 @@ _defined in_: [src/js/tracks.js#L309](https://github.com/videojs/video.js/blob/m
 ##### RETURNS: 
 * `String` The constructed class name
 
-_inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_inherited from_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -155,7 +156,7 @@ _inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -166,7 +167,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -217,7 +218,7 @@ _defined in_: [src/js/tracks.js#L190](https://github.com/videojs/video.js/blob/m
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
@@ -233,7 +234,7 @@ _defined in_: [src/js/tracks.js#L371](https://github.com/videojs/video.js/blob/m
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -245,12 +246,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -258,7 +286,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -271,22 +299,27 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
@@ -308,7 +341,7 @@ _defined in_: [src/js/tracks.js#L356](https://github.com/videojs/video.js/blob/m
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
@@ -333,7 +366,7 @@ _defined in_: [src/js/tracks.js#L128](https://github.com/videojs/video.js/blob/m
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -385,7 +418,7 @@ _defined in_: [src/js/tracks.js#L301](https://github.com/videojs/video.js/blob/m
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -401,7 +434,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -424,7 +457,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -438,7 +471,7 @@ _inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -481,12 +514,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -496,7 +529,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -512,7 +545,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -533,7 +566,7 @@ _defined in_: [src/js/tracks.js#L283](https://github.com/videojs/video.js/blob/m
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -546,7 +579,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -596,7 +629,7 @@ _defined in_: [src/js/tracks.js#L204](https://github.com/videojs/video.js/blob/m
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -606,25 +639,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -633,7 +668,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.TextTrackButton.md

@@ -21,9 +21,9 @@ The base class for buttons that toggle specific text track types (e.g. subtitles
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [createItems](#createitems) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -65,14 +65,14 @@ The base class for buttons that toggle specific text track types (e.g. subtitles
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -81,7 +81,7 @@ The base class for buttons that toggle specific text track types (e.g. subtitles
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -94,7 +94,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -113,7 +113,7 @@ _inherited from_: [src/js/menu.js#L157](https://github.com/videojs/video.js/blob
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -124,7 +124,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -138,7 +138,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js/blob/master/src/js/component.js#L190)
+_inherited from_: [src/js/component.js#L194](https://github.com/videojs/video.js/blob/master/src/js/component.js#L194)
 
 ---
 
@@ -159,21 +159,14 @@ _inherited from_: [src/js/menu.js#L154](https://github.com/videojs/video.js/blob
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -185,12 +178,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -198,7 +218,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -211,32 +231,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -248,7 +273,7 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
@@ -273,7 +298,7 @@ _defined in_: [src/js/tracks.js#L809](https://github.com/videojs/video.js/blob/m
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -285,7 +310,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -301,7 +326,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -324,7 +349,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -338,7 +363,7 @@ _inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -381,12 +406,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -396,7 +421,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -412,7 +437,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -423,7 +448,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -436,7 +461,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -446,7 +471,7 @@ _inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -462,7 +487,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -472,25 +497,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -499,7 +526,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.TextTrackDisplay.md

@@ -20,9 +20,9 @@ The component for displaying text track cues
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -64,14 +64,14 @@ The component for displaying text track cues
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -80,7 +80,7 @@ The component for displaying text track cues
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -93,7 +93,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -103,7 +103,7 @@ _inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` The constructed class name
 
-_inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_inherited from_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -115,7 +115,7 @@ _inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -126,7 +126,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -140,7 +140,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js/blob/master/src/js/component.js#L190)
+_inherited from_: [src/js/component.js#L194](https://github.com/videojs/video.js/blob/master/src/js/component.js#L194)
 
 ---
 
@@ -154,21 +154,14 @@ _inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -180,12 +173,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -193,7 +213,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -206,32 +226,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -243,7 +268,7 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
@@ -269,7 +294,7 @@ _defined in_: [src/js/tracks.js#L712](https://github.com/videojs/video.js/blob/m
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -281,7 +306,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -297,7 +322,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -320,7 +345,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -334,7 +359,7 @@ _inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -377,12 +402,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -392,7 +417,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -408,7 +433,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -419,7 +444,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -432,7 +457,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -442,7 +467,7 @@ _inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -458,7 +483,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -468,25 +493,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -495,7 +522,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.TextTrackMenuItem.md

@@ -20,9 +20,9 @@ The specific menu item type for selecting a language within a text track kind
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -66,14 +66,14 @@ The specific menu item type for selecting a language within a text track kind
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -82,7 +82,7 @@ The specific menu item type for selecting a language within a text track kind
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -95,7 +95,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -105,7 +105,7 @@ _inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` The constructed class name
 
-_inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_inherited from_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -117,7 +117,7 @@ _inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -128,7 +128,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -153,21 +153,14 @@ _inherited from_: [src/js/menu.js#L64](https://github.com/videojs/video.js/blob/
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -179,12 +172,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -192,7 +212,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -205,32 +225,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -242,7 +267,7 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
@@ -267,7 +292,7 @@ _defined in_: [src/js/tracks.js#L739](https://github.com/videojs/video.js/blob/m
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -279,7 +304,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -295,7 +320,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -318,7 +343,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -339,7 +364,7 @@ _inherited from_: [src/js/menu.js#L74](https://github.com/videojs/video.js/blob/
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -382,12 +407,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -397,7 +422,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -413,7 +438,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -424,7 +449,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -437,7 +462,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -457,7 +482,7 @@ _inherited from_: [src/js/menu.js#L82](https://github.com/videojs/video.js/blob/
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -473,7 +498,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -483,25 +508,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -510,7 +537,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

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#L83](https://github.com/videojs/video.js/blob/master/src/js/control-bar/time-display.js#L83)  
+__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)  
 
 The separator between the current time and duration
 
@@ -22,9 +22,9 @@ Can be hidden if it's not needed in the design.
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -66,14 +66,14 @@ Can be hidden if it's not needed in the design.
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -82,7 +82,7 @@ Can be hidden if it's not needed in the design.
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -95,7 +95,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -105,7 +105,7 @@ _inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` The constructed class name
 
-_inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_inherited from_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -117,7 +117,7 @@ _inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -128,7 +128,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -142,7 +142,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js/blob/master/src/js/component.js#L190)
+_inherited from_: [src/js/component.js#L194](https://github.com/videojs/video.js/blob/master/src/js/component.js#L194)
 
 ---
 
@@ -156,21 +156,14 @@ _inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -182,12 +175,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -195,7 +215,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -208,32 +228,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -245,7 +270,7 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
@@ -255,7 +280,7 @@ _inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js
 * __player__ 
 * __options__ 
 
-_defined in_: [src/js/control-bar/time-display.js#L85](https://github.com/videojs/video.js/blob/master/src/js/control-bar/time-display.js#L85)
+_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)
 
 ---
 
@@ -270,7 +295,7 @@ _defined in_: [src/js/control-bar/time-display.js#L85](https://github.com/videoj
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -282,7 +307,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -298,7 +323,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -321,7 +346,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -335,7 +360,7 @@ _inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -378,12 +403,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -393,7 +418,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -409,7 +434,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -420,7 +445,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -433,7 +458,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -443,7 +468,7 @@ _inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -459,7 +484,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -469,25 +494,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -496,7 +523,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.VolumeBar.md

@@ -20,9 +20,9 @@ The bar that contains the volume level and can be clicked on to adjust the level
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -65,14 +65,14 @@ The bar that contains the volume level and can be clicked on to adjust the level
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -81,7 +81,7 @@ The bar that contains the volume level and can be clicked on to adjust the level
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -94,7 +94,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -104,7 +104,7 @@ _inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` The constructed class name
 
-_inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_inherited from_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -116,7 +116,7 @@ _inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -127,7 +127,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -141,7 +141,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js/blob/master/src/js/component.js#L190)
+_inherited from_: [src/js/component.js#L194](https://github.com/videojs/video.js/blob/master/src/js/component.js#L194)
 
 ---
 
@@ -155,21 +155,14 @@ _inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -181,12 +174,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -194,7 +214,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -207,32 +227,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -244,7 +269,7 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
@@ -269,7 +294,7 @@ _defined in_: [src/js/control-bar/volume-control.js#L48](https://github.com/vide
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -281,7 +306,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -297,7 +322,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -320,7 +345,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -345,7 +370,7 @@ _inherited from_: [src/js/slider.js#L200](https://github.com/videojs/video.js/bl
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -388,12 +413,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -403,7 +428,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -419,7 +444,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -430,7 +455,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -443,7 +468,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -453,7 +478,7 @@ _inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -469,7 +494,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -479,25 +504,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -506,7 +533,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.VolumeControl.md

@@ -20,9 +20,9 @@ The component for controlling the volume level
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -64,14 +64,14 @@ The component for controlling the volume level
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -80,7 +80,7 @@ The component for controlling the volume level
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -93,7 +93,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -103,7 +103,7 @@ _inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` The constructed class name
 
-_inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_inherited from_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -115,7 +115,7 @@ _inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -126,7 +126,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -140,7 +140,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js/blob/master/src/js/component.js#L190)
+_inherited from_: [src/js/component.js#L194](https://github.com/videojs/video.js/blob/master/src/js/component.js#L194)
 
 ---
 
@@ -154,21 +154,14 @@ _inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -180,12 +173,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -193,7 +213,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -206,32 +226,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -243,7 +268,7 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
@@ -268,7 +293,7 @@ _defined in_: [src/js/control-bar/volume-control.js#L10](https://github.com/vide
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -280,7 +305,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -296,7 +321,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -319,7 +344,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -333,7 +358,7 @@ _inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -376,12 +401,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -391,7 +416,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -407,7 +432,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -418,7 +443,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -431,7 +456,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -441,7 +466,7 @@ _inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -457,7 +482,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -467,25 +492,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -494,7 +521,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.VolumeHandle.md

@@ -19,9 +19,9 @@ The volume handle can be dragged to adjust the volume level
   - [children](#children) _`inherited`_
   - [contentEl](#contentel) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -64,14 +64,14 @@ The volume handle can be dragged to adjust the volume level
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -80,7 +80,7 @@ The volume handle can be dragged to adjust the volume level
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -93,7 +93,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -103,7 +103,7 @@ _inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` The constructed class name
 
-_inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_inherited from_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -115,7 +115,7 @@ _inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -126,7 +126,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -151,21 +151,14 @@ _defined in_: [src/js/control-bar/volume-control.js#L137](https://github.com/vid
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -177,12 +170,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -190,7 +210,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -203,32 +223,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -240,12 +265,12 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
 ### init( player, options, ready )
-> the constructor funciton for the class
+> the constructor function for the class
 
 ##### PARAMETERS: 
 * __player__ 
@@ -267,7 +292,7 @@ _inherited from_: [src/js/component.js#L41](https://github.com/videojs/video.js/
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -279,7 +304,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -295,7 +320,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -318,7 +343,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -332,7 +357,7 @@ _inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -375,12 +400,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -390,7 +415,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -406,7 +431,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -417,7 +442,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -430,7 +455,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -440,7 +465,7 @@ _inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -456,7 +481,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -466,25 +491,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -493,7 +520,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.VolumeLevel.md

@@ -20,9 +20,9 @@ Shows volume level
   - [contentEl](#contentel) _`inherited`_
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -64,14 +64,14 @@ Shows volume level
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -80,7 +80,7 @@ Shows volume level
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -93,7 +93,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -103,7 +103,7 @@ _inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` The constructed class name
 
-_inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js/blob/master/src/js/component.js#L471)
+_inherited from_: [src/js/component.js#L475](https://github.com/videojs/video.js/blob/master/src/js/component.js#L475)
 
 ---
 
@@ -115,7 +115,7 @@ _inherited from_: [src/js/component.js#L471](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -126,7 +126,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -140,7 +140,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js/blob/master/src/js/component.js#L190)
+_inherited from_: [src/js/component.js#L194](https://github.com/videojs/video.js/blob/master/src/js/component.js#L194)
 
 ---
 
@@ -154,21 +154,14 @@ _inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -180,12 +173,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -193,7 +213,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -206,32 +226,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -243,7 +268,7 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
@@ -268,7 +293,7 @@ _defined in_: [src/js/control-bar/volume-control.js#L113](https://github.com/vid
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -280,7 +305,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -296,7 +321,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -319,7 +344,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -333,7 +358,7 @@ _inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -376,12 +401,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -391,7 +416,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -407,7 +432,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -418,7 +443,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -431,7 +456,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -441,7 +466,7 @@ _inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -457,7 +482,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -467,25 +492,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -494,7 +521,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.VolumeMenuButton.md

@@ -21,9 +21,9 @@ Menu button with a popup for showing the volume slider.
   - [createEl](#createel-tagname-attributes-) _`inherited`_
   - [createItems](#createitems) _`inherited`_
   - [dimensions](#dimensions-width-height-) _`inherited`_
-  - [disable](#disable) _`inherited`_
   - [dispose](#dispose) _`inherited`_
   - [el](#el) _`inherited`_
+  - [enableTouchActivity](#enabletouchactivity) _`inherited`_
   - [getChild](#getchild-name-) _`inherited`_
   - [getChildById](#getchildbyid-id-) _`inherited`_
   - [height](#height-num-skiplisteners-) _`inherited`_
@@ -65,14 +65,14 @@ Menu button with a popup for showing the volume slider.
 > 
 > 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
->        }
->      }
->    });
+>     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
@@ -81,7 +81,7 @@ Menu button with a popup for showing the volume slider.
 ##### RETURNS: 
 * `vjs.Component` The child component (created by this process if a string was used)
 
-_inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js/blob/master/src/js/component.js#L343)
+_inherited from_: [src/js/component.js#L347](https://github.com/videojs/video.js/blob/master/src/js/component.js#L347)
 
 ---
 
@@ -94,7 +94,7 @@ _inherited from_: [src/js/component.js#L343](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L628](https://github.com/videojs/video.js/blob/master/src/js/component.js#L628)
+_inherited from_: [src/js/component.js#L632](https://github.com/videojs/video.js/blob/master/src/js/component.js#L632)
 
 ---
 
@@ -113,7 +113,7 @@ _inherited from_: [src/js/menu.js#L157](https://github.com/videojs/video.js/blob
 ##### RETURNS: 
 * `Array` The children
 
-_inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js/blob/master/src/js/component.js#L277)
+_inherited from_: [src/js/component.js#L281](https://github.com/videojs/video.js/blob/master/src/js/component.js#L281)
 
 ---
 
@@ -124,7 +124,7 @@ _inherited from_: [src/js/component.js#L277](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js/blob/master/src/js/component.js#L220)
+_inherited from_: [src/js/component.js#L224](https://github.com/videojs/video.js/blob/master/src/js/component.js#L224)
 
 ---
 
@@ -138,7 +138,7 @@ _inherited from_: [src/js/component.js#L220](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L190](https://github.com/videojs/video.js/blob/master/src/js/component.js#L190)
+_inherited from_: [src/js/component.js#L194](https://github.com/videojs/video.js/blob/master/src/js/component.js#L194)
 
 ---
 
@@ -159,21 +159,14 @@ _inherited from_: [src/js/menu.js#L154](https://github.com/videojs/video.js/blob
 ##### RETURNS: 
 * `vjs.Component` The component
 
-_inherited from_: [src/js/component.js#L730](https://github.com/videojs/video.js/blob/master/src/js/component.js#L730)
-
----
-
-### disable()
-> Disable component by making it unshowable
-
-_inherited from_: [src/js/component.js#L691](https://github.com/videojs/video.js/blob/master/src/js/component.js#L691)
+_inherited from_: [src/js/component.js#L744](https://github.com/videojs/video.js/blob/master/src/js/component.js#L744)
 
 ---
 
 ### dispose()
 > Dispose of the component and all child components
 
-_inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/blob/master/src/js/component.js#L74)
+_inherited from_: [src/js/component.js#L78](https://github.com/videojs/video.js/blob/master/src/js/component.js#L78)
 
 ---
 
@@ -185,12 +178,39 @@ _inherited from_: [src/js/component.js#L74](https://github.com/videojs/video.js/
 ##### RETURNS: 
 * `Element` 
 
-_inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js/blob/master/src/js/component.js#L201)
+_inherited from_: [src/js/component.js#L205](https://github.com/videojs/video.js/blob/master/src/js/component.js#L205)
+
+---
+
+### 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#L897](https://github.com/videojs/video.js/blob/master/src/js/component.js#L897)
 
 ---
 
 ### getChild( name )
-> Returns a child component with the provided ID
+> Returns a child component with the provided name
 
 ##### PARAMETERS: 
 * __name__ 
@@ -198,7 +218,7 @@ _inherited from_: [src/js/component.js#L201](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js/blob/master/src/js/component.js#L311)
+_inherited from_: [src/js/component.js#L315](https://github.com/videojs/video.js/blob/master/src/js/component.js#L315)
 
 ---
 
@@ -211,32 +231,37 @@ _inherited from_: [src/js/component.js#L311](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js/blob/master/src/js/component.js#L294)
+_inherited from_: [src/js/component.js#L298](https://github.com/videojs/video.js/blob/master/src/js/component.js#L298)
 
 ---
 
 ### 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` The component if the height was set
-* `Number|String` The height if it wasn't set
+* `vjs.Component` This component, when setting the height
+* `Number|String` The height, when getting
 
-_inherited from_: [src/js/component.js#L719](https://github.com/videojs/video.js/blob/master/src/js/component.js#L719)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
 
 ---
 
 ### hide()
-> Hide the component element if hidden
+> Hide the component element if currently showing
 
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js/blob/master/src/js/component.js#L659)
+_inherited from_: [src/js/component.js#L663](https://github.com/videojs/video.js/blob/master/src/js/component.js#L663)
 
 ---
 
@@ -248,7 +273,7 @@ _inherited from_: [src/js/component.js#L659](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L239](https://github.com/videojs/video.js/blob/master/src/js/component.js#L239)
+_inherited from_: [src/js/component.js#L243](https://github.com/videojs/video.js/blob/master/src/js/component.js#L243)
 
 ---
 
@@ -273,7 +298,7 @@ _defined in_: [src/js/control-bar/volume-menu-button.js#L7](https://github.com/v
 >       }
 >     }
 
-_inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js/blob/master/src/js/component.js#L439)
+_inherited from_: [src/js/component.js#L443](https://github.com/videojs/video.js/blob/master/src/js/component.js#L443)
 
 ---
 
@@ -285,7 +310,7 @@ _inherited from_: [src/js/component.js#L439](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `String` 
 
-_inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js/blob/master/src/js/component.js#L258)
+_inherited from_: [src/js/component.js#L262](https://github.com/videojs/video.js/blob/master/src/js/component.js#L262)
 
 ---
 
@@ -301,7 +326,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js/blob/master/src/js/component.js#L510)
+_inherited from_: [src/js/component.js#L514](https://github.com/videojs/video.js/blob/master/src/js/component.js#L514)
 
 ---
 
@@ -324,7 +349,7 @@ _inherited from_: [src/js/component.js#L510](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js/blob/master/src/js/component.js#L496)
+_inherited from_: [src/js/component.js#L500](https://github.com/videojs/video.js/blob/master/src/js/component.js#L500)
 
 ---
 
@@ -338,7 +363,7 @@ _inherited from_: [src/js/component.js#L496](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js/blob/master/src/js/component.js#L522)
+_inherited from_: [src/js/component.js#L526](https://github.com/videojs/video.js/blob/master/src/js/component.js#L526)
 
 ---
 
@@ -381,12 +406,12 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
 >     }
 
 ##### PARAMETERS: 
-* __obj__ `Object` Object whose values will be overwritten
+* __obj__ `Object` Object of new option values
 
 ##### RETURNS: 
-* `Object` NEW merged object. Does not return obj1.
+* `Object` A NEW object of this.options_ and obj merged
 
-_inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js/blob/master/src/js/component.js#L169)
+_inherited from_: [src/js/component.js#L173](https://github.com/videojs/video.js/blob/master/src/js/component.js#L173)
 
 ---
 
@@ -396,7 +421,7 @@ _inherited from_: [src/js/component.js#L169](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Player` 
 
-_inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js/blob/master/src/js/component.js#L116)
+_inherited from_: [src/js/component.js#L120](https://github.com/videojs/video.js/blob/master/src/js/component.js#L120)
 
 ---
 
@@ -412,7 +437,7 @@ _inherited from_: [src/js/component.js#L116](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js/blob/master/src/js/component.js#L581)
+_inherited from_: [src/js/component.js#L585](https://github.com/videojs/video.js/blob/master/src/js/component.js#L585)
 
 ---
 
@@ -423,7 +448,7 @@ _inherited from_: [src/js/component.js#L581](https://github.com/videojs/video.js
 ##### PARAMETERS: 
 * __component__ `vjs.Component` Component to remove
 
-_inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js/blob/master/src/js/component.js#L401)
+_inherited from_: [src/js/component.js#L405](https://github.com/videojs/video.js/blob/master/src/js/component.js#L405)
 
 ---
 
@@ -436,7 +461,7 @@ _inherited from_: [src/js/component.js#L401](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js/blob/master/src/js/component.js#L639)
+_inherited from_: [src/js/component.js#L643](https://github.com/videojs/video.js/blob/master/src/js/component.js#L643)
 
 ---
 
@@ -446,7 +471,7 @@ _inherited from_: [src/js/component.js#L639](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js/blob/master/src/js/component.js#L649)
+_inherited from_: [src/js/component.js#L653](https://github.com/videojs/video.js/blob/master/src/js/component.js#L653)
 
 ---
 
@@ -462,7 +487,7 @@ _inherited from_: [src/js/component.js#L649](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` self
 
-_inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js/blob/master/src/js/component.js#L536)
+_inherited from_: [src/js/component.js#L540](https://github.com/videojs/video.js/blob/master/src/js/component.js#L540)
 
 ---
 
@@ -472,25 +497,27 @@ _inherited from_: [src/js/component.js#L536](https://github.com/videojs/video.js
 ##### RETURNS: 
 * `vjs.Component` 
 
-_inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js/blob/master/src/js/component.js#L600)
+_inherited from_: [src/js/component.js#L604](https://github.com/videojs/video.js/blob/master/src/js/component.js#L604)
 
 ---
 
 ### width( [num], skipListeners )
 > Set or get the width of the component (CSS values)
 > 
-> Video tag width/height only work in pixels. No percents.
-> But allowing limited percents use. e.g. width() will return number+%, not computed width
+> 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` Returns 'this' if width was set
-* `Number|String` Returns the width if nothing was set
+* `vjs.Component` This component, when setting the width
+* `Number|String` The width, when getting
 
-_inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js/blob/master/src/js/component.js#L707)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
 
 ---
 
@@ -499,7 +526,7 @@ _inherited from_: [src/js/component.js#L707](https://github.com/videojs/video.js
 ### resize `EVENT`
 > Fired when the width and/or height of the component changes
 
-_inherited from_: [src/js/component.js#L809](https://github.com/videojs/video.js/blob/master/src/js/component.js#L809)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
 
 ---
 

docs/api/vjs.md

@@ -69,6 +69,9 @@ The `vjs` function can be used to initialize or retrieve a player.
   - [VolumeLevel](vjs.VolumeLevel.md)
   - [VolumeMenuButton](vjs.VolumeMenuButton.md)
 
+- NAMESPACES
+  - [util](vjs.util.md)
+
 - [METHODS](#methods)
   - [plugin](#plugin-name-init-)
 

docs/api/vjs.media.md

@@ -17,7 +17,7 @@
 ### ApiMethods
 > List of default API methods for any MediaTechController
 
-_defined in_: [src/js/media/media.js#L174](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L174)
+_defined in_: [src/js/media/media.js#L160](https://github.com/videojs/video.js/blob/master/src/js/media/media.js#L160)
 
 ---
 

docs/guides/api.md

@@ -41,4 +41,4 @@ myPlayer.currentTime(120);
 
 ```
 
-The full list of player API methods and events can be found in the [player API docs](../api/player.md).
+The full list of player API methods and events can be found in the [player API docs](../api/vjs.Player.md).

docs/guides/setup.md

@@ -14,14 +14,14 @@ You can download the Video.js source and host it on your own servers, or use the
 
 > ```html
 <script type="text/javascript">
-  document.createElement('video');document.createElement('audio');
+  document.createElement('video');document.createElement('audio');document.createElement('track');
 </script>
 ```
 
 ### CDN Version ###
 ```html
-<link href="//vjs.zencdn.net/4.2/video-js.css" rel="stylesheet">
-<script src="//vjs.zencdn.net/4.2/video.js"></script>
+<link href="//vjs.zencdn.net/4.4/video-js.css" rel="stylesheet">
+<script src="//vjs.zencdn.net/4.4/video.js"></script>
 ```
 
 ### Self Hosted. ###
@@ -86,3 +86,17 @@ The second argument is an options object. It allows you to set additional option
 
 The third argument is a 'ready' callback. Once Video.js has initialized it will call this function.
 
+Instead of using an element ID, you can also pass a reference to the element itself.
+
+```js
+videojs(document.getElementsById('example_video_1')), {}, function()) {
+  // This is functionally the same as the previous example.
+});
+```
+
+```js
+videojs(document.getElementsByClassName('awesome_video_class')[0], {}, function()) {
+  // You can grab an element by class if you'd like, just make sure
+  // if it's an array that you pick one (here we chose the first).
+});
+```

docs/index.md

@@ -31,5 +31,5 @@ There are two categories of docs: [Guides](./guides/) and [API docs](./api/). Gu
 * [Glossary](./guides/glossary.md) - Some helpful definitions.
 
 ## API Docs
-- The most relevant API doc is the [player API doc](./api/player.md).
+- The most relevant API doc is the [player API doc](./api/vjs.Player.md).
 - [Full list of API Docs](./api/)

package.json

@@ -1,9 +1,10 @@
 {
   "name": "video.js",
   "description": "An HTML5 and Flash video player with a common API and skin for both.",
-  "version": "4.3.0",
-  "copyright": "Copyright 2013 Brightcove, Inc. https://github.com/videojs/video.js/blob/master/LICENSE",
+  "version": "4.4.2",
+  "copyright": "Copyright 2014 Brightcove, Inc. https://github.com/videojs/video.js/blob/master/LICENSE",
   "keywords": [
+    "videojs",
     "html5",
     "flash",
     "video",
@@ -16,11 +17,15 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/zencoder/video-js.git"
+    "url": "https://github.com/videojs/video.js.git"
+  },
+  "main": "./dist/video-js/video.js",
+  "dependencies": {
+    "videojs-swf": "4.4.0"
   },
   "devDependencies": {
     "grunt-cli": "~0.1.0",
-    "grunt": "~0.4.0",
+    "grunt": "~0.4",
     "grunt-contrib-jshint": "~0.4.3",
     "grunt-contrib-watch": "~0.1.4",
     "grunt-contrib-qunit": "~0.2.1",
@@ -34,25 +39,21 @@
     "grunt-contrib-cssmin": "~0.6.0",
     "uglify-js": "~2.3.6",
     "grunt-contrib-less": "~0.6.4",
-    "grunt-karma": "~0.4.4",
-    "karma-qunit": "~0.0.2",
-    "videojs-doc-generator": "0.0.1"
-  },
-  "testling": {
-    "browsers": [
-      "ie6",
-      "ie7",
-      "ie8",
-      "ie9",
-      "firefox/15",
-      "chrome/22",
-      "opera/12",
-      "safari/5.1"
-    ],
-    "harness": "mocha-qunit",
-    "scripts": [
-      "src/js/*.js",
-      "test/unit/*.js"
-    ]
+    "grunt-karma": "~0.6.2",
+    "karma": "~0.10.0",
+    "karma-chrome-launcher": "~0.1.2",
+    "karma-firefox-launcher": "~0.1.3",
+    "karma-ie-launcher": "~0.1.1",
+    "karma-opera-launcher": "~0.1.0",
+    "karma-phantomjs-launcher": "~0.1.1",
+    "karma-safari-launcher": "~0.1.1",
+    "karma-qunit": "~0.1.1",
+    "videojs-doc-generator": "0.0.1",
+    "qunitjs": "~1.12.0",
+    "grunt-zip": "0.10.2",
+    "grunt-banner": "~0.2.0",
+    "chg": "~0.1.8",
+    "grunt-bump": "0.0.13",
+    "grunt-tagrelease": "~0.3.3"
   }
 }

sandbox/index.html.example

@@ -11,7 +11,7 @@
 
   <!-- Set the location of the flash SWF -->
   <script>
-    vjs.options.flash.swf = '../src/swf/video-js.swf'
+    vjs.options.flash.swf = '../node_modules/videojs-swf/dist/video-js.swf'
   </script>
 
 </head>

src/js/button.js

@@ -43,7 +43,7 @@ vjs.Button.prototype.createEl = function(type, props){
   props = vjs.obj.merge({
     className: this.buildCSSClass(),
     innerHTML: '<div class="vjs-control-content"><span class="vjs-control-text">' + (this.buttonText || 'Need Text') + '</span></div>',
-    role: 'button',
+    'role': 'button',
     'aria-live': 'polite', // let the screen reader user know that the text of the button may change
     tabIndex: 0
   }, props);

src/js/component.js

@@ -34,7 +34,7 @@
  */
 vjs.Component = vjs.CoreObject.extend({
   /**
-   * the constructor funciton for the class
+   * the constructor function for the class
    *
    * @constructor
    */
@@ -65,6 +65,10 @@ vjs.Component = vjs.CoreObject.extend({
     this.ready(ready);
     // Don't want to trigger ready here or it will before init is actually
     // finished for all children that run this constructor
+
+    if (options.reportTouchActivity !== false) {
+      this.enableTouchActivity();
+    }
   }
 });
 
@@ -72,7 +76,7 @@ vjs.Component = vjs.CoreObject.extend({
  * Dispose of the component and all child components
  */
 vjs.Component.prototype.dispose = function(){
-  this.trigger('dispose');
+  this.trigger({ type: 'dispose', 'bubbles': false });
 
   // Dispose all children.
   if (this.children_) {
@@ -163,13 +167,13 @@ vjs.Component.prototype.options_;
  *       }
  *     }
  *
- * @param  {Object} obj Object whose values will be overwritten
- * @return {Object}     NEW merged object. Does not return obj1.
+ * @param  {Object} obj Object of new option values
+ * @return {Object}     A NEW object of this.options_ and obj merged
  */
 vjs.Component.prototype.options = function(obj){
   if (obj === undefined) return this.options_;
 
-  return this.options_ = vjs.obj.deepMerge(this.options_, obj);
+  return this.options_ = vjs.util.mergeOptions(this.options_, obj);
 };
 
 /**
@@ -304,7 +308,7 @@ vjs.Component.prototype.getChildById = function(id){
 vjs.Component.prototype.childNameIndex_;
 
 /**
- * Returns a child component with the provided ID
+ * Returns a child component with the provided name
  *
  * @return {vjs.Component}
  */
@@ -326,14 +330,14 @@ vjs.Component.prototype.getChild = function(name){
  *
  * 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
- *        }
- *      }
- *    });
+ *     var myButton = myComponent.addChild('MyButton', {
+ *       text: 'Press Me',
+ *       children: {
+ *         buttonChildExample: {
+ *           buttonChildOption: true
+ *         }
+ *       }
+ *     });
  *
  * @param {String|vjs.Component} child The class name or instance of a child to add
  * @param {Object=} options Options, including options to be passed to children of the child.
@@ -652,7 +656,7 @@ vjs.Component.prototype.show = function(){
 };
 
 /**
- * Hide the component element if hidden
+ * Hide the component element if currently showing
  *
  * @return {vjs.Component}
  */
@@ -687,6 +691,9 @@ vjs.Component.prototype.unlockShowing = function(){
 
 /**
  * Disable component by making it unshowable
+ *
+ * Currently private because we're movign towards more css-based states.
+ * @private
  */
 vjs.Component.prototype.disable = function(){
   this.hide();
@@ -696,13 +703,15 @@ vjs.Component.prototype.disable = function(){
 /**
  * Set or get the width of the component (CSS values)
  *
- * Video tag width/height only work in pixels. No percents.
- * But allowing limited percents use. e.g. width() will return number+%, not computed width
+ * 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.
  *
  * @param  {Number|String=} num   Optional width number
  * @param  {Boolean} skipListeners Skip the 'resize' event trigger
- * @return {vjs.Component} Returns 'this' if width was set
- * @return {Number|String} Returns the width if nothing was set
+ * @return {vjs.Component} This component, when setting the width
+ * @return {Number|String} The width, when getting
  */
 vjs.Component.prototype.width = function(num, skipListeners){
   return this.dimension('width', num, skipListeners);
@@ -711,10 +720,15 @@ vjs.Component.prototype.width = function(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.
+ *
  * @param  {Number|String=} num     New component height
  * @param  {Boolean=} skipListeners Skip the resize event trigger
- * @return {vjs.Component} The component if the height was set
- * @return {Number|String} The height if it wasn't set
+ * @return {vjs.Component} This component, when setting the height
+ * @return {Number|String} The height, when getting
  */
 vjs.Component.prototype.height = function(num, skipListeners){
   return this.dimension('height', num, skipListeners);
@@ -841,7 +855,7 @@ vjs.Component.prototype.emitTapEvents = function(){
 
   // When the touch ends, measure how long it took and trigger the appropriate
   // event
-  this.on('touchend', function() {
+  this.on('touchend', function(event) {
     // Proceed only if the touchmove/leave/cancel event didn't happen
     if (couldBeTap === true) {
       // Measure how long the touch lasted
@@ -856,3 +870,54 @@ vjs.Component.prototype.emitTapEvents = function(){
     }
   });
 };
+
+/**
+ * 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.
+ */
+vjs.Component.prototype.enableTouchActivity = function() {
+  var report, touchHolding, touchEnd;
+
+  // listener for reporting that the user is active
+  report = vjs.bind(this.player(), this.player().reportUserActivity);
+
+  this.on('touchstart', function() {
+    report();
+    // 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);
+    // report at the same interval as activityCheck
+    touchHolding = setInterval(report, 250);
+  });
+
+  touchEnd = function(event) {
+    report();
+    // stop the interval that maintains activity if the touch is holding
+    clearInterval(touchHolding);
+  };
+
+  this.on('touchmove', report);
+  this.on('touchend', touchEnd);
+  this.on('touchcancel', touchEnd);
+};
+

src/js/control-bar/fullscreen-toggle.js

@@ -23,7 +23,7 @@ vjs.FullscreenToggle.prototype.buildCSSClass = function(){
 };
 
 vjs.FullscreenToggle.prototype.onClick = function(){
-  if (!this.player_.isFullScreen) {
+  if (!this.player_.isFullScreen()) {
     this.player_.requestFullScreen();
     this.el_.children[0].children[0].innerHTML = 'Non-Fullscreen'; // change the button text to "Non-Fullscreen"
   } else {

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

@@ -68,25 +68,7 @@ vjs.SeekBar.prototype.updateARIAAttributes = function(){
 };
 
 vjs.SeekBar.prototype.getPercent = function(){
-  var currentTime;
-  // Flash RTMP provider will not report the correct time
-  // immediately after a seek. This isn't noticeable if you're
-  // seeking while the video is playing, but it is if you seek
-  // while the video is paused.
-  if (this.player_.techName === 'Flash' && this.player_.seeking()) {
-    var cache = this.player_.getCache();
-    if (cache.lastSetCurrentTime) {
-      currentTime = cache.lastSetCurrentTime;
-    }
-    else {
-      currentTime = this.player_.currentTime();
-    }
-  }
-  else {
-    currentTime = this.player_.currentTime();
-  }
-
-  return currentTime / this.player_.duration();
+  return this.player_.currentTime() / this.player_.duration();
 };
 
 vjs.SeekBar.prototype.onMouseDown = function(event){
@@ -182,7 +164,12 @@ vjs.PlayProgressBar.prototype.createEl = function(){
  * @param {Object=} options
  * @constructor
  */
-vjs.SeekHandle = vjs.SliderHandle.extend();
+vjs.SeekHandle = vjs.SliderHandle.extend({
+  init: function(player, options) {
+    vjs.SliderHandle.call(this, player, options);
+    player.on('timeupdate', vjs.bind(this, this.updateContent));
+  }
+});
 
 /**
  * The default value for the handle content, which may be read by screen readers
@@ -193,8 +180,14 @@ vjs.SeekHandle = vjs.SliderHandle.extend();
 vjs.SeekHandle.prototype.defaultValue = '00:00';
 
 /** @inheritDoc */
-vjs.SeekHandle.prototype.createEl = function(){
+vjs.SeekHandle.prototype.createEl = function() {
   return vjs.SliderHandle.prototype.createEl.call(this, 'div', {
-    className: 'vjs-seek-handle'
+    className: 'vjs-seek-handle',
+    'aria-live': 'off'
   });
 };
+
+vjs.SeekHandle.prototype.updateContent = function() {
+  var time = (this.player_.scrubbing) ? this.player_.getCache().currentTime : this.player_.currentTime();
+  this.el_.innerHTML = '<span class="vjs-control-text">' + vjs.formatTime(time, this.player_.duration()) + '</span>';
+};

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

@@ -18,20 +18,20 @@ vjs.CurrentTimeDisplay.prototype.createEl = function(){
     className: 'vjs-current-time vjs-time-controls vjs-control'
   });
 
-  this.content = vjs.createEl('div', {
+  this.contentEl_ = vjs.createEl('div', {
     className: 'vjs-current-time-display',
     innerHTML: '<span class="vjs-control-text">Current Time </span>' + '0:00', // label the current time for screen reader users
     'aria-live': 'off' // tell screen readers not to automatically read the time as it changes
   });
 
-  el.appendChild(vjs.createEl('div').appendChild(this.content));
+  el.appendChild(this.contentEl_);
   return el;
 };
 
 vjs.CurrentTimeDisplay.prototype.updateContent = function(){
   // Allows for smooth scrubbing, when player can't keep up.
   var time = (this.player_.scrubbing) ? this.player_.getCache().currentTime : this.player_.currentTime();
-  this.content.innerHTML = '<span class="vjs-control-text">Current Time </span>' + vjs.formatTime(time, this.player_.duration());
+  this.contentEl_.innerHTML = '<span class="vjs-control-text">Current Time </span>' + vjs.formatTime(time, this.player_.duration());
 };
 
 /**
@@ -45,7 +45,12 @@ vjs.DurationDisplay = vjs.Component.extend({
   init: function(player, options){
     vjs.Component.call(this, player, options);
 
-    player.on('timeupdate', vjs.bind(this, this.updateContent)); // this might need to be changes to 'durationchange' instead of 'timeupdate' eventually, however the durationchange event fires before this.player_.duration() is set, so the value cannot be written out using this method. Once the order of durationchange and this.player_.duration() being set is figured out, this can be updated.
+    // this might need to be changed to 'durationchange' instead of 'timeupdate' eventually,
+    // however the durationchange event fires before this.player_.duration() is set,
+    // so the value cannot be written out using this method.
+    // Once the order of durationchange and this.player_.duration() being set is figured out,
+    // this can be updated.
+    player.on('timeupdate', vjs.bind(this, this.updateContent));
   }
 });
 
@@ -54,20 +59,20 @@ vjs.DurationDisplay.prototype.createEl = function(){
     className: 'vjs-duration vjs-time-controls vjs-control'
   });
 
-  this.content = vjs.createEl('div', {
+  this.contentEl_ = vjs.createEl('div', {
     className: 'vjs-duration-display',
     innerHTML: '<span class="vjs-control-text">Duration Time </span>' + '0:00', // label the duration time for screen reader users
     'aria-live': 'off' // tell screen readers not to automatically read the time as it changes
   });
 
-  el.appendChild(vjs.createEl('div').appendChild(this.content));
+  el.appendChild(this.contentEl_);
   return el;
 };
 
 vjs.DurationDisplay.prototype.updateContent = function(){
   var duration = this.player_.duration();
   if (duration) {
-      this.content.innerHTML = '<span class="vjs-control-text">Duration Time </span>' + vjs.formatTime(duration); // label the duration time for screen reader users
+      this.contentEl_.innerHTML = '<span class="vjs-control-text">Duration Time </span>' + vjs.formatTime(duration); // label the duration time for screen reader users
   }
 };
 
@@ -114,22 +119,22 @@ vjs.RemainingTimeDisplay.prototype.createEl = function(){
     className: 'vjs-remaining-time vjs-time-controls vjs-control'
   });
 
-  this.content = vjs.createEl('div', {
+  this.contentEl_ = vjs.createEl('div', {
     className: 'vjs-remaining-time-display',
     innerHTML: '<span class="vjs-control-text">Remaining Time </span>' + '-0:00', // label the remaining time for screen reader users
     'aria-live': 'off' // tell screen readers not to automatically read the time as it changes
   });
 
-  el.appendChild(vjs.createEl('div').appendChild(this.content));
+  el.appendChild(this.contentEl_);
   return el;
 };
 
 vjs.RemainingTimeDisplay.prototype.updateContent = function(){
   if (this.player_.duration()) {
-    this.content.innerHTML = '<span class="vjs-control-text">Remaining Time </span>' + '-'+ vjs.formatTime(this.player_.remainingTime());
+    this.contentEl_.innerHTML = '<span class="vjs-control-text">Remaining Time </span>' + '-'+ vjs.formatTime(this.player_.remainingTime());
   }
 
   // Allows for smooth scrubbing, when player can't keep up.
   // var time = (this.player_.scrubbing) ? this.player_.getCache().currentTime : this.player_.currentTime();
-  // this.content.innerHTML = vjs.formatTime(time, this.player_.duration());
+  // this.contentEl_.innerHTML = vjs.formatTime(time, this.player_.duration());
 };

src/js/core.js

@@ -116,3 +116,18 @@ if (vjs.CDN_VERSION !== 'GENERATED'+'_CDN_VSN') {
  * @type {Object}
  */
 vjs.players = {};
+
+/*!
+ * Custom Universal Module Definition (UMD)
+ *
+ * Video.js will never be a non-browser lib so we can simplify UMD a bunch and
+ * still support requirejs and browserify. This also needs to be closure
+ * compiler compatible, so string keys are used.
+ */
+if (typeof define === 'function' && define['amd']) {
+  define([], function(){ return videojs; });
+
+// checking that module is an object too because of umdjs/umd#35
+} else if (typeof exports === 'object' && typeof module === 'object') {
+  module['exports'] = videojs;
+}

src/js/events.js

@@ -179,8 +179,13 @@ vjs.fixEvent = function(event) {
     // TODO: Probably best to create a whitelist of event props
     for (var key in old) {
       // Safari 6.0.3 warns you if you try to copy deprecated layerX/Y
-      if (key !== 'layerX' && key !== 'layerY') {
-        event[key] = old[key];
+      // Chrome warns you if you try to copy deprecated keyboardEvent.keyLocation
+      if (key !== 'layerX' && key !== 'layerY' && key !== 'keyboardEvent.keyLocation') {
+        // Chrome 32+ warns if you try to copy deprecated returnValue, but
+        // we still want to if preventDefault isn't supported (IE8).
+        if (!(key == 'returnValue' && old.preventDefault)) {
+          event[key] = old[key];
+        }
       }
     }
 

src/js/exports.js

@@ -39,12 +39,20 @@ goog.exportSymbol('videojs.cache', vjs.cache);
 // goog.exportProperty(vjs.CoreObject, 'create', vjs.CoreObject.create);
 
 goog.exportSymbol('videojs.Component', vjs.Component);
+// already in default externs: id, name
 goog.exportProperty(vjs.Component.prototype, 'player', vjs.Component.prototype.player);
+goog.exportProperty(vjs.Component.prototype, 'options', vjs.Component.prototype.options);
+goog.exportProperty(vjs.Component.prototype, 'init', vjs.Component.prototype.init);
 goog.exportProperty(vjs.Component.prototype, 'dispose', vjs.Component.prototype.dispose);
 goog.exportProperty(vjs.Component.prototype, 'createEl', vjs.Component.prototype.createEl);
+goog.exportProperty(vjs.Component.prototype, 'contentEl', vjs.Component.prototype.contentEl);
 goog.exportProperty(vjs.Component.prototype, 'el', vjs.Component.prototype.el);
 goog.exportProperty(vjs.Component.prototype, 'addChild', vjs.Component.prototype.addChild);
+goog.exportProperty(vjs.Component.prototype, 'getChild', vjs.Component.prototype.getChild);
+goog.exportProperty(vjs.Component.prototype, 'getChildById', vjs.Component.prototype.getChildById);
 goog.exportProperty(vjs.Component.prototype, 'children', vjs.Component.prototype.children);
+goog.exportProperty(vjs.Component.prototype, 'initChildren', vjs.Component.prototype.initChildren);
+goog.exportProperty(vjs.Component.prototype, 'removeChild', vjs.Component.prototype.removeChild);
 goog.exportProperty(vjs.Component.prototype, 'on', vjs.Component.prototype.on);
 goog.exportProperty(vjs.Component.prototype, 'off', vjs.Component.prototype.off);
 goog.exportProperty(vjs.Component.prototype, 'one', vjs.Component.prototype.one);
@@ -58,15 +66,10 @@ goog.exportProperty(vjs.Component.prototype, 'dimensions', vjs.Component.prototy
 goog.exportProperty(vjs.Component.prototype, 'ready', vjs.Component.prototype.ready);
 goog.exportProperty(vjs.Component.prototype, 'addClass', vjs.Component.prototype.addClass);
 goog.exportProperty(vjs.Component.prototype, 'removeClass', vjs.Component.prototype.removeClass);
+goog.exportProperty(vjs.Component.prototype, 'buildCSSClass', vjs.Component.prototype.buildCSSClass);
 
-goog.exportSymbol('videojs.Player', vjs.Player);
-goog.exportProperty(vjs.Player.prototype, 'dispose', vjs.Player.prototype.dispose);
-goog.exportProperty(vjs.Player.prototype, 'requestFullScreen', vjs.Player.prototype.requestFullScreen);
-goog.exportProperty(vjs.Player.prototype, 'cancelFullScreen', vjs.Player.prototype.cancelFullScreen);
-goog.exportProperty(vjs.Player.prototype, 'bufferedPercent', vjs.Player.prototype.bufferedPercent);
-goog.exportProperty(vjs.Player.prototype, 'usingNativeControls', vjs.Player.prototype.usingNativeControls);
-goog.exportProperty(vjs.Player.prototype, 'reportUserActivity', vjs.Player.prototype.reportUserActivity);
-goog.exportProperty(vjs.Player.prototype, 'userActive', vjs.Player.prototype.userActive);
+// Need to export ended to ensure it's not removed by CC, since it's not used internally
+goog.exportProperty(vjs.Player.prototype, 'ended', vjs.Player.prototype.ended);
 
 goog.exportSymbol('videojs.MediaLoader', vjs.MediaLoader);
 goog.exportSymbol('videojs.TextTrackDisplay', vjs.TextTrackDisplay);
@@ -125,6 +128,8 @@ goog.exportProperty(vjs.Html5.prototype, 'setMuted', vjs.Html5.prototype.setMute
 goog.exportProperty(vjs.Html5.prototype, 'setPreload', vjs.Html5.prototype.setPreload);
 goog.exportProperty(vjs.Html5.prototype, 'setAutoplay', vjs.Html5.prototype.setAutoplay);
 goog.exportProperty(vjs.Html5.prototype, 'setLoop', vjs.Html5.prototype.setLoop);
+goog.exportProperty(vjs.Html5.prototype, 'enterFullScreen', vjs.Html5.prototype.enterFullScreen);
+goog.exportProperty(vjs.Html5.prototype, 'exitFullScreen', vjs.Html5.prototype.exitFullScreen);
 
 goog.exportSymbol('videojs.Flash', vjs.Flash);
 goog.exportProperty(vjs.Flash, 'isSupported', vjs.Flash.isSupported);
@@ -133,6 +138,10 @@ goog.exportProperty(vjs.Flash, 'onReady', vjs.Flash['onReady']);
 
 goog.exportSymbol('videojs.TextTrack', vjs.TextTrack);
 goog.exportProperty(vjs.TextTrack.prototype, 'label', vjs.TextTrack.prototype.label);
+goog.exportProperty(vjs.TextTrack.prototype, 'kind', vjs.TextTrack.prototype.kind);
+goog.exportProperty(vjs.TextTrack.prototype, 'mode', vjs.TextTrack.prototype.mode);
+goog.exportProperty(vjs.TextTrack.prototype, 'cues', vjs.TextTrack.prototype.cues);
+goog.exportProperty(vjs.TextTrack.prototype, 'activeCues', vjs.TextTrack.prototype.activeCues);
 
 goog.exportSymbol('videojs.CaptionsTrack', vjs.CaptionsTrack);
 goog.exportSymbol('videojs.SubtitlesTrack', vjs.SubtitlesTrack);
@@ -143,3 +152,6 @@ goog.exportSymbol('videojs.autoSetup', vjs.autoSetup);
 goog.exportSymbol('videojs.plugin', vjs.plugin);
 
 goog.exportSymbol('videojs.createTimeRange', vjs.createTimeRange);
+
+goog.exportSymbol('videojs.util', vjs.util);
+goog.exportProperty(vjs.util, 'mergeOptions', vjs.util.mergeOptions);

src/js/json.js

@@ -27,6 +27,8 @@ if (typeof window.JSON !== 'undefined' && window.JSON.parse === 'function') {
    * parse the json
    *
    * @memberof vjs.JSON
+   * @param {String} text The JSON string to parse
+   * @param {Function=} [reviver] Optional function that can transform the results
    * @return {Object|Array} The parsed JSON
    */
   vjs.JSON.parse = function (text, reviver) {

src/js/media/flash.js

@@ -60,7 +60,9 @@ vjs.Flash = vjs.MediaTechController.extend({
           'id': objId,
           'name': objId, // Both ID and Name needed or swf to identifty itself
           'class': 'vjs-tech'
-        }, options['attributes'])
+        }, options['attributes']),
+
+        lastSeekTarget
     ;
 
     // If source was supplied pass as a flash var.
@@ -75,6 +77,19 @@ vjs.Flash = vjs.MediaTechController.extend({
       }
     }
 
+    this['setCurrentTime'] = function(time){
+      lastSeekTarget = time;
+      this.el_.vjs_setProperty('currentTime', time);
+    };
+    this['currentTime'] = function(time){
+      // when seeking make the reported time keep up with the requested time
+      // by reading the time we're seeking to
+      if (this.seeking()) {
+        return lastSeekTarget;
+      }
+      return this.el_.vjs_getProperty('currentTime');
+    };
+
     // Add placeholder to player div
     vjs.insertFirst(placeHolder, parentEl);
 
@@ -88,6 +103,17 @@ vjs.Flash = vjs.MediaTechController.extend({
       });
     }
 
+    // firefox doesn't bubble mousemove events to parent. videojs/video-js-swf#37
+    // bugzilla bug: https://bugzilla.mozilla.org/show_bug.cgi?id=836786
+    if (vjs.IS_FIREFOX) {
+      this.ready(function(){
+        vjs.on(this.el(), 'mousemove', vjs.bind(this, function(){
+          // since it's a custom event, don't bubble higher than the player
+          this.player().trigger({ 'type':'mousemove', 'bubbles': false });
+        }));
+      });
+    }
+
     // Flash iFrame Mode
     // In web browsers there are multiple instances where changing the parent element or visibility of a plugin causes the plugin to reload.
     // - Firefox just about always. https://bugzilla.mozilla.org/show_bug.cgi?id=90268 (might be fixed by version 13)
@@ -272,6 +298,9 @@ vjs.Flash.prototype.load = function(){
 vjs.Flash.prototype.poster = function(){
   this.el_.vjs_getProperty('poster');
 };
+vjs.Flash.prototype.setPoster = function(){
+  // poster images are not handled by the Flash tech so make this a no-op
+};
 
 vjs.Flash.prototype.buffered = function(){
   return vjs.createTimeRange(0, this.el_.vjs_getProperty('buffered'));
@@ -288,9 +317,9 @@ vjs.Flash.prototype.enterFullScreen = function(){
 
 // Create setters and getters for attributes
 var api = vjs.Flash.prototype,
-    readWrite = 'rtmpConnection,rtmpStream,preload,currentTime,defaultPlaybackRate,playbackRate,autoplay,loop,mediaGroup,controller,controls,volume,muted,defaultMuted'.split(','),
+    readWrite = 'rtmpConnection,rtmpStream,preload,defaultPlaybackRate,playbackRate,autoplay,loop,mediaGroup,controller,controls,volume,muted,defaultMuted'.split(','),
     readOnly = 'error,currentSrc,networkState,readyState,seeking,initialTime,duration,startOffsetTime,paused,played,seekable,ended,videoTracks,audioTracks,videoWidth,videoHeight,textTracks'.split(',');
-    // Overridden: buffered
+    // Overridden: buffered, currentTime
 
 /**
  * @this {*}

src/js/media/html5.js

@@ -22,6 +22,7 @@ vjs.Html5 = vjs.MediaTechController.extend({
     this.features['fullscreenResize'] = true;
 
     vjs.MediaTechController.call(this, player, options, ready);
+    this.setupTriggers();
 
     var source = options['source'];
 
@@ -54,7 +55,6 @@ vjs.Html5 = vjs.MediaTechController.extend({
       }
     });
 
-    this.setupTriggers();
     this.triggerReady();
   }
 });
@@ -214,6 +214,9 @@ vjs.Html5.prototype.src = function(src){ this.el_.src = src; };
 vjs.Html5.prototype.load = function(){ this.el_.load(); };
 vjs.Html5.prototype.currentSrc = function(){ return this.el_.currentSrc; };
 
+vjs.Html5.prototype.poster = function(){ return this.el_.poster; };
+vjs.Html5.prototype.setPoster = function(val){ this.el_.poster = val; };
+
 vjs.Html5.prototype.preload = function(){ return this.el_.preload; };
 vjs.Html5.prototype.setPreload = function(val){ this.el_.preload = val; };
 

src/js/media/media.js

@@ -12,6 +12,10 @@
 vjs.MediaTechController = vjs.Component.extend({
   /** @constructor */
   init: function(player, options, ready){
+    options = options || {};
+    // we don't want the tech to report user activity automatically.
+    // This is done manually in addControlsListeners
+    options.reportTouchActivity = false;
     vjs.Component.call(this, player, options, ready);
 
     this.initControlsListeners();
@@ -60,7 +64,7 @@ vjs.MediaTechController.prototype.initControlsListeners = function(){
 };
 
 vjs.MediaTechController.prototype.addControlsListeners = function(){
-  var preventBubble, userWasActive;
+  var userWasActive;
 
   // Some browsers (Chrome & IE) don't trigger a click on a flash swf, but do
   // trigger mousedown/up.
@@ -68,37 +72,20 @@ vjs.MediaTechController.prototype.addControlsListeners = function(){
   // Any touch events are set to block the mousedown event from happening
   this.on('mousedown', this.onClick);
 
-  // We need to block touch events on the video element from bubbling up,
-  // otherwise they'll signal activity prematurely. The specific use case is
-  // when the video is playing and the controls have faded out. In this case
-  // only a tap (fast touch) should toggle the user active state and turn the
-  // controls back on. A touch and move or touch and hold should not trigger
-  // the controls (per iOS as an example at least)
-  //
-  // We always want to stop propagation on touchstart because touchstart
-  // at the player level starts the touchInProgress interval. We can still
-  // report activity on the other events, but won't let them bubble for
-  // consistency. We don't want to bubble a touchend without a touchstart.
+  // If the controls were hidden we don't want that to change without a tap event
+  // so we'll check if the controls were already showing before reporting user
+  // activity
   this.on('touchstart', function(event) {
     // Stop the mouse events from also happening
     event.preventDefault();
-    event.stopPropagation();
-    // Record if the user was active now so we don't have to keep polling it
     userWasActive = this.player_.userActive();
   });
 
-  preventBubble = function(event){
-    event.stopPropagation();
-    if (userWasActive) {
-      this.player_.reportUserActivity();
+  this.on('touchmove', function(event) {
+    if (userWasActive){
+      this.player().reportUserActivity();
     }
-  };
-
-  // Treat all touch events the same for consistency
-  this.on('touchmove', preventBubble);
-  this.on('touchleave', preventBubble);
-  this.on('touchcancel', preventBubble);
-  this.on('touchend', preventBubble);
+  });
 
   // Turn on component tap events
   this.emitTapEvents();
@@ -148,7 +135,6 @@ vjs.MediaTechController.prototype.onClick = function(event){
  * Handle a tap on the media element. By default it will toggle the user
  * activity state, which hides and shows the controls.
  */
-
 vjs.MediaTechController.prototype.onTap = function(){
   this.player().userActive(!this.player().userActive());
 };

src/js/player.externs.js

@@ -0,0 +1,80 @@
+/**
+ * @fileoverview Externs for videojs.Player. Externs are functions that the
+ * compiler shouldn't obfuscate.
+ */
+
+/**
+ * @constructor
+ * @extends {videojs.Component}
+ */
+ videojs.Player = function(){};
+
+/**
+ * Native HTML5 video properties
+ * Most likely covered by the default closure compiler externs
+ * Copied list from http://code.google.com/p/closure-compiler/source/browse/externs/html5.js?spec=svne2e531de906d9ccccf23516bd2dd6152a93f6468&r=e2e531de906d9ccccf23516bd2dd6152a93f6468
+ * May not all be available on a videojs player yet
+ */
+videojs.Player.prototype.error = function(){};
+videojs.Player.prototype.src = function(){};
+videojs.Player.prototype.currentSrc = function(){};
+videojs.Player.prototype.networkState = function(){};
+videojs.Player.prototype.buffered = function(){};
+videojs.Player.prototype.load = function(){};
+videojs.Player.prototype.canPlayType = function(){};
+videojs.Player.prototype.readyState = function(){};
+videojs.Player.prototype.seeking = function(){};
+videojs.Player.prototype.currentTime = function(){};
+videojs.Player.prototype.startTime = function(){};
+videojs.Player.prototype.duration = function(){};
+videojs.Player.prototype.paused = function(){};
+videojs.Player.prototype.defaultPlaybackRate = function(){};
+videojs.Player.prototype.playbackRate = function(){};
+videojs.Player.prototype.played = function(){};
+videojs.Player.prototype.seekable = function(){};
+videojs.Player.prototype.ended = function(){};
+videojs.Player.prototype.autoplay = function(){};
+videojs.Player.prototype.loop = function(){};
+videojs.Player.prototype.play = function() {};
+videojs.Player.prototype.pause = function() {};
+videojs.Player.prototype.controls = function(){};
+videojs.Player.prototype.volume = function(){};
+videojs.Player.prototype.muted = function(){};
+videojs.Player.prototype.width = function(){};
+videojs.Player.prototype.height = function(){};
+videojs.Player.prototype.videoWidth = function(){};
+videojs.Player.prototype.videoHeight = function(){};
+videojs.Player.prototype.poster = function(){};
+
+/**
+ * Fullscreen functionality
+ */
+videojs.Player.prototype.isFullScreen = function(){};
+videojs.Player.prototype.requestFullScreen = function(){};
+videojs.Player.prototype.cancelFullScreen = function(){};
+
+/**
+ * Text tracks
+ */
+videojs.Player.prototype.textTracks = function(){};
+
+/**
+ * Component functions
+ */
+videojs.Player.prototype.dispose = function(){};
+
+/**
+ * Buffered percent
+ */
+videojs.Player.prototype.bufferedPercent = function(){};
+
+/**
+ * User activity functions
+ */
+videojs.Player.prototype.reportUserActivity = function(){};
+videojs.Player.prototype.userActive = function(){};
+
+/**
+ * Native controls
+ */
+videojs.Player.prototype.usingNativeControls = function(){};

src/js/player.js

@@ -32,6 +32,9 @@ vjs.Player = vjs.Component.extend({
   init: function(tag, options, ready){
     this.tag = tag; // Store the original tag used to set options
 
+    // Make sure tag ID exists
+    tag.id = tag.id || 'vjs_video_' + vjs.guid++;
+
     // Set Options
     // The options argument overrides options set in the video tag
     // which overrides globally set options.
@@ -51,6 +54,10 @@ vjs.Player = vjs.Component.extend({
     // May be turned back on by HTML5 tech if nativeControlsForTouch is true
     tag.controls = false;
 
+    // we don't want the player to report touch activity on itself
+    // see enableTouchActivity in Component
+    options.reportTouchActivity = false;
+
     // Run base component initializing with new options.
     // Builds the element through createEl()
     // Inits and embeds any child components in opts
@@ -205,9 +212,6 @@ vjs.Player.prototype.createEl = function(){
     }
   }
 
-  // Make sure tag ID exists
-  tag.id = tag.id || 'vjs_video_' + vjs.guid++;
-
   // Give video tag ID and class to player div
   // ID will now reference player box, not the video tag
   el.id = tag.id;
@@ -247,10 +251,10 @@ vjs.Player.prototype.loadTech = function(techName, source){
   // Pause and remove current playback technology
   if (this.tech) {
     this.unloadTech();
+  }
 
-  // if this is the first time loading, HTML5 tag will exist but won't be initialized
-  // so we need to remove it if we're not loading HTML5
-  } else if (techName !== 'Html5' && this.tag) {
+  // get rid of the HTML5 video tag as soon as we are using another tech
+  if (techName !== 'Html5' && this.tag) {
     vjs.Html5.disposeMediaElement(this.tag);
     this.tag = null;
   }
@@ -497,7 +501,12 @@ vjs.Player.prototype.onEnded = function(){
  */
 vjs.Player.prototype.onDurationChange = function(){
   // Allows for cacheing value instead of asking player each time.
-  this.duration(this.techGet('duration'));
+  // We need to get the techGet response and check for a value so we don't
+  // accidentally cause the stack to blow up.
+  var duration = this.techGet('duration');
+  if (duration) {
+    this.duration(duration);
+  }
 };
 
 /**
@@ -511,7 +520,7 @@ vjs.Player.prototype.onVolumeChange;
  * @event fullscreenchange
  */
 vjs.Player.prototype.onFullscreenChange = function() {
-  if (this.isFullScreen) {
+  if (this.isFullScreen()) {
     this.addClass('vjs-fullscreen');
   } else {
     this.removeClass('vjs-fullscreen');
@@ -641,9 +650,6 @@ vjs.Player.prototype.paused = function(){
 vjs.Player.prototype.currentTime = function(seconds){
   if (seconds !== undefined) {
 
-    // cache the last set value for smoother scrubbing
-    this.cache_.lastSetCurrentTime = seconds;
-
     this.techCall('setCurrentTime', seconds);
 
     // improve the accuracy of manual timeupdates
@@ -652,8 +658,12 @@ vjs.Player.prototype.currentTime = function(seconds){
     return this;
   }
 
-  // cache last currentTime and return
-  // default to 0 seconds
+  // cache last currentTime and return. default to 0 seconds
+  //
+  // Caching the currentTime is meant to prevent a massive amount of reads on the tech's
+  // currentTime when scrubbing, but may not provide much performace benefit afterall.
+  // Should be tested. Also something has to read the actual current time or the cache will
+  // never get updated.
   return this.cache_.currentTime = (this.techGet('currentTime') || 0);
 };
 
@@ -681,7 +691,7 @@ vjs.Player.prototype.duration = function(seconds){
     this.onDurationChange();
   }
 
-  return this.cache_.duration;
+  return this.cache_.duration || 0;
 };
 
 // Calculates how much time is left. Not in spec, but useful.
@@ -797,8 +807,43 @@ vjs.Player.prototype.muted = function(muted){
   return this.techGet('muted') || false; // Default to false
 };
 
-// Check if current tech can support native fullscreen (e.g. with built in controls lik iOS, so not our flash swf)
-vjs.Player.prototype.supportsFullScreen = function(){ return this.techGet('supportsFullScreen') || false; };
+// Check if current tech can support native fullscreen
+// (e.g. with built in controls lik iOS, so not our flash swf)
+vjs.Player.prototype.supportsFullScreen = function(){
+  return this.techGet('supportsFullScreen') || false;
+};
+
+/**
+ * is the player in fullscreen
+ * @type {Boolean}
+ * @private
+ */
+vjs.Player.prototype.isFullScreen_ = false;
+
+/**
+ * Check if the player is in fullscreen mode
+ *
+ *     // get
+ *     var fullscreenOrNot = myPlayer.isFullScreen();
+ *
+ *     // set
+ *     myPlayer.isFullScreen(true); // tell the player it's in fullscreen
+ *
+ * NOTE: As of the latest HTML5 spec, isFullScreen is no longer an official
+ * property and instead document.fullscreenElement is used. But isFullScreen is
+ * still a valuable property for internal player workings.
+ *
+ * @param  {Boolean=} isFS Update the player's fullscreen state
+ * @return {Boolean} true if fullscreen, false if not
+ * @return {vjs.Player} self, when setting
+ */
+vjs.Player.prototype.isFullScreen = function(isFS){
+  if (isFS !== undefined) {
+    this.isFullScreen_ = isFS;
+    return this;
+  }
+  return this.isFullScreen_;
+};
 
 /**
  * Increase the size of the video to full screen
@@ -816,7 +861,7 @@ vjs.Player.prototype.supportsFullScreen = function(){ return this.techGet('suppo
  */
 vjs.Player.prototype.requestFullScreen = function(){
   var requestFullScreen = vjs.support.requestFullScreen;
-  this.isFullScreen = true;
+  this.isFullScreen(true);
 
   if (requestFullScreen) {
     // the browser supports going fullscreen at the element level so we can
@@ -828,10 +873,10 @@ vjs.Player.prototype.requestFullScreen = function(){
     // players on a page, they would all be reacting to the same fullscreen
     // events
     vjs.on(document, requestFullScreen.eventName, vjs.bind(this, function(e){
-      this.isFullScreen = document[requestFullScreen.isFullScreen];
+      this.isFullScreen(document[requestFullScreen.isFullScreen]);
 
       // If cancelling fullscreen, remove event listener.
-      if (this.isFullScreen === false) {
+      if (this.isFullScreen() === false) {
         vjs.off(document, requestFullScreen.eventName, arguments.callee);
       }
 
@@ -863,7 +908,7 @@ vjs.Player.prototype.requestFullScreen = function(){
  */
 vjs.Player.prototype.cancelFullScreen = function(){
   var requestFullScreen = vjs.support.requestFullScreen;
-  this.isFullScreen = false;
+  this.isFullScreen(false);
 
   // Check for browser element fullscreen support
   if (requestFullScreen) {
@@ -898,7 +943,7 @@ vjs.Player.prototype.enterFullWindow = function(){
 };
 vjs.Player.prototype.fullWindowOnEscKey = function(event){
   if (event.keyCode === 27) {
-    if (this.isFullScreen === true) {
+    if (this.isFullScreen() === true) {
       this.cancelFullScreen();
     } else {
       this.exitFullWindow();
@@ -1093,11 +1138,18 @@ vjs.Player.prototype.poster_;
  * @return {vjs.Player} self when setting
  */
 vjs.Player.prototype.poster = function(src){
-  if (src !== undefined) {
-    this.poster_ = src;
-    return this;
+  if (src === undefined) {
+    return this.poster_;
   }
-  return this.poster_;
+
+  // update the internal poster variable
+  this.poster_ = src;
+
+  // update the tech's poster
+  this.techCall('setPoster', src);
+
+  // alert components that the poster has been set
+  this.trigger('posterchange');
 };
 
 /**
@@ -1239,7 +1291,7 @@ vjs.Player.prototype.listenForUserActivity = function(){
   var onMouseActivity, onMouseDown, mouseInProgress, onMouseUp,
       activityCheck, inactivityTimeout;
 
-  onMouseActivity = this.reportUserActivity;
+  onMouseActivity = vjs.bind(this, this.reportUserActivity);
 
   onMouseDown = function() {
     onMouseActivity();
@@ -1250,7 +1302,7 @@ vjs.Player.prototype.listenForUserActivity = function(){
     // Setting userActivity=true now and setting the interval to the same time
     // as the activityCheck interval (250) should ensure we never miss the
     // next activityCheck
-    mouseInProgress = setInterval(vjs.bind(this, onMouseActivity), 250);
+    mouseInProgress = setInterval(onMouseActivity, 250);
   };
 
   onMouseUp = function(event) {
@@ -1269,14 +1321,6 @@ vjs.Player.prototype.listenForUserActivity = function(){
   this.on('keydown', onMouseActivity);
   this.on('keyup', onMouseActivity);
 
-  // Consider any touch events that bubble up to be activity
-  // Certain touches on the tech will be blocked from bubbling because they
-  // toggle controls
-  this.on('touchstart', onMouseDown);
-  this.on('touchmove', onMouseActivity);
-  this.on('touchend', onMouseUp);
-  this.on('touchcancel', onMouseUp);
-
   // Run an interval every 250 milliseconds instead of stuffing everything into
   // the mousemove/touchmove function itself, to prevent performance degradation.
   // `this.reportUserActivity` simply sets this.userActivity_ to true, which
@@ -1317,7 +1361,6 @@ vjs.Player.prototype.listenForUserActivity = function(){
 // Methods to add support for
 // networkState: function(){ return this.techCall('networkState'); },
 // readyState: function(){ return this.techCall('readyState'); },
-// seeking: function(){ return this.techCall('seeking'); },
 // initialTime: function(){ return this.techCall('initialTime'); },
 // startOffsetTime: function(){ return this.techCall('startOffsetTime'); },
 // played: function(){ return this.techCall('played'); },
@@ -1381,5 +1424,3 @@ vjs.Player.prototype.listenForUserActivity = function(){
   }
 
 })();
-
-

src/js/poster.js

@@ -12,34 +12,64 @@ vjs.PosterImage = vjs.Button.extend({
   init: function(player, options){
     vjs.Button.call(this, player, options);
 
+    if (player.poster()) {
+      this.src(player.poster());
+    }
+
     if (!player.poster() || !player.controls()) {
       this.hide();
     }
 
+    player.on('posterchange', vjs.bind(this, function(){
+      this.src(player.poster());
+    }));
+
     player.on('play', vjs.bind(this, this.hide));
   }
 });
 
+// use the test el to check for backgroundSize style support
+var _backgroundSizeSupported = 'backgroundSize' in vjs.TEST_VID.style;
+
 vjs.PosterImage.prototype.createEl = function(){
   var el = vjs.createEl('div', {
-        className: 'vjs-poster',
+    className: 'vjs-poster',
 
-        // Don't want poster to be tabbable.
-        tabIndex: -1
-      }),
-      poster = this.player_.poster();
+    // Don't want poster to be tabbable.
+    tabIndex: -1
+  });
 
-  if (poster) {
-    if ('backgroundSize' in el.style) {
-      el.style.backgroundImage = 'url("' + poster + '")';
-    } else {
-      el.appendChild(vjs.createEl('img', { src: poster }));
-    }
+  if (!_backgroundSizeSupported) {
+    // setup an img element as a fallback for IE8
+    el.appendChild(vjs.createEl('img'));
   }
 
   return el;
 };
 
+vjs.PosterImage.prototype.src = function(url){
+  var el = this.el();
+
+  // getter
+  // can't think of a need for a getter here
+  // see #838 if on is needed in the future
+  // still don't want a getter to set src as undefined
+  if (url === undefined) {
+    return;
+  }
+
+  // setter
+  // To ensure the poster image resizes while maintaining its original aspect
+  // ratio, use a div with `background-size` when available. For browsers that
+  // do not support `background-size` (e.g. IE8), fall back on using a regular
+  // img element.
+  if (_backgroundSizeSupported) {
+    el.style.backgroundImage = 'url("' + url + '")';
+  } else {
+    el.firstChild.src = url;
+  }
+};
+
 vjs.PosterImage.prototype.onClick = function(){
   // Only accept clicks when controls are enabled
   if (this.player().controls()) {

src/js/slider.js

@@ -40,7 +40,7 @@ vjs.Slider.prototype.createEl = function(type, props) {
   // Add the slider element class to all sub classes
   props.className = props.className + ' vjs-slider';
   props = vjs.obj.merge({
-    role: 'slider',
+    'role': 'slider',
     'aria-valuenow': 0,
     'aria-valuemin': 0,
     'aria-valuemax': 100,

src/js/tracks.js

@@ -307,7 +307,7 @@ vjs.TextTrack.prototype.mode = function(){
  * and restore it to its normal size when not in fullscreen mode.
  */
 vjs.TextTrack.prototype.adjustFontSize = function(){
-    if (this.player_.isFullScreen) {
+    if (this.player_.isFullScreen()) {
         // Scale the font by the same factor as increasing the video width to the full screen window width.
         // Additionally, multiply that factor by 1.4, which is the default font size for
         // the caption track (from the CSS)

src/js/util.js

@@ -0,0 +1,40 @@
+/**
+ * Utility functions namespace
+ * @namespace
+ * @type {Object}
+ */
+vjs.util = {};
+
+/**
+ * Merge two options objects, 
+ * recursively merging any plain object properties as well.
+ * Previously `deepMerge`
+ * 
+ * @param  {Object} obj1 Object to override values in
+ * @param  {Object} obj2 Overriding object
+ * @return {Object}      New object -- obj1 and obj2 will be untouched
+ */
+vjs.util.mergeOptions = function(obj1, obj2){
+  var key, val1, val2;
+
+  // make a copy of obj1 so we're not ovewriting original values.
+  // like prototype.options_ and all sub options objects
+  obj1 = vjs.obj.copy(obj1);
+
+  for (key in obj2){
+    if (obj2.hasOwnProperty(key)) {
+      val1 = obj1[key];
+      val2 = obj2[key];
+
+      // Check if both properties are pure objects and do a deep merge if so
+      if (vjs.obj.isPlain(val1) && vjs.obj.isPlain(val2)) {
+        obj1[key] = vjs.util.mergeOptions(val1, val2);
+      } else {
+        obj1[key] = obj2[key];
+      }
+    }
+  }
+  return obj1;
+};
+
+

test/index.html

@@ -8,8 +8,8 @@
   <!--<![endif]-->
 
   <!-- QUnit -->
-  <link rel="stylesheet" href="../test/qunit/qunit/qunit.css" />
-  <script src="../test/qunit/qunit/qunit.js"></script>
+  <link rel="stylesheet" href="../node_modules/qunitjs/qunit/qunit.css" />
+  <script src="../node_modules/qunitjs/qunit/qunit.js"></script>
 
   <!-- Video.js CSS -->
   <link rel="stylesheet" href="../build/files/video-js.css" type="text/css">
@@ -22,6 +22,7 @@
         'test/unit/test-helpers.js',
         'test/unit/core-object.js',
         'test/unit/lib.js',
+        'test/unit/util.js',
         'test/unit/events.js',
         'test/unit/component.js',
         'test/unit/mediafaker.js',
@@ -29,8 +30,10 @@
         'test/unit/core.js',
         'test/unit/media.html5.js',
         'test/unit/controls.js',
+        'test/unit/poster.js',
         'test/unit/plugins.js',
-        'test/unit/flash.js'
+        'test/unit/flash.js',
+        'test/unit/api.js'
       ];
 
       var projectRoot = '../';
@@ -66,6 +69,7 @@
   <div>
     <h1 id="qunit-header">Video.js Test Suite</h1>
     <h2 id="qunit-banner"></h2>
+    <div id="qunit-testrunner-toolbar"></div>
     <h2 id="qunit-userAgent"></h2>
     <ol id="qunit-tests"></ol>
     <div id="qunit-fixture"></div>

test/karma.conf.js.example

@@ -4,98 +4,108 @@
 //       2.  Configure the properties below in your conf.js copy
 //       3.  Run your tests
 
-// base path, that will be used to resolve files and exclude
-basePath = '';
+module.exports = function(config) {
+  config.set({
+    // base path, that will be used to resolve files and exclude
+    basePath: '',
 
-frameworks = ['qunit'];
+    frameworks: ['qunit'],
 
-// Set autoWatch to true if you plan to run `grunt karma` continuously, to automatically test changes as you make them.
-autoWatch = false;
+    // Set autoWatch to true if you plan to run `grunt karma` continuously, to automatically test changes as you make them.
+    autoWatch: false,
 
-// Setting singleRun to true here will start up your specified browsers, run tests, and then shut down the browsers.  Helpful to have in a CI environment, where you don't want to leave browsers running continuously.
-singleRun = true;
+    // Setting singleRun to true here will start up your specified browsers, run tests, and then shut down the browsers.  Helpful to have in a CI environment, where you don't want to leave browsers running continuously.
+    singleRun: true,
 
-// Start these browsers, currently available:
-// - Chrome
-// - ChromeCanary
-// - Firefox
-// - Opera
-// - Safari (only Mac)
-// - PhantomJS
-// - IE (only Windows)
-// Example usage:
-// browsers = ['Chrome','Firefox','Safari'];
-browsers = [];
+    // Start these browsers, currently available:
+    // - Chrome
+    // - ChromeCanary
+    // - Firefox
+    // - Opera
+    // - Safari (only Mac)
+    // - PhantomJS
+    // - IE (only Windows)
+    // Example usage:
+    // browsers: ['Chrome','Firefox','Safari'],
+    browsers: [],
 
-// List of files / patterns to load in the browser
-// Add any new src files to this list.
-// If you add new unit tests, they will be picked up automatically by Karma,
-// unless you've added them to a nested directory, in which case you should
-// add their paths to this list.
-files = [
-  '../test/karma-qunit-shim.js',
-  QUNIT,
-  QUNIT_ADAPTER,
-  '../src/js/core.js',
-  '../src/js/core-object.js',
-  '../src/js/events.js',
-  '../src/js/lib.js',
-  '../src/js/component.js',
-  '../src/js/button.js',
-  '../src/js/slider.js',
-  '../src/js/menu.js',
-  '../src/js/player.js',
-  '../src/js/control-bar/control-bar.js',
-  '../src/js/control-bar/play-toggle.js',
-  '../src/js/control-bar/time-display.js',
-  '../src/js/control-bar/fullscreen-toggle.js',
-  '../src/js/control-bar/progress-control.js',
-  '../src/js/control-bar/volume-control.js',
-  '../src/js/control-bar/mute-toggle.js',
-  '../src/js/control-bar/volume-menu-button.js',
-  '../src/js/poster.js',
-  '../src/js/loading-spinner.js',
-  '../src/js/big-play-button.js',
-  '../src/js/media/media.js',
-  '../src/js/media/html5.js',
-  '../src/js/media/flash.js',
-  '../src/js/media/loader.js',
-  '../src/js/tracks.js',
-  '../src/js/json.js',
-  '../src/js/setup.js',
-  '../src/js/plugins.js',
-  '../test/unit/*.js'
-];
+    // List of files / patterns to load in the browser
+    // Add any new src files to this list.
+    // If you add new unit tests, they will be picked up automatically by Karma,
+    // unless you've added them to a nested directory, in which case you should
+    // add their paths to this list.
+    files: [
+      '../test/karma-qunit-shim.js',
+      '../src/js/core.js',
+      '../src/js/core-object.js',
+      '../src/js/events.js',
+      '../src/js/lib.js',
+      '../src/js/component.js',
+      '../src/js/button.js',
+      '../src/js/slider.js',
+      '../src/js/menu.js',
+      '../src/js/player.js',
+      '../src/js/control-bar/control-bar.js',
+      '../src/js/control-bar/play-toggle.js',
+      '../src/js/control-bar/time-display.js',
+      '../src/js/control-bar/fullscreen-toggle.js',
+      '../src/js/control-bar/progress-control.js',
+      '../src/js/control-bar/volume-control.js',
+      '../src/js/control-bar/mute-toggle.js',
+      '../src/js/control-bar/volume-menu-button.js',
+      '../src/js/poster.js',
+      '../src/js/loading-spinner.js',
+      '../src/js/big-play-button.js',
+      '../src/js/media/media.js',
+      '../src/js/media/html5.js',
+      '../src/js/media/flash.js',
+      '../src/js/media/loader.js',
+      '../src/js/tracks.js',
+      '../src/js/json.js',
+      '../src/js/setup.js',
+      '../src/js/plugins.js',
+      '../src/js/util.js',
+      '../test/unit/*.js'
+    ],
 
-plugins = ['karma-qunit', 'karma-chrome-launcher'];
+    plugins: [
+      'karma-qunit',
+      'karma-chrome-launcher',
+      'karma-firefox-launcher',
+      'karma-ie-launcher',
+      'karma-opera-launcher',
+      'karma-phantomjs-launcher',
+      'karma-safari-launcher'
+    ],
 
-// list of files to exclude
-exclude = [
-  
-];
+    // list of files to exclude
+    exclude: [
+
+    ],
 
 
-// test results reporter to use
-// possible values: 'dots', 'progress', 'junit'
-reporters = ['progress'];
+    // test results reporter to use
+    // possible values: 'dots', 'progress', 'junit'
+    reporters: ['progress'],
 
 
-// web server port
-port = 9876;
+    // web server port
+    port: 9876,
 
 
-// cli runner port
-runnerPort = 9100;
+    // cli runner port
+    runnerPort: 9100,
 
 
-// enable / disable colors in the output (reporters and logs)
-colors = true;
+    // enable / disable colors in the output (reporters and logs)
+    colors: true,
 
 
-// level of logging
-// possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
-//logLevel = LOG_INFO;
-
-// If browser does not capture in given timeout [ms], kill it
-captureTimeout = 60000;
+    // level of logging
+    // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+    //logLevel: config.LOG_INFO,
 
+    // If browser does not capture in given timeout [ms], kill it
+    captureTimeout: 60000
+  });
+};

test/minified-api.html

@@ -4,8 +4,8 @@
   <title>Video.js Test Suite</title>
 
   <!-- QUnit -->
-  <link rel="stylesheet" href="../test/qunit/qunit/qunit.css" />
-  <script src="../test/qunit/qunit/qunit.js"></script>
+  <link rel="stylesheet" href="../node_modules/qunitjs/qunit/qunit.css" />
+  <script src="../node_modules/qunitjs/qunit/qunit.js"></script>
 
   <!-- Video.js CSS -->
   <link rel="stylesheet" href="../build/files/video-js.css" type="text/css">
@@ -14,6 +14,18 @@
     Check publicly available APIs against compiled lib
   -->
   <script type="text/javascript">
+
+    // Test AMD Support
+    // window.define = function(a, b){
+    //   console.log(a, b);
+    // };
+    // define.amd = true;
+
+    // Test CJS Support
+    // Have to remove qunit and tests to because module becomes a function
+    // window.module = window.exports = {};
+    // window.module.exports = {};
+
     (function(){
 
       // ADD NEW TEST FILES HERE
@@ -38,6 +50,7 @@
   <div>
     <h1 id="qunit-header">Video.js Test Suite</h1>
     <h2 id="qunit-banner"></h2>
+    <div id="qunit-testrunner-toolbar"></div>
     <h2 id="qunit-userAgent"></h2>
     <ol id="qunit-tests"></ol>
     <div id="qunit-fixture"></div>

test/minified.html

@@ -4,8 +4,8 @@
   <title>Video.js Test Suite</title>
 
   <!-- QUnit -->
-  <link rel="stylesheet" href="../test/qunit/qunit/qunit.css" />
-  <script src="../test/qunit/qunit/qunit.js"></script>
+  <link rel="stylesheet" href="../node_modules/qunitjs/qunit/qunit.css" />
+  <script src="../node_modules/qunitjs/qunit/qunit.js"></script>
 
   <!-- Video.js CSS -->
   <link rel="stylesheet" href="../build/files/video-js.css" type="text/css">
@@ -22,6 +22,7 @@
   <div>
     <h1 id="qunit-header">Video.js Test Suite</h1>
     <h2 id="qunit-banner"></h2>
+    <div id="qunit-testrunner-toolbar"></div>
     <h2 id="qunit-userAgent"></h2>
     <ol id="qunit-tests"></ol>
     <div id="qunit-fixture"></div>

test/qunit/.gitignore

@@ -1,7 +0,0 @@
-.project
-*~
-*.diff
-*.patch
-.DS_Store
-.settings
-

test/qunit/README.md

@@ -1,27 +0,0 @@
-[QUnit](http://docs.jquery.com/QUnit) - A JavaScript Unit Testing framework.
-================================
-
-QUnit is a powerful, easy-to-use, JavaScript test suite. It's used by the jQuery
-project to test its code and plugins but is capable of testing any generic
-JavaScript code (and even capable of testing JavaScript code on the server-side).
-
-QUnit is especially useful for regression testing: Whenever a bug is reported,
-write a test that asserts the existence of that particular bug. Then fix it and
-commit both. Every time you work on the code again, run the tests. If the bug
-comes up again - a regression - you'll spot it immediately and know how to fix
-it, because you know what code you just changed.
-
-Having good unit test coverage makes safe refactoring easy and cheap. You can
-run the tests after each small refactoring step and always know what change
-broke something.
-
-QUnit is similar to other unit testing frameworks like JUnit, but makes use of
-the features JavaScript provides and helps with testing code in the browser, eg.
-with it's stop/start facilities for testing asynchronous code.
-
-If you are interested in helping developing QUnit, you are in the right place.
-For related discussions, visit the
-[QUnit and Testing forum](http://forum.jquery.com/qunit-and-testing).
-
-Planning for a qunitjs.com site and other testing tools related work now happens
-on the [jQuery Testing Team planning wiki](http://jquerytesting.pbworks.com/w/page/41556026/FrontPage).

test/qunit/addons/canvas/README.md

@@ -1,16 +0,0 @@
-Canvas - A QUnit Addon For Testing Canvas Rendering
-================================
-
-This addon for QUnit adds a pixelEqual method that allows you to assert
-individual pixel values in a given canvas.
-
-Usage:
-
-    pixelEqual(canvas, x, y, r, g, b, a, message)
-
-Where:
-
-  * canvas: Reference to a canvas element
-  * x, y: Coordinates of the pixel to test
-  * r, g, b, a: The color and opacity value of the pixel that you except
-  * message: Optional message, same as for other assertions

test/qunit/addons/canvas/canvas-test.js

@@ -1,76 +0,0 @@
-test("Canvas pixels", function () {
-	var canvas = document.getElementById('qunit-canvas'), context;
-	try {
-		context = canvas.getContext('2d');
-	} catch(e) {
-		// propably no canvas support, just exit
-		return;
-	}
-	context.fillStyle = 'rgba(0, 0, 0, 0)';
-	context.fillRect(0, 0, 5, 5);
-	QUnit.pixelEqual(canvas, 0, 0, 0, 0, 0, 0);
-	context.clearRect(0,0,5,5);
-	context.fillStyle = 'rgba(255, 0, 0, 0)';
-	context.fillRect(0, 0, 5, 5);
-	QUnit.pixelEqual(canvas, 0, 0, 0, 0, 0, 0);
-	context.clearRect(0,0,5,5);
-	context.fillStyle = 'rgba(0, 255, 0, 0)';
-	context.fillRect(0, 0, 5, 5);
-	QUnit.pixelEqual(canvas, 0, 0, 0, 0, 0, 0);
-	context.clearRect(0,0,5,5);
-	context.fillStyle = 'rgba(0, 0, 255, 0)';
-	context.fillRect(0, 0, 5, 5);
-	QUnit.pixelEqual(canvas, 0, 0, 0, 0, 0, 0);
-	context.clearRect(0,0,5,5);
-
-	context.fillStyle = 'rgba(0, 0, 0, 0.5)';
-	context.fillRect(0, 0, 5, 5);
-	QUnit.pixelEqual(canvas, 0, 0, 0, 0, 0, 127);
-	context.clearRect(0,0,5,5);
-	context.fillStyle = 'rgba(255, 0, 0, 0.5)';
-	context.fillRect(0, 0, 5, 5);
-	QUnit.pixelEqual(canvas, 0, 0, 255, 0, 0, 127);
-	context.clearRect(0,0,5,5);
-	context.fillStyle = 'rgba(0, 255, 0, 0.5)';
-	context.fillRect(0, 0, 5, 5);
-	QUnit.pixelEqual(canvas, 0, 0, 0, 255, 0, 127);
-	context.clearRect(0,0,5,5);
-	context.fillStyle = 'rgba(0, 0, 255, 0.5)';
-	context.fillRect(0, 0, 5, 5);
-	QUnit.pixelEqual(canvas, 0, 0, 0, 0, 255, 127);
-	context.clearRect(0,0,5,5);
-
-	context.fillStyle = 'rgba(0, 0, 0, 0.5)';
-	context.fillRect(0, 0, 5, 5);
-	QUnit.pixelEqual(canvas, 2, 2, 0, 0, 0, 127);
-	context.clearRect(0,0,5,5);
-	context.fillStyle = 'rgba(255, 0, 0, 0.5)';
-	context.fillRect(0, 0, 5, 5);
-	QUnit.pixelEqual(canvas, 2, 2, 255, 0, 0, 127);
-	context.clearRect(0,0,5,5);
-	context.fillStyle = 'rgba(0, 255, 0, 0.5)';
-	context.fillRect(0, 0, 5, 5);
-	QUnit.pixelEqual(canvas, 2, 2, 0, 255, 0, 127);
-	context.clearRect(0,0,5,5);
-	context.fillStyle = 'rgba(0, 0, 255, 0.5)';
-	context.fillRect(0, 0, 5, 5);
-	QUnit.pixelEqual(canvas, 2, 2, 0, 0, 255, 127);
-	context.clearRect(0,0,5,5);
-
-	context.fillStyle = 'rgba(0, 0, 0, 1)';
-	context.fillRect(0, 0, 5, 5);
-	QUnit.pixelEqual(canvas, 4, 4, 0, 0, 0, 255);
-	context.clearRect(0,0,5,5);
-	context.fillStyle = 'rgba(255, 0, 0, 1)';
-	context.fillRect(0, 0, 5, 5);
-	QUnit.pixelEqual(canvas, 4, 4, 255, 0, 0, 255);
-	context.clearRect(0,0,5,5);
-	context.fillStyle = 'rgba(0, 255, 0, 1)';
-	context.fillRect(0, 0, 5, 5);
-	QUnit.pixelEqual(canvas, 4, 4, 0, 255, 0, 255);
-	context.clearRect(0,0,5,5);
-	context.fillStyle = 'rgba(0, 0, 255, 1)';
-	context.fillRect(0, 0, 5, 5);
-	QUnit.pixelEqual(canvas, 4, 4, 0, 0, 255, 255);
-	context.clearRect(0,0,5,5);
-});