myButton
+ * // -> myButton === myComonent.children()[0];
+ *
+ * Pass in options for child constructors and options for children of the child
+ *
+ * var myButton = myComponent.addChild('MyButton', {
+ * text: 'Press Me',
+ * children: {
+ * buttonChildExample: {
+ * buttonChildOption: true
+ * }
+ * }
+ * });
+ *
+ * @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.
+ * @return {vjs.Component} The child component (created by this process if a string was used)
+ * @suppress {accessControls|checkRegExp|checkTypes|checkVars|const|constantProperty|deprecated|duplicate|es5Strict|fileoverviewTags|globalThis|invalidCasts|missingProperties|nonStandardJsDocs|strictModuleDepCheck|undefinedNames|undefinedVars|unknownDefines|uselessCode|visibility}
+ */
+vjs.Component.prototype.addChild = function(child, options){
+ var component, componentClass, componentName, componentId;
+
+ // If string, create new component with options
+ if (typeof child === 'string') {
+
+ componentName = child;
+
+ // Make sure options is at least an empty object to protect against errors
+ options = options || {};
+
+ // Assume name of set is a lowercased name of the UI Class (PlayButton, etc.)
+ componentClass = options['componentClass'] || vjs.capitalize(componentName);
+
+ // Set name through options
+ options['name'] = componentName;
+
+ // Create a new object & element for this controls set
+ // If there's no .player_, this is a player
+ // Closure Compiler throws an 'incomplete alias' warning if we use the vjs variable directly.
+ // Every class should be exported, so this should never be a problem here.
+ component = new window['videojs'][componentClass](this.player_ || this, options);
+
+ // child is a component instance
+ } else {
+ component = child;
+ }
+
+ this.children_.push(component);
+
+ if (typeof component.id === 'function') {
+ this.childIndex_[component.id()] = component;
+ }
+
+ // If a name wasn't used to create the component, check if we can use the
+ // name function of the component
+ componentName = componentName || (component.name && component.name());
+
+ if (componentName) {
+ this.childNameIndex_[componentName] = component;
+ }
+
+ // Add the UI object's element to the container div (box)
+ // Having an element is not required
+ if (typeof component['el'] === 'function' && component['el']()) {
+ this.contentEl().appendChild(component['el']());
+ }
+
+ // Return so it can stored on parent object if desired.
+ return component;
+};
+
+/**
+ * Remove a child component from this component's list of children, and the
+ * child component's element from this component's element
+ *
+ * @param {vjs.Component} component Component to remove
+ */
+vjs.Component.prototype.removeChild = function(component){
+ if (typeof component === 'string') {
+ component = this.getChild(component);
+ }
+
+ if (!component || !this.children_) return;
+
+ var childFound = false;
+ for (var i = this.children_.length - 1; i >= 0; i--) {
+ if (this.children_[i] === component) {
+ childFound = true;
+ this.children_.splice(i,1);
+ break;
+ }
+ }
+
+ if (!childFound) return;
+
+ this.childIndex_[component.id] = null;
+ this.childNameIndex_[component.name] = null;
+
+ var compEl = component.el();
+ if (compEl && compEl.parentNode === this.contentEl()) {
+ this.contentEl().removeChild(component.el());
+ }
+};
+
+/**
+ * Add and initialize default child components from options
+ *
+ * // when an instance of MyComponent is created, all children in options
+ * // will be added to the instance by their name strings and options
+ * MyComponent.prototype.options_.children = {
+ * myChildComponent: {
+ * myChildOption: true
+ * }
+ * }
+ */
+vjs.Component.prototype.initChildren = function(){
+ var options = this.options_;
+
+ if (options && options['children']) {
+ var self = this;
+
+ // Loop through components and add them to the player
+ vjs.obj.each(options['children'], function(name, opts){
+ // Allow for disabling default components
+ // e.g. vjs.options['children']['posterImage'] = false
+ if (opts === false) return;
+
+ // Allow waiting to add components until a specific event is called
+ var tempAdd = function(){
+ // Set property name on player. Could cause conflicts with other prop names, but it's worth making refs easy.
+ self[name] = self.addChild(name, opts);
+ };
+
+ if (opts['loadEvent']) {
+ // this.one(opts.loadEvent, tempAdd)
+ } else {
+ tempAdd();
+ }
+ });
+ }
+};
+
+/**
+ * Allows sub components to stack CSS class names
+ *
+ * @return {String} The constructed class name
+ */
+vjs.Component.prototype.buildCSSClass = function(){
+ // Child classes can include a function that does:
+ // return 'CLASS NAME' + this._super();
+ return '';
+};
+
+/* Events
+============================================================================= */
+
+/**
+ * Add an event listener to this component's element
+ *
+ * var myFunc = function(){
+ * var myPlayer = this;
+ * // Do something when the event is fired
+ * };
+ *
+ * myPlayer.on("eventName", myFunc);
+ *
+ * The context will be the component.
+ *
+ * @param {String} type The event type e.g. 'click'
+ * @param {Function} fn The event listener
+ * @return {vjs.Component} self
+ */
+vjs.Component.prototype.on = function(type, fn){
+ vjs.on(this.el_, type, vjs.bind(this, fn));
+ return this;
+};
+
+/**
+ * Remove an event listener from the component's element
+ *
+ * myComponent.off("eventName", myFunc);
+ *
+ * @param {String=} type Event type. Without type it will remove all listeners.
+ * @param {Function=} fn Event listener. Without fn it will remove all listeners for a type.
+ * @return {vjs.Component}
+ */
+vjs.Component.prototype.off = function(type, fn){
+ vjs.off(this.el_, type, fn);
+ return this;
+};
+
+/**
+ * Add an event listener to be triggered only once and then removed
+ *
+ * @param {String} type Event type
+ * @param {Function} fn Event listener
+ * @return {vjs.Component}
+ */
+vjs.Component.prototype.one = function(type, fn) {
+ vjs.one(this.el_, type, vjs.bind(this, fn));
+ return this;
+};
+
+/**
+ * Trigger an event on an element
+ *
+ * myComponent.trigger('eventName');
+ *
+ * @param {String} type The event type to trigger, e.g. 'click'
+ * @param {Event|Object} event The event object to be passed to the listener
+ * @return {vjs.Component} self
+ */
+vjs.Component.prototype.trigger = function(type, event){
+ vjs.trigger(this.el_, type, event);
+ return this;
+};
+
+/* Ready
+================================================================================ */
+/**
+ * Is the component loaded
+ * This can mean different things depending on the component.
+ *
+ * @private
+ * @type {Boolean}
+ */
+vjs.Component.prototype.isReady_;
+
+/**
+ * Trigger ready as soon as initialization is finished
+ *
+ * Allows for delaying ready. Override on a sub class prototype.
+ * If you set this.isReadyOnInitFinish_ it will affect all components.
+ * Specially used when waiting for the Flash player to asynchrnously load.
+ *
+ * @type {Boolean}
+ * @private
+ */
+vjs.Component.prototype.isReadyOnInitFinish_ = true;
+
+/**
+ * List of ready listeners
+ *
+ * @type {Array}
+ * @private
+ */
+vjs.Component.prototype.readyQueue_;
+
+/**
+ * Bind a listener to the component's ready state
+ *
+ * Different from event listeners in that if the ready event has already happend
+ * it will trigger the function immediately.
+ *
+ * @param {Function} fn Ready listener
+ * @return {vjs.Component}
+ */
+vjs.Component.prototype.ready = function(fn){
+ if (fn) {
+ if (this.isReady_) {
+ fn.call(this);
+ } else {
+ if (this.readyQueue_ === undefined) {
+ this.readyQueue_ = [];
+ }
+ this.readyQueue_.push(fn);
+ }
+ }
+ return this;
+};
+
+/**
+ * Trigger the ready listeners
+ *
+ * @return {vjs.Component}
+ */
+vjs.Component.prototype.triggerReady = function(){
+ this.isReady_ = true;
+
+ var readyQueue = this.readyQueue_;
+
+ if (readyQueue && readyQueue.length > 0) {
+
+ for (var i = 0, j = readyQueue.length; i < j; i++) {
+ readyQueue[i].call(this);
+ }
+
+ // Reset Ready Queue
+ this.readyQueue_ = [];
+
+ // Allow for using event listeners also, in case you want to do something everytime a source is ready.
+ this.trigger('ready');
+ }
+};
+
+/* Display
+============================================================================= */
+
+/**
+ * Add a CSS class name to the component's element
+ *
+ * @param {String} classToAdd Classname to add
+ * @return {vjs.Component}
+ */
+vjs.Component.prototype.addClass = function(classToAdd){
+ vjs.addClass(this.el_, classToAdd);
+ return this;
+};
+
+/**
+ * Remove a CSS class name from the component's element
+ *
+ * @param {String} classToRemove Classname to remove
+ * @return {vjs.Component}
+ */
+vjs.Component.prototype.removeClass = function(classToRemove){
+ vjs.removeClass(this.el_, classToRemove);
+ return this;
+};
+
+/**
+ * Show the component element if hidden
+ *
+ * @return {vjs.Component}
+ */
+vjs.Component.prototype.show = function(){
+ this.el_.style.display = 'block';
+ return this;
+};
+
+/**
+ * Hide the component element if currently showing
+ *
+ * @return {vjs.Component}
+ */
+vjs.Component.prototype.hide = function(){
+ this.el_.style.display = 'none';
+ return this;
+};
+
+/**
+ * Lock an item in its visible state
+ * To be used with fadeIn/fadeOut.
+ *
+ * @return {vjs.Component}
+ * @private
+ */
+vjs.Component.prototype.lockShowing = function(){
+ this.addClass('vjs-lock-showing');
+ return this;
+};
+
+/**
+ * Unlock an item to be hidden
+ * To be used with fadeIn/fadeOut.
+ *
+ * @return {vjs.Component}
+ * @private
+ */
+vjs.Component.prototype.unlockShowing = function(){
+ this.removeClass('vjs-lock-showing');
+ return this;
+};
+
+/**
+ * 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();
+ this.show = function(){};
+};
+
+/**
+ * Set or get the width of the component (CSS values)
+ *
+ * Setting the video tag dimension values only works with values in pixels.
+ * Percent values will not work.
+ * Some percents can be used, but width()/height() will return the number + %,
+ * not the actual computed width/height.
+ *
+ * @param {Number|String=} num Optional width number
+ * @param {Boolean} skipListeners Skip the 'resize' event trigger
+ * @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);
+};
+
+/**
+ * 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} 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);
+};
+
+/**
+ * Set both width and height at the same time
+ *
+ * @param {Number|String} width
+ * @param {Number|String} height
+ * @return {vjs.Component} The component
+ */
+vjs.Component.prototype.dimensions = function(width, height){
+ // Skip resize listeners on width for optimization
+ return this.width(width, true).height(height);
+};
+
+/**
+ * Get or set width or height
+ *
+ * This is the shared code for the width() and height() methods.
+ * All for an integer, integer + 'px' or integer + '%';
+ *
+ * Known issue: Hidden elements officially have a width of 0. We're defaulting
+ * to the style.width value and falling back to computedStyle which has the
+ * hidden element issue. Info, but probably not an efficient fix:
+ * http://www.foliotek.com/devblog/getting-the-width-of-a-hidden-element-with-jquery-using-width/
+ *
+ * @param {String} widthOrHeight 'width' or 'height'
+ * @param {Number|String=} num New dimension
+ * @param {Boolean=} skipListeners Skip resize event trigger
+ * @return {vjs.Component} The component if a dimension was set
+ * @return {Number|String} The dimension if nothing was set
+ * @private
+ */
+vjs.Component.prototype.dimension = function(widthOrHeight, num, skipListeners){
+ if (num !== undefined) {
+
+ // Check if using css width/height (% or px) and adjust
+ if ((''+num).indexOf('%') !== -1 || (''+num).indexOf('px') !== -1) {
+ this.el_.style[widthOrHeight] = num;
+ } else if (num === 'auto') {
+ this.el_.style[widthOrHeight] = '';
+ } else {
+ this.el_.style[widthOrHeight] = num+'px';
+ }
+
+ // skipListeners allows us to avoid triggering the resize event when setting both width and height
+ if (!skipListeners) { this.trigger('resize'); }
+
+ // Return component
+ return this;
+ }
+
+ // Not setting a value, so getting it
+ // Make sure element exists
+ if (!this.el_) return 0;
+
+ // Get dimension value from style
+ var val = this.el_.style[widthOrHeight];
+ var pxIndex = val.indexOf('px');
+ if (pxIndex !== -1) {
+ // Return the pixel value with no 'px'
+ return parseInt(val.slice(0,pxIndex), 10);
+
+ // No px so using % or no style was set, so falling back to offsetWidth/height
+ // If component has display:none, offset will return 0
+ // TODO: handle display:none and no dimension style using px
+ } else {
+
+ return parseInt(this.el_['offset'+vjs.capitalize(widthOrHeight)], 10);
+
+ // ComputedStyle version.
+ // Only difference is if the element is hidden it will return
+ // the percent value (e.g. '100%'')
+ // instead of zero like offsetWidth returns.
+ // var val = vjs.getComputedStyleValue(this.el_, widthOrHeight);
+ // var pxIndex = val.indexOf('px');
+
+ // if (pxIndex !== -1) {
+ // return val.slice(0, pxIndex);
+ // } else {
+ // return val;
+ // }
+ }
+};
+
+/**
+ * Fired when the width and/or height of the component changes
+ * @event resize
+ */
+vjs.Component.prototype.onResize;
+
+/**
+ * Emit 'tap' events when touch events are supported
+ *
+ * This is used to support toggling the controls through a tap on the video.
+ *
+ * We're requireing them to be enabled because otherwise every component would
+ * have this extra overhead unnecessarily, on mobile devices where extra
+ * overhead is especially bad.
+ * @private
+ */
+vjs.Component.prototype.emitTapEvents = function(){
+ var touchStart, touchTime, couldBeTap, noTap;
+
+ // Track the start time so we can determine how long the touch lasted
+ touchStart = 0;
+
+ this.on('touchstart', function(event) {
+ // Record start time so we can detect a tap vs. "touch and hold"
+ touchStart = new Date().getTime();
+ // Reset couldBeTap tracking
+ couldBeTap = true;
+ });
+
+ noTap = function(){
+ couldBeTap = false;
+ };
+ // TODO: Listen to the original target. http://youtu.be/DujfpXOKUp8?t=13m8s
+ this.on('touchmove', noTap);
+ this.on('touchleave', noTap);
+ this.on('touchcancel', noTap);
+
+ // When the touch ends, measure how long it took and trigger the appropriate
+ // event
+ 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
+ touchTime = new Date().getTime() - touchStart;
+ // The touch needs to be quick in order to consider it a tap
+ if (touchTime < 250) {
+ this.trigger('tap');
+ // It may be good to copy the touchend event object and change the
+ // type to tap, if the other event properties aren't exact after
+ // vjs.fixEvent runs (e.g. event.target)
+ }
+ }
+ });
+};
+
+/**
+ * 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);
+};
+
+/* Button - Base class for all buttons
+================================================================================ */
+/**
+ * Base class for all buttons
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @class
+ * @constructor
+ */
+vjs.Button = vjs.Component.extend({
+ /**
+ * @constructor
+ * @inheritDoc
+ */
+ init: function(player, options){
+ vjs.Component.call(this, player, options);
+
+ var touchstart = false;
+ this.on('touchstart', function(event) {
+ // Stop click and other mouse events from triggering also
+ event.preventDefault();
+ touchstart = true;
+ });
+ this.on('touchmove', function() {
+ touchstart = false;
+ });
+ var self = this;
+ this.on('touchend', function(event) {
+ if (touchstart) {
+ self.onClick(event);
+ }
+ event.preventDefault();
+ });
+
+ this.on('click', this.onClick);
+ this.on('focus', this.onFocus);
+ this.on('blur', this.onBlur);
+ }
+});
+
+vjs.Button.prototype.createEl = function(type, props){
+ // Add standard Aria and Tabindex info
+ props = vjs.obj.merge({
+ className: this.buildCSSClass(),
+ innerHTML: '
' + (this.buttonText || 'Need Text') + '
',
+ 'role': 'button',
+ 'aria-live': 'polite', // let the screen reader user know that the text of the button may change
+ tabIndex: 0
+ }, props);
+
+ return vjs.Component.prototype.createEl.call(this, type, props);
+};
+
+vjs.Button.prototype.buildCSSClass = function(){
+ // TODO: Change vjs-control to vjs-button?
+ return 'vjs-control ' + vjs.Component.prototype.buildCSSClass.call(this);
+};
+
+ // Click - Override with specific functionality for button
+vjs.Button.prototype.onClick = function(){};
+
+ // Focus - Add keyboard functionality to element
+vjs.Button.prototype.onFocus = function(){
+ vjs.on(document, 'keyup', vjs.bind(this, this.onKeyPress));
+};
+
+ // KeyPress (document level) - Trigger click when keys are pressed
+vjs.Button.prototype.onKeyPress = function(event){
+ // Check for space bar (32) or enter (13) keys
+ if (event.which == 32 || event.which == 13) {
+ event.preventDefault();
+ this.onClick();
+ }
+};
+
+// Blur - Remove keyboard triggers
+vjs.Button.prototype.onBlur = function(){
+ vjs.off(document, 'keyup', vjs.bind(this, this.onKeyPress));
+};
+/* Slider
+================================================================================ */
+/**
+ * The base functionality for sliders like the volume bar and seek bar
+ *
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.Slider = vjs.Component.extend({
+ /** @constructor */
+ init: function(player, options){
+ vjs.Component.call(this, player, options);
+
+ // Set property names to bar and handle to match with the child Slider class is looking for
+ this.bar = this.getChild(this.options_['barName']);
+ this.handle = this.getChild(this.options_['handleName']);
+
+ player.on(this.playerEvent, vjs.bind(this, this.update));
+
+ this.on('mousedown', this.onMouseDown);
+ this.on('touchstart', this.onMouseDown);
+ this.on('focus', this.onFocus);
+ this.on('blur', this.onBlur);
+ this.on('click', this.onClick);
+
+ this.player_.on('controlsvisible', vjs.bind(this, this.update));
+
+ // This is actually to fix the volume handle position. http://twitter.com/#!/gerritvanaaken/status/159046254519787520
+ // this.player_.one('timeupdate', vjs.bind(this, this.update));
+
+ player.ready(vjs.bind(this, this.update));
+
+ this.boundEvents = {};
+ }
+});
+
+vjs.Slider.prototype.createEl = function(type, props) {
+ props = props || {};
+ // Add the slider element class to all sub classes
+ props.className = props.className + ' vjs-slider';
+ props = vjs.obj.merge({
+ 'role': 'slider',
+ 'aria-valuenow': 0,
+ 'aria-valuemin': 0,
+ 'aria-valuemax': 100,
+ tabIndex: 0
+ }, props);
+
+ return vjs.Component.prototype.createEl.call(this, type, props);
+};
+
+vjs.Slider.prototype.onMouseDown = function(event){
+ event.preventDefault();
+ vjs.blockTextSelection();
+
+ this.boundEvents.move = vjs.bind(this, this.onMouseMove);
+ this.boundEvents.end = vjs.bind(this, this.onMouseUp);
+
+ vjs.on(document, 'mousemove', this.boundEvents.move);
+ vjs.on(document, 'mouseup', this.boundEvents.end);
+ vjs.on(document, 'touchmove', this.boundEvents.move);
+ vjs.on(document, 'touchend', this.boundEvents.end);
+
+ this.onMouseMove(event);
+};
+
+vjs.Slider.prototype.onMouseUp = function() {
+ vjs.unblockTextSelection();
+ vjs.off(document, 'mousemove', this.boundEvents.move, false);
+ vjs.off(document, 'mouseup', this.boundEvents.end, false);
+ vjs.off(document, 'touchmove', this.boundEvents.move, false);
+ vjs.off(document, 'touchend', this.boundEvents.end, false);
+
+ this.update();
+};
+
+vjs.Slider.prototype.update = function(){
+ // In VolumeBar init we have a setTimeout for update that pops and update to the end of the
+ // execution stack. The player is destroyed before then update will cause an error
+ if (!this.el_) return;
+
+ // If scrubbing, we could use a cached value to make the handle keep up with the user's mouse.
+ // On HTML5 browsers scrubbing is really smooth, but some flash players are slow, so we might want to utilize this later.
+ // var progress = (this.player_.scrubbing) ? this.player_.getCache().currentTime / this.player_.duration() : this.player_.currentTime() / this.player_.duration();
+
+ var barProgress,
+ progress = this.getPercent(),
+ handle = this.handle,
+ bar = this.bar;
+
+ // Protect against no duration and other division issues
+ if (isNaN(progress)) { progress = 0; }
+
+ barProgress = progress;
+
+ // If there is a handle, we need to account for the handle in our calculation for progress bar
+ // so that it doesn't fall short of or extend past the handle.
+ if (handle) {
+
+ var box = this.el_,
+ boxWidth = box.offsetWidth,
+
+ handleWidth = handle.el().offsetWidth,
+
+ // The width of the handle in percent of the containing box
+ // In IE, widths may not be ready yet causing NaN
+ handlePercent = (handleWidth) ? handleWidth / boxWidth : 0,
+
+ // Get the adjusted size of the box, considering that the handle's center never touches the left or right side.
+ // There is a margin of half the handle's width on both sides.
+ boxAdjustedPercent = 1 - handlePercent,
+
+ // Adjust the progress that we'll use to set widths to the new adjusted box width
+ adjustedProgress = progress * boxAdjustedPercent;
+
+ // The bar does reach the left side, so we need to account for this in the bar's width
+ barProgress = adjustedProgress + (handlePercent / 2);
+
+ // Move the handle from the left based on the adjected progress
+ handle.el().style.left = vjs.round(adjustedProgress * 100, 2) + '%';
+ }
+
+ // Set the new bar width
+ bar.el().style.width = vjs.round(barProgress * 100, 2) + '%';
+};
+
+vjs.Slider.prototype.calculateDistance = function(event){
+ var el, box, boxX, boxY, boxW, boxH, handle, pageX, pageY;
+
+ el = this.el_;
+ box = vjs.findPosition(el);
+ boxW = boxH = el.offsetWidth;
+ handle = this.handle;
+
+ if (this.options_.vertical) {
+ boxY = box.top;
+
+ if (event.changedTouches) {
+ pageY = event.changedTouches[0].pageY;
+ } else {
+ pageY = event.pageY;
+ }
+
+ if (handle) {
+ var handleH = handle.el().offsetHeight;
+ // Adjusted X and Width, so handle doesn't go outside the bar
+ boxY = boxY + (handleH / 2);
+ boxH = boxH - handleH;
+ }
+
+ // Percent that the click is through the adjusted area
+ return Math.max(0, Math.min(1, ((boxY - pageY) + boxH) / boxH));
+
+ } else {
+ boxX = box.left;
+
+ if (event.changedTouches) {
+ pageX = event.changedTouches[0].pageX;
+ } else {
+ pageX = event.pageX;
+ }
+
+ if (handle) {
+ var handleW = handle.el().offsetWidth;
+
+ // Adjusted X and Width, so handle doesn't go outside the bar
+ boxX = boxX + (handleW / 2);
+ boxW = boxW - handleW;
+ }
+
+ // Percent that the click is through the adjusted area
+ return Math.max(0, Math.min(1, (pageX - boxX) / boxW));
+ }
+};
+
+vjs.Slider.prototype.onFocus = function(){
+ vjs.on(document, 'keyup', vjs.bind(this, this.onKeyPress));
+};
+
+vjs.Slider.prototype.onKeyPress = function(event){
+ if (event.which == 37) { // Left Arrow
+ event.preventDefault();
+ this.stepBack();
+ } else if (event.which == 39) { // Right Arrow
+ event.preventDefault();
+ this.stepForward();
+ }
+};
+
+vjs.Slider.prototype.onBlur = function(){
+ vjs.off(document, 'keyup', vjs.bind(this, this.onKeyPress));
+};
+
+/**
+ * Listener for click events on slider, used to prevent clicks
+ * from bubbling up to parent elements like button menus.
+ * @param {Object} event Event object
+ */
+vjs.Slider.prototype.onClick = function(event){
+ event.stopImmediatePropagation();
+ event.preventDefault();
+};
+
+/**
+ * SeekBar Behavior includes play progress bar, and seek handle
+ * Needed so it can determine seek position based on handle position/size
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.SliderHandle = vjs.Component.extend();
+
+/**
+ * Default value of the slider
+ *
+ * @type {Number}
+ * @private
+ */
+vjs.SliderHandle.prototype.defaultValue = 0;
+
+/** @inheritDoc */
+vjs.SliderHandle.prototype.createEl = function(type, props) {
+ props = props || {};
+ // Add the slider element class to all sub classes
+ props.className = props.className + ' vjs-slider-handle';
+ props = vjs.obj.merge({
+ innerHTML: '
'+this.defaultValue+' '
+ }, props);
+
+ return vjs.Component.prototype.createEl.call(this, 'div', props);
+};
+/* Menu
+================================================================================ */
+/**
+ * The Menu component is used to build pop up menus, including subtitle and
+ * captions selection menus.
+ *
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @class
+ * @constructor
+ */
+vjs.Menu = vjs.Component.extend();
+
+/**
+ * Add a menu item to the menu
+ * @param {Object|String} component Component or component type to add
+ */
+vjs.Menu.prototype.addItem = function(component){
+ this.addChild(component);
+ component.on('click', vjs.bind(this, function(){
+ this.unlockShowing();
+ }));
+};
+
+/** @inheritDoc */
+vjs.Menu.prototype.createEl = function(){
+ var contentElType = this.options().contentElType || 'ul';
+ this.contentEl_ = vjs.createEl(contentElType, {
+ className: 'vjs-menu-content'
+ });
+ var el = vjs.Component.prototype.createEl.call(this, 'div', {
+ append: this.contentEl_,
+ className: 'vjs-menu'
+ });
+ el.appendChild(this.contentEl_);
+
+ // Prevent clicks from bubbling up. Needed for Menu Buttons,
+ // where a click on the parent is significant
+ vjs.on(el, 'click', function(event){
+ event.preventDefault();
+ event.stopImmediatePropagation();
+ });
+
+ return el;
+};
+
+/**
+ * The component for a menu item. `
`
+ *
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @class
+ * @constructor
+ */
+vjs.MenuItem = vjs.Button.extend({
+ /** @constructor */
+ init: function(player, options){
+ vjs.Button.call(this, player, options);
+ this.selected(options['selected']);
+ }
+});
+
+/** @inheritDoc */
+vjs.MenuItem.prototype.createEl = function(type, props){
+ return vjs.Button.prototype.createEl.call(this, 'li', vjs.obj.merge({
+ className: 'vjs-menu-item',
+ innerHTML: this.options_['label']
+ }, props));
+};
+
+/**
+ * Handle a click on the menu item, and set it to selected
+ */
+vjs.MenuItem.prototype.onClick = function(){
+ this.selected(true);
+};
+
+/**
+ * Set this menu item as selected or not
+ * @param {Boolean} selected
+ */
+vjs.MenuItem.prototype.selected = function(selected){
+ if (selected) {
+ this.addClass('vjs-selected');
+ this.el_.setAttribute('aria-selected',true);
+ } else {
+ this.removeClass('vjs-selected');
+ this.el_.setAttribute('aria-selected',false);
+ }
+};
+
+
+/**
+ * A button class with a popup menu
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.MenuButton = vjs.Button.extend({
+ /** @constructor */
+ init: function(player, options){
+ vjs.Button.call(this, player, options);
+
+ this.menu = this.createMenu();
+
+ // Add list to element
+ this.addChild(this.menu);
+
+ // Automatically hide empty menu buttons
+ if (this.items && this.items.length === 0) {
+ this.hide();
+ }
+
+ this.on('keyup', this.onKeyPress);
+ this.el_.setAttribute('aria-haspopup', true);
+ this.el_.setAttribute('role', 'button');
+ }
+});
+
+/**
+ * Track the state of the menu button
+ * @type {Boolean}
+ * @private
+ */
+vjs.MenuButton.prototype.buttonPressed_ = false;
+
+vjs.MenuButton.prototype.createMenu = function(){
+ var menu = new vjs.Menu(this.player_);
+
+ // Add a title list item to the top
+ if (this.options().title) {
+ menu.el().appendChild(vjs.createEl('li', {
+ className: 'vjs-menu-title',
+ innerHTML: vjs.capitalize(this.kind_),
+ tabindex: -1
+ }));
+ }
+
+ this.items = this['createItems']();
+
+ if (this.items) {
+ // Add menu items to the menu
+ for (var i = 0; i < this.items.length; i++) {
+ menu.addItem(this.items[i]);
+ }
+ }
+
+ return menu;
+};
+
+/**
+ * Create the list of menu items. Specific to each subclass.
+ */
+vjs.MenuButton.prototype.createItems = function(){};
+
+/** @inheritDoc */
+vjs.MenuButton.prototype.buildCSSClass = function(){
+ return this.className + ' vjs-menu-button ' + vjs.Button.prototype.buildCSSClass.call(this);
+};
+
+// Focus - Add keyboard functionality to element
+// This function is not needed anymore. Instead, the keyboard functionality is handled by
+// treating the button as triggering a submenu. When the button is pressed, the submenu
+// appears. Pressing the button again makes the submenu disappear.
+vjs.MenuButton.prototype.onFocus = function(){};
+// Can't turn off list display that we turned on with focus, because list would go away.
+vjs.MenuButton.prototype.onBlur = function(){};
+
+vjs.MenuButton.prototype.onClick = function(){
+ // When you click the button it adds focus, which will show the menu indefinitely.
+ // So we'll remove focus when the mouse leaves the button.
+ // Focus is needed for tab navigation.
+ this.one('mouseout', vjs.bind(this, function(){
+ this.menu.unlockShowing();
+ this.el_.blur();
+ }));
+ if (this.buttonPressed_){
+ this.unpressButton();
+ } else {
+ this.pressButton();
+ }
+};
+
+vjs.MenuButton.prototype.onKeyPress = function(event){
+ event.preventDefault();
+
+ // Check for space bar (32) or enter (13) keys
+ if (event.which == 32 || event.which == 13) {
+ if (this.buttonPressed_){
+ this.unpressButton();
+ } else {
+ this.pressButton();
+ }
+ // Check for escape (27) key
+ } else if (event.which == 27){
+ if (this.buttonPressed_){
+ this.unpressButton();
+ }
+ }
+};
+
+vjs.MenuButton.prototype.pressButton = function(){
+ this.buttonPressed_ = true;
+ this.menu.lockShowing();
+ this.el_.setAttribute('aria-pressed', true);
+ if (this.items && this.items.length > 0) {
+ this.items[0].el().focus(); // set the focus to the title of the submenu
+ }
+};
+
+vjs.MenuButton.prototype.unpressButton = function(){
+ this.buttonPressed_ = false;
+ this.menu.unlockShowing();
+ this.el_.setAttribute('aria-pressed', false);
+};
+
+/**
+ * An instance of the `vjs.Player` class is created when any of the Video.js setup methods are used to initialize a video.
+ *
+ * ```js
+ * var myPlayer = videojs('example_video_1');
+ * ```
+ *
+ * In the follwing example, the `data-setup` attribute tells the Video.js library to create a player instance when the library is ready.
+ *
+ * ```html
+ *
+ *
+ *
+ * ```
+ *
+ * After an instance has been created it can be accessed globally using `Video('example_video_1')`.
+ *
+ * @class
+ * @extends vjs.Component
+ */
+vjs.Player = vjs.Component.extend({
+
+ /**
+ * player's constructor function
+ *
+ * @constructs
+ * @method init
+ * @param {Element} tag The original video tag used for configuring options
+ * @param {Object=} options Player options
+ * @param {Function=} ready Ready callback function
+ */
+ 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.
+ // This latter part coincides with the load order
+ // (tag must exist before Player)
+ options = vjs.obj.merge(this.getTagSettings(tag), options);
+
+ // Cache for video property values.
+ this.cache_ = {};
+
+ // Set poster
+ this.poster_ = options['poster'];
+ // Set controls
+ this.controls_ = options['controls'];
+ // Original tag settings stored in options
+ // now remove immediately so native controls don't flash.
+ // 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
+ vjs.Component.call(this, this, options, ready);
+
+ // Update controls className. Can't do this when the controls are initially
+ // set because the element doesn't exist yet.
+ if (this.controls()) {
+ this.addClass('vjs-controls-enabled');
+ } else {
+ this.addClass('vjs-controls-disabled');
+ }
+
+ // TODO: Make this smarter. Toggle user state between touching/mousing
+ // using events, since devices can have both touch and mouse events.
+ // if (vjs.TOUCH_ENABLED) {
+ // this.addClass('vjs-touch-enabled');
+ // }
+
+ // Firstplay event implimentation. Not sold on the event yet.
+ // Could probably just check currentTime==0?
+ this.one('play', function(e){
+ var fpEvent = { type: 'firstplay', target: this.el_ };
+ // Using vjs.trigger so we can check if default was prevented
+ var keepGoing = vjs.trigger(this.el_, fpEvent);
+
+ if (!keepGoing) {
+ e.preventDefault();
+ e.stopPropagation();
+ e.stopImmediatePropagation();
+ }
+ });
+
+ this.on('ended', this.onEnded);
+ this.on('play', this.onPlay);
+ this.on('firstplay', this.onFirstPlay);
+ this.on('pause', this.onPause);
+ this.on('progress', this.onProgress);
+ this.on('durationchange', this.onDurationChange);
+ this.on('error', this.onError);
+ this.on('fullscreenchange', this.onFullscreenChange);
+
+ // Make player easily findable by ID
+ vjs.players[this.id_] = this;
+
+ if (options['plugins']) {
+ vjs.obj.each(options['plugins'], function(key, val){
+ this[key](val);
+ }, this);
+ }
+
+ this.listenForUserActivity();
+ }
+});
+
+/**
+ * Player instance options, surfaced using vjs.options
+ * vjs.options = vjs.Player.prototype.options_
+ * Make changes in vjs.options, not here.
+ * All options should use string keys so they avoid
+ * renaming by closure compiler
+ * @type {Object}
+ * @private
+ */
+vjs.Player.prototype.options_ = vjs.options;
+
+/**
+ * Destroys the video player and does any necessary cleanup
+ *
+ * myPlayer.dispose();
+ *
+ * This is especially helpful if you are dynamically adding and removing videos
+ * to/from the DOM.
+ */
+vjs.Player.prototype.dispose = function(){
+ this.trigger('dispose');
+ // prevent dispose from being called twice
+ this.off('dispose');
+
+ // Kill reference to this player
+ vjs.players[this.id_] = null;
+ if (this.tag && this.tag['player']) { this.tag['player'] = null; }
+ if (this.el_ && this.el_['player']) { this.el_['player'] = null; }
+
+ // Ensure that tracking progress and time progress will stop and plater deleted
+ this.stopTrackingProgress();
+ this.stopTrackingCurrentTime();
+
+ if (this.tech) { this.tech.dispose(); }
+
+ // Component dispose
+ vjs.Component.prototype.dispose.call(this);
+};
+
+vjs.Player.prototype.getTagSettings = function(tag){
+ var options = {
+ 'sources': [],
+ 'tracks': []
+ };
+
+ vjs.obj.merge(options, vjs.getAttributeValues(tag));
+
+ // Get tag children settings
+ if (tag.hasChildNodes()) {
+ var children, child, childName, i, j;
+
+ children = tag.childNodes;
+
+ for (i=0,j=children.length; i 0) {
+ techOptions['startTime'] = this.cache_.currentTime;
+ }
+
+ this.cache_.src = source.src;
+ }
+
+ // Initialize tech instance
+ this.tech = new window['videojs'][techName](this, techOptions);
+
+ this.tech.ready(techReady);
+};
+
+vjs.Player.prototype.unloadTech = function(){
+ this.isReady_ = false;
+ this.tech.dispose();
+
+ // Turn off any manual progress or timeupdate tracking
+ if (this.manualProgress) { this.manualProgressOff(); }
+
+ if (this.manualTimeUpdates) { this.manualTimeUpdatesOff(); }
+
+ this.tech = false;
+};
+
+// There's many issues around changing the size of a Flash (or other plugin) object.
+// First is a plugin reload issue in Firefox that has been around for 11 years: https://bugzilla.mozilla.org/show_bug.cgi?id=90268
+// Then with the new fullscreen API, Mozilla and webkit browsers will reload the flash object after going to fullscreen.
+// To get around this, we're unloading the tech, caching source and currentTime values, and reloading the tech once the plugin is resized.
+// reloadTech: function(betweenFn){
+// vjs.log('unloadingTech')
+// this.unloadTech();
+// vjs.log('unloadedTech')
+// if (betweenFn) { betweenFn.call(); }
+// vjs.log('LoadingTech')
+// this.loadTech(this.techName, { src: this.cache_.src })
+// vjs.log('loadedTech')
+// },
+
+/* Fallbacks for unsupported event types
+================================================================================ */
+// Manually trigger progress events based on changes to the buffered amount
+// Many flash players and older HTML5 browsers don't send progress or progress-like events
+vjs.Player.prototype.manualProgressOn = function(){
+ this.manualProgress = true;
+
+ // Trigger progress watching when a source begins loading
+ this.trackProgress();
+
+ // Watch for a native progress event call on the tech element
+ // In HTML5, some older versions don't support the progress event
+ // So we're assuming they don't, and turning off manual progress if they do.
+ // As opposed to doing user agent detection
+ this.tech.one('progress', function(){
+
+ // Update known progress support for this playback technology
+ this.features['progressEvents'] = true;
+
+ // Turn off manual progress tracking
+ this.player_.manualProgressOff();
+ });
+};
+
+vjs.Player.prototype.manualProgressOff = function(){
+ this.manualProgress = false;
+ this.stopTrackingProgress();
+};
+
+vjs.Player.prototype.trackProgress = function(){
+
+ this.progressInterval = setInterval(vjs.bind(this, function(){
+ // Don't trigger unless buffered amount is greater than last time
+ // log(this.cache_.bufferEnd, this.buffered().end(0), this.duration())
+ /* TODO: update for multiple buffered regions */
+ if (this.cache_.bufferEnd < this.buffered().end(0)) {
+ this.trigger('progress');
+ } else if (this.bufferedPercent() == 1) {
+ this.stopTrackingProgress();
+ this.trigger('progress'); // Last update
+ }
+ }), 500);
+};
+vjs.Player.prototype.stopTrackingProgress = function(){ clearInterval(this.progressInterval); };
+
+/*! Time Tracking -------------------------------------------------------------- */
+vjs.Player.prototype.manualTimeUpdatesOn = function(){
+ this.manualTimeUpdates = true;
+
+ this.on('play', this.trackCurrentTime);
+ this.on('pause', this.stopTrackingCurrentTime);
+ // timeupdate is also called by .currentTime whenever current time is set
+
+ // Watch for native timeupdate event
+ this.tech.one('timeupdate', function(){
+ // Update known progress support for this playback technology
+ this.features['timeupdateEvents'] = true;
+ // Turn off manual progress tracking
+ this.player_.manualTimeUpdatesOff();
+ });
+};
+
+vjs.Player.prototype.manualTimeUpdatesOff = function(){
+ this.manualTimeUpdates = false;
+ this.stopTrackingCurrentTime();
+ this.off('play', this.trackCurrentTime);
+ this.off('pause', this.stopTrackingCurrentTime);
+};
+
+vjs.Player.prototype.trackCurrentTime = function(){
+ if (this.currentTimeInterval) { this.stopTrackingCurrentTime(); }
+ this.currentTimeInterval = setInterval(vjs.bind(this, function(){
+ this.trigger('timeupdate');
+ }), 250); // 42 = 24 fps // 250 is what Webkit uses // FF uses 15
+};
+
+// Turn off play progress tracking (when paused or dragging)
+vjs.Player.prototype.stopTrackingCurrentTime = function(){ clearInterval(this.currentTimeInterval); };
+
+// /* Player event handlers (how the player reacts to certain events)
+// ================================================================================ */
+
+/**
+ * Fired when the user agent begins looking for media data
+ * @event loadstart
+ */
+vjs.Player.prototype.onLoadStart;
+
+/**
+ * Fired when the player has initial duration and dimension information
+ * @event loadedmetadata
+ */
+vjs.Player.prototype.onLoadedMetaData;
+
+/**
+ * Fired when the player has downloaded data at the current playback position
+ * @event loadeddata
+ */
+vjs.Player.prototype.onLoadedData;
+
+/**
+ * Fired when the player has finished downloading the source data
+ * @event loadedalldata
+ */
+vjs.Player.prototype.onLoadedAllData;
+
+/**
+ * Fired whenever the media begins or resumes playback
+ * @event play
+ */
+vjs.Player.prototype.onPlay = function(){
+ vjs.removeClass(this.el_, 'vjs-paused');
+ vjs.addClass(this.el_, 'vjs-playing');
+};
+
+/**
+ * Fired the first time a video is played
+ *
+ * Not part of the HLS spec, and we're not sure if this is the best
+ * implementation yet, so use sparingly. If you don't have a reason to
+ * prevent playback, use `myPlayer.one('play');` instead.
+ *
+ * @event firstplay
+ */
+vjs.Player.prototype.onFirstPlay = function(){
+ //If the first starttime attribute is specified
+ //then we will start at the given offset in seconds
+ if(this.options_['starttime']){
+ this.currentTime(this.options_['starttime']);
+ }
+
+ this.addClass('vjs-has-started');
+};
+
+/**
+ * Fired whenever the media has been paused
+ * @event pause
+ */
+vjs.Player.prototype.onPause = function(){
+ vjs.removeClass(this.el_, 'vjs-playing');
+ vjs.addClass(this.el_, 'vjs-paused');
+};
+
+/**
+ * Fired when the current playback position has changed
+ *
+ * During playback this is fired every 15-250 milliseconds, depnding on the
+ * playback technology in use.
+ * @event timeupdate
+ */
+vjs.Player.prototype.onTimeUpdate;
+
+/**
+ * Fired while the user agent is downloading media data
+ * @event progress
+ */
+vjs.Player.prototype.onProgress = function(){
+ // Add custom event for when source is finished downloading.
+ if (this.bufferedPercent() == 1) {
+ this.trigger('loadedalldata');
+ }
+};
+
+/**
+ * Fired when the end of the media resource is reached (currentTime == duration)
+ * @event ended
+ */
+vjs.Player.prototype.onEnded = function(){
+ if (this.options_['loop']) {
+ this.currentTime(0);
+ this.play();
+ }
+};
+
+/**
+ * Fired when the duration of the media resource is first known or changed
+ * @event durationchange
+ */
+vjs.Player.prototype.onDurationChange = function(){
+ // Allows for cacheing value instead of asking player each time.
+ // 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);
+ }
+};
+
+/**
+ * Fired when the volume changes
+ * @event volumechange
+ */
+vjs.Player.prototype.onVolumeChange;
+
+/**
+ * Fired when the player switches in or out of fullscreen mode
+ * @event fullscreenchange
+ */
+vjs.Player.prototype.onFullscreenChange = function() {
+ if (this.isFullScreen()) {
+ this.addClass('vjs-fullscreen');
+ } else {
+ this.removeClass('vjs-fullscreen');
+ }
+};
+
+/**
+ * Fired when there is an error in playback
+ * @event error
+ */
+vjs.Player.prototype.onError = function(e) {
+ vjs.log('Video Error', e);
+};
+
+// /* Player API
+// ================================================================================ */
+
+/**
+ * Object for cached values.
+ * @private
+ */
+vjs.Player.prototype.cache_;
+
+vjs.Player.prototype.getCache = function(){
+ return this.cache_;
+};
+
+// Pass values to the playback tech
+vjs.Player.prototype.techCall = function(method, arg){
+ // If it's not ready yet, call method when it is
+ if (this.tech && !this.tech.isReady_) {
+ this.tech.ready(function(){
+ this[method](arg);
+ });
+
+ // Otherwise call method now
+ } else {
+ try {
+ this.tech[method](arg);
+ } catch(e) {
+ vjs.log(e);
+ throw e;
+ }
+ }
+};
+
+// Get calls can't wait for the tech, and sometimes don't need to.
+vjs.Player.prototype.techGet = function(method){
+
+ if (this.tech && this.tech.isReady_) {
+
+ // Flash likes to die and reload when you hide or reposition it.
+ // In these cases the object methods go away and we get errors.
+ // When that happens we'll catch the errors and inform tech that it's not ready any more.
+ try {
+ return this.tech[method]();
+ } catch(e) {
+ // When building additional tech libs, an expected method may not be defined yet
+ if (this.tech[method] === undefined) {
+ vjs.log('Video.js: ' + method + ' method not defined for '+this.techName+' playback technology.', e);
+ } else {
+ // When a method isn't available on the object it throws a TypeError
+ if (e.name == 'TypeError') {
+ vjs.log('Video.js: ' + method + ' unavailable on '+this.techName+' playback technology element.', e);
+ this.tech.isReady_ = false;
+ } else {
+ vjs.log(e);
+ }
+ }
+ throw e;
+ }
+ }
+
+ return;
+};
+
+/**
+ * start media playback
+ *
+ * myPlayer.play();
+ *
+ * @return {vjs.Player} self
+ */
+vjs.Player.prototype.play = function(){
+ this.techCall('play');
+ return this;
+};
+
+/**
+ * Pause the video playback
+ *
+ * myPlayer.pause();
+ *
+ * @return {vjs.Player} self
+ */
+vjs.Player.prototype.pause = function(){
+ this.techCall('pause');
+ return this;
+};
+
+/**
+ * Check if the player is paused
+ *
+ * var isPaused = myPlayer.paused();
+ * var isPlaying = !myPlayer.paused();
+ *
+ * @return {Boolean} false if the media is currently playing, or true otherwise
+ */
+vjs.Player.prototype.paused = function(){
+ // The initial state of paused should be true (in Safari it's actually false)
+ return (this.techGet('paused') === false) ? false : true;
+};
+
+/**
+ * Get or set the current time (in seconds)
+ *
+ * // get
+ * var whereYouAt = myPlayer.currentTime();
+ *
+ * // set
+ * myPlayer.currentTime(120); // 2 minutes into the video
+ *
+ * @param {Number|String=} seconds The time to seek to
+ * @return {Number} The time in seconds, when not setting
+ * @return {vjs.Player} self, when the current time is set
+ */
+vjs.Player.prototype.currentTime = function(seconds){
+ if (seconds !== undefined) {
+
+ this.techCall('setCurrentTime', seconds);
+
+ // improve the accuracy of manual timeupdates
+ if (this.manualTimeUpdates) { this.trigger('timeupdate'); }
+
+ return this;
+ }
+
+ // 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);
+};
+
+/**
+ * Get the length in time of the video in seconds
+ *
+ * var lengthOfVideo = myPlayer.duration();
+ *
+ * **NOTE**: The video must have started loading before the duration can be
+ * known, and in the case of Flash, may not be known until the video starts
+ * playing.
+ *
+ * @return {Number} The duration of the video in seconds
+ */
+vjs.Player.prototype.duration = function(seconds){
+ if (seconds !== undefined) {
+
+ // cache the last set value for optimiized scrubbing (esp. Flash)
+ this.cache_.duration = parseFloat(seconds);
+
+ return this;
+ }
+
+ if (this.cache_.duration === undefined) {
+ this.onDurationChange();
+ }
+
+ return this.cache_.duration || 0;
+};
+
+// Calculates how much time is left. Not in spec, but useful.
+vjs.Player.prototype.remainingTime = function(){
+ return this.duration() - this.currentTime();
+};
+
+// http://dev.w3.org/html5/spec/video.html#dom-media-buffered
+// Buffered returns a timerange object.
+// Kind of like an array of portions of the video that have been downloaded.
+// So far no browsers return more than one range (portion)
+
+/**
+ * Get a TimeRange object with the times of the video that have been downloaded
+ *
+ * If you just want the percent of the video that's been downloaded,
+ * use bufferedPercent.
+ *
+ * // Number of different ranges of time have been buffered. Usually 1.
+ * numberOfRanges = bufferedTimeRange.length,
+ *
+ * // Time in seconds when the first range starts. Usually 0.
+ * firstRangeStart = bufferedTimeRange.start(0),
+ *
+ * // Time in seconds when the first range ends
+ * firstRangeEnd = bufferedTimeRange.end(0),
+ *
+ * // Length in seconds of the first time range
+ * firstRangeLength = firstRangeEnd - firstRangeStart;
+ *
+ * @return {Object} A mock TimeRange object (following HTML spec)
+ */
+vjs.Player.prototype.buffered = function(){
+ var buffered = this.techGet('buffered'),
+ start = 0,
+ buflast = buffered.length - 1,
+ // Default end to 0 and store in values
+ end = this.cache_.bufferEnd = this.cache_.bufferEnd || 0;
+
+ if (buffered && buflast >= 0 && buffered.end(buflast) !== end) {
+ end = buffered.end(buflast);
+ // Storing values allows them be overridden by setBufferedFromProgress
+ this.cache_.bufferEnd = end;
+ }
+
+ return vjs.createTimeRange(start, end);
+};
+
+/**
+ * Get the percent (as a decimal) of the video that's been downloaded
+ *
+ * var howMuchIsDownloaded = myPlayer.bufferedPercent();
+ *
+ * 0 means none, 1 means all.
+ * (This method isn't in the HTML5 spec, but it's very convenient)
+ *
+ * @return {Number} A decimal between 0 and 1 representing the percent
+ */
+vjs.Player.prototype.bufferedPercent = function(){
+ return (this.duration()) ? this.buffered().end(0) / this.duration() : 0;
+};
+
+/**
+ * Get or set the current volume of the media
+ *
+ * // get
+ * var howLoudIsIt = myPlayer.volume();
+ *
+ * // set
+ * myPlayer.volume(0.5); // Set volume to half
+ *
+ * 0 is off (muted), 1.0 is all the way up, 0.5 is half way.
+ *
+ * @param {Number} percentAsDecimal The new volume as a decimal percent
+ * @return {Number} The current volume, when getting
+ * @return {vjs.Player} self, when setting
+ */
+vjs.Player.prototype.volume = function(percentAsDecimal){
+ var vol;
+
+ if (percentAsDecimal !== undefined) {
+ vol = Math.max(0, Math.min(1, parseFloat(percentAsDecimal))); // Force value to between 0 and 1
+ this.cache_.volume = vol;
+ this.techCall('setVolume', vol);
+ vjs.setLocalStorage('volume', vol);
+ return this;
+ }
+
+ // Default to 1 when returning current volume.
+ vol = parseFloat(this.techGet('volume'));
+ return (isNaN(vol)) ? 1 : vol;
+};
+
+
+/**
+ * Get the current muted state, or turn mute on or off
+ *
+ * // get
+ * var isVolumeMuted = myPlayer.muted();
+ *
+ * // set
+ * myPlayer.muted(true); // mute the volume
+ *
+ * @param {Boolean=} muted True to mute, false to unmute
+ * @return {Boolean} True if mute is on, false if not, when getting
+ * @return {vjs.Player} self, when setting mute
+ */
+vjs.Player.prototype.muted = function(muted){
+ if (muted !== undefined) {
+ this.techCall('setMuted', muted);
+ return this;
+ }
+ 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;
+};
+
+/**
+ * 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
+ *
+ * myPlayer.requestFullScreen();
+ *
+ * In some browsers, full screen is not supported natively, so it enters
+ * "full window mode", where the video fills the browser window.
+ * In browsers and devices that support native full screen, sometimes the
+ * browser's default controls will be shown, and not the Video.js custom skin.
+ * This includes most mobile devices (iOS, Android) and older versions of
+ * Safari.
+ *
+ * @return {vjs.Player} self
+ */
+vjs.Player.prototype.requestFullScreen = function(){
+ var requestFullScreen = vjs.support.requestFullScreen;
+ this.isFullScreen(true);
+
+ if (requestFullScreen) {
+ // the browser supports going fullscreen at the element level so we can
+ // take the controls fullscreen as well as the video
+
+ // Trigger fullscreenchange event after change
+ // We have to specifically add this each time, and remove
+ // when cancelling fullscreen. Otherwise if there's multiple
+ // 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]);
+
+ // If cancelling fullscreen, remove event listener.
+ if (this.isFullScreen() === false) {
+ vjs.off(document, requestFullScreen.eventName, arguments.callee);
+ }
+
+ this.trigger('fullscreenchange');
+ }));
+
+ this.el_[requestFullScreen.requestFn]();
+
+ } else if (this.tech.supportsFullScreen()) {
+ // we can't take the video.js controls fullscreen but we can go fullscreen
+ // with native controls
+ this.techCall('enterFullScreen');
+ } else {
+ // fullscreen isn't supported so we'll just stretch the video element to
+ // fill the viewport
+ this.enterFullWindow();
+ this.trigger('fullscreenchange');
+ }
+
+ return this;
+};
+
+/**
+ * Return the video to its normal size after having been in full screen mode
+ *
+ * myPlayer.cancelFullScreen();
+ *
+ * @return {vjs.Player} self
+ */
+vjs.Player.prototype.cancelFullScreen = function(){
+ var requestFullScreen = vjs.support.requestFullScreen;
+ this.isFullScreen(false);
+
+ // Check for browser element fullscreen support
+ if (requestFullScreen) {
+ document[requestFullScreen.cancelFn]();
+ } else if (this.tech.supportsFullScreen()) {
+ this.techCall('exitFullScreen');
+ } else {
+ this.exitFullWindow();
+ this.trigger('fullscreenchange');
+ }
+
+ return this;
+};
+
+// When fullscreen isn't supported we can stretch the video container to as wide as the browser will let us.
+vjs.Player.prototype.enterFullWindow = function(){
+ this.isFullWindow = true;
+
+ // Storing original doc overflow value to return to when fullscreen is off
+ this.docOrigOverflow = document.documentElement.style.overflow;
+
+ // Add listener for esc key to exit fullscreen
+ vjs.on(document, 'keydown', vjs.bind(this, this.fullWindowOnEscKey));
+
+ // Hide any scroll bars
+ document.documentElement.style.overflow = 'hidden';
+
+ // Apply fullscreen styles
+ vjs.addClass(document.body, 'vjs-full-window');
+
+ this.trigger('enterFullWindow');
+};
+vjs.Player.prototype.fullWindowOnEscKey = function(event){
+ if (event.keyCode === 27) {
+ if (this.isFullScreen() === true) {
+ this.cancelFullScreen();
+ } else {
+ this.exitFullWindow();
+ }
+ }
+};
+
+vjs.Player.prototype.exitFullWindow = function(){
+ this.isFullWindow = false;
+ vjs.off(document, 'keydown', this.fullWindowOnEscKey);
+
+ // Unhide scroll bars.
+ document.documentElement.style.overflow = this.docOrigOverflow;
+
+ // Remove fullscreen styles
+ vjs.removeClass(document.body, 'vjs-full-window');
+
+ // Resize the box, controller, and poster to original sizes
+ // this.positionAll();
+ this.trigger('exitFullWindow');
+};
+
+vjs.Player.prototype.selectSource = function(sources){
+
+ // Loop through each playback technology in the options order
+ for (var i=0,j=this.options_['techOrder'];iCurrent Time ' + '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(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.contentEl_.innerHTML = 'Current Time ' + vjs.formatTime(time, this.player_.duration());
+};
+
+/**
+ * Displays the duration
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.DurationDisplay = vjs.Component.extend({
+ /** @constructor */
+ init: function(player, options){
+ vjs.Component.call(this, player, options);
+
+ // 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));
+ }
+});
+
+vjs.DurationDisplay.prototype.createEl = function(){
+ var el = vjs.Component.prototype.createEl.call(this, 'div', {
+ className: 'vjs-duration vjs-time-controls vjs-control'
+ });
+
+ this.contentEl_ = vjs.createEl('div', {
+ className: 'vjs-duration-display',
+ innerHTML: 'Duration Time ' + '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(this.contentEl_);
+ return el;
+};
+
+vjs.DurationDisplay.prototype.updateContent = function(){
+ var duration = this.player_.duration();
+ if (duration) {
+ this.contentEl_.innerHTML = 'Duration Time ' + vjs.formatTime(duration); // label the duration time for screen reader users
+ }
+};
+
+/**
+ * The separator between the current time and duration
+ *
+ * Can be hidden if it's not needed in the design.
+ *
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.TimeDivider = vjs.Component.extend({
+ /** @constructor */
+ init: function(player, options){
+ vjs.Component.call(this, player, options);
+ }
+});
+
+vjs.TimeDivider.prototype.createEl = function(){
+ return vjs.Component.prototype.createEl.call(this, 'div', {
+ className: 'vjs-time-divider',
+ innerHTML: '/
'
+ });
+};
+
+/**
+ * Displays the time left in the video
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.RemainingTimeDisplay = vjs.Component.extend({
+ /** @constructor */
+ init: function(player, options){
+ vjs.Component.call(this, player, options);
+
+ player.on('timeupdate', vjs.bind(this, this.updateContent));
+ }
+});
+
+vjs.RemainingTimeDisplay.prototype.createEl = function(){
+ var el = vjs.Component.prototype.createEl.call(this, 'div', {
+ className: 'vjs-remaining-time vjs-time-controls vjs-control'
+ });
+
+ this.contentEl_ = vjs.createEl('div', {
+ className: 'vjs-remaining-time-display',
+ innerHTML: 'Remaining Time ' + '-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(this.contentEl_);
+ return el;
+};
+
+vjs.RemainingTimeDisplay.prototype.updateContent = function(){
+ if (this.player_.duration()) {
+ this.contentEl_.innerHTML = 'Remaining Time ' + '-'+ 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.contentEl_.innerHTML = vjs.formatTime(time, this.player_.duration());
+};
+/**
+ * Toggle fullscreen video
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @class
+ * @extends vjs.Button
+ */
+vjs.FullscreenToggle = vjs.Button.extend({
+ /**
+ * @constructor
+ * @memberof vjs.FullscreenToggle
+ * @instance
+ */
+ init: function(player, options){
+ vjs.Button.call(this, player, options);
+ }
+});
+
+vjs.FullscreenToggle.prototype.buttonText = 'Fullscreen';
+
+vjs.FullscreenToggle.prototype.buildCSSClass = function(){
+ return 'vjs-fullscreen-control ' + vjs.Button.prototype.buildCSSClass.call(this);
+};
+
+vjs.FullscreenToggle.prototype.onClick = function(){
+ if (!this.player_.isFullScreen()) {
+ this.player_.requestFullScreen();
+ this.el_.children[0].children[0].innerHTML = 'Non-Fullscreen'; // change the button text to "Non-Fullscreen"
+ } else {
+ this.player_.cancelFullScreen();
+ this.el_.children[0].children[0].innerHTML = 'Fullscreen'; // change the button to "Fullscreen"
+ }
+};
+/**
+ * The Progress Control component contains the seek bar, load progress,
+ * and play progress
+ *
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.ProgressControl = vjs.Component.extend({
+ /** @constructor */
+ init: function(player, options){
+ vjs.Component.call(this, player, options);
+ }
+});
+
+vjs.ProgressControl.prototype.options_ = {
+ children: {
+ 'seekBar': {}
+ }
+};
+
+vjs.ProgressControl.prototype.createEl = function(){
+ return vjs.Component.prototype.createEl.call(this, 'div', {
+ className: 'vjs-progress-control vjs-control'
+ });
+};
+
+/**
+ * Seek Bar and holder for the progress bars
+ *
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.SeekBar = vjs.Slider.extend({
+ /** @constructor */
+ init: function(player, options){
+ vjs.Slider.call(this, player, options);
+ player.on('timeupdate', vjs.bind(this, this.updateARIAAttributes));
+ player.ready(vjs.bind(this, this.updateARIAAttributes));
+ }
+});
+
+vjs.SeekBar.prototype.options_ = {
+ children: {
+ 'loadProgressBar': {},
+ 'playProgressBar': {},
+ 'seekHandle': {}
+ },
+ 'barName': 'playProgressBar',
+ 'handleName': 'seekHandle'
+};
+
+vjs.SeekBar.prototype.playerEvent = 'timeupdate';
+
+vjs.SeekBar.prototype.createEl = function(){
+ return vjs.Slider.prototype.createEl.call(this, 'div', {
+ className: 'vjs-progress-holder',
+ 'aria-label': 'video progress bar'
+ });
+};
+
+vjs.SeekBar.prototype.updateARIAAttributes = function(){
+ // Allows for smooth scrubbing, when player can't keep up.
+ var time = (this.player_.scrubbing) ? this.player_.getCache().currentTime : this.player_.currentTime();
+ this.el_.setAttribute('aria-valuenow',vjs.round(this.getPercent()*100, 2)); // machine readable value of progress bar (percentage complete)
+ this.el_.setAttribute('aria-valuetext',vjs.formatTime(time, this.player_.duration())); // human readable value of progress bar (time complete)
+};
+
+vjs.SeekBar.prototype.getPercent = function(){
+ return this.player_.currentTime() / this.player_.duration();
+};
+
+vjs.SeekBar.prototype.onMouseDown = function(event){
+ vjs.Slider.prototype.onMouseDown.call(this, event);
+
+ this.player_.scrubbing = true;
+
+ this.videoWasPlaying = !this.player_.paused();
+ this.player_.pause();
+};
+
+vjs.SeekBar.prototype.onMouseMove = function(event){
+ var newTime = this.calculateDistance(event) * this.player_.duration();
+
+ // Don't let video end while scrubbing.
+ if (newTime == this.player_.duration()) { newTime = newTime - 0.1; }
+
+ // Set new time (tell player to seek to new time)
+ this.player_.currentTime(newTime);
+};
+
+vjs.SeekBar.prototype.onMouseUp = function(event){
+ vjs.Slider.prototype.onMouseUp.call(this, event);
+
+ this.player_.scrubbing = false;
+ if (this.videoWasPlaying) {
+ this.player_.play();
+ }
+};
+
+vjs.SeekBar.prototype.stepForward = function(){
+ this.player_.currentTime(this.player_.currentTime() + 5); // more quickly fast forward for keyboard-only users
+};
+
+vjs.SeekBar.prototype.stepBack = function(){
+ this.player_.currentTime(this.player_.currentTime() - 5); // more quickly rewind for keyboard-only users
+};
+
+
+/**
+ * Shows load progress
+ *
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.LoadProgressBar = vjs.Component.extend({
+ /** @constructor */
+ init: function(player, options){
+ vjs.Component.call(this, player, options);
+ player.on('progress', vjs.bind(this, this.update));
+ }
+});
+
+vjs.LoadProgressBar.prototype.createEl = function(){
+ return vjs.Component.prototype.createEl.call(this, 'div', {
+ className: 'vjs-load-progress',
+ innerHTML: 'Loaded: 0% '
+ });
+};
+
+vjs.LoadProgressBar.prototype.update = function(){
+ if (this.el_.style) { this.el_.style.width = vjs.round(this.player_.bufferedPercent() * 100, 2) + '%'; }
+};
+
+
+/**
+ * Shows play progress
+ *
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.PlayProgressBar = vjs.Component.extend({
+ /** @constructor */
+ init: function(player, options){
+ vjs.Component.call(this, player, options);
+ }
+});
+
+vjs.PlayProgressBar.prototype.createEl = function(){
+ return vjs.Component.prototype.createEl.call(this, 'div', {
+ className: 'vjs-play-progress',
+ innerHTML: 'Progress: 0% '
+ });
+};
+
+/**
+ * The Seek Handle shows the current position of the playhead during playback,
+ * and can be dragged to adjust the playhead.
+ *
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+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
+ *
+ * @type {String}
+ * @private
+ */
+vjs.SeekHandle.prototype.defaultValue = '00:00';
+
+/** @inheritDoc */
+vjs.SeekHandle.prototype.createEl = function() {
+ return vjs.SliderHandle.prototype.createEl.call(this, 'div', {
+ 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 = '' + vjs.formatTime(time, this.player_.duration()) + ' ';
+};
+/**
+ * The component for controlling the volume level
+ *
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.VolumeControl = vjs.Component.extend({
+ /** @constructor */
+ init: function(player, options){
+ vjs.Component.call(this, player, options);
+
+ // hide volume controls when they're not supported by the current tech
+ if (player.tech && player.tech.features && player.tech.features['volumeControl'] === false) {
+ this.addClass('vjs-hidden');
+ }
+ player.on('loadstart', vjs.bind(this, function(){
+ if (player.tech.features && player.tech.features['volumeControl'] === false) {
+ this.addClass('vjs-hidden');
+ } else {
+ this.removeClass('vjs-hidden');
+ }
+ }));
+ }
+});
+
+vjs.VolumeControl.prototype.options_ = {
+ children: {
+ 'volumeBar': {}
+ }
+};
+
+vjs.VolumeControl.prototype.createEl = function(){
+ return vjs.Component.prototype.createEl.call(this, 'div', {
+ className: 'vjs-volume-control vjs-control'
+ });
+};
+
+/**
+ * The bar that contains the volume level and can be clicked on to adjust the level
+ *
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.VolumeBar = vjs.Slider.extend({
+ /** @constructor */
+ init: function(player, options){
+ vjs.Slider.call(this, player, options);
+ player.on('volumechange', vjs.bind(this, this.updateARIAAttributes));
+ player.ready(vjs.bind(this, this.updateARIAAttributes));
+ setTimeout(vjs.bind(this, this.update), 0); // update when elements is in DOM
+ }
+});
+
+vjs.VolumeBar.prototype.updateARIAAttributes = function(){
+ // Current value of volume bar as a percentage
+ this.el_.setAttribute('aria-valuenow',vjs.round(this.player_.volume()*100, 2));
+ this.el_.setAttribute('aria-valuetext',vjs.round(this.player_.volume()*100, 2)+'%');
+};
+
+vjs.VolumeBar.prototype.options_ = {
+ children: {
+ 'volumeLevel': {},
+ 'volumeHandle': {}
+ },
+ 'barName': 'volumeLevel',
+ 'handleName': 'volumeHandle'
+};
+
+vjs.VolumeBar.prototype.playerEvent = 'volumechange';
+
+vjs.VolumeBar.prototype.createEl = function(){
+ return vjs.Slider.prototype.createEl.call(this, 'div', {
+ className: 'vjs-volume-bar',
+ 'aria-label': 'volume level'
+ });
+};
+
+vjs.VolumeBar.prototype.onMouseMove = function(event) {
+ if (this.player_.muted()) {
+ this.player_.muted(false);
+ }
+
+ this.player_.volume(this.calculateDistance(event));
+};
+
+vjs.VolumeBar.prototype.getPercent = function(){
+ if (this.player_.muted()) {
+ return 0;
+ } else {
+ return this.player_.volume();
+ }
+};
+
+vjs.VolumeBar.prototype.stepForward = function(){
+ this.player_.volume(this.player_.volume() + 0.1);
+};
+
+vjs.VolumeBar.prototype.stepBack = function(){
+ this.player_.volume(this.player_.volume() - 0.1);
+};
+
+/**
+ * Shows volume level
+ *
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.VolumeLevel = vjs.Component.extend({
+ /** @constructor */
+ init: function(player, options){
+ vjs.Component.call(this, player, options);
+ }
+});
+
+vjs.VolumeLevel.prototype.createEl = function(){
+ return vjs.Component.prototype.createEl.call(this, 'div', {
+ className: 'vjs-volume-level',
+ innerHTML: 'Mute
'
+ });
+};
+
+vjs.MuteToggle.prototype.onClick = function(){
+ this.player_.muted( this.player_.muted() ? false : true );
+};
+
+vjs.MuteToggle.prototype.update = function(){
+ var vol = this.player_.volume(),
+ level = 3;
+
+ if (vol === 0 || this.player_.muted()) {
+ level = 0;
+ } else if (vol < 0.33) {
+ level = 1;
+ } else if (vol < 0.67) {
+ level = 2;
+ }
+
+ // Don't rewrite the button text if the actual text doesn't change.
+ // This causes unnecessary and confusing information for screen reader users.
+ // This check is needed because this function gets called every time the volume level is changed.
+ if(this.player_.muted()){
+ if(this.el_.children[0].children[0].innerHTML!='Unmute'){
+ this.el_.children[0].children[0].innerHTML = 'Unmute'; // change the button text to "Unmute"
+ }
+ } else {
+ if(this.el_.children[0].children[0].innerHTML!='Mute'){
+ this.el_.children[0].children[0].innerHTML = 'Mute'; // change the button text to "Mute"
+ }
+ }
+
+ /* TODO improve muted icon classes */
+ for (var i = 0; i < 4; i++) {
+ vjs.removeClass(this.el_, 'vjs-vol-'+i);
+ }
+ vjs.addClass(this.el_, 'vjs-vol-'+level);
+};
+/**
+ * Menu button with a popup for showing the volume slider.
+ * @constructor
+ */
+vjs.VolumeMenuButton = vjs.MenuButton.extend({
+ /** @constructor */
+ init: function(player, options){
+ vjs.MenuButton.call(this, player, options);
+
+ // Same listeners as MuteToggle
+ player.on('volumechange', vjs.bind(this, this.update));
+
+ // hide mute toggle if the current tech doesn't support volume control
+ if (player.tech && player.tech.features && player.tech.features.volumeControl === false) {
+ this.addClass('vjs-hidden');
+ }
+ player.on('loadstart', vjs.bind(this, function(){
+ if (player.tech.features && player.tech.features.volumeControl === false) {
+ this.addClass('vjs-hidden');
+ } else {
+ this.removeClass('vjs-hidden');
+ }
+ }));
+ this.addClass('vjs-menu-button');
+ }
+});
+
+vjs.VolumeMenuButton.prototype.createMenu = function(){
+ var menu = new vjs.Menu(this.player_, {
+ contentElType: 'div'
+ });
+ var vc = new vjs.VolumeBar(this.player_, vjs.obj.merge({vertical: true}, this.options_.volumeBar));
+ menu.addChild(vc);
+ return menu;
+};
+
+vjs.VolumeMenuButton.prototype.onClick = function(){
+ vjs.MuteToggle.prototype.onClick.call(this);
+ vjs.MenuButton.prototype.onClick.call(this);
+};
+
+vjs.VolumeMenuButton.prototype.createEl = function(){
+ return vjs.Button.prototype.createEl.call(this, 'div', {
+ className: 'vjs-volume-menu-button vjs-menu-button vjs-control',
+ innerHTML: 'Mute
'
+ });
+};
+vjs.VolumeMenuButton.prototype.update = vjs.MuteToggle.prototype.update;
+/* Poster Image
+================================================================================ */
+/**
+ * The component that handles showing the poster image.
+ *
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.PosterImage = vjs.Button.extend({
+ /** @constructor */
+ 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',
+
+ // Don't want poster to be tabbable.
+ tabIndex: -1
+ });
+
+ 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()) {
+ this.player_.play();
+ }
+};
+/* Loading Spinner
+================================================================================ */
+/**
+ * Loading spinner for waiting events
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @class
+ * @constructor
+ */
+vjs.LoadingSpinner = vjs.Component.extend({
+ /** @constructor */
+ init: function(player, options){
+ vjs.Component.call(this, player, options);
+
+ player.on('canplay', vjs.bind(this, this.hide));
+ player.on('canplaythrough', vjs.bind(this, this.hide));
+ player.on('playing', vjs.bind(this, this.hide));
+ player.on('seeked', vjs.bind(this, this.hide));
+
+ player.on('seeking', vjs.bind(this, this.show));
+
+ // in some browsers seeking does not trigger the 'playing' event,
+ // so we also need to trap 'seeked' if we are going to set a
+ // 'seeking' event
+ player.on('seeked', vjs.bind(this, this.hide));
+
+ player.on('error', vjs.bind(this, this.show));
+
+ // Not showing spinner on stalled any more. Browsers may stall and then not trigger any events that would remove the spinner.
+ // Checked in Chrome 16 and Safari 5.1.2. http://help.videojs.com/discussions/problems/883-why-is-the-download-progress-showing
+ // player.on('stalled', vjs.bind(this, this.show));
+
+ player.on('waiting', vjs.bind(this, this.show));
+ }
+});
+
+vjs.LoadingSpinner.prototype.createEl = function(){
+ return vjs.Component.prototype.createEl.call(this, 'div', {
+ className: 'vjs-loading-spinner'
+ });
+};
+/* Big Play Button
+================================================================================ */
+/**
+ * Initial play button. Shows before the video has played. The hiding of the
+ * big play button is done via CSS and player states.
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @class
+ * @constructor
+ */
+vjs.BigPlayButton = vjs.Button.extend();
+
+vjs.BigPlayButton.prototype.createEl = function(){
+ return vjs.Button.prototype.createEl.call(this, 'div', {
+ className: 'vjs-big-play-button',
+ innerHTML: ' 0) {
+ track.disable();
+ }
+ }
+
+ // Get track kind from shown track or disableSameKind
+ kind = (showTrack) ? showTrack.kind() : ((disableSameKind) ? disableSameKind : false);
+
+ // Trigger trackchange event, captionstrackchange, subtitlestrackchange, etc.
+ if (kind) {
+ this.trigger(kind+'trackchange');
+ }
+
+ return this;
+};
+
+/**
+ * The base class for all text tracks
+ *
+ * Handles the parsing, hiding, and showing of text track cues
+ *
+ * @param {vjs.Player|Object} player
+ * @param {Object=} options
+ * @constructor
+ */
+vjs.TextTrack = vjs.Component.extend({
+ /** @constructor */
+ init: function(player, options){
+ vjs.Component.call(this, player, options);
+
+ // Apply track info to track object
+ // Options will often be a track element
+
+ // Build ID if one doesn't exist
+ this.id_ = options['id'] || ('vjs_' + options['kind'] + '_' + options['language'] + '_' + vjs.guid++);
+ this.src_ = options['src'];
+ // 'default' is a reserved keyword in js so we use an abbreviated version
+ this.dflt_ = options['default'] || options['dflt'];
+ this.title_ = options['title'];
+ this.language_ = options['srclang'];
+ this.label_ = options['label'];
+ this.cues_ = [];
+ this.activeCues_ = [];
+ this.readyState_ = 0;
+ this.mode_ = 0;
+
+ this.player_.on('fullscreenchange', vjs.bind(this, this.adjustFontSize));
+ }
+});
+
+/**
+ * Track kind value. Captions, subtitles, etc.
+ * @private
+ */
+vjs.TextTrack.prototype.kind_;
+
+/**
+ * Get the track kind value
+ * @return {String}
+ */
+vjs.TextTrack.prototype.kind = function(){
+ return this.kind_;
+};
+
+/**
+ * Track src value
+ * @private
+ */
+vjs.TextTrack.prototype.src_;
+
+/**
+ * Get the track src value
+ * @return {String}
+ */
+vjs.TextTrack.prototype.src = function(){
+ return this.src_;
+};
+
+/**
+ * Track default value
+ * If default is used, subtitles/captions to start showing
+ * @private
+ */
+vjs.TextTrack.prototype.dflt_;
+
+/**
+ * Get the track default value. ('default' is a reserved keyword)
+ * @return {Boolean}
+ */
+vjs.TextTrack.prototype.dflt = function(){
+ return this.dflt_;
+};
+
+/**
+ * Track title value
+ * @private
+ */
+vjs.TextTrack.prototype.title_;
+
+/**
+ * Get the track title value
+ * @return {String}
+ */
+vjs.TextTrack.prototype.title = function(){
+ return this.title_;
+};
+
+/**
+ * Language - two letter string to represent track language, e.g. 'en' for English
+ * Spec def: readonly attribute DOMString language;
+ * @private
+ */
+vjs.TextTrack.prototype.language_;
+
+/**
+ * Get the track language value
+ * @return {String}
+ */
+vjs.TextTrack.prototype.language = function(){
+ return this.language_;
+};
+
+/**
+ * Track label e.g. 'English'
+ * Spec def: readonly attribute DOMString label;
+ * @private
+ */
+vjs.TextTrack.prototype.label_;
+
+/**
+ * Get the track label value
+ * @return {String}
+ */
+vjs.TextTrack.prototype.label = function(){
+ return this.label_;
+};
+
+/**
+ * All cues of the track. Cues have a startTime, endTime, text, and other properties.
+ * Spec def: readonly attribute TextTrackCueList cues;
+ * @private
+ */
+vjs.TextTrack.prototype.cues_;
+
+/**
+ * Get the track cues
+ * @return {Array}
+ */
+vjs.TextTrack.prototype.cues = function(){
+ return this.cues_;
+};
+
+/**
+ * ActiveCues is all cues that are currently showing
+ * Spec def: readonly attribute TextTrackCueList activeCues;
+ * @private
+ */
+vjs.TextTrack.prototype.activeCues_;
+
+/**
+ * Get the track active cues
+ * @return {Array}
+ */
+vjs.TextTrack.prototype.activeCues = function(){
+ return this.activeCues_;
+};
+
+/**
+ * ReadyState describes if the text file has been loaded
+ * const unsigned short NONE = 0;
+ * const unsigned short LOADING = 1;
+ * const unsigned short LOADED = 2;
+ * const unsigned short ERROR = 3;
+ * readonly attribute unsigned short readyState;
+ * @private
+ */
+vjs.TextTrack.prototype.readyState_;
+
+/**
+ * Get the track readyState
+ * @return {Number}
+ */
+vjs.TextTrack.prototype.readyState = function(){
+ return this.readyState_;
+};
+
+/**
+ * Mode describes if the track is showing, hidden, or disabled
+ * const unsigned short OFF = 0;
+ * const unsigned short HIDDEN = 1; (still triggering cuechange events, but not visible)
+ * const unsigned short SHOWING = 2;
+ * attribute unsigned short mode;
+ * @private
+ */
+vjs.TextTrack.prototype.mode_;
+
+/**
+ * Get the track mode
+ * @return {Number}
+ */
+vjs.TextTrack.prototype.mode = function(){
+ return this.mode_;
+};
+
+/**
+ * Change the font size of the text track to make it larger when playing in fullscreen mode
+ * and restore it to its normal size when not in fullscreen mode.
+ */
+vjs.TextTrack.prototype.adjustFontSize = function(){
+ 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)
+ this.el_.style.fontSize = screen.width / this.player_.width() * 1.4 * 100 + '%';
+ } else {
+ // Change the font size of the text track back to its original non-fullscreen size
+ this.el_.style.fontSize = '';
+ }
+};
+
+/**
+ * Create basic div to hold cue text
+ * @return {Element}
+ */
+vjs.TextTrack.prototype.createEl = function(){
+ return vjs.Component.prototype.createEl.call(this, 'div', {
+ className: 'vjs-' + this.kind_ + ' vjs-text-track'
+ });
+};
+
+/**
+ * Show: Mode Showing (2)
+ * Indicates that the text track is active. If no attempt has yet been made to obtain the track's cues, the user agent will perform such an attempt momentarily.
+ * The user agent is maintaining a list of which cues are active, and events are being fired accordingly.
+ * In addition, for text tracks whose kind is subtitles or captions, the cues are being displayed over the video as appropriate;
+ * for text tracks whose kind is descriptions, the user agent is making the cues available to the user in a non-visual fashion;
+ * and for text tracks whose kind is chapters, the user agent is making available to the user a mechanism by which the user can navigate to any point in the media resource by selecting a cue.
+ * The showing by default state is used in conjunction with the default attribute on track elements to indicate that the text track was enabled due to that attribute.
+ * This allows the user agent to override the state if a later track is discovered that is more appropriate per the user's preferences.
+ */
+vjs.TextTrack.prototype.show = function(){
+ this.activate();
+
+ this.mode_ = 2;
+
+ // Show element.
+ vjs.Component.prototype.show.call(this);
+};
+
+/**
+ * Hide: Mode Hidden (1)
+ * Indicates that the text track is active, but that the user agent is not actively displaying the cues.
+ * If no attempt has yet been made to obtain the track's cues, the user agent will perform such an attempt momentarily.
+ * The user agent is maintaining a list of which cues are active, and events are being fired accordingly.
+ */
+vjs.TextTrack.prototype.hide = function(){
+ // When hidden, cues are still triggered. Disable to stop triggering.
+ this.activate();
+
+ this.mode_ = 1;
+
+ // Hide element.
+ vjs.Component.prototype.hide.call(this);
+};
+
+/**
+ * Disable: Mode Off/Disable (0)
+ * Indicates that the text track is not active. Other than for the purposes of exposing the track in the DOM, the user agent is ignoring the text track.
+ * No cues are active, no events are fired, and the user agent will not attempt to obtain the track's cues.
+ */
+vjs.TextTrack.prototype.disable = function(){
+ // If showing, hide.
+ if (this.mode_ == 2) { this.hide(); }
+
+ // Stop triggering cues
+ this.deactivate();
+
+ // Switch Mode to Off
+ this.mode_ = 0;
+};
+
+/**
+ * Turn on cue tracking. Tracks that are showing OR hidden are active.
+ */
+vjs.TextTrack.prototype.activate = function(){
+ // Load text file if it hasn't been yet.
+ if (this.readyState_ === 0) { this.load(); }
+
+ // Only activate if not already active.
+ if (this.mode_ === 0) {
+ // Update current cue on timeupdate
+ // Using unique ID for bind function so other tracks don't remove listener
+ this.player_.on('timeupdate', vjs.bind(this, this.update, this.id_));
+
+ // Reset cue time on media end
+ this.player_.on('ended', vjs.bind(this, this.reset, this.id_));
+
+ // Add to display
+ if (this.kind_ === 'captions' || this.kind_ === 'subtitles') {
+ this.player_.getChild('textTrackDisplay').addChild(this);
+ }
+ }
+};
+
+/**
+ * Turn off cue tracking.
+ */
+vjs.TextTrack.prototype.deactivate = function(){
+ // Using unique ID for bind function so other tracks don't remove listener
+ this.player_.off('timeupdate', vjs.bind(this, this.update, this.id_));
+ this.player_.off('ended', vjs.bind(this, this.reset, this.id_));
+ this.reset(); // Reset
+
+ // Remove from display
+ this.player_.getChild('textTrackDisplay').removeChild(this);
+};
+
+// A readiness state
+// One of the following:
+//
+// Not loaded
+// Indicates that the text track is known to exist (e.g. it has been declared with a track element), but its cues have not been obtained.
+//
+// Loading
+// Indicates that the text track is loading and there have been no fatal errors encountered so far. Further cues might still be added to the track.
+//
+// Loaded
+// Indicates that the text track has been loaded with no fatal errors. No new cues will be added to the track except if the text track corresponds to a MutableTextTrack object.
+//
+// Failed to load
+// Indicates that the text track was enabled, but when the user agent attempted to obtain it, this failed in some way (e.g. URL could not be resolved, network error, unknown text track format). Some or all of the cues are likely missing and will not be obtained.
+vjs.TextTrack.prototype.load = function(){
+
+ // Only load if not loaded yet.
+ if (this.readyState_ === 0) {
+ this.readyState_ = 1;
+ vjs.get(this.src_, vjs.bind(this, this.parseCues), vjs.bind(this, this.onError));
+ }
+
+};
+
+vjs.TextTrack.prototype.onError = function(err){
+ this.error = err;
+ this.readyState_ = 3;
+ this.trigger('error');
+};
+
+// Parse the WebVTT text format for cue times.
+// TODO: Separate parser into own class so alternative timed text formats can be used. (TTML, DFXP)
+vjs.TextTrack.prototype.parseCues = function(srcContent) {
+ var cue, time, text,
+ lines = srcContent.split('\n'),
+ line = '', id;
+
+ for (var i=1, j=lines.length; i') == -1) {
+ id = line;
+ // Advance to next line for timing.
+ line = vjs.trim(lines[++i]);
+ } else {
+ id = this.cues_.length;
+ }
+
+ // First line - Number
+ cue = {
+ id: id, // Cue Number
+ index: this.cues_.length // Position in Array
+ };
+
+ // Timing line
+ time = line.split(' --> ');
+ cue.startTime = this.parseCueTime(time[0]);
+ cue.endTime = this.parseCueTime(time[1]);
+
+ // Additional lines - Cue Text
+ text = [];
+
+ // Loop until a blank line or end of lines
+ // Assumeing trim('') returns false for blank lines
+ while (lines[++i] && (line = vjs.trim(lines[i]))) {
+ text.push(line);
+ }
+
+ cue.text = text.join('';
+ }
+
+ this.el_.innerHTML = html;
+};
+
+// Set all loop helper values back
+vjs.TextTrack.prototype.reset = function(){
+ this.nextChange = 0;
+ this.prevChange = this.player_.duration();
+ this.firstActiveIndex = 0;
+ this.lastActiveIndex = 0;
+};
+
+// Create specific track types
+/**
+ * The track component for managing the hiding and showing of captions
+ *
+ * @constructor
+ */
+vjs.CaptionsTrack = vjs.TextTrack.extend();
+vjs.CaptionsTrack.prototype.kind_ = 'captions';
+// Exporting here because Track creation requires the track kind
+// to be available on global object. e.g. new window['videojs'][Kind + 'Track']
+
+/**
+ * The track component for managing the hiding and showing of subtitles
+ *
+ * @constructor
+ */
+vjs.SubtitlesTrack = vjs.TextTrack.extend();
+vjs.SubtitlesTrack.prototype.kind_ = 'subtitles';
+
+/**
+ * The track component for managing the hiding and showing of chapters
+ *
+ * @constructor
+ */
+vjs.ChaptersTrack = vjs.TextTrack.extend();
+vjs.ChaptersTrack.prototype.kind_ = 'chapters';
+
+
+/* Text Track Display
+============================================================================= */
+// Global container for both subtitle and captions text. Simple div container.
+
+/**
+ * The component for displaying text track cues
+ *
+ * @constructor
+ */
+vjs.TextTrackDisplay = vjs.Component.extend({
+ /** @constructor */
+ init: function(player, options, ready){
+ vjs.Component.call(this, player, options, ready);
+
+ // This used to be called during player init, but was causing an error
+ // if a track should show by default and the display hadn't loaded yet.
+ // Should probably be moved to an external track loader when we support
+ // tracks that don't need a display.
+ if (player.options_['tracks'] && player.options_['tracks'].length > 0) {
+ this.player_.addTextTracks(player.options_['tracks']);
+ }
+ }
+});
+
+vjs.TextTrackDisplay.prototype.createEl = function(){
+ return vjs.Component.prototype.createEl.call(this, 'div', {
+ className: 'vjs-text-track-display'
+ });
+};
+
+
+/**
+ * The specific menu item type for selecting a language within a text track kind
+ *
+ * @constructor
+ */
+vjs.TextTrackMenuItem = vjs.MenuItem.extend({
+ /** @constructor */
+ init: function(player, options){
+ var track = this.track = options['track'];
+
+ // Modify options for parent MenuItem class's init.
+ options['label'] = track.label();
+ options['selected'] = track.dflt();
+ vjs.MenuItem.call(this, player, options);
+
+ this.player_.on(track.kind() + 'trackchange', vjs.bind(this, this.update));
+ }
+});
+
+vjs.TextTrackMenuItem.prototype.onClick = function(){
+ vjs.MenuItem.prototype.onClick.call(this);
+ this.player_.showTextTrack(this.track.id_, this.track.kind());
+};
+
+vjs.TextTrackMenuItem.prototype.update = function(){
+ this.selected(this.track.mode() == 2);
+};
+
+/**
+ * A special menu item for turning of a specific type of text track
+ *
+ * @constructor
+ */
+vjs.OffTextTrackMenuItem = vjs.TextTrackMenuItem.extend({
+ /** @constructor */
+ init: function(player, options){
+ // Create pseudo track info
+ // Requires options['kind']
+ options['track'] = {
+ kind: function() { return options['kind']; },
+ player: player,
+ label: function(){ return options['kind'] + ' off'; },
+ dflt: function(){ return false; },
+ mode: function(){ return false; }
+ };
+ vjs.TextTrackMenuItem.call(this, player, options);
+ this.selected(true);
+ }
+});
+
+vjs.OffTextTrackMenuItem.prototype.onClick = function(){
+ vjs.TextTrackMenuItem.prototype.onClick.call(this);
+ this.player_.showTextTrack(this.track.id_, this.track.kind());
+};
+
+vjs.OffTextTrackMenuItem.prototype.update = function(){
+ var tracks = this.player_.textTracks(),
+ i=0, j=tracks.length, track,
+ off = true;
+
+ for (;i 0) {
+ this.show();
+ }
+
+ return menu;
+};
+
+
+/**
+ * @constructor
+ */
+vjs.ChaptersTrackMenuItem = vjs.MenuItem.extend({
+ /** @constructor */
+ init: function(player, options){
+ var track = this.track = options['track'],
+ cue = this.cue = options['cue'],
+ currentTime = player.currentTime();
+
+ // Modify options for parent MenuItem class's init.
+ options['label'] = cue.text;
+ options['selected'] = (cue.startTime <= currentTime && currentTime < cue.endTime);
+ vjs.MenuItem.call(this, player, options);
+
+ track.on('cuechange', vjs.bind(this, this.update));
+ }
+});
+
+vjs.ChaptersTrackMenuItem.prototype.onClick = function(){
+ vjs.MenuItem.prototype.onClick.call(this);
+ this.player_.currentTime(this.cue.startTime);
+ this.update(this.cue.startTime);
+};
+
+vjs.ChaptersTrackMenuItem.prototype.update = function(){
+ var cue = this.cue,
+ currentTime = this.player_.currentTime();
+
+ // vjs.log(currentTime, cue.startTime);
+ this.selected(cue.startTime <= currentTime && currentTime < cue.endTime);
+};
+
+// Add Buttons to controlBar
+vjs.obj.merge(vjs.ControlBar.prototype.options_['children'], {
+ 'subtitlesButton': {},
+ 'captionsButton': {},
+ 'chaptersButton': {}
+});
+
+// vjs.Cue = vjs.Component.extend({
+// /** @constructor */
+// init: function(player, options){
+// vjs.Component.call(this, player, options);
+// }
+// });
+/**
+ * @fileoverview Add JSON support
+ * @suppress {undefinedVars}
+ * (Compiler doesn't like JSON not being declared)
+ */
+
+/**
+ * Javascript JSON implementation
+ * (Parse Method Only)
+ * https://github.com/douglascrockford/JSON-js/blob/master/json2.js
+ * Only using for parse method when parsing data-setup attribute JSON.
+ * @suppress {undefinedVars}
+ * @namespace
+ * @private
+ */
+vjs.JSON;
+
+if (typeof window.JSON !== 'undefined' && window.JSON.parse === 'function') {
+ vjs.JSON = window.JSON;
+
+} else {
+ vjs.JSON = {};
+
+ var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;
+
+ /**
+ * 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) {
+ var j;
+
+ function walk(holder, key) {
+ var k, v, value = holder[key];
+ if (value && typeof value === 'object') {
+ for (k in value) {
+ if (Object.prototype.hasOwnProperty.call(value, k)) {
+ v = walk(value, k);
+ if (v !== undefined) {
+ value[k] = v;
+ } else {
+ delete value[k];
+ }
+ }
+ }
+ }
+ return reviver.call(holder, key, value);
+ }
+ text = String(text);
+ cx.lastIndex = 0;
+ if (cx.test(text)) {
+ text = text.replace(cx, function (a) {
+ return '\\u' +
+ ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+ });
+ }
+
+ if (/^[\],:{}\s]*$/
+ .test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@')
+ .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']')
+ .replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
+
+ j = eval('(' + text + ')');
+
+ return typeof reviver === 'function' ?
+ walk({'': j}, '') : j;
+ }
+
+ throw new SyntaxError('JSON.parse(): invalid or malformed JSON data');
+ };
+}
+/**
+ * @fileoverview Functions for automatically setting up a player
+ * based on the data-setup attribute of the video tag
+ */
+
+// Automatically set up any tags that have a data-setup attribute
+vjs.autoSetup = function(){
+ var options, vid, player,
+ vids = document.getElementsByTagName('video');
+
+ // Check if any media elements exist
+ if (vids && vids.length > 0) {
+
+ for (var i=0,j=vids.length; iChrome or download the latest Adobe Flash Player .'};
+"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.Ld=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;ku.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&&0e?"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:'x '}).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'+(this.oa||"Need Text")+" ",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:'
'+this.defaultValue+" "},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
Current Time 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='Current Time '+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:'Duration Time 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='Duration Time '+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:"/
"})};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:'Remaining Time -0:00',"aria-live":"off"});a.appendChild(this.F);return a};u.gb.prototype.ca=function(){this.c.duration()&&(this.F.innerHTML='Remaining Time -'+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:'Loaded: 0% '})};
+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:'Progress: 0% '})};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=''+u.ta(a,this.c.duration())+" "};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:'Mute
'})};
+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.Yd));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:'Mute
'})};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:'"+j+" "};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");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.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'+a[d].text+"";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=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;de.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 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,7 +174,34 @@ _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)
---
@@ -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,7 +227,7 @@ _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)
---
@@ -227,7 +247,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -237,7 +257,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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)
---
@@ -249,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)
---
@@ -276,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)
---
@@ -288,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)
---
@@ -304,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)
---
@@ -327,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)
---
@@ -341,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)
---
@@ -389,7 +409,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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)
---
@@ -399,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)
---
@@ -415,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)
---
@@ -426,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)
---
@@ -439,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)
---
@@ -449,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)
---
@@ -465,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)
---
@@ -475,7 +495,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)
---
@@ -495,7 +515,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -504,7 +524,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.Button.md b/docs/api/vjs.Button.md
index 27d55a25eb..c5d2b38122 100644
--- a/docs/api/vjs.Button.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +173,34 @@ _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)
---
@@ -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,7 +226,7 @@ _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)
---
@@ -226,7 +246,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -236,7 +256,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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 +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)
---
@@ -275,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)
---
@@ -287,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)
---
@@ -303,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)
---
@@ -326,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)
---
@@ -340,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)
---
@@ -388,7 +408,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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)
---
@@ -398,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)
---
@@ -414,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)
---
@@ -425,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)
---
@@ -438,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)
---
@@ -448,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)
---
@@ -464,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)
---
@@ -474,7 +494,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)
---
@@ -494,7 +514,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -503,7 +523,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.CaptionsButton.md b/docs/api/vjs.CaptionsButton.md
index 7efb77b239..aec10f661d 100644
--- a/docs/api/vjs.CaptionsButton.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +178,34 @@ _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)
---
@@ -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,7 +231,7 @@ _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)
---
@@ -231,7 +251,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -241,7 +261,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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)
---
@@ -253,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)
---
@@ -279,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)
---
@@ -291,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)
---
@@ -307,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)
---
@@ -330,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)
---
@@ -344,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)
---
@@ -392,7 +412,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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 +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)
---
@@ -418,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)
---
@@ -429,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)
---
@@ -442,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)
---
@@ -452,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)
---
@@ -468,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)
---
@@ -478,7 +498,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)
---
@@ -498,7 +518,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -507,7 +527,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.CaptionsTrack.md b/docs/api/vjs.CaptionsTrack.md
index 77179e4589..4afcd487ac 100644
--- a/docs/api/vjs.CaptionsTrack.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
+_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,7 +244,34 @@ _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)
---
@@ -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,7 +297,7 @@ _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)
---
@@ -289,7 +317,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -311,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)
---
@@ -336,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)
---
@@ -388,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)
---
@@ -404,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)
---
@@ -427,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)
---
@@ -441,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)
---
@@ -489,7 +517,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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)
---
@@ -499,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)
---
@@ -515,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)
---
@@ -536,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)
---
@@ -549,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)
---
@@ -599,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)
---
@@ -609,7 +637,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)
---
@@ -629,7 +657,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -638,7 +666,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.ChaptersButton.md b/docs/api/vjs.ChaptersButton.md
index d1fa108f66..1c2ffbc5f1 100644
--- a/docs/api/vjs.ChaptersButton.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +178,34 @@ _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)
---
@@ -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,7 +231,7 @@ _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)
---
@@ -231,7 +251,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -241,7 +261,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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)
---
@@ -253,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)
---
@@ -279,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)
---
@@ -291,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)
---
@@ -307,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)
---
@@ -330,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)
---
@@ -344,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)
---
@@ -392,7 +412,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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 +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)
---
@@ -418,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)
---
@@ -429,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)
---
@@ -442,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)
---
@@ -452,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)
---
@@ -468,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)
---
@@ -478,7 +498,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)
---
@@ -498,7 +518,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -507,7 +527,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.ChaptersTrack.md b/docs/api/vjs.ChaptersTrack.md
index 21d9bedf11..a7ab7541c2 100644
--- a/docs/api/vjs.ChaptersTrack.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
+_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,7 +244,34 @@ _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)
---
@@ -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,7 +297,7 @@ _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)
---
@@ -289,7 +317,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -311,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)
---
@@ -336,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)
---
@@ -388,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)
---
@@ -404,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)
---
@@ -427,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)
---
@@ -441,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)
---
@@ -489,7 +517,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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)
---
@@ -499,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)
---
@@ -515,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)
---
@@ -536,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)
---
@@ -549,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)
---
@@ -599,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)
---
@@ -609,7 +637,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)
---
@@ -629,7 +657,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -638,7 +666,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.ChaptersTrackMenuItem.md b/docs/api/vjs.ChaptersTrackMenuItem.md
index 3e972c3ae4..c5e92153d3 100644
--- a/docs/api/vjs.ChaptersTrackMenuItem.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +170,34 @@ _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)
---
@@ -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,7 +223,7 @@ _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)
---
@@ -223,7 +243,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -233,7 +253,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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 +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)
---
@@ -270,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)
---
@@ -282,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)
---
@@ -298,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)
---
@@ -321,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)
---
@@ -342,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)
---
@@ -390,7 +410,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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)
---
@@ -400,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)
---
@@ -416,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)
---
@@ -427,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)
---
@@ -440,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)
---
@@ -460,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)
---
@@ -476,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)
---
@@ -486,7 +506,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)
---
@@ -506,7 +526,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -515,7 +535,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.Component.md b/docs/api/vjs.Component.md
index a80d41c5b8..7242baa9b6 100644
--- a/docs/api/vjs.Component.md
+++ b/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-)
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +193,34 @@ _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)
---
@@ -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,7 +246,7 @@ _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)
---
@@ -246,7 +266,7 @@ _defined in_: [src/js/component.js#L294](https://github.com/videojs/video.js/blo
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_defined in_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_defined in_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -256,7 +276,7 @@ _defined in_: [src/js/component.js#L726](https://github.com/videojs/video.js/blo
##### 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)
---
@@ -268,7 +288,7 @@ _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)
---
@@ -295,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)
---
@@ -307,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)
---
@@ -323,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)
---
@@ -346,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)
---
@@ -360,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)
---
@@ -408,7 +428,7 @@ _defined in_: [src/js/component.js#L522](https://github.com/videojs/video.js/blo
##### RETURNS:
* `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)
---
@@ -418,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)
---
@@ -434,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)
---
@@ -445,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)
---
@@ -458,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)
---
@@ -468,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)
---
@@ -484,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)
---
@@ -494,7 +514,7 @@ _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)
---
@@ -514,7 +534,7 @@ _defined in_: [src/js/component.js#L600](https://github.com/videojs/video.js/blo
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_defined in_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_defined in_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -523,7 +543,7 @@ _defined in_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_defined in_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.ControlBar.md b/docs/api/vjs.ControlBar.md
index de42fe5d7e..119f63daee 100644
--- a/docs/api/vjs.ControlBar.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +173,34 @@ _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)
---
@@ -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,7 +226,7 @@ _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)
---
@@ -226,7 +246,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -236,7 +256,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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 +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)
---
@@ -275,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)
---
@@ -287,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)
---
@@ -303,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)
---
@@ -326,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)
---
@@ -340,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)
---
@@ -388,7 +408,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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)
---
@@ -398,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)
---
@@ -414,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)
---
@@ -425,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)
---
@@ -438,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)
---
@@ -448,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)
---
@@ -464,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)
---
@@ -474,7 +494,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)
---
@@ -494,7 +514,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -503,7 +523,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.CurrentTimeDisplay.md b/docs/api/vjs.CurrentTimeDisplay.md
index 82a7074a67..8f8ed94476 100644
--- a/docs/api/vjs.CurrentTimeDisplay.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +173,34 @@ _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)
---
@@ -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,7 +226,7 @@ _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)
---
@@ -226,7 +246,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -236,7 +256,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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 +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)
---
@@ -273,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)
---
@@ -285,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)
---
@@ -301,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)
---
@@ -324,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)
---
@@ -338,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)
---
@@ -386,7 +406,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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 +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)
---
@@ -412,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)
---
@@ -423,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)
---
@@ -436,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)
---
@@ -446,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)
---
@@ -462,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)
---
@@ -472,7 +492,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)
---
@@ -492,7 +512,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -501,7 +521,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.DurationDisplay.md b/docs/api/vjs.DurationDisplay.md
index c7bc69934e..fb48b20b4b 100644
--- a/docs/api/vjs.DurationDisplay.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +173,34 @@ _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)
---
@@ -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,7 +226,7 @@ _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)
---
@@ -226,7 +246,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -236,7 +256,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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 +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)
---
@@ -273,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)
---
@@ -285,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)
---
@@ -301,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)
---
@@ -324,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)
---
@@ -338,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)
---
@@ -386,7 +406,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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 +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)
---
@@ -412,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)
---
@@ -423,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)
---
@@ -436,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)
---
@@ -446,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)
---
@@ -462,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)
---
@@ -472,7 +492,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)
---
@@ -492,7 +512,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -501,7 +521,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.Flash.md b/docs/api/vjs.Flash.md
index d8d068278a..f5db21ec39 100644
--- a/docs/api/vjs.Flash.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +177,34 @@ _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)
---
@@ -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,7 +230,7 @@ _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)
---
@@ -229,7 +250,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -239,7 +260,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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)
---
@@ -251,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)
---
@@ -277,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)
---
@@ -301,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)
---
@@ -313,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)
---
@@ -329,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)
---
@@ -352,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)
---
@@ -362,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)
---
@@ -376,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)
---
@@ -424,7 +453,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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)
---
@@ -434,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)
---
@@ -450,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)
---
@@ -461,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)
---
@@ -474,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)
---
@@ -482,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)
---
@@ -492,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)
---
@@ -508,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)
---
@@ -518,7 +547,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)
---
@@ -538,7 +567,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -547,7 +576,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.FullscreenToggle.md b/docs/api/vjs.FullscreenToggle.md
index b779a82f83..f20cd1c4ee 100644
--- a/docs/api/vjs.FullscreenToggle.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +173,34 @@ _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)
---
@@ -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,7 +226,7 @@ _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)
---
@@ -226,7 +246,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -236,7 +256,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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 +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)
---
@@ -273,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)
---
@@ -285,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)
---
@@ -301,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)
---
@@ -324,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)
---
@@ -338,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)
---
@@ -386,7 +406,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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 +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)
---
@@ -412,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)
---
@@ -423,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)
---
@@ -436,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)
---
@@ -446,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)
---
@@ -462,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)
---
@@ -472,7 +492,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)
---
@@ -492,7 +512,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -501,7 +521,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.Html5.md b/docs/api/vjs.Html5.md
index c0267cbbe0..ac70ed7bf8 100644
--- a/docs/api/vjs.Html5.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +177,34 @@ _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)
---
@@ -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,7 +230,7 @@ _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)
---
@@ -229,7 +250,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -239,7 +260,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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)
---
@@ -251,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)
---
@@ -277,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)
---
@@ -301,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)
---
@@ -313,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)
---
@@ -329,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)
---
@@ -352,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)
---
@@ -362,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)
---
@@ -376,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)
---
@@ -424,7 +453,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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)
---
@@ -434,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)
---
@@ -450,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)
---
@@ -461,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)
---
@@ -474,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)
---
@@ -482,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)
---
@@ -492,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)
---
@@ -508,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)
---
@@ -518,7 +547,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)
---
@@ -538,7 +567,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -547,7 +576,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.LoadProgressBar.md b/docs/api/vjs.LoadProgressBar.md
index 0513d05a46..1ee9a6e78b 100644
--- a/docs/api/vjs.LoadProgressBar.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +173,34 @@ _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)
---
@@ -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,7 +226,7 @@ _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)
---
@@ -226,7 +246,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -236,7 +256,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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 +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)
---
@@ -258,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)
---
@@ -273,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)
---
@@ -285,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)
---
@@ -301,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)
---
@@ -324,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)
---
@@ -338,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)
---
@@ -386,7 +406,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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 +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)
---
@@ -412,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)
---
@@ -423,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)
---
@@ -436,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)
---
@@ -446,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)
---
@@ -462,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)
---
@@ -472,7 +492,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)
---
@@ -492,7 +512,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -501,7 +521,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.LoadingSpinner.md b/docs/api/vjs.LoadingSpinner.md
index e57987231b..233ed4bb4b 100644
--- a/docs/api/vjs.LoadingSpinner.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +173,34 @@ _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)
---
@@ -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,7 +226,7 @@ _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)
---
@@ -226,7 +246,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -236,7 +256,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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 +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)
---
@@ -273,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)
---
@@ -285,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)
---
@@ -301,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)
---
@@ -324,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)
---
@@ -338,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)
---
@@ -386,7 +406,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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 +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)
---
@@ -412,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)
---
@@ -423,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)
---
@@ -436,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)
---
@@ -446,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)
---
@@ -462,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)
---
@@ -472,7 +492,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)
---
@@ -492,7 +512,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -501,7 +521,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.MediaLoader.md b/docs/api/vjs.MediaLoader.md
index e403834b4a..1faf916e18 100644
--- a/docs/api/vjs.MediaLoader.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +174,34 @@ _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)
---
@@ -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,7 +227,7 @@ _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)
---
@@ -227,7 +247,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -237,7 +257,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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)
---
@@ -249,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)
---
@@ -275,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)
---
@@ -287,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)
---
@@ -303,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)
---
@@ -326,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)
---
@@ -340,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)
---
@@ -388,7 +408,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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)
---
@@ -398,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)
---
@@ -414,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)
---
@@ -425,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)
---
@@ -438,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)
---
@@ -448,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)
---
@@ -464,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)
---
@@ -474,7 +494,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)
---
@@ -494,7 +514,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -503,7 +523,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.MediaTechController.md b/docs/api/vjs.MediaTechController.md
index 067780e8b3..dc21ae272b 100644
--- a/docs/api/vjs.MediaTechController.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +177,34 @@ _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)
---
@@ -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,7 +230,7 @@ _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)
---
@@ -229,7 +250,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -239,7 +260,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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)
---
@@ -251,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)
---
@@ -277,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)
---
@@ -301,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)
---
@@ -313,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)
---
@@ -329,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)
---
@@ -352,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)
---
@@ -362,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)
---
@@ -376,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)
---
@@ -424,7 +453,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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)
---
@@ -434,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)
---
@@ -450,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)
---
@@ -461,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)
---
@@ -474,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)
---
@@ -482,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)
---
@@ -492,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)
---
@@ -508,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)
---
@@ -518,7 +547,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)
---
@@ -538,7 +567,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -547,7 +576,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.Menu.md b/docs/api/vjs.Menu.md
index 09462d99c3..d267a7581b 100644
--- a/docs/api/vjs.Menu.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +182,34 @@ _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)
---
@@ -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,7 +235,7 @@ _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)
---
@@ -235,7 +255,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -245,7 +265,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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)
---
@@ -257,7 +277,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)
---
@@ -284,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)
---
@@ -296,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)
---
@@ -312,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)
---
@@ -335,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)
---
@@ -349,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)
---
@@ -397,7 +417,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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)
---
@@ -407,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)
---
@@ -423,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)
---
@@ -434,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)
---
@@ -447,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)
---
@@ -457,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)
---
@@ -473,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)
---
@@ -483,7 +503,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)
---
@@ -503,7 +523,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -512,7 +532,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.MenuButton.md b/docs/api/vjs.MenuButton.md
index c4815ac50b..cf7de50d31 100644
--- a/docs/api/vjs.MenuButton.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +178,34 @@ _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)
---
@@ -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,7 +231,7 @@ _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)
---
@@ -231,7 +251,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -241,7 +261,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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)
---
@@ -253,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)
---
@@ -278,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)
---
@@ -290,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)
---
@@ -306,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)
---
@@ -329,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)
---
@@ -343,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)
---
@@ -391,7 +411,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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)
---
@@ -401,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)
---
@@ -417,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)
---
@@ -428,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)
---
@@ -441,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)
---
@@ -451,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)
---
@@ -467,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)
---
@@ -477,7 +497,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)
---
@@ -497,7 +517,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -506,7 +526,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.MenuItem.md b/docs/api/vjs.MenuItem.md
index 1a61f9bf69..daa22c0e00 100644
--- a/docs/api/vjs.MenuItem.md
+++ b/docs/api/vjs.MenuItem.md
@@ -22,9 +22,9 @@ The component for a menu item. ``
- [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`_
@@ -82,7 +82,7 @@ The component for a menu item. ` `
##### 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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +172,34 @@ _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)
---
@@ -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,7 +225,7 @@ _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)
---
@@ -225,7 +245,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -235,7 +255,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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)
---
@@ -247,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)
---
@@ -272,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)
---
@@ -284,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)
---
@@ -300,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)
---
@@ -323,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)
---
@@ -344,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)
---
@@ -392,7 +412,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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 +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)
---
@@ -418,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)
---
@@ -429,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)
---
@@ -442,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)
---
@@ -462,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)
---
@@ -478,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)
---
@@ -488,7 +508,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)
---
@@ -508,7 +528,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -517,7 +537,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.MuteToggle.md b/docs/api/vjs.MuteToggle.md
index c83b421158..a2e608a80d 100644
--- a/docs/api/vjs.MuteToggle.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +173,34 @@ _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)
---
@@ -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,7 +226,7 @@ _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)
---
@@ -226,7 +246,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -236,7 +256,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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 +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)
---
@@ -273,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)
---
@@ -285,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)
---
@@ -301,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)
---
@@ -324,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)
---
@@ -338,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)
---
@@ -386,7 +406,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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 +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)
---
@@ -412,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)
---
@@ -423,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)
---
@@ -436,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)
---
@@ -446,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)
---
@@ -462,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)
---
@@ -472,7 +492,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)
---
@@ -492,7 +512,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -501,7 +521,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.OffTextTrackMenuItem.md b/docs/api/vjs.OffTextTrackMenuItem.md
index 7ef27a0f53..9cdbdabe88 100644
--- a/docs/api/vjs.OffTextTrackMenuItem.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +172,34 @@ _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)
---
@@ -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,7 +225,7 @@ _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)
---
@@ -225,7 +245,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -235,7 +255,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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)
---
@@ -247,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)
---
@@ -272,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)
---
@@ -284,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)
---
@@ -300,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)
---
@@ -323,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)
---
@@ -344,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)
---
@@ -392,7 +412,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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 +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)
---
@@ -418,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)
---
@@ -429,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)
---
@@ -442,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)
---
@@ -462,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)
---
@@ -478,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)
---
@@ -488,7 +508,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)
---
@@ -508,7 +528,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -517,7 +537,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.PlayProgressBar.md b/docs/api/vjs.PlayProgressBar.md
index 8fc3440259..285d0bf73d 100644
--- a/docs/api/vjs.PlayProgressBar.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +173,34 @@ _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)
---
@@ -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,7 +226,7 @@ _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)
---
@@ -226,7 +246,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -236,7 +256,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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 +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)
---
@@ -258,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)
---
@@ -273,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)
---
@@ -285,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)
---
@@ -301,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)
---
@@ -324,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)
---
@@ -338,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)
---
@@ -386,7 +406,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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 +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)
---
@@ -412,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)
---
@@ -423,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)
---
@@ -436,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)
---
@@ -446,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)
---
@@ -462,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)
---
@@ -472,7 +492,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)
---
@@ -492,7 +512,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -501,7 +521,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.PlayToggle.md b/docs/api/vjs.PlayToggle.md
index 78ec438643..866600628b 100644
--- a/docs/api/vjs.PlayToggle.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +173,34 @@ _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)
---
@@ -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,7 +226,7 @@ _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)
---
@@ -226,7 +246,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -236,7 +256,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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 +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)
---
@@ -273,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)
---
@@ -285,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)
---
@@ -301,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)
---
@@ -324,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)
---
@@ -338,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)
---
@@ -386,7 +406,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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 +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)
---
@@ -412,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)
---
@@ -423,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)
---
@@ -436,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)
---
@@ -446,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)
---
@@ -462,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)
---
@@ -472,7 +492,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)
---
@@ -492,7 +512,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -501,7 +521,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.Player.md b/docs/api/vjs.Player.md
index 83fb189a88..90aeef7389 100644
--- a/docs/api/vjs.Player.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +325,34 @@ _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)
---
@@ -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,7 +378,7 @@ _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)
---
@@ -377,7 +398,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -387,7 +408,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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)
---
@@ -399,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)
---
@@ -426,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)
---
@@ -446,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)
---
@@ -458,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)
---
@@ -474,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)
---
@@ -497,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)
---
@@ -511,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)
---
@@ -559,7 +604,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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)
---
@@ -571,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)
---
@@ -584,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)
---
@@ -596,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)
---
@@ -606,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)
---
@@ -628,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)
---
@@ -644,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)
---
@@ -655,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)
---
@@ -668,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)
---
@@ -687,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)
---
@@ -697,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)
---
@@ -735,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)
---
@@ -751,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)
---
@@ -761,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)
---
@@ -783,7 +828,7 @@ _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)
---
@@ -803,7 +848,7 @@ _defined in_: [src/js/player.js#L762](https://github.com/videojs/video.js/blob/m
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -812,14 +857,14 @@ _inherited from_: [src/js/component.js#L709](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)
---
@@ -829,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)
---
@@ -840,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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
@@ -913,14 +958,14 @@ _inherited from_: [src/js/component.js#L816](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)
---
diff --git a/docs/api/vjs.PosterImage.md b/docs/api/vjs.PosterImage.md
index b670e8ae43..33f5e4b3cd 100644
--- a/docs/api/vjs.PosterImage.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +173,34 @@ _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)
---
@@ -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,7 +226,7 @@ _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)
---
@@ -226,7 +246,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -236,7 +256,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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 +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)
---
@@ -273,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)
---
@@ -285,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)
---
@@ -301,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)
---
@@ -324,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)
---
@@ -338,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)
---
@@ -386,7 +406,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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 +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)
---
@@ -412,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)
---
@@ -423,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)
---
@@ -436,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)
---
@@ -446,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)
---
@@ -462,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)
---
@@ -472,7 +492,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)
---
@@ -492,7 +512,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -501,7 +521,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.ProgressControl.md b/docs/api/vjs.ProgressControl.md
index 8bfacaf8a5..da6fb5de19 100644
--- a/docs/api/vjs.ProgressControl.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +174,34 @@ _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)
---
@@ -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,7 +227,7 @@ _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)
---
@@ -227,7 +247,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -237,7 +257,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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)
---
@@ -249,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)
---
@@ -274,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)
---
@@ -286,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)
---
@@ -302,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)
---
@@ -325,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)
---
@@ -339,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)
---
@@ -387,7 +407,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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 +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)
---
@@ -413,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)
---
@@ -424,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)
---
@@ -437,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)
---
@@ -447,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)
---
@@ -463,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)
---
@@ -473,7 +493,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)
---
@@ -493,7 +513,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -502,7 +522,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.RemainingTimeDisplay.md b/docs/api/vjs.RemainingTimeDisplay.md
index f243628b3a..33273ef428 100644
--- a/docs/api/vjs.RemainingTimeDisplay.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +173,34 @@ _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)
---
@@ -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,7 +226,7 @@ _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)
---
@@ -226,7 +246,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -236,7 +256,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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 +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)
---
@@ -258,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)
---
@@ -273,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)
---
@@ -285,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)
---
@@ -301,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)
---
@@ -324,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)
---
@@ -338,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)
---
@@ -386,7 +406,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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 +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)
---
@@ -412,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)
---
@@ -423,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)
---
@@ -436,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)
---
@@ -446,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)
---
@@ -462,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)
---
@@ -472,7 +492,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)
---
@@ -492,7 +512,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -501,7 +521,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.SeekBar.md b/docs/api/vjs.SeekBar.md
index d9ba88516c..9dfec034e7 100644
--- a/docs/api/vjs.SeekBar.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +174,34 @@ _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)
---
@@ -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,7 +227,7 @@ _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)
---
@@ -227,7 +247,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -237,7 +257,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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)
---
@@ -249,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)
---
@@ -274,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)
---
@@ -286,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)
---
@@ -302,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)
---
@@ -325,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)
---
@@ -350,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)
---
@@ -398,7 +418,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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)
---
@@ -408,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)
---
@@ -424,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)
---
@@ -435,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)
---
@@ -448,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)
---
@@ -458,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)
---
@@ -474,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)
---
@@ -484,7 +504,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)
---
@@ -504,7 +524,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -513,7 +533,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.SeekHandle.md b/docs/api/vjs.SeekHandle.md
index d68e2535a9..b4589f0ec7 100644
--- a/docs/api/vjs.SeekHandle.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +171,34 @@ _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)
---
@@ -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,7 +224,7 @@ _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)
---
@@ -224,7 +244,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -234,7 +254,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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 +266,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 +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)
---
@@ -285,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)
---
@@ -301,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)
---
@@ -324,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)
---
@@ -338,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)
---
@@ -386,7 +406,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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 +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)
---
@@ -412,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)
---
@@ -423,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)
---
@@ -436,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)
---
@@ -446,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)
---
@@ -462,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)
---
@@ -472,7 +492,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)
---
@@ -492,7 +512,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -501,7 +521,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.Slider.md b/docs/api/vjs.Slider.md
index d0e223ac25..1d929e1c87 100644
--- a/docs/api/vjs.Slider.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +174,34 @@ _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)
---
@@ -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,7 +227,7 @@ _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)
---
@@ -227,7 +247,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -237,7 +257,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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)
---
@@ -249,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)
---
@@ -274,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)
---
@@ -286,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)
---
@@ -302,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)
---
@@ -325,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)
---
@@ -350,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)
---
@@ -398,7 +418,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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)
---
@@ -408,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)
---
@@ -424,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)
---
@@ -435,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)
---
@@ -448,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)
---
@@ -458,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)
---
@@ -474,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)
---
@@ -484,7 +504,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)
---
@@ -504,7 +524,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -513,7 +533,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.SliderHandle.md b/docs/api/vjs.SliderHandle.md
index 81fac6c6ca..d51e6c50c0 100644
--- a/docs/api/vjs.SliderHandle.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +171,34 @@ _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)
---
@@ -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,7 +224,7 @@ _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)
---
@@ -224,7 +244,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -234,7 +254,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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 +266,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 +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)
---
@@ -285,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)
---
@@ -301,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)
---
@@ -324,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)
---
@@ -338,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)
---
@@ -386,7 +406,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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 +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)
---
@@ -412,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)
---
@@ -423,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)
---
@@ -436,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)
---
@@ -446,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)
---
@@ -462,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)
---
@@ -472,7 +492,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)
---
@@ -492,7 +512,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -501,7 +521,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.SubtitlesButton.md b/docs/api/vjs.SubtitlesButton.md
index d00fe73713..9f1222e570 100644
--- a/docs/api/vjs.SubtitlesButton.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +178,34 @@ _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)
---
@@ -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,7 +231,7 @@ _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)
---
@@ -231,7 +251,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -241,7 +261,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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)
---
@@ -253,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)
---
@@ -279,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)
---
@@ -291,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)
---
@@ -307,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)
---
@@ -330,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)
---
@@ -344,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)
---
@@ -392,7 +412,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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 +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)
---
@@ -418,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)
---
@@ -429,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)
---
@@ -442,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)
---
@@ -452,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)
---
@@ -468,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)
---
@@ -478,7 +498,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)
---
@@ -498,7 +518,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -507,7 +527,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.SubtitlesTrack.md b/docs/api/vjs.SubtitlesTrack.md
index f7164950d8..93afb75dfa 100644
--- a/docs/api/vjs.SubtitlesTrack.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
+_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,7 +244,34 @@ _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)
---
@@ -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,7 +297,7 @@ _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)
---
@@ -289,7 +317,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -311,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)
---
@@ -336,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)
---
@@ -388,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)
---
@@ -404,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)
---
@@ -427,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)
---
@@ -441,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)
---
@@ -489,7 +517,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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)
---
@@ -499,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)
---
@@ -515,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)
---
@@ -536,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)
---
@@ -549,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)
---
@@ -599,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)
---
@@ -609,7 +637,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)
---
@@ -629,7 +657,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -638,7 +666,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.TextTrack.md b/docs/api/vjs.TextTrack.md
index 6e3675c88f..edd5e2647b 100644
--- a/docs/api/vjs.TextTrack.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
+_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,7 +246,34 @@ _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)
---
@@ -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,7 +299,7 @@ _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)
---
@@ -291,7 +319,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -313,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)
---
@@ -338,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)
---
@@ -390,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)
---
@@ -406,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)
---
@@ -429,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)
---
@@ -443,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)
---
@@ -491,7 +519,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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)
---
@@ -501,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)
---
@@ -517,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)
---
@@ -538,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)
---
@@ -551,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)
---
@@ -601,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)
---
@@ -611,7 +639,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)
---
@@ -631,7 +659,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -640,7 +668,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.TextTrackButton.md b/docs/api/vjs.TextTrackButton.md
index ab3c7fb481..8f5cfe0057 100644
--- a/docs/api/vjs.TextTrackButton.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +178,34 @@ _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)
---
@@ -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,7 +231,7 @@ _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)
---
@@ -231,7 +251,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -241,7 +261,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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)
---
@@ -253,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)
---
@@ -278,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)
---
@@ -290,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)
---
@@ -306,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)
---
@@ -329,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)
---
@@ -343,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)
---
@@ -391,7 +411,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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)
---
@@ -401,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)
---
@@ -417,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)
---
@@ -428,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)
---
@@ -441,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)
---
@@ -451,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)
---
@@ -467,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)
---
@@ -477,7 +497,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)
---
@@ -497,7 +517,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -506,7 +526,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.TextTrackDisplay.md b/docs/api/vjs.TextTrackDisplay.md
index 1ca378da7b..ed295f8066 100644
--- a/docs/api/vjs.TextTrackDisplay.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +173,34 @@ _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)
---
@@ -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,7 +226,7 @@ _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)
---
@@ -226,7 +246,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -236,7 +256,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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 +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)
---
@@ -274,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)
---
@@ -286,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)
---
@@ -302,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)
---
@@ -325,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)
---
@@ -339,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)
---
@@ -387,7 +407,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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 +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)
---
@@ -413,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)
---
@@ -424,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)
---
@@ -437,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)
---
@@ -447,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)
---
@@ -463,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)
---
@@ -473,7 +493,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)
---
@@ -493,7 +513,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -502,7 +522,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.TextTrackMenuItem.md b/docs/api/vjs.TextTrackMenuItem.md
index 209138b63e..05d5265e67 100644
--- a/docs/api/vjs.TextTrackMenuItem.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +172,34 @@ _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)
---
@@ -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,7 +225,7 @@ _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)
---
@@ -225,7 +245,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -235,7 +255,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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)
---
@@ -247,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)
---
@@ -272,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)
---
@@ -284,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)
---
@@ -300,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)
---
@@ -323,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)
---
@@ -344,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)
---
@@ -392,7 +412,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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 +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)
---
@@ -418,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)
---
@@ -429,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)
---
@@ -442,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)
---
@@ -462,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)
---
@@ -478,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)
---
@@ -488,7 +508,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)
---
@@ -508,7 +528,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -517,7 +537,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.TimeDivider.md b/docs/api/vjs.TimeDivider.md
index 8fc0c16dfe..8428d3f261 100644
--- a/docs/api/vjs.TimeDivider.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +175,34 @@ _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)
---
@@ -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,7 +228,7 @@ _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)
---
@@ -228,7 +248,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -238,7 +258,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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)
---
@@ -250,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)
---
@@ -260,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)
---
@@ -275,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)
---
@@ -287,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)
---
@@ -303,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)
---
@@ -326,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)
---
@@ -340,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)
---
@@ -388,7 +408,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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)
---
@@ -398,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)
---
@@ -414,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)
---
@@ -425,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)
---
@@ -438,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)
---
@@ -448,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)
---
@@ -464,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)
---
@@ -474,7 +494,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)
---
@@ -494,7 +514,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -503,7 +523,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.VolumeBar.md b/docs/api/vjs.VolumeBar.md
index 279c8724e6..fbdcaf9c3a 100644
--- a/docs/api/vjs.VolumeBar.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +174,34 @@ _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)
---
@@ -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,7 +227,7 @@ _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)
---
@@ -227,7 +247,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -237,7 +257,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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)
---
@@ -249,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)
---
@@ -274,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)
---
@@ -286,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)
---
@@ -302,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)
---
@@ -325,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)
---
@@ -350,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)
---
@@ -398,7 +418,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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)
---
@@ -408,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)
---
@@ -424,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)
---
@@ -435,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)
---
@@ -448,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)
---
@@ -458,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)
---
@@ -474,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)
---
@@ -484,7 +504,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)
---
@@ -504,7 +524,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -513,7 +533,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.VolumeControl.md b/docs/api/vjs.VolumeControl.md
index 839fcf36ce..7db61221b2 100644
--- a/docs/api/vjs.VolumeControl.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +173,34 @@ _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)
---
@@ -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,7 +226,7 @@ _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)
---
@@ -226,7 +246,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -236,7 +256,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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 +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)
---
@@ -273,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)
---
@@ -285,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)
---
@@ -301,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)
---
@@ -324,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)
---
@@ -338,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)
---
@@ -386,7 +406,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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 +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)
---
@@ -412,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)
---
@@ -423,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)
---
@@ -436,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)
---
@@ -446,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)
---
@@ -462,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)
---
@@ -472,7 +492,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)
---
@@ -492,7 +512,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -501,7 +521,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.VolumeHandle.md b/docs/api/vjs.VolumeHandle.md
index 5243c4dc5a..3adbb7104e 100644
--- a/docs/api/vjs.VolumeHandle.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +170,34 @@ _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)
---
@@ -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,7 +223,7 @@ _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)
---
@@ -223,7 +243,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -233,7 +253,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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 +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)
---
@@ -272,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)
---
@@ -284,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)
---
@@ -300,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)
---
@@ -323,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)
---
@@ -337,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)
---
@@ -385,7 +405,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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 +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)
---
@@ -411,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)
---
@@ -422,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)
---
@@ -435,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)
---
@@ -445,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)
---
@@ -461,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)
---
@@ -471,7 +491,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)
---
@@ -491,7 +511,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -500,7 +520,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.VolumeLevel.md b/docs/api/vjs.VolumeLevel.md
index 6759124eb3..bc6c07a07b 100644
--- a/docs/api/vjs.VolumeLevel.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +173,34 @@ _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)
---
@@ -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,7 +226,7 @@ _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)
---
@@ -226,7 +246,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -236,7 +256,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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 +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)
---
@@ -273,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)
---
@@ -285,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)
---
@@ -301,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)
---
@@ -324,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)
---
@@ -338,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)
---
@@ -386,7 +406,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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 +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)
---
@@ -412,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)
---
@@ -423,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)
---
@@ -436,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)
---
@@ -446,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)
---
@@ -462,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)
---
@@ -472,7 +492,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)
---
@@ -492,7 +512,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -501,7 +521,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.VolumeMenuButton.md b/docs/api/vjs.VolumeMenuButton.md
index 416bfccbcf..62123f616c 100644
--- a/docs/api/vjs.VolumeMenuButton.md
+++ b/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`_
@@ -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#L737](https://github.com/videojs/video.js/blob/master/src/js/component.js#L737)
-
----
-
-### 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,7 +178,34 @@ _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)
---
@@ -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,7 +231,7 @@ _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)
---
@@ -231,7 +251,7 @@ _inherited from_: [src/js/component.js#L294](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the height
* `Number|String` The height, when getting
-_inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js/blob/master/src/js/component.js#L726)
+_inherited from_: [src/js/component.js#L733](https://github.com/videojs/video.js/blob/master/src/js/component.js#L733)
---
@@ -241,7 +261,7 @@ _inherited from_: [src/js/component.js#L726](https://github.com/videojs/video.js
##### 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)
---
@@ -253,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)
---
@@ -278,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)
---
@@ -290,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)
---
@@ -306,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)
---
@@ -329,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)
---
@@ -343,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)
---
@@ -391,7 +411,7 @@ _inherited from_: [src/js/component.js#L522](https://github.com/videojs/video.js
##### RETURNS:
* `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)
---
@@ -401,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)
---
@@ -417,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)
---
@@ -428,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)
---
@@ -441,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)
---
@@ -451,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)
---
@@ -467,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)
---
@@ -477,7 +497,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)
---
@@ -497,7 +517,7 @@ _inherited from_: [src/js/component.js#L600](https://github.com/videojs/video.js
* `vjs.Component` This component, when setting the width
* `Number|String` The width, when getting
-_inherited from_: [src/js/component.js#L709](https://github.com/videojs/video.js/blob/master/src/js/component.js#L709)
+_inherited from_: [src/js/component.js#L716](https://github.com/videojs/video.js/blob/master/src/js/component.js#L716)
---
@@ -506,7 +526,7 @@ _inherited from_: [src/js/component.js#L709](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#L816](https://github.com/videojs/video.js/blob/master/src/js/component.js#L816)
+_inherited from_: [src/js/component.js#L823](https://github.com/videojs/video.js/blob/master/src/js/component.js#L823)
---
diff --git a/docs/api/vjs.md b/docs/api/vjs.md
index 3d0149da96..e03bd84051 100644
--- a/docs/api/vjs.md
+++ b/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-)
diff --git a/docs/api/vjs.media.md b/docs/api/vjs.media.md
index fabe7f16bb..e449004b9e 100644
--- a/docs/api/vjs.media.md
+++ b/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)
---
diff --git a/package.json b/package.json
index 6292c64567..cc51d5a0c9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "video.js",
"description": "An HTML5 and Flash video player with a common API and skin for both.",
- "version": "4.3.0",
+ "version": "4.4.0",
"copyright": "Copyright 2014 Brightcove, Inc. https://github.com/videojs/video.js/blob/master/LICENSE",
"keywords": [
"videojs",