6.2.4

Add a --prerelease flag so we can run gh-release.js manually and mark releases as prerelease.
Also, get the correct zip file.

.jsdoc.json

@@ -35,6 +35,7 @@
   },
   "plugins": ["plugins/markdown"],
   "markdown": {
-    "tags": ["example"]
+    "tags": ["example"],
+    "idInHeadings": true
   }
 }

.travis.yml

@@ -2,7 +2,7 @@ language: node_js
 node_js:
   - 4.4
 before_install:
-  - export CHROME_BIN=chromium-browser
+  - export CHROME_BIN=/usr/bin/google-chrome
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
 after_failure:
@@ -26,8 +26,12 @@ env:
     - secure: gglh7xDnURKfXp9T543DD7NG1pQ8HeWh1XtRspBAwr0H7RqJBVDqqODSYSPRFhfld7M6sYmvQIXgil7XlyefnKNTXqCarvaoTg3lbip8kSltXMiNw2V6AVpsQGuja7+XbaM0do70ETTKjW4Kw6wnxEHb78BvGN/hXIeqizUAjanlDAjd7fouaxpTBIbMESe2rI+WRHPis1cmnv8v70Mrh/8Un/NO4gkebGyvA47LTDNIaVqIVjonsndr8WjMv1/PNxQ8LyCO6D64MufrobS7Sec+VuN30apwEsBw8v82MK/MZ3qXu0lUp4+ERTbuc/rymh2wDFTQeG20Kf/NTauSaH6f414KNzIRFj0/xyLAzVZKIscXM2DKXMuskkZuvHLZvaspnZWcPYTjPZl0P88N0RBqnoLdR80dR5bDljNwU2QnSBeol/q1wXNEr6I1VTRFOB+qsHrD1blVMB1I5W3I0ti1aQ7XtgMOGi1kcPb4oFcJdl+3dLFDnyRyaNfdMOnOZYBBHdQCo19Mj/L+nqPGWeeYiEAM6JsuhNjHn5Za5nGf1ztXTimVPOQjyATin0x9kST3soLWSVmdW2dBHUGDVSMhvoLLR+nKSdNQ0KfpqtgrzeLxoVnRYHVBlih41tapM9IG/6BMYnDMaRcc0i54YeUP4oxlxGSyASIenkAgC6w=
     - secure: WtIEOSnqDkCZuTlBsxwlVwaRpVTbz7ol8+XSJIZb0aFo1lLisF9cz6s9WrAfX36MaxIcDN9LFZkpXzMvNrNkZWQa1kacGWH1rbx0SiiQ8LMweAcKdnZ5uXlSplBxbJ8bZfXKB1sIHsOsYw/vWhHKkcsDUkAEzQrIiMOhuoUV3s0uKM0knKXIAfNIF0EbDzLIojm+nm+F0n5vM60LRdKesaSt/o2p2LKxdZVoFGrg48D7bdA9VEfMWWRL/evDxJmnX4p+AjBc7mklqZ5F2pYsY6XXQuuS+2Sy+lnxz01kLg+RC4Cpv5dyYfK3h0j8KeyK8IuixycVONWVe9rANq8UaIsMrRN+6uDSC8zXiH4P+h6UDMm3jetc2ZyAfhBA8OyIs5QEShae2Rd7Y3WFJxBp6UVgyj6SkXGxrEdb1ZJgTTl4dyqiP0bYrLePNP2qSJ6OTfNdG791HF077uzXI96ABdMG54Wv9N9T/hmxKwV2Lajx/GZJMmHuwT9tkHKhkcxWea1HYam9QYSFUyJ5THfNk2A9u/r8DkL62MZ85zIQBisrlFjbPAGRejq6qyirBJPAy+FCjhM+oO/i2f2bGkkAfHGT0Og1BcrWVXs54yWdO7UZgie2F+Rmdwinb/GxebZJ+21ZQ4OkVr2t1Skr/PRni9+U7q/6xCLwUJgx45XJ0FE=
 sudo: false
+dist: trusty
 cache:
   directories:
     - node_modules
 addons:
   firefox: latest
+  apt:
+    packages:
+      - google-chrome-stable

CHANGELOG.md

