v5.19.2 dist

.travis.yml

@@ -13,8 +13,6 @@ notifications:
     on_success: never
   webhooks:
     - http://pam.videojs.com/savage/travis
-  slack:
-    secure: LrF8K6mCYWlUt6SvdbGHazyQZSk/opKoiB/wgoGYaGc9+3wYXkVexY0WkO1m6wBKhUqXRAMVMFszr1wqKgdcxtItmFMMj8HqTLI1MVqgKqYX4Ux3CnEHJQiwxIk0aVL7lHLsZTXV/2Y0QIOYmAnCrgy46klETrk0ZuXf5okpu2Q=
 env:
   global:
     - secure: K6JpKwMkfNaJix3Bb0tLjVMzHMJgtBXdd/dvfw1BMb9DCBpd81PqXbDs7yXCddUxnUPTBPxZCrQgWsw71Wn+qEoIG5MU3uOT5A2rBbx/yZonVAGv5ed/9w0xk0OzO383CmPMFqwqtp9YmdmqGjQBkYXVXJjTvNTOAExFSdhO+3U=

CHANGELOG.md

@@ -1,90 +1,3 @@
-<a name="5.20.2"></a>
-## [5.20.2](https://github.com/videojs/video.js/compare/v6.2.5...v5.20.2) (2017-07-26)
-
-### Features
-
-* add 'playsinline' player option ([#4325](https://github.com/videojs/video.js/issues/4325)) ([946f84b](https://github.com/videojs/video.js/commit/946f84b))
-* Add a version class to the player ([#4335](https://github.com/videojs/video.js/issues/4335)) ([b855bfb](https://github.com/videojs/video.js/commit/b855bfb))
-* Add getVideoPlaybackQuality API ([#4286](https://github.com/videojs/video.js/issues/4286)) ([c970474](https://github.com/videojs/video.js/commit/c970474))
-* focus play toggle from Big Play Btn on play ([#4132](https://github.com/videojs/video.js/issues/4132)) ([dcc615a](https://github.com/videojs/video.js/commit/dcc615a)), closes [#2729](https://github.com/videojs/video.js/issues/2729)
-* Make pause on open optional for ModalDialog via options ([#4187](https://github.com/videojs/video.js/issues/4187)) ([4ec3b56](https://github.com/videojs/video.js/commit/4ec3b56))
-* remove playbackRate blacklist for recent Android Chrome ([#4336](https://github.com/videojs/video.js/issues/4336)) ([3fe22e9](https://github.com/videojs/video.js/commit/3fe22e9))
-* update videojs-vtt.js and wrap native cues in TextTrack ([#4131](https://github.com/videojs/video.js/issues/4131)) ([3d4aebc](https://github.com/videojs/video.js/commit/3d4aebc)), closes [#4093](https://github.com/videojs/video.js/issues/4093)
-
-### Bug Fixes
-
-* addChild instance names should be toTitleCased ([#4117](https://github.com/videojs/video.js/issues/4117)) ([fa97309](https://github.com/videojs/video.js/commit/fa97309))
-* adjust volume ranges so muted(true) and vol=0 do not use the same icons ([#4425](https://github.com/videojs/video.js/issues/4425)) ([b314268](https://github.com/videojs/video.js/commit/b314268))
-* cue-points with a startTime of 0 ([#4148](https://github.com/videojs/video.js/issues/4148)) ([e7d4b47](https://github.com/videojs/video.js/commit/e7d4b47))
-* make load progress buffered regions height 100% ([#4191](https://github.com/videojs/video.js/issues/4191)) ([398c6e9](https://github.com/videojs/video.js/commit/398c6e9))
-* make mergeOptions behave the same across browsers  ([#4090](https://github.com/videojs/video.js/issues/4090)) ([ce19ed5](https://github.com/videojs/video.js/commit/ce19ed5))
-* make sure audio track hides with one item ([#4203](https://github.com/videojs/video.js/issues/4203)) ([c069655](https://github.com/videojs/video.js/commit/c069655))
-* make sure that cues copy over their id ([#4154](https://github.com/videojs/video.js/issues/4154)) ([072c277](https://github.com/videojs/video.js/commit/072c277))
-* not showing default text tracks over video ([#4217](https://github.com/videojs/video.js/issues/4217)) ([4653922](https://github.com/videojs/video.js/commit/4653922))
-* **vttjs:** wait till tech el in DOM before loading vttjs ([#4176](https://github.com/videojs/video.js/issues/4176)) ([ad86eec](https://github.com/videojs/video.js/commit/ad86eec))
-* only change focus from BPB if not a mouse click ([#4523](https://github.com/videojs/video.js/issues/4523)) ([d90c945](https://github.com/videojs/video.js/commit/d90c945))
-* only disable user-selection on sliders ([#4355](https://github.com/videojs/video.js/issues/4355)) ([0d60720](https://github.com/videojs/video.js/commit/0d60720))
-* Only update text track mode if changed ([#4368](https://github.com/videojs/video.js/issues/4368)) ([a1763dc](https://github.com/videojs/video.js/commit/a1763dc))
-* Patch a memory leak caused by un-removed track listener(s). ([#3975](https://github.com/videojs/video.js/issues/3975)) ([bca44c0](https://github.com/videojs/video.js/commit/bca44c0))
-* player.duration() should return NaN if duration is not known ([#4456](https://github.com/videojs/video.js/issues/4456)) ([2576eda](https://github.com/videojs/video.js/commit/2576eda))
-* prevent dupe events on enabled ClickableComponents ([#4357](https://github.com/videojs/video.js/issues/4357)) ([3faea9f](https://github.com/videojs/video.js/commit/3faea9f))
-* remove title attribute on menu items, fixes [#3699](https://github.com/videojs/video.js/issues/3699) ([#4009](https://github.com/videojs/video.js/issues/4009)) ([91874a3](https://github.com/videojs/video.js/commit/91874a3))
-* removeCue should work with native passed in cue ([#4209](https://github.com/videojs/video.js/issues/4209)) ([3974944](https://github.com/videojs/video.js/commit/3974944))
-* Safari picture-in-picture triggers fullscreenchange ([#4442](https://github.com/videojs/video.js/issues/4442)) ([c17c003](https://github.com/videojs/video.js/commit/c17c003))
-* **cues:** only copy cue props that don't exist ([#4146](https://github.com/videojs/video.js/issues/4146)) ([de08669](https://github.com/videojs/video.js/commit/de08669))
-* **cues:** only copy cue props that don't exist ([#4146](https://github.com/videojs/video.js/issues/4146)) ([841d135](https://github.com/videojs/video.js/commit/841d135))
-* **MenuButton:** Unify behavior of showing/hiding ([#3993](https://github.com/videojs/video.js/issues/3993)) ([4367c69](https://github.com/videojs/video.js/commit/4367c69))
-* set IE_VERSION correctly for IE11 ([#4280](https://github.com/videojs/video.js/issues/4280)) ([207730e](https://github.com/videojs/video.js/commit/207730e)), closes [#4278](https://github.com/videojs/video.js/issues/4278)
-* synchronously shim vtt.js when possible ([#4082](https://github.com/videojs/video.js/issues/4082)) ([b5727a6](https://github.com/videojs/video.js/commit/b5727a6))
-* Use passive event listeners for touchstart/touchmove ([#4445](https://github.com/videojs/video.js/issues/4445)) ([8599c8e](https://github.com/videojs/video.js/commit/8599c8e)), closes [#4432](https://github.com/videojs/video.js/issues/4432)
-* **playback rate menu:** playback rate menu items should be selectable ([#4150](https://github.com/videojs/video.js/issues/4150)) ([288edd1](https://github.com/videojs/video.js/commit/288edd1))
-* **sass:** import path has cwd once again ([#4076](https://github.com/videojs/video.js/issues/4076)) ([c02c6c6](https://github.com/videojs/video.js/commit/c02c6c6))
-
-### Chores
-
-* add a release script to makes things easier ([#4517](https://github.com/videojs/video.js/issues/4517)) ([9ca9989](https://github.com/videojs/video.js/commit/9ca9989))
-* add slack travis notifications ([#4339](https://github.com/videojs/video.js/issues/4339)) ([ab110ff](https://github.com/videojs/video.js/commit/ab110ff))
-* change accessibility test in grunt.js to remove unnecessary warning message. ([#4008](https://github.com/videojs/video.js/issues/4008)) ([daad492](https://github.com/videojs/video.js/commit/daad492))
-* **build:** lint errors only and silence webpack ([#4153](https://github.com/videojs/video.js/issues/4153)) ([b1ca344](https://github.com/videojs/video.js/commit/b1ca344))
-* **package:** pin karma to 1.3.0 for IE8 support ([#4340](https://github.com/videojs/video.js/issues/4340)) ([6cf7327](https://github.com/videojs/video.js/commit/6cf7327))
-* **package:** update swf to 5.2.0 ([#4040](https://github.com/videojs/video.js/issues/4040)) ([dab893b](https://github.com/videojs/video.js/commit/dab893b))
-* **package:** update to swf 5.4.1 ([#4516](https://github.com/videojs/video.js/issues/4516)) ([a145dd2](https://github.com/videojs/video.js/commit/a145dd2))
-* **package:** update video-js-swf to 5.3.0 ([#4161](https://github.com/videojs/video.js/issues/4161)) ([2bcfe21](https://github.com/videojs/video.js/commit/2bcfe21))
-* **package:** update videojs-vtt.js to 0.12.3 ([#4223](https://github.com/videojs/video.js/issues/4223)) ([ad770fb](https://github.com/videojs/video.js/commit/ad770fb))
-* **package:** update videojs-vtt.js to 0.12.4 ([#4364](https://github.com/videojs/video.js/issues/4364)) ([3f7e215](https://github.com/videojs/video.js/commit/3f7e215))
-* move imports up so bundlers wont trip up ([#4363](https://github.com/videojs/video.js/issues/4363)) ([0d725df](https://github.com/videojs/video.js/commit/0d725df))
-
-### Tests
-
-* fix playsinline test for IE8 ([#4347](https://github.com/videojs/video.js/issues/4347)) ([823f6c7](https://github.com/videojs/video.js/commit/823f6c7))
-
-<a name="5.20.1"></a>
-## [5.20.1](https://github.com/videojs/video.js/compare/v5.20.0...v5.20.1) (2017-05-15)
-
-### Bug Fixes
-
-* only disable user-selection on sliders ([#4355](https://github.com/videojs/video.js/issues/4355)) ([0d60720](https://github.com/videojs/video.js/commit/0d60720))
-* prevent dupe events on enabled ClickableComponents ([#4357](https://github.com/videojs/video.js/issues/4357)) ([3faea9f](https://github.com/videojs/video.js/commit/3faea9f))
-
-<a name="5.20.0"></a>
-# [5.20.0](https://github.com/videojs/video.js/compare/v5.19.2...v5.20.0) (2017-05-11)
-
-### Features
-
-* add 'playsinline' player option ([#4325](https://github.com/videojs/video.js/issues/4325)) ([946f84b](https://github.com/videojs/video.js/commit/946f84b))
-* Add a version class to the player ([#4335](https://github.com/videojs/video.js/issues/4335)) ([b855bfb](https://github.com/videojs/video.js/commit/b855bfb))
-* Add getVideoPlaybackQuality API ([#4286](https://github.com/videojs/video.js/issues/4286)) ([c970474](https://github.com/videojs/video.js/commit/c970474))
-* remove playbackRate blacklist for recent Android Chrome ([#4336](https://github.com/videojs/video.js/issues/4336)) ([3fe22e9](https://github.com/videojs/video.js/commit/3fe22e9))
-
-### Chores
-
-* add slack travis notifications ([#4339](https://github.com/videojs/video.js/issues/4339)) ([ab110ff](https://github.com/videojs/video.js/commit/ab110ff))
-* **package:** pin karma to 1.3.0 for IE8 support ([#4340](https://github.com/videojs/video.js/issues/4340)) ([6cf7327](https://github.com/videojs/video.js/commit/6cf7327))
-
-### Tests
-
-* fix playsinline test for IE8 ([#4347](https://github.com/videojs/video.js/issues/4347)) ([823f6c7](https://github.com/videojs/video.js/commit/823f6c7))
-
 <a name="5.19.2"></a>
 ## [5.19.2](https://github.com/videojs/video.js/compare/v5.19.1...v5.19.2) (2017-04-13)
 

build/bin/release-next.sh

@@ -1,59 +0,0 @@
-#!/usr/bin/env bash
-
-echo "Release Type?"
-read -rp "> " rtype
-
-echo grunt version:${rtype}
-grunt version:${rtype}
-version=$(./build/bin/version)
-
-echo New version is $version
-
-# echo grunt chg-release:$version
-# grunt chg-release:$version
-npm run changelog
-
-echo git commit -am "v$version"
-git commit -am "v$version"
-
-echo git checkout temp-release-branch
-git checkout -b temp-release-branch
-
-echo grunt dist
-grunt dist
-
-echo git add -f dist
-git add -f dist
-
-echo git commit -m "v$version dist"
-git commit -m "v$version dist"
-
-echo git tag -a "v$version" -m "v$version"
-git tag -a "v$version" -m "v$version"
-
-echo git show
-git show
-
-
-read -p "publish? " -n 1 -r
-echo    # (optional) move to a new line
-if [[ $REPLY =~ ^[Nn]$  ]]
-then
- exit 0
-fi
-
-echo git push upstream
-git push upstream --tags
-git push origin --tags
-
-echo npm publish --tag next-5
-npm publish --tag next-5
-
-echo grunt github-release:prereleease
-grunt github-release:prerelease
-
-echo git checkout -
-git checkout -
-
-echo git branch -D temp-release-branch
-git branch -D temp-release-branch

component.json

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

dist/alt/video-js-cdn.css

@@ -248,7 +248,11 @@
   line-height: 1;
   font-weight: normal;
   font-style: normal;
-  font-family: Arial, Helvetica, sans-serif; }
+  font-family: Arial, Helvetica, sans-serif;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none; }
   .video-js:-moz-full-screen {
     position: absolute; }
   .video-js:-webkit-full-screen {
@@ -790,10 +794,6 @@ body.vjs-full-window {
   cursor: pointer;
   padding: 0;
   margin: 0 0.45em 0 0.45em;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
   background-color: #73859f;
   background-color: rgba(115, 133, 159, 0.5); }
 

dist/alt/video.novtt.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Video.js 5.20.2 <http://videojs.com/>
+ * Video.js 5.19.2 <http://videojs.com/>
  * Copyright Brightcove, Inc. <https://www.brightcove.com/>
  * Available under Apache License Version 2.0
  * <https://github.com/videojs/video.js/blob/master/LICENSE>
@@ -39,15 +39,10 @@ function _inherits(subClass, superClass) { if (typeof superClass !== "function"
 var BigPlayButton = function (_Button) {
   _inherits(BigPlayButton, _Button);
 
-  function BigPlayButton(player, options) {
+  function BigPlayButton() {
     _classCallCheck(this, BigPlayButton);
 
-    var _this = _possibleConstructorReturn(this, _Button.call(this, player, options));
-
-    _this.mouseused_ = false;
-
-    _this.on('mousedown', _this.handleMouseDown);
-    return _this;
+    return _possibleConstructorReturn(this, _Button.apply(this, arguments));
   }
 
   /**
@@ -56,8 +51,6 @@ var BigPlayButton = function (_Button) {
    * @return {string}
    *         The DOM `className` for this object. Always returns 'vjs-big-play-button'.
    */
-
-
   BigPlayButton.prototype.buildCSSClass = function buildCSSClass() {
     return 'vjs-big-play-button';
   };
@@ -76,12 +69,7 @@ var BigPlayButton = function (_Button) {
 
 
   BigPlayButton.prototype.handleClick = function handleClick(event) {
-    var playPromise = this.player_.play();
-
-    // exit early if clicked via the mouse
-    if (this.mouseused_ && event.clientX && event.clientY) {
-      return;
-    }
+    this.player_.play();
 
     var cb = this.player_.getChild('controlBar');
     var playToggle = cb && cb.getChild('playToggle');
@@ -91,27 +79,9 @@ var BigPlayButton = function (_Button) {
       return;
     }
 
-    var playFocus = function playFocus() {
-      return playToggle.focus();
-    };
-
-    if (playPromise && playPromise.then) {
-      var ignoreRejectedPlayPromise = function ignoreRejectedPlayPromise() {};
-
-      playPromise.then(playFocus, ignoreRejectedPlayPromise);
-    } else {
-      this.setTimeout(playFocus, 1);
-    }
-  };
-
-  BigPlayButton.prototype.handleKeyPress = function handleKeyPress(event) {
-    this.mouseused_ = false;
-
-    _Button.prototype.handleKeyPress.call(this, event);
-  };
-
-  BigPlayButton.prototype.handleMouseDown = function handleMouseDown(event) {
-    this.mouseused_ = true;
+    this.setTimeout(function () {
+      playToggle.focus();
+    }, 1);
   };
 
   return BigPlayButton;
@@ -515,10 +485,8 @@ var ClickableComponent = function (_Component) {
     if (typeof this.tabIndex_ !== 'undefined') {
       this.el_.setAttribute('tabIndex', this.tabIndex_);
     }
-    this.off(['tap', 'click'], this.handleClick);
-    this.off('focus', this.handleFocus);
-    this.off('blur', this.handleBlur);
-    this.on(['tap', 'click'], this.handleClick);
+    this.on('tap', this.handleClick);
+    this.on('click', this.handleClick);
     this.on('focus', this.handleFocus);
     this.on('blur', this.handleBlur);
     return this;
@@ -538,7 +506,8 @@ var ClickableComponent = function (_Component) {
     if (typeof this.tabIndex_ !== 'undefined') {
       this.el_.removeAttribute('tabIndex');
     }
-    this.off(['tap', 'click'], this.handleClick);
+    this.off('tap', this.handleClick);
+    this.off('click', this.handleClick);
     this.off('focus', this.handleFocus);
     this.off('blur', this.handleBlur);
     return this;
@@ -3245,7 +3214,7 @@ var MuteToggle = function (_Button) {
     var vol = this.player_.volume();
     var level = 3;
 
-    if (this.player_.muted()) {
+    if (vol === 0 || this.player_.muted()) {
       level = 0;
     } else if (vol < 0.33) {
       level = 1;
@@ -5878,10 +5847,8 @@ var TextTrackMenuItem = function (_MenuItem) {
       }
 
       if (track === this.track) {
-        if (track.mode !== 'showing') {
-          track.mode = 'showing';
-        }
-      } else if (track.mode !== 'disabled') {
+        track.mode = 'showing';
+      } else {
         track.mode = 'disabled';
       }
     }
@@ -9357,11 +9324,6 @@ var Player = function (_Component) {
     // Make player easily findable by ID
     Player.players[_this.id_] = _this;
 
-    // Add a major version class to aid css in plugins
-    var majorVersion = '5.20.2'.split('.')[0];
-
-    _this.addClass('vjs-v' + majorVersion);
-
     // When the player is first initialized, trigger activity so components
     // like the control bar show themselves if needed
     _this.userActive(true);
@@ -9782,7 +9744,6 @@ var Player = function (_Component) {
       'textTracks': this.textTracks_,
       'audioTracks': this.audioTracks_,
       'autoplay': this.options_.autoplay,
-      'playsinline': this.options_.playsinline,
       'preload': this.options_.preload,
       'loop': this.options_.loop,
       'muted': this.options_.muted,
@@ -10722,11 +10683,10 @@ var Player = function (_Component) {
 
   Player.prototype.duration = function duration(seconds) {
     if (seconds === undefined) {
-      // return NaN if the duration is not known
-      return this.cache_.duration !== undefined ? this.cache_.duration : NaN;
+      return this.cache_.duration || 0;
     }
 
-    seconds = parseFloat(seconds);
+    seconds = parseFloat(seconds) || 0;
 
     // Standardize on Inifity for signaling video is live
     if (seconds < 0) {
@@ -11472,33 +11432,6 @@ var Player = function (_Component) {
     return this.techGet_('autoplay', value);
   };
 
-  /**
-   * Set or unset the playsinline attribute.
-   * Playsinline tells the browser that non-fullscreen playback is preferred.
-   *
-   * @param {boolean} [value]
-   *        - true means that we should try to play inline by default
-   *        - false means that we should use the browser's default playback mode,
-   *          which in most cases is inline. iOS Safari is a notable exception
-   *          and plays fullscreen by default.
-   *
-   * @return {string|Player}
-   *         - the current value of playsinline
-   *         - the player when setting
-   *
-   * @see [Spec]{@link https://html.spec.whatwg.org/#attr-video-playsinline}
-   */
-
-
-  Player.prototype.playsinline = function playsinline(value) {
-    if (value !== undefined) {
-      this.techCall_('setPlaysinline', value);
-      this.options_.playsinline = value;
-      return this;
-    }
-    return this.techGet_('playsinline');
-  };
-
   /**
    * Get or set the loop attribute on the video element.
    *
@@ -12149,22 +12082,6 @@ var Player = function (_Component) {
     }
   };
 
-  /**
-   * Gets available media playback quality metrics as specified by the W3C's Media
-   * Playback Quality API.
-   *
-   * @see [Spec]{@link https://wicg.github.io/media-playback-quality}
-   *
-   * @return {Object|undefined}
-   *         An object with supported media playback quality metrics or undefined if there
-   *         is no tech or the tech does not support it.
-   */
-
-
-  Player.prototype.getVideoPlaybackQuality = function getVideoPlaybackQuality() {
-    return this.techGet_('getVideoPlaybackQuality');
-  };
-
   /**
    * Get video width
    *
@@ -13805,7 +13722,7 @@ var Flash = function (_Tech) {
     // Otherwise this adds a CDN url.
     // The CDN also auto-adds a swf URL for that specific version.
     if (!options.swf) {
-      var ver = '5.4.1';
+      var ver = '5.3.0';
 
       options.swf = '//vjs.zencdn.net/swf/' + ver + '/video-js.swf';
     }
@@ -14098,29 +14015,6 @@ var Flash = function (_Tech) {
     return false;
   };
 
-  /**
-   * Gets available media playback quality metrics as specified by the W3C's Media
-   * Playback Quality API.
-   *
-   * @see [Spec]{@link https://wicg.github.io/media-playback-quality}
-   *
-   * @return {Object}
-   *         An object with supported media playback quality metrics
-   */
-
-
-  Flash.prototype.getVideoPlaybackQuality = function getVideoPlaybackQuality() {
-    var videoPlaybackQuality = this.el_.vjs_getProperty('getVideoPlaybackQuality');
-
-    if (_window2['default'].performance && typeof _window2['default'].performance.now === 'function') {
-      videoPlaybackQuality.creationTime = _window2['default'].performance.now();
-    } else if (_window2['default'].performance && _window2['default'].performance.timing && typeof _window2['default'].performance.timing.navigationStart === 'number') {
-      videoPlaybackQuality.creationTime = _window2['default'].Date.now() - _window2['default'].performance.timing.navigationStart;
-    }
-
-    return videoPlaybackQuality;
-  };
-
   return Flash;
 }(_tech2['default']);
 
@@ -15147,7 +15041,7 @@ var Html5 = function (_Tech) {
     }
 
     // Update specific tag settings, in case they were overridden
-    var settingsAttrs = ['autoplay', 'preload', 'loop', 'muted', 'playsinline'];
+    var settingsAttrs = ['autoplay', 'preload', 'loop', 'muted'];
 
     for (var i = settingsAttrs.length - 1; i >= 0; i--) {
       var attr = settingsAttrs[i];
@@ -15510,11 +15404,9 @@ var Html5 = function (_Tech) {
     };
 
     var beginFn = function beginFn() {
-      if ('webkitPresentationMode' in this.el_ && this.el_.webkitPresentationMode !== 'picture-in-picture') {
-        this.one('webkitendfullscreen', endFn);
+      this.one('webkitendfullscreen', endFn);
 
-        this.trigger('fullscreenchange', { isFullscreen: true });
-      }
+      this.trigger('fullscreenchange', { isFullscreen: true });
     };
 
     this.on('webkitbeginfullscreen', beginFn);
@@ -15772,79 +15664,6 @@ var Html5 = function (_Tech) {
     }
   };
 
-  /**
-   * Get the value of `playsinline` from the media element. `playsinline` indicates
-   * to the browser that non-fullscreen playback is preferred when fullscreen
-   * playback is the native default, such as in iOS Safari.
-   *
-   * @method Html5#playsinline
-   * @return {boolean}
-   *         - The value of `playsinline` from the media element.
-   *         - True indicates that the media should play inline.
-   *         - False indicates that the media should not play inline.
-   *
-   * @see [Spec]{@link https://html.spec.whatwg.org/#attr-video-playsinline}
-   */
-
-
-  Html5.prototype.playsinline = function playsinline() {
-    return this.el_.hasAttribute('playsinline');
-  };
-
-  /**
-   * Set the value of `playsinline` from the media element. `playsinline` indicates
-   * to the browser that non-fullscreen playback is preferred when fullscreen
-   * playback is the native default, such as in iOS Safari.
-   *
-   * @method Html5#setPlaysinline
-   * @param {boolean} playsinline
-   *         - True indicates that the media should play inline.
-   *         - False indicates that the media should not play inline.
-   *
-   * @see [Spec]{@link https://html.spec.whatwg.org/#attr-video-playsinline}
-   */
-
-
-  Html5.prototype.setPlaysinline = function setPlaysinline(value) {
-    if (value) {
-      this.el_.setAttribute('playsinline', 'playsinline');
-    } else {
-      this.el_.removeAttribute('playsinline');
-    }
-  };
-
-  /**
-   * Gets available media playback quality metrics as specified by the W3C's Media
-   * Playback Quality API.
-   *
-   * @see [Spec]{@link https://wicg.github.io/media-playback-quality}
-   *
-   * @return {Object}
-   *         An object with supported media playback quality metrics
-   */
-
-
-  Html5.prototype.getVideoPlaybackQuality = function getVideoPlaybackQuality() {
-    if (typeof this.el().getVideoPlaybackQuality === 'function') {
-      return this.el().getVideoPlaybackQuality();
-    }
-
-    var videoPlaybackQuality = {};
-
-    if (typeof this.el().webkitDroppedFrameCount !== 'undefined' && typeof this.el().webkitDecodedFrameCount !== 'undefined') {
-      videoPlaybackQuality.droppedVideoFrames = this.el().webkitDroppedFrameCount;
-      videoPlaybackQuality.totalVideoFrames = this.el().webkitDecodedFrameCount;
-    }
-
-    if (_window2['default'].performance && typeof _window2['default'].performance.now === 'function') {
-      videoPlaybackQuality.creationTime = _window2['default'].performance.now();
-    } else if (_window2['default'].performance && _window2['default'].performance.timing && typeof _window2['default'].performance.timing.navigationStart === 'number') {
-      videoPlaybackQuality.creationTime = _window2['default'].Date.now() - _window2['default'].performance.timing.navigationStart;
-    }
-
-    return videoPlaybackQuality;
-  };
-
   return Html5;
 }(_tech2['default']);
 
@@ -15917,7 +15736,7 @@ Html5.canControlVolume = function () {
 Html5.canControlPlaybackRate = function () {
   // Playback rate API is implemented in Android Chrome, but doesn't do anything
   // https://github.com/videojs/video.js/issues/3180
-  if (browser.IS_ANDROID && browser.IS_CHROME && browser.CHROME_VERSION < 58) {
+  if (browser.IS_ANDROID && browser.IS_CHROME) {
     return false;
   }
   // IE will error if Windows Media Player not installed #3315
@@ -17448,7 +17267,7 @@ var Tech = function (_Component) {
       // passed in
       var script = _document2['default'].createElement('script');
 
-      script.src = this.options_['vtt.js'] || 'https://vjs.zencdn.net/vttjs/0.12.4/vtt.min.js';
+      script.src = this.options_['vtt.js'] || 'https://vjs.zencdn.net/vttjs/0.12.3/vtt.min.js';
       script.onload = function () {
         /**
          * Fired when vtt.js is loaded.
@@ -17732,23 +17551,6 @@ var Tech = function (_Component) {
     this.autoRemoteTextTracks_.removeTrack_(track);
   };
 
-  /**
-   * Gets available media playback quality metrics as specified by the W3C's Media
-   * Playback Quality API.
-   *
-   * @see [Spec]{@link https://wicg.github.io/media-playback-quality}
-   *
-   * @return {Object}
-   *         An object with supported media playback quality metrics
-   *
-   * @abstract
-   */
-
-
-  Tech.prototype.getVideoPlaybackQuality = function getVideoPlaybackQuality() {
-    return {};
-  };
-
   /**
    * A method to set a poster from a `Tech`.
    *
@@ -17758,24 +17560,6 @@ var Tech = function (_Component) {
 
   Tech.prototype.setPoster = function setPoster() {};
 
-  /**
-   * A method to check for the presence of the 'playsinine' <video> attribute.
-   *
-   * @abstract
-   */
-
-
-  Tech.prototype.playsinline = function playsinline() {};
-
-  /**
-   * A method to set or unset the 'playsinine' <video> attribute.
-   *
-   * @abstract
-   */
-
-
-  Tech.prototype.setPlaysinline = function setPlaysinline() {};
-
   /*
    * Check if the tech can support the given mime-type.
    *
@@ -21380,7 +21164,7 @@ exports['default'] = VideoTrack;
 'use strict';
 
 exports.__esModule = true;
-exports.BACKGROUND_SIZE_SUPPORTED = exports.TOUCH_ENABLED = exports.IS_ANY_SAFARI = exports.IS_SAFARI = exports.IE_VERSION = exports.IS_IE8 = exports.CHROME_VERSION = exports.IS_CHROME = exports.IS_EDGE = exports.IS_FIREFOX = exports.IS_NATIVE_ANDROID = exports.IS_OLD_ANDROID = exports.ANDROID_VERSION = exports.IS_ANDROID = exports.IOS_VERSION = exports.IS_IOS = exports.IS_IPOD = exports.IS_IPHONE = exports.IS_IPAD = undefined;
+exports.BACKGROUND_SIZE_SUPPORTED = exports.TOUCH_ENABLED = exports.IS_ANY_SAFARI = exports.IS_SAFARI = exports.IE_VERSION = exports.IS_IE8 = exports.IS_CHROME = exports.IS_EDGE = exports.IS_FIREFOX = exports.IS_NATIVE_ANDROID = exports.IS_OLD_ANDROID = exports.ANDROID_VERSION = exports.IS_ANDROID = exports.IOS_VERSION = exports.IS_IOS = exports.IS_IPOD = exports.IS_IPHONE = exports.IS_IPAD = undefined;
 
 var _dom = _dereq_(81);
 
@@ -21455,14 +21239,6 @@ var IS_NATIVE_ANDROID = exports.IS_NATIVE_ANDROID = IS_ANDROID && ANDROID_VERSIO
 var IS_FIREFOX = exports.IS_FIREFOX = /Firefox/i.test(USER_AGENT);
 var IS_EDGE = exports.IS_EDGE = /Edge/i.test(USER_AGENT);
 var IS_CHROME = exports.IS_CHROME = !IS_EDGE && /Chrome/i.test(USER_AGENT);
-var CHROME_VERSION = exports.CHROME_VERSION = function () {
-  var match = USER_AGENT.match(/Chrome\/(\d+)/);
-
-  if (match && match[1]) {
-    return parseFloat(match[1]);
-  }
-  return null;
-}();
 var IS_IE8 = exports.IS_IE8 = /MSIE\s8\.0/.test(USER_AGENT);
 var IE_VERSION = exports.IE_VERSION = function () {
   var result = /MSIE\s(\d+)\.\d/.exec(USER_AGENT);
@@ -22700,30 +22476,6 @@ function fixEvent(event) {
   return event;
 }
 
-/**
- * Whether passive event listeners are supported
- */
-var _supportsPassive = false;
-
-(function () {
-  try {
-    var opts = Object.defineProperty({}, 'passive', {
-      get: function get() {
-        _supportsPassive = true;
-      }
-    });
-
-    _window2['default'].addEventListener('test', null, opts);
-  } catch (e) {
-    // disregard
-  }
-})();
-
-/**
- * Touch events Chrome expects to be passive
- */
-var passiveEvents = ['touchstart', 'touchmove'];
-
 /**
  * Add an event listener to element
  * It stores the handler function in a separate cache object
@@ -22795,12 +22547,7 @@ function on(elem, type, fn) {
 
   if (data.handlers[type].length === 1) {
     if (elem.addEventListener) {
-      var options = false;
-
-      if (_supportsPassive && passiveEvents.indexOf(type) > -1) {
-        options = { passive: true };
-      }
-      elem.addEventListener(type, data.dispatcher, options);
+      elem.addEventListener(type, data.dispatcher, false);
     } else if (elem.attachEvent) {
       elem.attachEvent('on' + type, data.dispatcher);
     }
@@ -23891,14 +23638,6 @@ var _document = _dereq_(94);
 
 var _document2 = _interopRequireDefault(_document);
 
-var _browser = _dereq_(78);
-
-var browser = _interopRequireWildcard(_browser);
-
-var _dom = _dereq_(81);
-
-var Dom = _interopRequireWildcard(_dom);
-
 var _setup = _dereq_(56);
 
 var setup = _interopRequireWildcard(_setup);
@@ -23957,6 +23696,14 @@ var _log = _dereq_(86);
 
 var _log2 = _interopRequireDefault(_log);
 
+var _dom = _dereq_(81);
+
+var Dom = _interopRequireWildcard(_dom);
+
+var _browser = _dereq_(78);
+
+var browser = _interopRequireWildcard(_browser);
+
 var _url = _dereq_(92);
 
 var Url = _interopRequireWildcard(_url);
@@ -24169,7 +23916,7 @@ setup.autoSetupTimeout(1, videojs);
  *
  * @type {string}
  */
-videojs.VERSION = '5.20.2';
+videojs.VERSION = '5.19.2';
 
 /**
  * The global options object. These are the settings that take effect
@@ -24724,7 +24471,7 @@ function _createXHR(options) {
 
     function readystatechange() {
         if (xhr.readyState === 4) {
-            loadFunc()
+            setTimeout(loadFunc, 0)
         }
     }
 
@@ -24747,15 +24494,6 @@ function _createXHR(options) {
         return body
     }
 
-    var failureResponse = {
-                body: undefined,
-                headers: {},
-                statusCode: 0,
-                method: method,
-                url: uri,
-                rawRequest: xhr
-            }
-
     function errorFunc(evt) {
         clearTimeout(timeoutTimer)
         if(!(evt instanceof Error)){
@@ -24811,18 +24549,26 @@ function _createXHR(options) {
     var aborted
     var uri = xhr.url = options.uri || options.url
     var method = xhr.method = options.method || "GET"
-    var body = options.body || options.data || null
+    var body = options.body || options.data
     var headers = xhr.headers = options.headers || {}
     var sync = !!options.sync
     var isJson = false
     var timeoutTimer
+    var failureResponse = {
+        body: undefined,
+        headers: {},
+        statusCode: 0,
+        method: method,
+        url: uri,
+        rawRequest: xhr
+    }
 
-    if ("json" in options) {
+    if ("json" in options && options.json !== false) {
         isJson = true
         headers["accept"] || headers["Accept"] || (headers["Accept"] = "application/json") //Don't override existing accept header declared by user
         if (method !== "GET" && method !== "HEAD") {
             headers["content-type"] || headers["Content-Type"] || (headers["Content-Type"] = "application/json") //Don't override existing accept header declared by user
-            body = JSON.stringify(options.json)
+            body = JSON.stringify(options.json === true ? body : options.json)
         }
     }
 
@@ -24833,6 +24579,9 @@ function _createXHR(options) {
     xhr.onprogress = function () {
         // IE must die
     }
+    xhr.onabort = function(){
+        aborted = true;
+    }
     xhr.ontimeout = errorFunc
     xhr.open(method, uri, !sync, options.username, options.password)
     //has to be after open
@@ -24844,7 +24593,8 @@ function _createXHR(options) {
     // both npm's request and jquery 1.x use this kind of timeout, so this is being consistent
     if (!sync && options.timeout > 0 ) {
         timeoutTimer = setTimeout(function(){
-            aborted=true//IE9 may still call readystatechange
+            if (aborted) return
+            aborted = true//IE9 may still call readystatechange
             xhr.abort("timeout")
             var e = new Error("XMLHttpRequest timeout")
             e.code = "ETIMEDOUT"
@@ -24872,7 +24622,10 @@ function _createXHR(options) {
         options.beforeSend(xhr)
     }
 
-    xhr.send(body)
+    // Microsoft Edge browser sends "undefined" when send is called with undefined value.
+    // XMLHttpRequest spec says to pass null as body to indicate no body
+    // See https://github.com/naugtur/xhr/issues/100.
+    xhr.send(body || null)
 
     return xhr
 
@@ -24883,7 +24636,7 @@ function getXml(xhr) {
     if (xhr.responseType === "document") {
         return xhr.responseXML
     }
-    var firefoxBugTakenEffect = xhr.status === 204 && xhr.responseXML && xhr.responseXML.documentElement.nodeName === "parsererror"
+    var firefoxBugTakenEffect = xhr.responseXML && xhr.responseXML.documentElement.nodeName === "parsererror"
     if (xhr.responseType === "" && !firefoxBugTakenEffect) {
         return xhr.responseXML
     }

dist/video-js.css

@@ -248,7 +248,11 @@
   line-height: 1;
   font-weight: normal;
   font-style: normal;
-  font-family: Arial, Helvetica, sans-serif; }
+  font-family: Arial, Helvetica, sans-serif;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none; }
   .video-js:-moz-full-screen {
     position: absolute; }
   .video-js:-webkit-full-screen {
@@ -790,10 +794,6 @@ body.vjs-full-window {
   cursor: pointer;
   padding: 0;
   margin: 0 0.45em 0 0.45em;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
   background-color: #73859f;
   background-color: rgba(115, 133, 159, 0.5); }
 

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": "5.20.2",
+  "version": "5.19.2",
   "main": "./es5/video.js",
   "style": "./dist/video-js.css",
   "copyright": "Copyright Brightcove, Inc. <https://www.brightcove.com/>",
@@ -41,8 +41,8 @@
     "tsml": "1.0.1",
     "videojs-font": "2.0.0",
     "videojs-ie8": "1.1.2",
-    "videojs-swf": "5.4.1",
-    "videojs-vtt.js": "0.12.4",
+    "videojs-swf": "5.3.0",
+    "videojs-vtt.js": "0.12.3",
     "xhr": "2.2.2"
   },
   "devDependencies": {
@@ -91,7 +91,7 @@
     "grunt-zip": "0.17.1",
     "istanbul": "^0.4.5",
     "jsdoc": "^3.4.2",
-    "karma": "1.3.0",
+    "karma": "^1.2.0",
     "karma-browserify": "^5.1.0",
     "karma-browserstack-launcher": "^1.0.1",
     "karma-chrome-launcher": "^2.0.0",

src/css/components/_layout.scss

@@ -21,6 +21,8 @@
   // Avoiding helvetica: issue #376
   font-family: $text-font-family;
 
+  @include user-select(none);
+
   // Fix for Firefox 9 fullscreen (only if it is enabled). Not needed when
   // checking fullScreenEnabled.
   &:-moz-full-screen { position: absolute; }

src/css/components/_slider.scss

@@ -5,8 +5,6 @@
   padding: 0;
   margin: 0 0.45em 0 0.45em;
 
-  @include user-select(none);
-
   @include background-color-with-alpha($secondary-background-color, $secondary-background-transparency);
 }
 

src/js/big-play-button.js

@@ -11,13 +11,6 @@ import Component from './component.js';
  * @extends Button
  */
 class BigPlayButton extends Button {
-  constructor(player, options) {
-    super(player, options);
-
-    this.mouseused_ = false;
-
-    this.on('mousedown', this.handleMouseDown);
-  }
 
   /**
    * Builds the default DOM `className`.
@@ -41,12 +34,7 @@ class BigPlayButton extends Button {
    * @listens click
    */
   handleClick(event) {
-    const playPromise = this.player_.play();
-
-    // exit early if clicked via the mouse
-    if (this.mouseused_ && event.clientX && event.clientY) {
-      return;
-    }
+    this.player_.play();
 
     const cb = this.player_.getChild('controlBar');
     const playToggle = cb && cb.getChild('playToggle');
@@ -56,25 +44,9 @@ class BigPlayButton extends Button {
       return;
     }
 
-    const playFocus = () => playToggle.focus();
-
-    if (playPromise && playPromise.then) {
-      const ignoreRejectedPlayPromise = () => {};
-
-      playPromise.then(playFocus, ignoreRejectedPlayPromise);
-    } else {
-      this.setTimeout(playFocus, 1);
-    }
-  }
-
-  handleKeyPress(event) {
-    this.mouseused_ = false;
-
-    super.handleKeyPress(event);
-  }
-
-  handleMouseDown(event) {
-    this.mouseused_ = true;
+    this.setTimeout(function() {
+      playToggle.focus();
+    }, 1);
   }
 }
 

src/js/clickable-component.js

@@ -152,10 +152,8 @@ class ClickableComponent extends Component {
     if (typeof this.tabIndex_ !== 'undefined') {
       this.el_.setAttribute('tabIndex', this.tabIndex_);
     }
-    this.off(['tap', 'click'], this.handleClick);
-    this.off('focus', this.handleFocus);
-    this.off('blur', this.handleBlur);
-    this.on(['tap', 'click'], this.handleClick);
+    this.on('tap', this.handleClick);
+    this.on('click', this.handleClick);
     this.on('focus', this.handleFocus);
     this.on('blur', this.handleBlur);
     return this;
@@ -173,7 +171,8 @@ class ClickableComponent extends Component {
     if (typeof this.tabIndex_ !== 'undefined') {
       this.el_.removeAttribute('tabIndex');
     }
-    this.off(['tap', 'click'], this.handleClick);
+    this.off('tap', this.handleClick);
+    this.off('click', this.handleClick);
     this.off('focus', this.handleFocus);
     this.off('blur', this.handleBlur);
     return this;

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

@@ -81,7 +81,7 @@ class MuteToggle extends Button {
     const vol = this.player_.volume();
     let level = 3;
 
-    if (this.player_.muted()) {
+    if (vol === 0 || this.player_.muted()) {
       level = 0;
     } else if (vol < 0.33) {
       level = 1;

src/js/control-bar/text-track-controls/text-track-menu-item.js

@@ -103,10 +103,8 @@ class TextTrackMenuItem extends MenuItem {
       }
 
       if (track === this.track) {
-        if (track.mode !== 'showing') {
-          track.mode = 'showing';
-        }
-      } else if (track.mode !== 'disabled') {
+        track.mode = 'showing';
+      } else {
         track.mode = 'disabled';
       }
     }

src/js/player.js

@@ -413,11 +413,6 @@ class Player extends Component {
     // Make player easily findable by ID
     Player.players[this.id_] = this;
 
-    // Add a major version class to aid css in plugins
-    const majorVersion = require('../../package.json').version.split('.')[0];
-
-    this.addClass(`vjs-v${majorVersion}`);
-
     // When the player is first initialized, trigger activity so components
     // like the control bar show themselves if needed
     this.userActive(true);
@@ -827,7 +822,6 @@ class Player extends Component {
       'textTracks': this.textTracks_,
       'audioTracks': this.audioTracks_,
       'autoplay': this.options_.autoplay,
-      'playsinline': this.options_.playsinline,
       'preload': this.options_.preload,
       'loop': this.options_.loop,
       'muted': this.options_.muted,
@@ -1694,11 +1688,10 @@ class Player extends Component {
    */
   duration(seconds) {
     if (seconds === undefined) {
-      // return NaN if the duration is not known
-      return this.cache_.duration !== undefined ? this.cache_.duration : NaN;
+      return this.cache_.duration || 0;
     }
 
-    seconds = parseFloat(seconds);
+    seconds = parseFloat(seconds) || 0;
 
     // Standardize on Inifity for signaling video is live
     if (seconds < 0) {
@@ -2387,31 +2380,6 @@ class Player extends Component {
     return this.techGet_('autoplay', value);
   }
 
-  /**
-   * Set or unset the playsinline attribute.
-   * Playsinline tells the browser that non-fullscreen playback is preferred.
-   *
-   * @param {boolean} [value]
-   *        - true means that we should try to play inline by default
-   *        - false means that we should use the browser's default playback mode,
-   *          which in most cases is inline. iOS Safari is a notable exception
-   *          and plays fullscreen by default.
-   *
-   * @return {string|Player}
-   *         - the current value of playsinline
-   *         - the player when setting
-   *
-   * @see [Spec]{@link https://html.spec.whatwg.org/#attr-video-playsinline}
-   */
-  playsinline(value) {
-    if (value !== undefined) {
-      this.techCall_('setPlaysinline', value);
-      this.options_.playsinline = value;
-      return this;
-    }
-    return this.techGet_('playsinline');
-  }
-
   /**
    * Get or set the loop attribute on the video element.
    *
@@ -3020,20 +2988,6 @@ class Player extends Component {
     }
   }
 
-  /**
-   * Gets available media playback quality metrics as specified by the W3C's Media
-   * Playback Quality API.
-   *
-   * @see [Spec]{@link https://wicg.github.io/media-playback-quality}
-   *
-   * @return {Object|undefined}
-   *         An object with supported media playback quality metrics or undefined if there
-   *         is no tech or the tech does not support it.
-   */
-  getVideoPlaybackQuality() {
-    return this.techGet_('getVideoPlaybackQuality');
-  }
-
   /**
    * Get video width
    *

src/js/tech/flash.js

@@ -341,29 +341,6 @@ class Flash extends Tech {
     return false;
   }
 
-  /**
-   * Gets available media playback quality metrics as specified by the W3C's Media
-   * Playback Quality API.
-   *
-   * @see [Spec]{@link https://wicg.github.io/media-playback-quality}
-   *
-   * @return {Object}
-   *         An object with supported media playback quality metrics
-   */
-  getVideoPlaybackQuality() {
-    const videoPlaybackQuality = this.el_.vjs_getProperty('getVideoPlaybackQuality');
-
-    if (window.performance && typeof window.performance.now === 'function') {
-      videoPlaybackQuality.creationTime = window.performance.now();
-    } else if (window.performance &&
-               window.performance.timing &&
-               typeof window.performance.timing.navigationStart === 'number') {
-      videoPlaybackQuality.creationTime =
-        window.Date.now() - window.performance.timing.navigationStart;
-    }
-
-    return videoPlaybackQuality;
-  }
 }
 
 // Create setters and getters for attributes

src/js/tech/html5.js

@@ -223,7 +223,7 @@ class Html5 extends Tech {
     }
 
     // Update specific tag settings, in case they were overridden
-    const settingsAttrs = ['autoplay', 'preload', 'loop', 'muted', 'playsinline'];
+    const settingsAttrs = ['autoplay', 'preload', 'loop', 'muted'];
 
     for (let i = settingsAttrs.length - 1; i >= 0; i--) {
       const attr = settingsAttrs[i];
@@ -557,12 +557,9 @@ class Html5 extends Tech {
     };
 
     const beginFn = function() {
-      if ('webkitPresentationMode' in this.el_ &&
-        this.el_.webkitPresentationMode !== 'picture-in-picture') {
-        this.one('webkitendfullscreen', endFn);
+      this.one('webkitendfullscreen', endFn);
 
-        this.trigger('fullscreenchange', { isFullscreen: true });
-      }
+      this.trigger('fullscreenchange', { isFullscreen: true });
     };
 
     this.on('webkitbeginfullscreen', beginFn);
@@ -797,77 +794,6 @@ class Html5 extends Tech {
       }
     }
   }
-
-  /**
-   * Get the value of `playsinline` from the media element. `playsinline` indicates
-   * to the browser that non-fullscreen playback is preferred when fullscreen
-   * playback is the native default, such as in iOS Safari.
-   *
-   * @method Html5#playsinline
-   * @return {boolean}
-   *         - The value of `playsinline` from the media element.
-   *         - True indicates that the media should play inline.
-   *         - False indicates that the media should not play inline.
-   *
-   * @see [Spec]{@link https://html.spec.whatwg.org/#attr-video-playsinline}
-   */
-  playsinline() {
-    return this.el_.hasAttribute('playsinline');
-  }
-
-  /**
-   * Set the value of `playsinline` from the media element. `playsinline` indicates
-   * to the browser that non-fullscreen playback is preferred when fullscreen
-   * playback is the native default, such as in iOS Safari.
-   *
-   * @method Html5#setPlaysinline
-   * @param {boolean} playsinline
-   *         - True indicates that the media should play inline.
-   *         - False indicates that the media should not play inline.
-   *
-   * @see [Spec]{@link https://html.spec.whatwg.org/#attr-video-playsinline}
-   */
-  setPlaysinline(value) {
-    if (value) {
-      this.el_.setAttribute('playsinline', 'playsinline');
-    } else {
-      this.el_.removeAttribute('playsinline');
-    }
-  }
-
-  /**
-   * Gets available media playback quality metrics as specified by the W3C's Media
-   * Playback Quality API.
-   *
-   * @see [Spec]{@link https://wicg.github.io/media-playback-quality}
-   *
-   * @return {Object}
-   *         An object with supported media playback quality metrics
-   */
-  getVideoPlaybackQuality() {
-    if (typeof this.el().getVideoPlaybackQuality === 'function') {
-      return this.el().getVideoPlaybackQuality();
-    }
-
-    const videoPlaybackQuality = {};
-
-    if (typeof this.el().webkitDroppedFrameCount !== 'undefined' &&
-        typeof this.el().webkitDecodedFrameCount !== 'undefined') {
-      videoPlaybackQuality.droppedVideoFrames = this.el().webkitDroppedFrameCount;
-      videoPlaybackQuality.totalVideoFrames = this.el().webkitDecodedFrameCount;
-    }
-
-    if (window.performance && typeof window.performance.now === 'function') {
-      videoPlaybackQuality.creationTime = window.performance.now();
-    } else if (window.performance &&
-               window.performance.timing &&
-               typeof window.performance.timing.navigationStart === 'number') {
-      videoPlaybackQuality.creationTime =
-        window.Date.now() - window.performance.timing.navigationStart;
-    }
-
-    return videoPlaybackQuality;
-  }
 }
 
 /* HTML5 Support Testing ---------------------------------------------------- */
@@ -939,7 +865,7 @@ Html5.canControlVolume = function() {
 Html5.canControlPlaybackRate = function() {
   // Playback rate API is implemented in Android Chrome, but doesn't do anything
   // https://github.com/videojs/video.js/issues/3180
-  if (browser.IS_ANDROID && browser.IS_CHROME && browser.CHROME_VERSION < 58) {
+  if (browser.IS_ANDROID && browser.IS_CHROME) {
     return false;
   }
   // IE will error if Windows Media Player not installed #3315

src/js/tech/tech.js

@@ -551,7 +551,7 @@ class Tech extends Component {
       // passed in
       const script = document.createElement('script');
 
-      script.src = this.options_['vtt.js'] || 'https://vjs.zencdn.net/vttjs/0.12.4/vtt.min.js';
+      script.src = this.options_['vtt.js'] || 'https://vjs.zencdn.net/vttjs/0.12.3/vtt.min.js';
       script.onload = () => {
         /**
          * Fired when vtt.js is loaded.
@@ -805,21 +805,6 @@ class Tech extends Component {
     this.autoRemoteTextTracks_.removeTrack_(track);
   }
 
-  /**
-   * Gets available media playback quality metrics as specified by the W3C's Media
-   * Playback Quality API.
-   *
-   * @see [Spec]{@link https://wicg.github.io/media-playback-quality}
-   *
-   * @return {Object}
-   *         An object with supported media playback quality metrics
-   *
-   * @abstract
-   */
-  getVideoPlaybackQuality() {
-    return {};
-  }
-
   /**
    * A method to set a poster from a `Tech`.
    *
@@ -827,20 +812,6 @@ class Tech extends Component {
    */
   setPoster() {}
 
-  /**
-   * A method to check for the presence of the 'playsinine' <video> attribute.
-   *
-   * @abstract
-   */
-  playsinline() {}
-
-  /**
-   * A method to set or unset the 'playsinine' <video> attribute.
-   *
-   * @abstract
-   */
-  setPlaysinline() {}
-
   /*
    * Check if the tech can support the given mime-type.
    *

src/js/utils/browser.js

@@ -62,14 +62,6 @@ export const IS_NATIVE_ANDROID = IS_ANDROID && ANDROID_VERSION < 5 && appleWebki
 export const IS_FIREFOX = (/Firefox/i).test(USER_AGENT);
 export const IS_EDGE = (/Edge/i).test(USER_AGENT);
 export const IS_CHROME = !IS_EDGE && (/Chrome/i).test(USER_AGENT);
-export const CHROME_VERSION = (function() {
-  const match = USER_AGENT.match(/Chrome\/(\d+)/);
-
-  if (match && match[1]) {
-    return parseFloat(match[1]);
-  }
-  return null;
-}());
 export const IS_IE8 = (/MSIE\s8\.0/).test(USER_AGENT);
 export const IE_VERSION = (function() {
   const result = (/MSIE\s(\d+)\.\d/).exec(USER_AGENT);

src/js/utils/events.js

@@ -202,33 +202,6 @@ export function fixEvent(event) {
   return event;
 }
 
-/**
- * Whether passive event listeners are supported
- */
-let _supportsPassive = false;
-
-(function() {
-  try {
-    const opts = Object.defineProperty({}, 'passive', {
-      get() {
-        _supportsPassive = true;
-      }
-    });
-
-    window.addEventListener('test', null, opts);
-  } catch (e) {
-    // disregard
-  }
-})();
-
-/**
- * Touch events Chrome expects to be passive
- */
-const passiveEvents = [
-  'touchstart',
-  'touchmove'
-];
-
 /**
  * Add an event listener to element
  * It stores the handler function in a separate cache object
@@ -300,13 +273,7 @@ export function on(elem, type, fn) {
 
   if (data.handlers[type].length === 1) {
     if (elem.addEventListener) {
-      let options = false;
-
-      if (_supportsPassive &&
-        passiveEvents.indexOf(type) > -1) {
-        options = {passive: true};
-      }
-      elem.addEventListener(type, data.dispatcher, options);
+      elem.addEventListener(type, data.dispatcher, false);
     } else if (elem.attachEvent) {
       elem.attachEvent('on' + type, data.dispatcher);
     }

src/js/video.js

@@ -7,8 +7,6 @@
 
 import window from 'global/window';
 import document from 'global/document';
-import * as browser from './utils/browser.js';
-import * as Dom from './utils/dom.js';
 import * as setup from './setup';
 import * as stylesheet from './utils/stylesheet.js';
 import Component from './component';
@@ -25,6 +23,8 @@ import VideoTrack from './tracks/video-track.js';
 import { createTimeRanges } from './utils/time-ranges.js';
 import formatTime from './utils/format-time.js';
 import log from './utils/log.js';
+import * as Dom from './utils/dom.js';
+import * as browser from './utils/browser.js';
 import * as Url from './utils/url.js';
 import {isObject} from './utils/obj';
 import computedStyle from './utils/computed-style.js';

test/api/api.js

@@ -59,7 +59,6 @@ QUnit.test('should be able to access expected player API methods', function(asse
   assert.ok(player.userActive, 'userActive exists');
   assert.ok(player.usingNativeControls, 'usingNativeControls exists');
   assert.ok(player.isFullscreen, 'isFullscreen exists');
-  assert.ok(player.getVideoPlaybackQuality, 'getVideoPlaybackQuality exists');
 
   // Track methods
   assert.ok(player.audioTracks, 'audioTracks exists');

test/unit/clickable-component.test.js

@@ -71,25 +71,3 @@ QUnit.test('handleClick should not be triggered when disabled', function() {
   testClickableComponent.dispose();
   player.dispose();
 });
-
-QUnit.test('handleClick should not be triggered more than once when enabled', function() {
-  let clicks = 0;
-
-  class TestClickableComponent extends ClickableComponent {
-    handleClick() {
-      clicks++;
-    }
-  }
-
-  const player = TestHelpers.makePlayer({});
-  const testClickableComponent = new TestClickableComponent(player);
-  const el = testClickableComponent.el();
-
-  testClickableComponent.enable();
-  // Click should still be handled just once
-  Events.trigger(el, 'click');
-  QUnit.equal(clicks, 1, 'no additional click handler when already enabled ClickableComponent has been enabled again');
-
-  testClickableComponent.dispose();
-  player.dispose();
-});

test/unit/player.test.js

@@ -830,35 +830,6 @@ QUnit.test('should restore attributes from the original video tag when creating
   assert.equal(el.getAttribute('webkit-playsinline'), '', 'webkit-playsinline attribute was set properly');
 });
 
-if (Html5.isSupported()) {
-  QUnit.test('player.playsinline() should be able to get/set playsinline attribute', function(assert) {
-    assert.expect(5);
-
-    const video = document.createElement('video');
-    const player = TestHelpers.makePlayer({techOrder: ['html5']}, video);
-
-    // test setter
-    assert.ok(!player.tech_.el().hasAttribute('playsinline'), 'playsinline has not yet been added');
-
-    player.playsinline(true);
-
-    assert.ok(player.tech_.el().hasAttribute('playsinline'), 'playsinline attribute added');
-
-    player.playsinline(false);
-
-    assert.ok(!player.tech_.el().hasAttribute('playsinline'), 'playsinline attribute removed');
-
-    // test getter
-    player.tech_.el().setAttribute('playsinline', 'playsinline');
-
-    assert.ok(player.playsinline(), 'correctly detects playsinline attribute');
-
-    player.tech_.el().removeAttribute('playsinline');
-
-    assert.ok(!player.playsinline(), 'correctly detects absence of playsinline attribute');
-  });
-}
-
 QUnit.test('if tag exists and movingMediaElementInDOM, re-use the tag', function(assert) {
   // simulate attributes stored from the original tag
   const tag = Dom.createEl('video');
@@ -1416,40 +1387,3 @@ QUnit.test('should not allow to register custom player when any player has been
   // reset the Player to the original value;
   videojs.registerComponent('Player', Player);
 });
-
-QUnit.test('should add a class with major version', function(assert) {
-  const majorVersion = require('../../package.json').version.split('.')[0];
-  const player = TestHelpers.makePlayer();
-
-  assert.ok(player.hasClass('vjs-v' + majorVersion), 'the version class should be added to the player');
-
-  player.dispose();
-});
-
-QUnit.test('player.duration() returns NaN if player.cache_.duration is undefined', function(assert) {
-  const player = TestHelpers.makePlayer();
-
-  player.cache_.duration = undefined;
-  assert.ok(Number.isNaN(player.duration()), 'returned NaN for unkown duration');
-});
-
-QUnit.test('player.duration() returns player.cache_.duration if it is defined', function(assert) {
-  const player = TestHelpers.makePlayer();
-
-  player.cache_.duration = 200;
-  assert.equal(player.duration(), 200, 'returned correct integer duration');
-  player.cache_.duration = 942;
-  assert.equal(player.duration(), 942, 'returned correct integer duration');
-});
-
-QUnit.test('player.duration() sets the value of player.cache_.duration', function(assert) {
-  const player = TestHelpers.makePlayer();
-
-  // set an arbitrary initial cached duration value for testing the setter functionality
-  player.cache_.duration = 1;
-
-  player.duration(NaN);
-  assert.ok(Number.isNaN(player.duration()), 'duration() set and get NaN duration value');
-  player.duration(200);
-  assert.equal(player.duration(), 200, 'duration() set and get integer duration value');
-});

test/unit/setup.test.js

@@ -7,13 +7,12 @@ QUnit.test('should set options from data-setup even if autoSetup is not called b
   const el = TestHelpers.makeTag();
 
   el.setAttribute('data-setup',
-                  '{"controls": true, "autoplay": false, "preload": "auto", "playsinline": true}');
+                  '{"controls": true, "autoplay": false, "preload": "auto"}');
 
   const player = TestHelpers.makePlayer({}, el);
 
   assert.ok(player.options_.controls === true);
   assert.ok(player.options_.autoplay === false);
   assert.ok(player.options_.preload === 'auto');
-  assert.ok(player.options_.playsinline === true);
   player.dispose();
 });

test/unit/tech/flash.test.js

@@ -2,7 +2,6 @@
 import Flash from '../../../src/js/tech/flash.js';
 import { createTimeRange } from '../../../src/js/utils/time-ranges.js';
 import document from 'global/document';
-import window from 'global/window';
 import sinon from 'sinon';
 
 // fake out the <object> interaction but leave all the other logic intact
@@ -262,78 +261,3 @@ QUnit.test('duration returns NaN, Infinity or duration according to the HTML sta
               'duration returns duration property when readyState' +
               ' and duration property are both higher than 0');
 });
-
-QUnit.test('getVideoPlaybackQuality API exists', function(assert) {
-  const propertyCalls = [];
-  const videoPlaybackQuality = { test: 'test' };
-  const mockFlash = {
-    el_: {
-      /* eslint-disable camelcase */
-      vjs_getProperty(attr) {
-        propertyCalls.push(attr);
-        return videoPlaybackQuality;
-      }
-      /* eslint-enable camelcase */
-    }
-  };
-
-  assert.deepEqual(Flash.prototype.getVideoPlaybackQuality.call(mockFlash),
-                   videoPlaybackQuality,
-                   'called to get property from flash');
-  assert.equal(propertyCalls.length, 1, 'only one property call');
-  assert.equal(propertyCalls[0],
-               'getVideoPlaybackQuality',
-               'called for getVideoPlaybackQuality');
-});
-
-QUnit.test('getVideoPlaybackQuality uses best available creationTime', function(assert) {
-  const origPerformance = window.performance;
-  const origDate = window.Date;
-  const videoPlaybackQuality = {};
-  const mockFlash = {
-    el_: {
-      /* eslint-disable camelcase */
-      vjs_getProperty(attr) {
-        return videoPlaybackQuality;
-      }
-      /* eslint-enable camelcase */
-    }
-  };
-
-  window.performance = void 0;
-  assert.notOk(Flash.prototype.getVideoPlaybackQuality.call(mockFlash).creationTime,
-               'no creationTime when no performance API available');
-
-  window.performance = {
-    timing: {}
-  };
-  assert.notOk(Flash.prototype.getVideoPlaybackQuality.call(mockFlash).creationTime,
-               'no creationTime when performance API insufficient');
-
-  window.performance = {
-    now: () => 4
-  };
-  assert.equal(Flash.prototype.getVideoPlaybackQuality.call(mockFlash).creationTime,
-               4,
-               'creationTime is performance.now when available');
-
-  window.Date = {
-    now: () => 10
-  };
-  window.performance = {
-    timing: {
-      navigationStart: 3
-    }
-  };
-  assert.equal(Flash.prototype.getVideoPlaybackQuality.call(mockFlash).creationTime,
-               7,
-               'creationTime uses Date.now() - navigationStart when available');
-
-  window.performance.now = () => 4;
-  assert.equal(Flash.prototype.getVideoPlaybackQuality.call(mockFlash).creationTime,
-               4,
-               'creationTime prioritizes performance.now when available');
-
-  window.Date = origDate;
-  window.performance = origPerformance;
-});

test/unit/tech/html5.test.js

@@ -50,19 +50,6 @@ QUnit.module('HTML5', {
   }
 });
 
-QUnit.test('should be able to set playsinline attribute', function(assert) {
-  assert.expect(2);
-
-  tech.createEl();
-  tech.setPlaysinline(true);
-
-  assert.ok(tech.el().hasAttribute('playsinline'), 'playsinline attribute was added');
-
-  tech.setPlaysinline(false);
-
-  assert.ok(!tech.el().hasAttribute('playsinline'), 'playsinline attribute was removed');
-});
-
 QUnit.test('should detect whether the volume can be changed', function(assert) {
 
   if (!{}.__defineSetter__) {
@@ -97,32 +84,6 @@ QUnit.test('test playbackRate', function(assert) {
   assert.strictEqual(tech.playbackRate(), 0.75);
 });
 
-QUnit.test('blacklist playbackRate support on older verisons of Chrome on Android', function(assert) {
-  if (!Html5.canControlPlaybackRate()) {
-    assert.ok(true, 'playbackRate is not supported');
-    return;
-  }
-
-  // Reset playbackrate - Firefox's rounding of playbackRate causes the rate not to change in canControlPlaybackRate() after a few instances
-  Html5.TEST_VID.playbackRate = 1;
-
-  const oldIsAndroid = browser.IS_ANDROID;
-  const oldIsChrome = browser.IS_CHROME;
-  const oldChromeVersion = browser.CHROME_VERSION;
-
-  browser.IS_ANDROID = true;
-  browser.IS_CHROME = true;
-  browser.CHROME_VERSION = 50;
-  assert.strictEqual(Html5.canControlPlaybackRate(), false, 'canControlPlaybackRate should return false on older Chrome');
-
-  browser.CHROME_VERSION = 58;
-  assert.strictEqual(Html5.canControlPlaybackRate(), true, 'canControlPlaybackRate should return true on newer Chrome');
-
-  browser.IS_ANDROID = oldIsAndroid;
-  browser.IS_CHROME = oldIsChrome;
-  browser.CHROME_VERSION = oldChromeVersion;
-});
-
 QUnit.test('should export played', function(assert) {
   tech.createEl();
   assert.deepEqual(tech.played(), tech.el().played, 'returns the played attribute');
@@ -680,83 +641,3 @@ test('When Android Chrome reports Infinity duration with currentTime 0, return N
   browser.IS_CHROME = oldIsChrome;
   tech.el_ = oldEl;
 });
-
-QUnit.test('supports getting available media playback quality metrics', function(assert) {
-  const origPerformance = window.performance;
-  const origDate = window.Date;
-  const oldEl = tech.el_;
-  const videoPlaybackQuality = {
-    creationTime: 1,
-    corruptedVideoFrames: 2,
-    droppedVideoFrames: 3,
-    totalVideoFrames: 5
-  };
-
-  tech.el_ = {
-    getVideoPlaybackQuality: () => videoPlaybackQuality
-  };
-  assert.deepEqual(tech.getVideoPlaybackQuality(),
-                   videoPlaybackQuality,
-                   'uses native implementation when supported');
-
-  tech.el_ = {
-    webkitDroppedFrameCount: 1,
-    webkitDecodedFrameCount: 2
-  };
-  window.performance = {
-    now: () => 4
-  };
-  assert.deepEqual(tech.getVideoPlaybackQuality(),
-                   { droppedVideoFrames: 1, totalVideoFrames: 2, creationTime: 4 },
-                   'uses webkit prefixed metrics and performance.now when supported');
-
-  tech.el_ = {
-    webkitDroppedFrameCount: 1,
-    webkitDecodedFrameCount: 2
-  };
-  window.Date = {
-    now: () => 10
-  };
-  window.performance = {
-    timing: {
-      navigationStart: 3
-    }
-  };
-  assert.deepEqual(tech.getVideoPlaybackQuality(),
-                   { droppedVideoFrames: 1, totalVideoFrames: 2, creationTime: 7 },
-                   'uses webkit prefixed metrics and Date.now() - navigationStart when ' +
-                   'supported');
-
-  tech.el_ = {};
-  window.performance = void 0;
-  assert.deepEqual(tech.getVideoPlaybackQuality(), {}, 'empty object when not supported');
-
-  window.performance = {
-    now: () => 5
-  };
-  assert.deepEqual(tech.getVideoPlaybackQuality(),
-                   { creationTime: 5 },
-                   'only creation time when it\'s the only piece available');
-
-  window.performance = {
-    timing: {
-      navigationStart: 3
-    }
-  };
-  assert.deepEqual(tech.getVideoPlaybackQuality(),
-                   { creationTime: 7 },
-                   'only creation time when it\'s the only piece available');
-
-  tech.el_ = {
-    getVideoPlaybackQuality: () => videoPlaybackQuality,
-    webkitDroppedFrameCount: 1,
-    webkitDecodedFrameCount: 2
-  };
-  assert.deepEqual(tech.getVideoPlaybackQuality(),
-                   videoPlaybackQuality,
-                   'prefers native implementation when supported');
-
-  tech.el_ = oldEl;
-  window.performance = origPerformance;
-  window.Date = origDate;
-});

test/unit/tech/tech.test.js

@@ -631,9 +631,3 @@ QUnit.test('setSource after previous setSource should dispose source handler onc
 
 });
 
-QUnit.test('returns an empty object for getVideoPlaybackQuality', function(assert) {
-  const tech = new Tech();
-
-  assert.deepEqual(tech.getVideoPlaybackQuality(), {}, 'returns an empty object');
-});
-