@@ -1,3 +1,40 @@
+<a name="6.2.4"></a>
+## [6.2.4](https://github.com/videojs/video.js/compare/v6.2.3...v6.2.4) (2017-07-14)
+
+### Chores
+
+* fix gh-release minimist call ([#4489](https://github.com/videojs/video.js/issues/4489)) ([07594bc](https://github.com/videojs/video.js/commit/07594bc))
+
+<a name="6.2.3"></a>
+## [6.2.3](https://github.com/videojs/video.js/compare/v6.2.2...v6.2.3) (2017-07-14)
+
+### Chores
+
+* **gh-release:** add prerelease flag and find right zip  ([#4488](https://github.com/videojs/video.js/issues/4488)) ([b1ac2e0](https://github.com/videojs/video.js/commit/b1ac2e0))
+
+<a name="6.2.2"></a>
+## [6.2.2](https://github.com/videojs/video.js/compare/v6.2.1...v6.2.2) (2017-07-14)
+
+### Bug Fixes
+
+* **playback rate menu:** cycling rates via click ([#4486](https://github.com/videojs/video.js/issues/4486)) ([4f43616](https://github.com/videojs/video.js/commit/4f43616))
+
+### Chores
+
+* **build:** remove unused var in build/version.js ([#4458](https://github.com/videojs/video.js/issues/4458)) ([6986dbb](https://github.com/videojs/video.js/commit/6986dbb))
+* add automatic github release ([#4466](https://github.com/videojs/video.js/issues/4466)) ([3a600d0](https://github.com/videojs/video.js/commit/3a600d0))
+* switch to using chrome for testing PRs on travis ([#4462](https://github.com/videojs/video.js/issues/4462)) ([687aae5](https://github.com/videojs/video.js/commit/687aae5))
+* **package:** update rollup to version 0.45.2 ([#4487](https://github.com/videojs/video.js/issues/4487)) ([971f633](https://github.com/videojs/video.js/commit/971f633)), closes [#4475](https://github.com/videojs/video.js/issues/4475)
+
+### Documentation
+
+* Fix Player#src API documentation. ([#4454](https://github.com/videojs/video.js/issues/4454)) ([7579fc1](https://github.com/videojs/video.js/commit/7579fc1))
+* make jsdoc generate anchor names so ToC links work ([#4471](https://github.com/videojs/video.js/issues/4471)) ([03fd402](https://github.com/videojs/video.js/commit/03fd402))
+
+### Tests
+
+* add unit tests for player.duration() ([#4459](https://github.com/videojs/video.js/issues/4459)) ([1e80e59](https://github.com/videojs/video.js/commit/1e80e59))
+
 <a name="6.2.1"></a>
 ## [6.2.1](https://github.com/videojs/video.js/compare/v6.2.0...v6.2.1) (2017-06-28)
 

build/current-changelog.js

@@ -0,0 +1,33 @@
+var unified = require('unified');
+var markdown = require('remark-parse');
+var stringify = require('remark-stringify');
+var fs = require('fs');
+
+module.exports = function() {
+  var processor = unified()
+  .use(markdown, {commonmark: true})
+  .use(stringify);
+
+  var ast = processor.parse(fs.readFileSync('./CHANGELOG.md'));
+
+  var changelog = [];
+  changelog.push(processor.stringify(ast.children[0]));
+
+  // start at 1 so we get the first anchor tag
+  // and can break on the second
+  for (var i = 1; i < ast.children.length; i++) {
+    var item = processor.stringify(ast.children[i]);
+
+    if (/^<a name="/.test(item)) {
+      break;
+    }
+
+    if (/^###/.test(item)) {
+      item = '\n' + item + '\n';
+    }
+
+    changelog.push(item);
+  }
+
+  return changelog.join('\n');
+};

build/fix-api-docs.js

@@ -5,7 +5,31 @@ var apiPath = path.join(__dirname, '..', 'docs', 'api');
 var replacements = [
   {find: /\/docs\/guides\/(.+)\.md/g, replace: 'tutorial-$1.html'},
   {find: /tutorial-tech.html/g, replace: 'tutorial-tech_.html'},
-  {find: /\/docs\/guides\//g, replace: '#'}
+  {find: /\/docs\/guides\//g, replace: '#'},
+  {find: /(\<h[1-6] id="(?:.*)?)video-js(.*)?"\>/g, replace: '$1videojs$2">'},
+  {find: /(\<h[1-6] id="(?:.*)?)don-t(.*)?"\>/g, replace: '$1dont$2">'},
+  {find: /(\<h[1-6] id="(?:.*)?)node-js(.*)?"\>/g, replace: '$1nodejs$2">'},
+  {find: /(\<h[1-6] id="(?:.*)?)vtt-js(.*)?"\>/g, replace: '$1vttjs$2">'},
+  {find: /(\<h[1-6] id=")-(.*)("\>)/g, replace: '$1$2$3'},
+  {find: /(\<h[1-6] id=")(.*)-("\>)/g, replace: '$1$2$3'},
+  {find: /(\<h[1-6] id=".*)-docs-guides-.*-md("\>)/g, replace: '$1$2'},
+  // replace all children with children-1
+  {find: /\<h3 id="children"\>/g, replace: '<h3 id="children-1">'},
+  // remove the -1 from the first item
+  {find: /\<h3 id="children-1"\>/, replace: '<h3 id="children">'},
+  {find: '<h4 id="nativecontrolsfortouch">', replace: '<h4 id="nativecontrolsfortouch-1">'},
+  {find: '<h3 id="videojs-(audio|video)track">', replace: '<h3 id="videojs$1track">'},
+  {find: '<h3 id="text-tracks">', replace: '<h3 id="text-tracks-1">'},
+  {find: '<h2 id="q-how-can-i-hide-the-links-to-my-video-subtitles-audio-tracks">',
+   replace: '<h2 id="q-how-can-i-hide-the-links-to-my-videosubtitlesaudiotracks">'},
+  {find: '<h3 id="dispose-http-docs-videojs-com-player-html-dispose">',
+   replace: '<h3 id="dispose">'},
+  {find: '<h4 id="effect-on-player-width-and-player-height">',
+   replace: '<h4 id="effect-on-playerwidth-and-playerheight">'},
+  {find: '<h4 id="i-want-to-have-a-single-source-and-dont-care-about-live-adaptive-streaming">',
+   replace: '<h4 id="i-want-to-have-a-single-source-and-dont-care-about-liveadaptive-streaming">'},
+  {find: '<h2 id="api-docs-api">', replace: '<h2 id="api-docs">'},
+  {find: '<h2 id="guides-docs-guides">', replace: '<h2 id="guides">'}
 ];
 
 

build/gh-release.js

@@ -0,0 +1,44 @@
+var ghrelease = require('gh-release');
+var currentChangelog = require('./current-changelog.js');
+var safeParse = require('safe-json-parse/tuple');
+var pkg = require('../package.json')
+var minimist = require('minimist');
+
+var args = minimist(process.argv.slice(2), {
+  boolean: ['prerelease'],
+  default: {
+    prerelease: false
+  },
+  alias: {
+    p: 'prerelease'
+  }
+});
+
+var options = {
+  owner: 'videojs',
+  repo: 'video.js',
+  body: currentChangelog(),
+  assets: ['./dist/video-js-'+pkg.version+'.zip'],
+  endpoint: 'https://api.github.com',
+  auth: {
+    username: process.env.VJS_GITHUB_USER,
+    password: process.env.VJS_GITHUB_TOKEN
+  }
+};
+
+var tuple = safeParse(process.env.npm_config_argv);
+var npmargs = tuple[0] ? [] : tuple[1].cooked;
+
+if (args.prerelease || npmargs.some(function(arg) { return /next/.test(arg); })) {
+  options.prerelease = true;
+}
+
+ghrelease(options, function(err, result) {
+  if (err) {
+    console.log('Unable to publish release to github');
+    console.log(err);
+  } else {
+    console.log('Publish release to github!');
+    console.log(result);
+  }
+});

build/version.js

@@ -7,7 +7,6 @@ if (tuple[0]) {
 }
 
 var sh = require('shelljs');
-var version = process.env.npm_package_version;
 var prereleaseType = npm_config_argv['remain'][0];
 var approvedTypes = {
   'major': 1,

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": "6.2.1",
+  "version": "6.2.4",
   "main": "./dist/video.cjs.js",
   "module": "./dist/video.es.js",
   "style": "./dist/video-js.css",
@@ -39,6 +39,7 @@
     "docs:fix": "remark --output -- './**/*.md'",
     "babel": "babel src/js -d es5",
     "prepublish": "not-in-install && run-p docs:api build || in-install",
+    "publish": "node build/gh-release.js",
     "prepush": "npm run lint -- --errors",
     "version": "node build/version.js && git add CHANGELOG.md"
   },
@@ -78,6 +79,7 @@
     "es5-shim": "^4.1.3",
     "es6-shim": "^0.35.1",
     "filesize": "^3.5.6",
+    "gh-release": "^3.0.0",
     "grunt": "^0.4.5",
     "grunt-accessibility": "^5.0.0",
     "grunt-babel": "^6.0.0",
@@ -129,10 +131,12 @@
     "qunitjs": "1.23.1",
     "remark-cli": "^3.0.0",
     "remark-lint": "^6.0.0",
+    "remark-parse": "^3.0.1",
+    "remark-stringify": "^3.0.1",
     "remark-toc": "^4.0.0",
     "remark-validate-links": "^6.0.0",
     "replace": "^0.3.0",
-    "rollup": "^0.42.0",
+    "rollup": "^0.45.2",
     "rollup-plugin-babel": "^2.7.1",
     "rollup-plugin-commonjs": "^8.0.2",
     "rollup-plugin-filesize": "^1.2.1",
@@ -147,6 +151,7 @@
     "time-grunt": "^1.1.1",
     "tui-jsdoc-template": "^1.1.0",
     "uglify-js": "~2.8.8",
+    "unified": "^6.1.5",
     "videojs-doc-generator": "0.0.1",
     "videojs-flash": "^2.0.0",
     "videojs-standard": "^6.0.1",

src/css/components/_playback-rate.scss

@@ -1,12 +1,17 @@
 // TODO: I feel like this should be a generic menu. Research later.
+.vjs-playback-rate > .vjs-menu-button,
 .vjs-playback-rate .vjs-playback-rate-value {
-  font-size: 1.5em;
-  line-height: 2;
   position: absolute;
   top: 0;
   left: 0;
   width: 100%;
   height: 100%;
+}
+
+.vjs-playback-rate .vjs-playback-rate-value {
+  pointer-events: none;
+  font-size: 1.5em;
+  line-height: 2;
   text-align: center;
 }
 

src/js/player.js

@@ -2247,17 +2247,19 @@ class Player extends Component {
   }
 
   /**
-   * The source function updates the video source
-   * There are three types of variables you can pass as the argument.
-   * **URL string**: A URL to the the video file. Use this method if you are sure
-   * the current playback technology (HTML5/Flash) can support the source you
-   * provide. Currently only MP4 files can be used in both HTML5 and Flash.
+   * Get or set the video source.
    *
-   * @param {Tech~SourceObject|Tech~SourceObject[]} [source]
-   *        One SourceObject or an array of SourceObjects
+   * @param {Tech~SourceObject|Tech~SourceObject[]|string} [source]
+   *        A SourceObject, an array of SourceObjects, or a string referencing
+   *        a URL to a media source. It is _highly recommended_ that an object
+   *        or array of objects is used here, so that source selection
+   *        algorithms can take the `type` into account.
    *
-   * @return {string}
-   *         The current video source when getting
+   *        If not provided, this method acts as a getter.
+   *
+   * @return {string|undefined}
+   *         If the `source` argument is missing, returns the current source
+   *         URL. Otherwise, returns nothing/undefined.
    */
   src(source) {
     // getter usage

test/karma.conf.js

@@ -124,7 +124,7 @@ module.exports = function(config) {
         'ie8_bs'
       ];
     } else {
-      settings.browsers = ['Firefox'];
+      settings.browsers = ['chrome_travis'];
     }
   }
 
@@ -133,6 +133,11 @@ module.exports = function(config) {
 
 function getCustomLaunchers(){
   return {
+    chrome_travis: {
+      base: 'Chrome',
+      flags: ['--no-sandbox']
+    },
+
     chrome_bs: {
       base: 'BrowserStack',
       browser: 'chrome',

test/unit/player.test.js

@@ -1655,3 +1655,31 @@ QUnit.test('should add a class with major version', function(assert) {
 
   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');
+});