v5.12.3 dist

This updates our changelog automation to use conventinoal changelog. Ultimately, it will make it easier to merge PRs because it won't require the use of the contrib tool.
It uses https://github.com/videojs/conventional-changelog-videojs/blob/master/convention.md

.babelrc

@@ -0,0 +1,4 @@
+{
+  "presets": [ ["es2015", {"loose": true}] ],
+  "plugins": ["transform-es3-property-literals", "transform-es3-member-expression-literals", "inline-json"]
+}

.gitignore

@@ -28,5 +28,6 @@ test/coverage/*
 .sass-cache
 
 dist/*
+es5/*
 
 .idea/

.jshintrc

@@ -1,49 +0,0 @@
-{
-    "evil" : true,
-    "validthis": true,
-    "node"     : true,
-    "debug"    : true,
-    "boss"     : true,
-    "expr"     : true,
-    "eqnull"   : true,
-    "quotmark" : "single",
-    "sub"      : true,
-    "trailing" : true,
-    "undef"    : true,
-    "laxbreak" : true,
-    "esnext"   : true,
-    "eqeqeq"   : true,
-    "predef"   : [
-        "_V_",
-        "goog",
-        "console",
-
-        "require",
-        "define",
-        "module",
-        "exports",
-        "process",
-
-        "DOMException",
-
-        "q",
-        "asyncTest",
-        "deepEqual",
-        "equal",
-        "expect",
-        "module",
-        "notDeepEqual",
-        "notEqual",
-        "notStrictEqual",
-        "ok",
-        "throws",
-        "QUnit",
-        "raises",
-        "start",
-        "stop",
-        "strictEqual",
-        "test",
-        "throws",
-        "sinon"
-    ]
-}

.npmignore

@@ -1,4 +1,5 @@
 # Exclude everything but the contents of the dist directory.
 **/*
 !dist/**
+!es5/**
 !src/css/**

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - 0.12
+  - 4.4
 before_install:
   - export CHROME_BIN=chromium-browser
   - export DISPLAY=:99.0

CHANGELOG.md

@@ -1,10 +1,81 @@
-CHANGELOG
-=========
+<a name="5.12.3"></a>
+## [5.12.3](https://github.com/videojs/video.js/compare/v5.10.7...v5.12.3) (2016-10-06)
 
-## HEAD (Unreleased)
-_(none)_
+### Features
 
---------------------
+* **lang:** add missing translations in fr.json ([280ecd4](https://github.com/videojs/video.js/commit/280ecd4))
+* **lang:** add missing translations to el.json ([eb0efd4](https://github.com/videojs/video.js/commit/eb0efd4))
+
+### Bug Fixes
+
+* **controls:** fix load progress bar never highlighting first buffered time range ([ca02298](https://github.com/videojs/video.js/commit/ca02298))
+* **css:** remove commented out css ([5fdcd46](https://github.com/videojs/video.js/commit/5fdcd46)), closes [#3587](https://github.com/videojs/video.js/issues/3587)
+* disable HLS hack on Firefox for Android ([#3586](https://github.com/videojs/video.js/issues/3586)) ([dd2aff0](https://github.com/videojs/video.js/commit/dd2aff0))
+* proxy ios webkit events into fullscreenchange ([#3644](https://github.com/videojs/video.js/issues/3644)) ([e479f8c](https://github.com/videojs/video.js/commit/e479f8c))
+* **html5:** disable manual timeupdate events on html5 tech ([#3656](https://github.com/videojs/video.js/issues/3656)) ([920c54a](https://github.com/videojs/video.js/commit/920c54a))
+
+### Chores
+
+* move metadata to hidden folder and update references ([86f0830](https://github.com/videojs/video.js/commit/86f0830))
+* **deps:** add the bundle-collapser browserify plugin ([816291e](https://github.com/videojs/video.js/commit/816291e))
+* **package:** remove es2015-loose since it's an option for es2015 ([#3629](https://github.com/videojs/video.js/issues/3629)) ([c545acd](https://github.com/videojs/video.js/commit/c545acd))
+* **package:** update grunt-contrib-cssmin to version 1.0.2 ([#3595](https://github.com/videojs/video.js/issues/3595)) ([54e3db5](https://github.com/videojs/video.js/commit/54e3db5))
+* **package:** update grunt-shell to version 2.0.0 ([#3642](https://github.com/videojs/video.js/issues/3642)) ([2032b17](https://github.com/videojs/video.js/commit/2032b17))
+* refactor redundant code in html5 tech ([#3593](https://github.com/videojs/video.js/issues/3593)) ([6878c21](https://github.com/videojs/video.js/commit/6878c21))
+* refactor redundant or verbose code in player.js ([#3597](https://github.com/videojs/video.js/issues/3597)) ([ae3e277](https://github.com/videojs/video.js/commit/ae3e277))
+* update CHANGELOG automation to use conventional-changelog ([#3669](https://github.com/videojs/video.js/issues/3669)) ([d4e89d2](https://github.com/videojs/video.js/commit/d4e89d2))
+* update object.assign to ^4.0.4 ([08c7f4e](https://github.com/videojs/video.js/commit/08c7f4e))
+
+### Documentation
+
+* fix broken links in docs index.md ([4063f96](https://github.com/videojs/video.js/commit/4063f96))
+
+### Tests
+
+* **a11y:** add basic accessibility testing using grunt-accessibility ([7d85f27](https://github.com/videojs/video.js/commit/7d85f27))
+
+## 5.12.2 (2016-09-28)
+* Changes from 5.11.7 on the 5.12 branch
+
+## 5.12.1 (2016-08-25)
+* Changes from 5.11.6 on the 5.12 branch
+
+## 5.13.0 (2016-08-25)
+* Ignored release
+
+## 5.12.0 (2016-08-25)
+* @misteroneill, @BrandonOCasey, and @pagarwal123 updates all the code to pass the linter ([view](https://github.com/videojs/video.js/pull/3459))
+* @misteroneill added ghooks to run linter on git push ([view](https://github.com/videojs/video.js/pull/3459))
+* @BrandonOCasey removed unused base-styles.js file ([view](https://github.com/videojs/video.js/pull/3486))
+* @erikyuzwa, @gkatsev updated CSS build to inlcude the IE8-specific CSS from a separate file instead of it being inside of sass ([view](https://github.com/videojs/video.js/pull/3380)) ([view2](https://github.com/erikyuzwa/video.js/pull/1))
+* @gkatsev added null checks around navigator.userAgent ([view](https://github.com/videojs/video.js/pull/3502))
+* greenkeeper updated karma dependencies ([view](https://github.com/videojs/video.js/pull/3523))
+* @BrandonOCasey updated language docs to link to IANA language registry ([view](https://github.com/videojs/video.js/pull/3493))
+* @gkatsev removed unused dependencies ([view](https://github.com/videojs/video.js/pull/3516))
+* @misteroneill enabled and updated videojs-standard and fixed an issue with linting ([view](https://github.com/videojs/video.js/pull/3508))
+* @misteroneill updated tests to qunit 2.0 ([view](https://github.com/videojs/video.js/pull/3509))
+* @gkatsev added slack badge to README ([view](https://github.com/videojs/video.js/pull/3527))
+* @gkatsev reverted back to qunitjs 1.x to unbreak IE8. Added es5-shim to tests ([view](https://github.com/videojs/video.js/pull/3533))
+* @gkatsev updated build system to open es5 folder for bundles and dist folder other users ([view](https://github.com/videojs/video.js/pull/3445))
+* greenkeeper updated uglify ([view](https://github.com/videojs/video.js/pull/3547))
+* greenkeeper updated grunt-concurrent ([view](https://github.com/videojs/video.js/pull/3532))
+* greenkeeper updated karma-chrome-launcher ([view](https://github.com/videojs/video.js/pull/3553))
+* @gkatsev added tests for webpack and browserify bundling and node.js requiring ([view](https://github.com/videojs/video.js/pull/3558))
+* @rlchung fixed tests that weren't disposing players when they finished ([view](https://github.com/videojs/video.js/pull/3524))
+
+## 5.11.7 (2016-09-28)
+* @gkatsev checked throwIfWhitespace first in hasElClass ([view](https://github.com/videojs/video.js/pull/3640))
+* @misteroneill pinned grunt-contrib-uglify to ~0.11 to pin uglify to ~2.6 ([view](https://github.com/videojs/video.js/pull/3634))
+* @gkatsev set playerId on new el created for movingMediaElementInDOM. Fixes #3283 ([view](https://github.com/videojs/video.js/pull/3648))
+
+## 5.11.6 (2016-08-25)
+* @imbcmdth Added exception handling to event dispatcher ([view](https://github.com/videojs/video.js/pull/3580))
+
+## 5.11.5 (2016-08-25)
+* @misteroneill fixed wrapping native and emulated MediaErrors ([view](https://github.com/videojs/video.js/pull/3562))
+* @snyderizer fixed switching between audio tracks. Fixes #3510 ([view](https://github.com/videojs/video.js/pull/3538))
+* @jbarabander added title attribute to audio button. Fixes #3528 ([view](https://github.com/videojs/video.js/pull/3565))
+* @misteroneill fixed IE8 media error test failure ([view](https://github.com/videojs/video.js/pull/3568))
 
 ## 5.11.4 (2016-08-16)
 _(none)_

Gruntfile.js

@@ -1,4 +1,4 @@
-require('babel/register');
+require('babel-register');
 
 // Need to `require` a separate Grunt file so we can use ES6 syntax via
 // Babel's require hook.

README.md

@@ -3,6 +3,8 @@
 # [Video.js - HTML5 Video Player](http://videojs.com)
 [![Build Status](https://travis-ci.org/videojs/video.js.svg?branch=master)](https://travis-ci.org/videojs/video.js)
 [![Coverage Status](https://coveralls.io/repos/github/videojs/video.js/badge.svg?branch=master)](https://coveralls.io/github/videojs/video.js?branch=master)
+[![Slack Status](http://slack.videojs.com/badge.svg)](http://slack.videojs.com)
+
 
 [![NPM](https://nodei.co/npm/video.js.png?downloads=true&downloadRank=true)](https://nodei.co/npm/video.js/)
 
@@ -53,11 +55,11 @@ var player = videojs('really-cool-video', { /* Options */ }, function() {
 If you're ready to dive in, the [documentation](http://docs.videojs.com) is the first place to go for more information.
 
 ## Contributing
-Video.js is a free and open source library, and we appreciate any help you're willing to give. Check out the [contributing guide](CONTRIBUTING.md).
+Video.js is a free and open source library, and we appreciate any help you're willing to give. Check out the [contributing guide](/CONTRIBUTING.md).
 
 _Video.js uses [BrowserStack](https://browserstack.com) for compatibility testing_
 ## Building your own Video.js from source
-To build your own custom version read the section on [contributing code](CONTRIBUTING.md#contributing-code) and ["Building your own copy"](CONTRIBUTING.md#building-your-own-copy-of-videojs) in the contributing guide.
+To build your own custom version read the section on [contributing code](/CONTRIBUTING.md#contributing-code) and ["Building your own copy"](/CONTRIBUTING.md#building-your-own-copy-of-videojs) in the contributing guide.
 ## License
 
 Video.js is licensed under the Apache License, Version 2.0. [View the license file](LICENSE)

build/grunt.js

@@ -1,4 +1,7 @@
 import {gruntCustomizer, gruntOptionsMaker} from './options-customizer.js';
+import chg from 'chg';
+import nodeCli from 'shelljs-nodecli';
+
 module.exports = function(grunt) {
   require('time-grunt')(grunt);
 
@@ -16,29 +19,11 @@ module.exports = function(grunt) {
 
   const browserifyGruntDefaults = {
     browserifyOptions: {
-      debug: true,
       standalone: 'videojs'
     },
     plugin: [
+      ['bundle-collapser/plugin'],
       ['browserify-derequire']
-    ],
-    transform: [
-      require('babelify').configure({
-        sourceMapRelative: './',
-        loose: ['all']
-      }),
-      ['browserify-versionify', {
-        placeholder: '__VERSION__',
-        version: pkg.version
-      }],
-      ['browserify-versionify', {
-        placeholder: '__VERSION_NO_PATCH__',
-        version: version.majorMinor
-      }],
-      ['browserify-versionify', {
-        placeholder: '__SWF_VERSION__',
-        version: pkg.dependencies['videojs-swf']
-      }]
     ]
   };
 
@@ -47,7 +32,7 @@ module.exports = function(grunt) {
       release: {
         tag_name: 'v'+ version.full,
         name: version.full,
-        body: require('chg').find(version.full).changesRaw
+        body: nodeCli.exec('conventional-changelog', '-p videojs', {silent: true}).output
       },
     },
     files: {
@@ -111,22 +96,11 @@ module.exports = function(grunt) {
   grunt.initConfig({
     pkg,
     clean: {
-      build: ['build/temp/*'],
+      build: ['build/temp/*', 'es5'],
       dist: ['dist/*']
     },
-    jshint: {
-      src: {
-        src: ['src/js/**/*.js', 'Gruntfile.js', 'test/unit/**/*.js'],
-        options: {
-          jshintrc: '.jshintrc'
-        }
-      }
-    },
     uglify: {
       options: {
-        sourceMap: true,
-        sourceMapIn: 'build/temp/video.js.map',
-        sourceMapRoot: '../../src/js',
         preserveComments: 'some',
         mangle: true,
         compress: {
@@ -159,7 +133,11 @@ module.exports = function(grunt) {
       },
       skin: {
         files: ['src/css/**/*'],
-        tasks: ['sass']
+        tasks: ['skin']
+      },
+      babel: {
+        files: ['src/js/**/*.js'],
+        tasks: ['babel:es5']
       },
       jshint: {
         files: ['src/**/*', 'test/unit/**/*.js', 'Gruntfile.js'],
@@ -190,6 +168,7 @@ module.exports = function(grunt) {
       swf:   { cwd: 'node_modules/videojs-swf/dist/', src: 'video-js.swf', dest: 'build/temp/', expand: true, filter: 'isFile' },
       ie8:   { cwd: 'node_modules/videojs-ie8/dist/', src: ['**/**'], dest: 'build/temp/ie8/', expand: true, filter: 'isFile' },
       dist:  { cwd: 'build/temp/', src: ['**/**', '!test*'], dest: 'dist/', expand: true, filter: 'isFile' },
+      a11y:  { src: 'sandbox/descriptions.html.example', dest: 'sandbox/descriptions.test-a11y.html' }, // Can only test a file with a .html or .htm extension
       examples: { cwd: 'docs/examples/', src: ['**/**'], dest: 'dist/examples/', expand: true, filter: 'isFile' }
     },
     cssmin: {
@@ -325,11 +304,21 @@ module.exports = function(grunt) {
         }
       })
     },
+    babel: {
+      es5: {
+        files: [{
+          expand: true,
+          cwd: 'src/js/',
+          src: ['**/*.js', '!base-styles.js'],
+          dest: 'es5/'
+        }]
+      }
+    },
     browserify: {
       options: browserifyGruntOptions(),
       build: {
         files: {
-          'build/temp/video.js': ['src/js/video.js']
+          'build/temp/video.js': ['es5/video.js']
         }
       },
       dist: {
@@ -342,7 +331,7 @@ module.exports = function(grunt) {
           ]
         }),
         files: {
-          'build/temp/video.js': ['src/js/video.js']
+          'build/temp/video.js': ['es5/video.js']
         }
       },
       watch: {
@@ -351,17 +340,18 @@ module.exports = function(grunt) {
           keepAlive: true
         },
         files: {
-          'build/temp/video.js': ['src/js/video.js']
+          'build/temp/video.js': ['es5/video.js']
         }
       },
       tests: {
         options: {
           browserifyOptions: {
-            debug: true,
-            standalone: false
+            verbose: true,
+            standalone: false,
+            transform: ['babelify']
           },
           plugin: [
-            ['proxyquireify/plugin']
+            ['proxyquireify/plugin', 'bundle-collapser/plugin']
           ],
           banner: false,
           watch: true,
@@ -375,14 +365,6 @@ module.exports = function(grunt) {
         }
       }
     },
-    exorcise: {
-      build: {
-        options: {},
-        files: {
-          'build/temp/video.js.map': ['build/temp/video.js'],
-        }
-      }
-    },
     coveralls: {
       options: {
         // warn instead of failing when coveralls errors
@@ -394,25 +376,30 @@ module.exports = function(grunt) {
       }
     },
     concat: {
+      options: {
+        separator: '\n'
+      },
       novtt: {
-        options: {
-          separator: '\n'
-        },
         src: ['build/temp/video.js'],
         dest: 'build/temp/alt/video.novtt.js'
       },
       vtt: {
-        options: {
-          separator: '\n',
-        },
         src: ['build/temp/video.js', 'node_modules/videojs-vtt.js/dist/vtt.js'],
-        dest: 'build/temp/video.js',
+        dest: 'build/temp/video.js'
       },
+      ie8_addition: {
+        src: ['build/temp/video-js.css', 'src/css/ie8.css'],
+        dest: 'build/temp/video-js.css'
+      }
     },
     concurrent: {
       options: {
         logConcurrentOutput: true
       },
+      tests: [
+        'watch:babel',
+        'browserify:tests'
+      ],
       // Run multiple watch tasks in parallel
       // Needed so watchify can cache intelligently
       watchAll: [
@@ -443,6 +430,50 @@ module.exports = function(grunt) {
           src: ['build/temp/video.js']
         }
       }
+    },
+    shell: {
+      lint: {
+        command: 'npm run lint',
+        options: {
+          preferLocal: true
+        }
+      },
+      noderequire: {
+        command: 'node test/require/node.js',
+        options: {
+          failOnError: true
+        }
+      },
+      browserify: {
+        command: 'browserify test/require/browserify.js -o build/temp/browserify.js',
+        options: {
+          preferLocal: true
+        }
+      },
+      webpack: {
+        command: 'webpack test/require/webpack.js build/temp/webpack.js',
+        options: {
+          preferLocal: true
+        }
+      }
+    },
+    accessibility: {
+      options: {
+        accessibilityLevel: 'WCAG2AA',
+        reportLevels: {
+          notice: false,
+          warning: true,
+          error: true
+        },
+        ignore: [
+          // Ignore the warning about needing <optgroup> elements
+          'WCAG2AA.Principle1.Guideline1_3.1_3_1.H85.2'
+        ]
+
+      },
+      test: {
+        src: ['sandbox/descriptions.test-a11y.html']
+      }
     }
   });
 
@@ -451,20 +482,21 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('videojs-doc-generator');
   grunt.loadNpmTasks('chg');
   grunt.loadNpmTasks('gkatsev-grunt-sass');
+  grunt.loadNpmTasks('grunt-accessibility');
 
   const buildDependents = [
+    'shell:lint',
     'clean:build',
 
-    'jshint',
+    'babel:es5',
     'browserify:build',
-    'exorcise:build',
     'concat:novtt',
     'concat:vtt',
     'usebanner:novtt',
     'usebanner:vtt',
     'uglify',
 
-    'sass',
+    'skin',
     'version:css',
     'cssmin',
 
@@ -489,19 +521,27 @@ module.exports = function(grunt) {
     'zip:dist'
   ]);
 
-  grunt.registerTask('skin', ['sass']);
+  grunt.registerTask('skin', ['sass', 'concat:ie8_addition']);
 
   // Default task - build and test
   grunt.registerTask('default', ['test']);
 
   // The test script includes coveralls only when the TRAVIS env var is set.
-  grunt.registerTask('test', ['build', 'karma:defaults'].concat(process.env.TRAVIS && 'coveralls').filter(Boolean));
+  grunt.registerTask('test', [
+    'build',
+    'shell:noderequire',
+    'shell:browserify',
+    'shell:webpack',
+    'karma:defaults',
+    'test-a11y'].concat(process.env.TRAVIS && 'coveralls').filter(Boolean));
 
   // Run while developing
   grunt.registerTask('dev', ['build', 'connect:dev', 'concurrent:watchSandbox']);
 
   grunt.registerTask('watchAll', ['build', 'connect:dev', 'concurrent:watchAll']);
 
+  grunt.registerTask('test-a11y', ['copy:a11y', 'accessibility']);
+
   // Pick your testing, or run both in different terminals
   grunt.registerTask('test-ui', ['browserify:tests']);
   grunt.registerTask('test-cli', ['karma:watch']);

build/tasks/cdn-links.js

@@ -1,7 +1,7 @@
 module.exports = function(grunt) {
   grunt.registerTask('cdn-links', 'Update the version of CDN links in docs', function(){
     let doc = grunt.file.read('docs/guides/setup.md');
-    let version = require('../package.json').version;
+    let version = require('../../package.json').version;
 
     // remove the patch version to point to the latest patch
     version = version.replace(/(\d+\.\d+)\.\d+/, '$1');

build/tasks/languages.js

@@ -0,0 +1,35 @@
+module.exports = function(grunt) {
+  grunt.registerTask('check-translations', 'Check that translations are up to date', function(){
+    const source = require('../../lang/en.json');
+    const table = require('markdown-table');
+    let doc = grunt.file.read('docs/translations-needed.md');
+    const tableRegex = /(<!-- START langtable -->)(.|\n)*(<!-- END langtable -->)/;
+    let tableData = [['Language file', 'Missing translations']];
+
+    grunt.file.recurse('lang', (abspath, rootdir, subdir, filename) => {
+      if (filename === 'en.json') {
+        return;
+      }
+      const target = require(`../../${abspath}`);
+      let missing = [];
+      for (const string in source) {
+        if (!target[string]) {
+          grunt.log.writeln(`${filename} missing "${string}"`);
+          missing.push(string);
+        }
+      }
+      if (missing.length > 0) {
+        grunt.log.error(`${filename} is missing ${missing.length} translations.`);
+        tableData.push([`${filename} (missing ${missing.length})`, missing[0]]);
+        for (var i = 1; i < missing.length; i++) {
+          tableData.push(['', missing[i]]);
+        }
+      } else {
+        grunt.log.ok(`${filename} is up to date.`);
+        tableData.push([`${filename} (Complete)`, '']);
+      }
+    });
+    doc = doc.replace(tableRegex, `$1\n` + table(tableData) + `\n$3`);
+    grunt.file.write('docs/translations-needed.md', doc);
+  });
+};

build/tasks/saucelabs.js

@@ -1,24 +0,0 @@
-module.exports = function(grunt) {
-  grunt.registerTask('saucelabs', function() {
-    const exec = require('child_process').exec;
-    const done = this.async();
-
-    if (this.args[0] == 'connect') {
-      exec('curl https://gist.githubusercontent.com/santiycr/5139565/raw/sauce_connect_setup.sh | bash',
-      function(error, stdout, stderr) {
-        if (error) {
-          grunt.log.error(error);
-          return done();
-        }
-
-        grunt.verbose.error(stderr.toString());
-        grunt.verbose.writeln(stdout.toString());
-        grunt.task.run(['karma:saucelabs']);
-        done();
-      });
-    } else {
-      grunt.task.run(['karma:saucelabs']);
-      done();
-    }
-  });
-}

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.11.4",
+  "version": "5.12.3",
   "keywords": [
     "videojs",
     "html5",

contrib.json

@@ -280,7 +280,7 @@
         [ "git checkout -b temp-release-branch master","Create a temporary branch for the dist" ],
         [ "grunt version:{{release_type}}",            "Bump package versions" ],
         [ "./build/bin/version",                       "Return the current VJS Version from the package.json file", "version" ],
-        [ "grunt chg-release:{{version}}",             "Update the changelog with the new release" ],
+        [ "npm run changelog",                         "Update the changelog with the new release" ],
         [ "git commit -am 'v{{version}}'",             "Add and commit the package changes" ],
         [ "git checkout master",                       "Checkout the developmet branch" ],
         [ "git merge temp-release-branch",             "Merge package changes into the dev brach" ],
@@ -306,7 +306,7 @@
         [ "grunt test",                                "Run tests" ],
         [ "grunt version:{{release_type}}",            "Bump package versions" ],
         [ "./build/bin/version",                       "Return the current VJS Version from the package.json file", "version" ],
-        [ "grunt chg-release:{{version}}",             "Update the changelog with the new release" ],
+        [ "npm run changelog",                         "Update the changelog with the new release" ],
         [ "git commit -am 'v{{version}}'",             "Add and commit the package changes" ],
         [ "git push upstream stable",                  "Push the release branch changes to the repo" ],
         [ "git checkout -b temp-release-branch stable","Create a temporary branch for the dist" ],

dist/alt/video-js-cdn.css

@@ -585,9 +585,6 @@ body.vjs-full-window {
   -moz-transition: visibility 1s, opacity 1s;
   -o-transition: visibility 1s, opacity 1s;
   transition: visibility 1s, opacity 1s; }
-  @media \0screen {
-    .vjs-has-started.vjs-user-inactive.vjs-playing .vjs-control-bar {
-      visibility: hidden; } }
 
 .vjs-controls-disabled .vjs-control-bar,
 .vjs-using-native-controls .vjs-control-bar,
@@ -598,10 +595,6 @@ body.vjs-full-window {
   opacity: 1;
   visibility: visible; }
 
-@media \0screen {
-  .vjs-user-inactive.vjs-playing .vjs-control-bar :before {
-    content: ""; } }
-
 .vjs-has-started.vjs-no-flex .vjs-control-bar {
   display: table; }
 

dist/lang/de.js

@@ -30,5 +30,11 @@ videojs.addLanguage("de",{
  "This modal can be closed by pressing the Escape key or activating the close button.": "Durch Drücken der Esc-Taste bzw. Betätigung der Schaltfläche \"Schließen\" wird dieses modale Fenster geschlossen.",
  ", opens captions settings dialog": ", öffnet Einstellungen für Untertitel",
  ", opens subtitles settings dialog": ", öffnet Einstellungen für Untertitel",
- ", selected": " (ausgewählt)"
+ ", selected": ", ausgewählt",
+ "Close Modal Dialog": "Modales Fenster schließen",
+ "Descriptions": "Beschreibungen",
+ "descriptions off": "Beschreibungen aus",
+ "The media is encrypted and we do not have the keys to decrypt it.": "Die Entschlüsselungsschlüssel für den verschlüsselten Medieninhalt sind nicht verfügbar.",
+ ", opens descriptions settings dialog": ", öffnet Einstellungen für Beschreibungen",
+ "Audio Track": "Tonspur"
 });

dist/lang/el.js

@@ -18,17 +18,23 @@ videojs.addLanguage("el",{
  "Captions": "Λεζάντες",
  "captions off": "απόκρυψη λεζάντων",
  "Chapters": "Κεφάλαια",
+ "Close Modal Dialog": "Κλείσιμο παραθύρου",
+ "Descriptions": "Περιγραφές",
+ "descriptions off": "απόκρυψη περιγραφών",
+ "Audio Track": "Ροή ήχου",
  "You aborted the media playback": "Ακυρώσατε την αναπαραγωγή",
  "A network error caused the media download to fail part-way.": "Ένα σφάλμα δικτύου προκάλεσε την αποτυχία μεταφόρτωσης του αρχείου προς αναπαραγωγή.",
  "The media could not be loaded, either because the server or network failed or because the format is not supported.": "Το αρχείο προς αναπαραγωγή δεν ήταν δυνατό να φορτωθεί είτε γιατί υπήρξε σφάλμα στον διακομιστή ή το δίκτυο, είτε γιατί ο τύπος του αρχείου δεν υποστηρίζεται.",
  "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "Η αναπαραγωγή ακυρώθηκε είτε λόγω κατεστραμμένου αρχείου, είτε γιατί το αρχείο απαιτεί λειτουργίες που δεν υποστηρίζονται από το πρόγραμμα περιήγησης που χρησιμοποιείτε.",
  "No compatible source was found for this media.": "Δεν βρέθηκε συμβατή πηγή αναπαραγωγής για το συγκεκριμένο αρχείο.",
- "Play video": "Αναπαραγωγή βίντεο",
+ "The media is encrypted and we do not have the keys to decrypt it.": "Το αρχείο προς αναπαραγωγή είναι κρυπτογραφημένo και δεν υπάρχουν τα απαραίτητα κλειδιά αποκρυπτογράφησης.",
+ "Play Video": "Αναπαραγωγή βίντεο",
  "Close": "Κλείσιμο",
  "Modal Window": "Aναδυόμενο παράθυρο",
  "This is a modal window": "Το παρών είναι ένα αναδυόμενο παράθυρο",
  "This modal can be closed by pressing the Escape key or activating the close button.": "Αυτό το παράθυρο μπορεί να εξαφανιστεί πατώντας το πλήκτρο Escape ή πατώντας το κουμπί κλεισίματος.",
  ", opens captions settings dialog": ", εμφανίζει τις ρυθμίσεις για τις λεζάντες",
  ", opens subtitles settings dialog": ", εμφανίζει τις ρυθμίσεις για τους υπότιτλους",
+ ", opens descriptions settings dialog": ", εμφανίζει τις ρυθμίσεις για τις περιγραφές",
  ", selected": ", επιλεγμένο"
 });

dist/lang/en.js

@@ -21,11 +21,13 @@ videojs.addLanguage("en",{
  "Close Modal Dialog": "Close Modal Dialog",
  "Descriptions": "Descriptions",
  "descriptions off": "descriptions off",
+ "Audio Track": "Audio Track",
  "You aborted the media playback": "You aborted the media playback",
  "A network error caused the media download to fail part-way.": "A network error caused the media download to fail part-way.",
  "The media could not be loaded, either because the server or network failed or because the format is not supported.": "The media could not be loaded, either because the server or network failed or because the format is not supported.",
  "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.",
  "No compatible source was found for this media.": "No compatible source was found for this media.",
+ "The media is encrypted and we do not have the keys to decrypt it.": "The media is encrypted and we do not have the keys to decrypt it.",
  "Play Video": "Play Video",
  "Close": "Close",
  "Modal Window": "Modal Window",

dist/lang/fr.js

@@ -15,12 +15,26 @@ videojs.addLanguage("fr",{
  "Playback Rate": "Vitesse de lecture",
  "Subtitles": "Sous-titres",
  "subtitles off": "Sous-titres désactivés",
- "Captions": "Sous-titres",
- "captions off": "Sous-titres désactivés",
+ "Captions": "Sous-titres transcrits",
+ "captions off": "Sous-titres transcrits désactivés",
  "Chapters": "Chapitres",
+ "Close Modal Dialog": "Fermer la boîte de dialogue modale",
+ "Descriptions": "Descriptions",
+ "descriptions off": "descriptions désactivées",
+ "Audio Track": "Piste audio",
  "You aborted the media playback": "Vous avez interrompu la lecture de la vidéo.",
  "A network error caused the media download to fail part-way.": "Une erreur de réseau a interrompu le téléchargement de la vidéo.",
  "The media could not be loaded, either because the server or network failed or because the format is not supported.": "Cette vidéo n'a pas pu être chargée, soit parce que le serveur ou le réseau a échoué ou parce que le format n'est pas reconnu.",
  "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "La lecture de la vidéo a été interrompue à cause d'un problème de corruption ou parce que la vidéo utilise des fonctionnalités non prises en charge par votre navigateur.",
- "No compatible source was found for this media.": "Aucune source compatible n'a été trouvée pour cette vidéo."
+ "No compatible source was found for this media.": "Aucune source compatible n'a été trouvée pour cette vidéo.",
+ "The media is encrypted and we do not have the keys to decrypt it.": "Le média est chiffré et nous n'avons pas les clés pour le déchiffrer.",
+ "Play Video": "Lire la vidéo",
+ "Close": "Fermer",
+ "Modal Window": "Fenêtre modale",
+ "This is a modal window": "Ceci est une fenêtre modale",
+ "This modal can be closed by pressing the Escape key or activating the close button.": "Ce modal peut être fermé en appuyant sur la touche Échap ou activer le bouton de fermeture.",
+ ", opens captions settings dialog": ", ouvrir les paramètres des sous-titres transcrits",
+ ", opens subtitles settings dialog": ", ouvrir les paramètres des sous-titres",
+ ", opens descriptions settings dialog": ", ouvrir les paramètres des descriptions",
+ ", selected": ", sélectionné"
 });

dist/video-js.css

@@ -585,9 +585,6 @@ body.vjs-full-window {
   -moz-transition: visibility 1s, opacity 1s;
   -o-transition: visibility 1s, opacity 1s;
   transition: visibility 1s, opacity 1s; }
-  @media \0screen {
-    .vjs-has-started.vjs-user-inactive.vjs-playing .vjs-control-bar {
-      visibility: hidden; } }
 
 .vjs-controls-disabled .vjs-control-bar,
 .vjs-using-native-controls .vjs-control-bar,
@@ -598,10 +595,6 @@ body.vjs-full-window {
   opacity: 1;
   visibility: visible; }
 
-@media \0screen {
-  .vjs-user-inactive.vjs-playing .vjs-control-bar :before {
-    content: ""; } }
-
 .vjs-has-started.vjs-no-flex .vjs-control-bar {
   display: table; }
 
@@ -1300,3 +1293,15 @@ video::-webkit-media-text-track-display {
 @media print {
   .video-js > *:not(.vjs-tech):not(.vjs-poster) {
     visibility: hidden; } }
+
+@media \0screen {
+  .vjs-user-inactive.vjs-playing .vjs-control-bar :before {
+    content: "";
+  }
+}
+
+@media \0screen {
+  .vjs-has-started.vjs-user-inactive.vjs-playing .vjs-control-bar {
+    visibility: hidden;
+  }
+}

docs/guides/languages.md

@@ -110,6 +110,10 @@ NOTE: These need to be added after the core Video.js script.
 Notes:
 - This will add your language key/values to the Video.js player instances individually. If these values already exist in the global dictionary via the process above, those will be overridden for the player instance in question.
 
+Updating default translations
+-----------------------------
+
+A list of the current translations and any strings that need translation are at [docs/translations-needed.md](../translations-needed.md). After updating the language files in /lang/ running `grunt check-languages` will update that list.
 
 Setting Default Language in a Video.js Player
 ---------------------------------------------
@@ -157,159 +161,7 @@ var details = '<div class="vjs-errors-details">' + player.localize('Technical de
 
 Language Codes
 --------------
-The following is a list of official language codes.
+A list of languages codes can be found [here](http://www.iana.org/assignments/language-subtag-registry/language-subtag-registry)
 
-**NOTE:** For supported language translations, please see the [Languages Folder (/lang)](https://github.com/videojs/video.js/tree/master/lang) folder located in the project root.
+For supported language translations, please see the [Languages Folder (/lang)](https://github.com/videojs/video.js/tree/master/lang) folder located in the project root.
 
-<table border="0" cellspacing="5" cellpadding="5">
-  <tr>
-    <table>
-      <tr><th>ab<th><td>Abkhazian</td></tr>
-      <tr><th>aa<th><td>Afar</td></tr>
-      <tr><th>af<th><td>Afrikaans</td></tr>
-      <tr><th>sq<th><td>Albanian</td></tr>
-      <tr><th>am<th><td>Amharic</td></tr>
-      <tr><th>ar<th><td>Arabic</td></tr>
-      <tr><th>an<th><td>Aragonese</td></tr>
-      <tr><th>hy<th><td>Armenian</td></tr>
-      <tr><th>as<th><td>Assamese</td></tr>
-      <tr><th>ay<th><td>Aymara</td></tr>
-      <tr><th>az<th><td>Azerbaijani</td></tr>
-      <tr><th>ba<th><td>Bashkir</td></tr>
-      <tr><th>eu<th><td>Basque</td></tr>
-      <tr><th>bn<th><td>Bengali (Bangla)</td></tr>
-      <tr><th>dz<th><td>Bhutani</td></tr>
-      <tr><th>bh<th><td>Bihari</td></tr>
-      <tr><th>bi<th><td>Bislama</td></tr>
-      <tr><th>br<th><td>Breton</td></tr>
-      <tr><th>bg<th><td>Bulgarian</td></tr>
-      <tr><th>my<th><td>Burmese</td></tr>
-      <tr><th>be<th><td>Byelorussian (Belarusian)</td></tr>
-      <tr><th>km<th><td>Cambodian</td></tr>
-      <tr><th>ca<th><td>Catalan</td></tr>
-      <tr><th>zh<th><td>Chinese (Simplified)</td></tr>
-      <tr><th>zh<th><td>Chinese (Traditional)</td></tr>
-      <tr><th>co<th><td>Corsican</td></tr>
-      <tr><th>hr<th><td>Croatian</td></tr>
-      <tr><th>cs<th><td>Czech</td></tr>
-      <tr><th>da<th><td>Danish</td></tr>
-      <tr><th>nl<th><td>Dutch</td></tr>
-      <tr><th>en<th><td>English</td></tr>
-      <tr><th>eo<th><td>Esperanto</td></tr>
-      <tr><th>et<th><td>Estonian</td></tr>
-      <tr><th>fo<th><td>Faeroese</td></tr>
-      <tr><th>fa<th><td>Farsi</td></tr>
-      <tr><th>fj<th><td>Fiji</td></tr>
-      <tr><th>fi<th><td>Finnish</td></tr>
-      <tr><th>fr<th><td>French</td></tr>
-      <tr><th>fy<th><td>Frisian</td></tr>
-      <tr><th>gl<th><td>Galician</td></tr>
-      <tr><th>gd<th><td>Gaelic (Scottish)</td></tr>
-      <tr><th>gv<th><td>Gaelic (Manx)</td></tr>
-      <tr><th>ka<th><td>Georgian</td></tr>
-      <tr><th>de<th><td>German</td></tr>
-      <tr><th>el<th><td>Greek</td></tr>
-      <tr><th>kl<th><td>Greenlandic</td></tr>
-      <tr><th>gn<th><td>Guarani</td></tr>
-      <tr><th>gu<th><td>Gujarati</td></tr>
-      <tr><th>ht<th><td>Haitian Creole</td></tr>
-      <tr><th>ha<th><td>Hausa</td></tr>
-      <tr><th>he<th><td>Hebrew</td></tr>
-      <tr><th>hi<th><td>Hindi</td></tr>
-      <tr><th>hu<th><td>Hungarian</td></tr>
-      <tr><th>is<th><td>Icelandic</td></tr>
-      <tr><th>io<th><td>Ido</td></tr>
-      <tr><th>id<th><td>Indonesian</td></tr>
-      <tr><th>ia<th><td>Interlingua</td></tr>
-      <tr><th>ie<th><td>Interlingue</td></tr>
-      <tr><th>iu<th><td>Inuktitut</td></tr>
-      <tr><th>ik<th><td>Inupiak</td></tr>
-      <tr><th>ga<th><td>Irish</td></tr>
-      <tr><th>it<th><td>Italian</td></tr>
-      <tr><th>ja<th><td>Japanese</td></tr>
-      <tr><th>jv<th><td>Javanese</td></tr>
-      <tr><th>kn<th><td>Kannada</td></tr>
-      <tr><th>ks<th><td>Kashmiri</td></tr>
-      <tr><th>kk<th><td>Kazakh</td></tr>
-      <tr><th>rw<th><td>Kinyarwanda (Ruanda)</td></tr>
-      <tr><th>ky<th><td>Kirghiz</td></tr>
-      <tr><th>rn<th><td>Kirundi (Rundi)</td></tr>
-      <tr><th>ko<th><td>Korean</td></tr>
-      <tr><th>ku<th><td>Kurdish</td></tr>
-      <tr><th>lo<th><td>Laothian</td></tr>
-      <tr><th>la<th><td>Latin</td></tr>
-      <tr><th>lv<th><td>Latvian (Lettish)</td></tr>
-      <tr><th>li<th><td>Limburgish ( Limburger)</td></tr>
-      <tr><th>ln<th><td>Lingala</td></tr>
-      <tr><th>lt<th><td>Lithuanian</td></tr>
-      <tr><th>mk<th><td>Macedonian</td></tr>
-      <tr><th>mg<th><td>Malagasy</td></tr>
-      <tr><th>ms<th><td>Malay</td></tr>
-      <tr><th>ml<th><td>Malayalam</td></tr>
-      <tr><th>mt<th><td>Maltese</td></tr>
-      <tr><th>mi<th><td>Maori</td></tr>
-      <tr><th>mr<th><td>Marathi</td></tr>
-      <tr><th>mo<th><td>Moldavian</td></tr>
-      <tr><th>mn<th><td>Mongolian</td></tr>
-      <tr><th>na<th><td>Nauru</td></tr>
-      <tr><th>ne<th><td>Nepali</td></tr>
-      <tr><th>no<th><td>Norwegian</td></tr>
-      <tr><th>oc<th><td>Occitan</td></tr>
-      <tr><th>or<th><td>Oriya</td></tr>
-      <tr><th>om<th><td>Oromo (Afan, Galla)</td></tr>
-      <tr><th>ps<th><td>Pashto (Pushto)</td></tr>
-      <tr><th>pl<th><td>Polish</td></tr>
-      <tr><th>pt<th><td>Portuguese</td></tr>
-      <tr><th>pa<th><td>Punjabi</td></tr>
-      <tr><th>qu<th><td>Quechua</td></tr>
-      <tr><th>rm<th><td>Rhaeto-Romance</td></tr>
-      <tr><th>ro<th><td>Romanian</td></tr>
-      <tr><th>ru<th><td>Russian</td></tr>
-      <tr><th>sm<th><td>Samoan</td></tr>
-      <tr><th>sg<th><td>Sangro</td></tr>
-      <tr><th>sa<th><td>Sanskrit</td></tr>
-      <tr><th>sr<th><td>Serbian</td></tr>
-      <tr><th>sh<th><td>Serbo-Croatian</td></tr>
-      <tr><th>st<th><td>Sesotho</td></tr>
-      <tr><th>tn<th><td>Setswana</td></tr>
-      <tr><th>sn<th><td>Shona</td></tr>
-      <tr><th>ii<th><td>Sichuan Yi</td></tr>
-      <tr><th>sd<th><td>Sindhi</td></tr>
-      <tr><th>si<th><td>Sinhalese</td></tr>
-      <tr><th>ss<th><td>Siswati</td></tr>
-      <tr><th>sk<th><td>Slovak</td></tr>
-      <tr><th>sl<th><td>Slovenian</td></tr>
-      <tr><th>so<th><td>Somali</td></tr>
-      <tr><th>es<th><td>Spanish</td></tr>
-      <tr><th>su<th><td>Sundanese</td></tr>
-      <tr><th>sw<th><td>Swahili (Kiswahili)</td></tr>
-      <tr><th>sv<th><td>Swedish</td></tr>
-      <tr><th>tl<th><td>Tagalog</td></tr>
-      <tr><th>tg<th><td>Tajik</td></tr>
-      <tr><th>ta<th><td>Tamil</td></tr>
-      <tr><th>tt<th><td>Tatar</td></tr>
-      <tr><th>te<th><td>Telugu</td></tr>
-      <tr><th>th<th><td>Thai</td></tr>
-      <tr><th>bo<th><td>Tibetan</td></tr>
-      <tr><th>ti<th><td>Tigrinya</td></tr>
-      <tr><th>to<th><td>Tonga</td></tr>
-      <tr><th>ts<th><td>Tsonga</td></tr>
-      <tr><th>tr<th><td>Turkish</td></tr>
-      <tr><th>tk<th><td>Turkmen</td></tr>
-      <tr><th>tw<th><td>Twi</td></tr>
-      <tr><th>ug<th><td>Uighur</td></tr>
-      <tr><th>uk<th><td>Ukrainian</td></tr>
-      <tr><th>ur<th><td>Urdu</td></tr>
-      <tr><th>uz<th><td>Uzbek</td></tr>
-      <tr><th>vi<th><td>Vietnamese</td></tr>
-      <tr><th>vo<th><td>Volapük</td></tr>
-      <tr><th>wa<th><td>Wallon</td></tr>
-      <tr><th>cy<th><td>Welsh</td></tr>
-      <tr><th>wo<th><td>Wolof</td></tr>
-      <tr><th>xh<th><td>Xhosa</td></tr>
-      <tr><th>yi<th><td>Yiddish</td></tr>
-      <tr><th>yo<th><td>Yoruba</td></tr>
-      <tr><th>zu<th><td>Zulu</td></tr>
-    </table>
-  </tr>
-</table>

docs/guides/setup.md

@@ -121,4 +121,4 @@ videojs(document.getElementsByClassName('awesome_video_class')[0], {}, function(
 });
 ```
 
-\* If you have trouble playing back content you know is in the [correct format](http://blog.zencoder.com/2013/09/13/what-formats-do-i-need-for-html5-video/), your HTTP server might not be delivering the content with the correct [MIME type](http://en.wikipedia.org/wiki/Internet_media_type#Type_video). Please double check your content's headers before opening an [issue](https://github.com/videojs/video.js/blob/master/CONTRIBUTING.md).
+\* If you have trouble playing back content you know is in the [correct format](http://blog.zencoder.com/2013/09/13/what-formats-do-i-need-for-html5-video/), your HTTP server might not be delivering the content with the correct [MIME type](http://en.wikipedia.org/wiki/Internet_media_type#Type_video). Please double check your content's headers before opening an [issue](/CONTRIBUTING.md).

docs/index.md

@@ -33,5 +33,5 @@ There are two categories of docs: [Guides](./guides/) and [API docs](./api/). Gu
 * [Removing Players](./guides/removing-players.md) - Helpful for using VideoJS in single page apps.
 
 ## API Docs
-- The most relevant API doc is the [player API doc](./api/vjs.Player.md).
-- [Full list of API Docs](./api/)
+- The most relevant API doc is the [player API doc](http://docs.videojs.com/docs/api/player.html)
+- [Full list of API Docs](http://docs.videojs.com/docs/api/index.html)

docs/translations-needed.md

@@ -0,0 +1,357 @@
+# Translations needed
+
+The currently available translations are in the lang dir. This table shows the completeness of those translations. Anything not listed does not exist yet, so go ahead and create it by copying `en.json`.
+
+If you add or update a translation run `grunt check-translations` to update the list and include this modified doc in the pull request.
+
+## Status of translations
+
+<!-- START langtable -->
+| Language file           | Missing translations                                                                |
+| ----------------------- | ----------------------------------------------------------------------------------- |
+| ar.json (missing 6)     | Close Modal Dialog                                                                  |
+|                         | Descriptions                                                                        |
+|                         | descriptions off                                                                    |
+|                         | Audio Track                                                                         |
+|                         | The media is encrypted and we do not have the keys to decrypt it.                   |
+|                         | , opens descriptions settings dialog                                                |
+| ba.json (missing 14)    | Close Modal Dialog                                                                  |
+|                         | Descriptions                                                                        |
+|                         | descriptions off                                                                    |
+|                         | Audio Track                                                                         |
+|                         | The media is encrypted and we do not have the keys to decrypt it.                   |
+|                         | Play Video                                                                          |
+|                         | Close                                                                               |
+|                         | Modal Window                                                                        |
+|                         | This is a modal window                                                              |
+|                         | This modal can be closed by pressing the Escape key or activating the close button. |
+|                         | , opens captions settings dialog                                                    |
+|                         | , opens subtitles settings dialog                                                   |
+|                         | , opens descriptions settings dialog                                                |
+|                         | , selected                                                                          |
+| bg.json (missing 14)    | Close Modal Dialog                                                                  |
+|                         | Descriptions                                                                        |
+|                         | descriptions off                                                                    |
+|                         | Audio Track                                                                         |
+|                         | The media is encrypted and we do not have the keys to decrypt it.                   |
+|                         | Play Video                                                                          |
+|                         | Close                                                                               |
+|                         | Modal Window                                                                        |
+|                         | This is a modal window                                                              |
+|                         | This modal can be closed by pressing the Escape key or activating the close button. |
+|                         | , opens captions settings dialog                                                    |
+|                         | , opens subtitles settings dialog                                                   |
+|                         | , opens descriptions settings dialog                                                |
+|                         | , selected                                                                          |
+| ca.json (missing 14)    | Close Modal Dialog                                                                  |
+|                         | Descriptions                                                                        |
+|                         | descriptions off                                                                    |
+|                         | Audio Track                                                                         |
+|                         | The media is encrypted and we do not have the keys to decrypt it.                   |
+|                         | Play Video                                                                          |
+|                         | Close                                                                               |
+|                         | Modal Window                                                                        |
+|                         | This is a modal window                                                              |
+|                         | This modal can be closed by pressing the Escape key or activating the close button. |
+|                         | , opens captions settings dialog                                                    |
+|                         | , opens subtitles settings dialog                                                   |
+|                         | , opens descriptions settings dialog                                                |
+|                         | , selected                                                                          |
+| cs.json (missing 14)    | Close Modal Dialog                                                                  |
+|                         | Descriptions                                                                        |
+|                         | descriptions off                                                                    |
+|                         | Audio Track                                                                         |
+|                         | The media is encrypted and we do not have the keys to decrypt it.                   |
+|                         | Play Video                                                                          |
+|                         | Close                                                                               |
+|                         | Modal Window                                                                        |
+|                         | This is a modal window                                                              |
+|                         | This modal can be closed by pressing the Escape key or activating the close button. |
+|                         | , opens captions settings dialog                                                    |
+|                         | , opens subtitles settings dialog                                                   |
+|                         | , opens descriptions settings dialog                                                |
+|                         | , selected                                                                          |
+| da.json (missing 14)    | Close Modal Dialog                                                                  |
+|                         | Descriptions                                                                        |
+|                         | descriptions off                                                                    |
+|                         | Audio Track                                                                         |
+|                         | The media is encrypted and we do not have the keys to decrypt it.                   |
+|                         | Play Video                                                                          |
+|                         | Close                                                                               |
+|                         | Modal Window                                                                        |
+|                         | This is a modal window                                                              |
+|                         | This modal can be closed by pressing the Escape key or activating the close button. |
+|                         | , opens captions settings dialog                                                    |
+|                         | , opens subtitles settings dialog                                                   |
+|                         | , opens descriptions settings dialog                                                |
+|                         | , selected                                                                          |
+| de.json (Complete)      |                                                                                     |
+| el.json (Complete)      |                                                                                     |
+| es.json (missing 14)    | Close Modal Dialog                                                                  |
+|                         | Descriptions                                                                        |
+|                         | descriptions off                                                                    |
+|                         | Audio Track                                                                         |
+|                         | The media is encrypted and we do not have the keys to decrypt it.                   |
+|                         | Play Video                                                                          |
+|                         | Close                                                                               |
+|                         | Modal Window                                                                        |
+|                         | This is a modal window                                                              |
+|                         | This modal can be closed by pressing the Escape key or activating the close button. |
+|                         | , opens captions settings dialog                                                    |
+|                         | , opens subtitles settings dialog                                                   |
+|                         | , opens descriptions settings dialog                                                |
+|                         | , selected                                                                          |
+| fa.json (missing 14)    | Close Modal Dialog                                                                  |
+|                         | Descriptions                                                                        |
+|                         | descriptions off                                                                    |
+|                         | Audio Track                                                                         |
+|                         | The media is encrypted and we do not have the keys to decrypt it.                   |
+|                         | Play Video                                                                          |
+|                         | Close                                                                               |
+|                         | Modal Window                                                                        |
+|                         | This is a modal window                                                              |
+|                         | This modal can be closed by pressing the Escape key or activating the close button. |
+|                         | , opens captions settings dialog                                                    |
+|                         | , opens subtitles settings dialog                                                   |
+|                         | , opens descriptions settings dialog                                                |
+|                         | , selected                                                                          |
+| fi.json (missing 14)    | Close Modal Dialog                                                                  |
+|                         | Descriptions                                                                        |
+|                         | descriptions off                                                                    |
+|                         | Audio Track                                                                         |
+|                         | The media is encrypted and we do not have the keys to decrypt it.                   |
+|                         | Play Video                                                                          |
+|                         | Close                                                                               |
+|                         | Modal Window                                                                        |
+|                         | This is a modal window                                                              |
+|                         | This modal can be closed by pressing the Escape key or activating the close button. |
+|                         | , opens captions settings dialog                                                    |
+|                         | , opens subtitles settings dialog                                                   |
+|                         | , opens descriptions settings dialog                                                |
+|                         | , selected                                                                          |
+| fr.json (Complete)      |                                                                                     |
+| hr.json (missing 14)    | Close Modal Dialog                                                                  |
+|                         | Descriptions                                                                        |
+|                         | descriptions off                                                                    |
+|                         | Audio Track                                                                         |
+|                         | The media is encrypted and we do not have the keys to decrypt it.                   |
+|                         | Play Video                                                                          |
+|                         | Close                                                                               |
+|                         | Modal Window                                                                        |
+|                         | This is a modal window                                                              |
+|                         | This modal can be closed by pressing the Escape key or activating the close button. |
+|                         | , opens captions settings dialog                                                    |
+|                         | , opens subtitles settings dialog                                                   |
+|                         | , opens descriptions settings dialog                                                |
+|                         | , selected                                                                          |
+| hu.json (missing 14)    | Close Modal Dialog                                                                  |
+|                         | Descriptions                                                                        |
+|                         | descriptions off                                                                    |
+|                         | Audio Track                                                                         |
+|                         | The media is encrypted and we do not have the keys to decrypt it.                   |
+|                         | Play Video                                                                          |
+|                         | Close                                                                               |
+|                         | Modal Window                                                                        |
+|                         | This is a modal window                                                              |
+|                         | This modal can be closed by pressing the Escape key or activating the close button. |
+|                         | , opens captions settings dialog                                                    |
+|                         | , opens subtitles settings dialog                                                   |
+|                         | , opens descriptions settings dialog                                                |
+|                         | , selected                                                                          |
+| it.json (missing 14)    | Close Modal Dialog                                                                  |
+|                         | Descriptions                                                                        |
+|                         | descriptions off                                                                    |
+|                         | Audio Track                                                                         |
+|                         | The media is encrypted and we do not have the keys to decrypt it.                   |
+|                         | Play Video                                                                          |
+|                         | Close                                                                               |
+|                         | Modal Window                                                                        |
+|                         | This is a modal window                                                              |
+|                         | This modal can be closed by pressing the Escape key or activating the close button. |
+|                         | , opens captions settings dialog                                                    |
+|                         | , opens subtitles settings dialog                                                   |
+|                         | , opens descriptions settings dialog                                                |
+|                         | , selected                                                                          |
+| ja.json (missing 14)    | Close Modal Dialog                                                                  |
+|                         | Descriptions                                                                        |
+|                         | descriptions off                                                                    |
+|                         | Audio Track                                                                         |
+|                         | The media is encrypted and we do not have the keys to decrypt it.                   |
+|                         | Play Video                                                                          |
+|                         | Close                                                                               |
+|                         | Modal Window                                                                        |
+|                         | This is a modal window                                                              |
+|                         | This modal can be closed by pressing the Escape key or activating the close button. |
+|                         | , opens captions settings dialog                                                    |
+|                         | , opens subtitles settings dialog                                                   |
+|                         | , opens descriptions settings dialog                                                |
+|                         | , selected                                                                          |
+| ko.json (missing 14)    | Close Modal Dialog                                                                  |
+|                         | Descriptions                                                                        |
+|                         | descriptions off                                                                    |
+|                         | Audio Track                                                                         |
+|                         | The media is encrypted and we do not have the keys to decrypt it.                   |
+|                         | Play Video                                                                          |
+|                         | Close                                                                               |
+|                         | Modal Window                                                                        |
+|                         | This is a modal window                                                              |
+|                         | This modal can be closed by pressing the Escape key or activating the close button. |
+|                         | , opens captions settings dialog                                                    |
+|                         | , opens subtitles settings dialog                                                   |
+|                         | , opens descriptions settings dialog                                                |
+|                         | , selected                                                                          |
+| nb.json (missing 14)    | Close Modal Dialog                                                                  |
+|                         | Descriptions                                                                        |
+|                         | descriptions off                                                                    |
+|                         | Audio Track                                                                         |
+|                         | The media is encrypted and we do not have the keys to decrypt it.                   |
+|                         | Play Video                                                                          |
+|                         | Close                                                                               |
+|                         | Modal Window                                                                        |
+|                         | This is a modal window                                                              |
+|                         | This modal can be closed by pressing the Escape key or activating the close button. |
+|                         | , opens captions settings dialog                                                    |
+|                         | , opens subtitles settings dialog                                                   |
+|                         | , opens descriptions settings dialog                                                |
+|                         | , selected                                                                          |
+| nl.json (missing 3)     | Close Modal Dialog                                                                  |
+|                         | Audio Track                                                                         |
+|                         | The media is encrypted and we do not have the keys to decrypt it.                   |
+| nn.json (missing 14)    | Close Modal Dialog                                                                  |
+|                         | Descriptions                                                                        |
+|                         | descriptions off                                                                    |
+|                         | Audio Track                                                                         |
+|                         | The media is encrypted and we do not have the keys to decrypt it.                   |
+|                         | Play Video                                                                          |
+|                         | Close                                                                               |
+|                         | Modal Window                                                                        |
+|                         | This is a modal window                                                              |
+|                         | This modal can be closed by pressing the Escape key or activating the close button. |
+|                         | , opens captions settings dialog                                                    |
+|                         | , opens subtitles settings dialog                                                   |
+|                         | , opens descriptions settings dialog                                                |
+|                         | , selected                                                                          |
+| pl.json (missing 7)     | Close Modal Dialog                                                                  |
+|                         | Descriptions                                                                        |
+|                         | descriptions off                                                                    |
+|                         | Audio Track                                                                         |
+|                         | The media is encrypted and we do not have the keys to decrypt it.                   |
+|                         | Play Video                                                                          |
+|                         | , opens descriptions settings dialog                                                |
+| pt-BR.json (missing 14) | Close Modal Dialog                                                                  |
+|                         | Descriptions                                                                        |
+|                         | descriptions off                                                                    |
+|                         | Audio Track                                                                         |
+|                         | The media is encrypted and we do not have the keys to decrypt it.                   |
+|                         | Play Video                                                                          |
+|                         | Close                                                                               |
+|                         | Modal Window                                                                        |
+|                         | This is a modal window                                                              |
+|                         | This modal can be closed by pressing the Escape key or activating the close button. |
+|                         | , opens captions settings dialog                                                    |
+|                         | , opens subtitles settings dialog                                                   |
+|                         | , opens descriptions settings dialog                                                |
+|                         | , selected                                                                          |
+| ru.json (missing 14)    | Close Modal Dialog                                                                  |
+|                         | Descriptions                                                                        |
+|                         | descriptions off                                                                    |
+|                         | Audio Track                                                                         |
+|                         | The media is encrypted and we do not have the keys to decrypt it.                   |
+|                         | Play Video                                                                          |
+|                         | Close                                                                               |
+|                         | Modal Window                                                                        |
+|                         | This is a modal window                                                              |
+|                         | This modal can be closed by pressing the Escape key or activating the close button. |
+|                         | , opens captions settings dialog                                                    |
+|                         | , opens subtitles settings dialog                                                   |
+|                         | , opens descriptions settings dialog                                                |
+|                         | , selected                                                                          |
+| sr.json (missing 14)    | Close Modal Dialog                                                                  |
+|                         | Descriptions                                                                        |
+|                         | descriptions off                                                                    |
+|                         | Audio Track                                                                         |
+|                         | The media is encrypted and we do not have the keys to decrypt it.                   |
+|                         | Play Video                                                                          |
+|                         | Close                                                                               |
+|                         | Modal Window                                                                        |
+|                         | This is a modal window                                                              |
+|                         | This modal can be closed by pressing the Escape key or activating the close button. |
+|                         | , opens captions settings dialog                                                    |
+|                         | , opens subtitles settings dialog                                                   |
+|                         | , opens descriptions settings dialog                                                |
+|                         | , selected                                                                          |
+| sv.json (missing 14)    | Close Modal Dialog                                                                  |
+|                         | Descriptions                                                                        |
+|                         | descriptions off                                                                    |
+|                         | Audio Track                                                                         |
+|                         | The media is encrypted and we do not have the keys to decrypt it.                   |
+|                         | Play Video                                                                          |
+|                         | Close                                                                               |
+|                         | Modal Window                                                                        |
+|                         | This is a modal window                                                              |
+|                         | This modal can be closed by pressing the Escape key or activating the close button. |
+|                         | , opens captions settings dialog                                                    |
+|                         | , opens subtitles settings dialog                                                   |
+|                         | , opens descriptions settings dialog                                                |
+|                         | , selected                                                                          |
+| tr.json (missing 6)     | Close Modal Dialog                                                                  |
+|                         | Descriptions                                                                        |
+|                         | descriptions off                                                                    |
+|                         | Audio Track                                                                         |
+|                         | The media is encrypted and we do not have the keys to decrypt it.                   |
+|                         | , opens descriptions settings dialog                                                |
+| uk.json (missing 14)    | Close Modal Dialog                                                                  |
+|                         | Descriptions                                                                        |
+|                         | descriptions off                                                                    |
+|                         | Audio Track                                                                         |
+|                         | The media is encrypted and we do not have the keys to decrypt it.                   |
+|                         | Play Video                                                                          |
+|                         | Close                                                                               |
+|                         | Modal Window                                                                        |
+|                         | This is a modal window                                                              |
+|                         | This modal can be closed by pressing the Escape key or activating the close button. |
+|                         | , opens captions settings dialog                                                    |
+|                         | , opens subtitles settings dialog                                                   |
+|                         | , opens descriptions settings dialog                                                |
+|                         | , selected                                                                          |
+| vi.json (missing 14)    | Close Modal Dialog                                                                  |
+|                         | Descriptions                                                                        |
+|                         | descriptions off                                                                    |
+|                         | Audio Track                                                                         |
+|                         | The media is encrypted and we do not have the keys to decrypt it.                   |
+|                         | Play Video                                                                          |
+|                         | Close                                                                               |
+|                         | Modal Window                                                                        |
+|                         | This is a modal window                                                              |
+|                         | This modal can be closed by pressing the Escape key or activating the close button. |
+|                         | , opens captions settings dialog                                                    |
+|                         | , opens subtitles settings dialog                                                   |
+|                         | , opens descriptions settings dialog                                                |
+|                         | , selected                                                                          |
+| zh-CN.json (missing 13) | Close Modal Dialog                                                                  |
+|                         | Descriptions                                                                        |
+|                         | descriptions off                                                                    |
+|                         | Audio Track                                                                         |
+|                         | Play Video                                                                          |
+|                         | Close                                                                               |
+|                         | Modal Window                                                                        |
+|                         | This is a modal window                                                              |
+|                         | This modal can be closed by pressing the Escape key or activating the close button. |
+|                         | , opens captions settings dialog                                                    |
+|                         | , opens subtitles settings dialog                                                   |
+|                         | , opens descriptions settings dialog                                                |
+|                         | , selected                                                                          |
+| zh-TW.json (missing 13) | Close Modal Dialog                                                                  |
+|                         | Descriptions                                                                        |
+|                         | descriptions off                                                                    |
+|                         | Audio Track                                                                         |
+|                         | Play Video                                                                          |
+|                         | Close                                                                               |
+|                         | Modal Window                                                                        |
+|                         | This is a modal window                                                              |
+|                         | This modal can be closed by pressing the Escape key or activating the close button. |
+|                         | , opens captions settings dialog                                                    |
+|                         | , opens subtitles settings dialog                                                   |
+|                         | , opens descriptions settings dialog                                                |
+|                         | , selected                                                                          |
+<!-- END langtable -->

lang/de.json

@@ -30,5 +30,11 @@
   "This modal can be closed by pressing the Escape key or activating the close button.": "Durch Drücken der Esc-Taste bzw. Betätigung der Schaltfläche \"Schließen\" wird dieses modale Fenster geschlossen.",
   ", opens captions settings dialog": ", öffnet Einstellungen für Untertitel",
   ", opens subtitles settings dialog": ", öffnet Einstellungen für Untertitel",
-  ", selected": " (ausgewählt)"
+  ", selected": ", ausgewählt",
+  "Close Modal Dialog": "Modales Fenster schließen",
+  "Descriptions": "Beschreibungen",
+  "descriptions off": "Beschreibungen aus",
+  "The media is encrypted and we do not have the keys to decrypt it.": "Die Entschlüsselungsschlüssel für den verschlüsselten Medieninhalt sind nicht verfügbar.",
+  ", opens descriptions settings dialog": ", öffnet Einstellungen für Beschreibungen",
+  "Audio Track": "Tonspur"
 }

lang/el.json

@@ -18,17 +18,23 @@
   "Captions": "Λεζάντες",
   "captions off": "απόκρυψη λεζάντων",
   "Chapters": "Κεφάλαια",
+  "Close Modal Dialog": "Κλείσιμο παραθύρου",
+  "Descriptions": "Περιγραφές",
+  "descriptions off": "απόκρυψη περιγραφών",
+  "Audio Track": "Ροή ήχου",
   "You aborted the media playback": "Ακυρώσατε την αναπαραγωγή",
   "A network error caused the media download to fail part-way.": "Ένα σφάλμα δικτύου προκάλεσε την αποτυχία μεταφόρτωσης του αρχείου προς αναπαραγωγή.",
   "The media could not be loaded, either because the server or network failed or because the format is not supported.": "Το αρχείο προς αναπαραγωγή δεν ήταν δυνατό να φορτωθεί είτε γιατί υπήρξε σφάλμα στον διακομιστή ή το δίκτυο, είτε γιατί ο τύπος του αρχείου δεν υποστηρίζεται.",
   "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "Η αναπαραγωγή ακυρώθηκε είτε λόγω κατεστραμμένου αρχείου, είτε γιατί το αρχείο απαιτεί λειτουργίες που δεν υποστηρίζονται από το πρόγραμμα περιήγησης που χρησιμοποιείτε.",
   "No compatible source was found for this media.": "Δεν βρέθηκε συμβατή πηγή αναπαραγωγής για το συγκεκριμένο αρχείο.",
-  "Play video": "Αναπαραγωγή βίντεο",
+  "The media is encrypted and we do not have the keys to decrypt it.": "Το αρχείο προς αναπαραγωγή είναι κρυπτογραφημένo και δεν υπάρχουν τα απαραίτητα κλειδιά αποκρυπτογράφησης.",
+  "Play Video": "Αναπαραγωγή βίντεο",
   "Close": "Κλείσιμο",
   "Modal Window": "Aναδυόμενο παράθυρο",
   "This is a modal window": "Το παρών είναι ένα αναδυόμενο παράθυρο",
   "This modal can be closed by pressing the Escape key or activating the close button.": "Αυτό το παράθυρο μπορεί να εξαφανιστεί πατώντας το πλήκτρο Escape ή πατώντας το κουμπί κλεισίματος.",
   ", opens captions settings dialog": ", εμφανίζει τις ρυθμίσεις για τις λεζάντες",
   ", opens subtitles settings dialog": ", εμφανίζει τις ρυθμίσεις για τους υπότιτλους",
+  ", opens descriptions settings dialog": ", εμφανίζει τις ρυθμίσεις για τις περιγραφές",
   ", selected": ", επιλεγμένο"
 }

lang/en.json

@@ -21,11 +21,13 @@
   "Close Modal Dialog": "Close Modal Dialog",
   "Descriptions": "Descriptions",
   "descriptions off": "descriptions off",
+  "Audio Track": "Audio Track",
   "You aborted the media playback": "You aborted the media playback",
   "A network error caused the media download to fail part-way.": "A network error caused the media download to fail part-way.",
   "The media could not be loaded, either because the server or network failed or because the format is not supported.": "The media could not be loaded, either because the server or network failed or because the format is not supported.",
   "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.",
   "No compatible source was found for this media.": "No compatible source was found for this media.",
+  "The media is encrypted and we do not have the keys to decrypt it.": "The media is encrypted and we do not have the keys to decrypt it.",
   "Play Video": "Play Video",
   "Close": "Close",
   "Modal Window": "Modal Window",

lang/fr.json

@@ -15,12 +15,26 @@
   "Playback Rate": "Vitesse de lecture",
   "Subtitles": "Sous-titres",
   "subtitles off": "Sous-titres désactivés",
-  "Captions": "Sous-titres",
-  "captions off": "Sous-titres désactivés",
+  "Captions": "Sous-titres transcrits",
+  "captions off": "Sous-titres transcrits désactivés",
   "Chapters": "Chapitres",
+  "Close Modal Dialog": "Fermer la boîte de dialogue modale",
+  "Descriptions": "Descriptions",
+  "descriptions off": "descriptions désactivées",
+  "Audio Track": "Piste audio",
   "You aborted the media playback": "Vous avez interrompu la lecture de la vidéo.",
   "A network error caused the media download to fail part-way.": "Une erreur de réseau a interrompu le téléchargement de la vidéo.",
   "The media could not be loaded, either because the server or network failed or because the format is not supported.": "Cette vidéo n'a pas pu être chargée, soit parce que le serveur ou le réseau a échoué ou parce que le format n'est pas reconnu.",
   "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "La lecture de la vidéo a été interrompue à cause d'un problème de corruption ou parce que la vidéo utilise des fonctionnalités non prises en charge par votre navigateur.",
-  "No compatible source was found for this media.": "Aucune source compatible n'a été trouvée pour cette vidéo."
+  "No compatible source was found for this media.": "Aucune source compatible n'a été trouvée pour cette vidéo.",
+  "The media is encrypted and we do not have the keys to decrypt it.": "Le média est chiffré et nous n'avons pas les clés pour le déchiffrer.",
+  "Play Video": "Lire la vidéo",
+  "Close": "Fermer",
+  "Modal Window": "Fenêtre modale",
+  "This is a modal window": "Ceci est une fenêtre modale",
+  "This modal can be closed by pressing the Escape key or activating the close button.": "Ce modal peut être fermé en appuyant sur la touche Échap ou activer le bouton de fermeture.",
+  ", opens captions settings dialog": ", ouvrir les paramètres des sous-titres transcrits",
+  ", opens subtitles settings dialog": ", ouvrir les paramètres des sous-titres",
+  ", opens descriptions settings dialog": ", ouvrir les paramètres des descriptions",
+  ", selected": ", sélectionné"
 }

package.json

@@ -1,7 +1,9 @@
 {
   "name": "video.js",
   "description": "An HTML5 and Flash video player with a common API and skin for both.",
-  "version": "5.11.4",
+  "version": "5.12.3",
+  "main": "./es5/video.js",
+  "style": "./dist/video-js.css",
   "copyright": "Copyright Brightcove, Inc. <https://www.brightcove.com/>",
   "license": "Apache-2.0",
   "keywords": [
@@ -14,18 +16,23 @@
   "homepage": "http://videojs.com",
   "author": "Steve Heffernan",
   "scripts": {
+    "changelog": "conventional-changelog -p videojs -i CHANGELOG.md -s",
+    "build": "grunt dist",
+    "change": "grunt chg-add",
+    "clean": "grunt clean",
+    "lint": "vjsstandard",
+    "start": "grunt watchAll",
     "test": "grunt test"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/videojs/video.js.git"
   },
-  "main": "./dist/video.js",
-  "style": "./dist/video-js.css",
   "dependencies": {
+    "babel-runtime": "^6.9.2",
     "global": "4.3.0",
     "lodash-compat": "3.10.2",
-    "object.assign": "4.0.3",
+    "object.assign": "^4.0.4",
     "safe-json-parse": "4.0.0",
     "tsml": "1.0.1",
     "videojs-font": "2.0.0",
@@ -35,69 +42,89 @@
     "xhr": "2.2.0"
   },
   "devDependencies": {
-    "babel": "^5.2.2",
-    "babelify": "^6.0.1",
+    "babel-cli": "^6.11.4",
+    "babel-plugin-inline-json": "^1.1.1",
+    "babel-plugin-transform-es3-member-expression-literals": "^6.8.0",
+    "babel-plugin-transform-es3-property-literals": "^6.8.0",
+    "babel-plugin-transform-runtime": "^6.9.0",
+    "babel-preset-es2015": "^6.14.0",
+    "babel-register": "^6.9.0",
+    "babelify": "^7.3.0",
     "blanket": "^1.1.6",
     "browserify-derequire": "^0.9.4",
     "browserify-istanbul": "^0.2.1",
     "browserify-versionify": "^1.0.4",
+    "bundle-collapser": "^1.2.1",
     "chg": "^0.3.2",
-    "css": "^2.2.0",
+    "conventional-changelog-cli": "^1.2.0",
+    "conventional-changelog-videojs": "^3.0.0",
     "es5-shim": "^4.1.3",
     "es6-shim": "^0.35.1",
+    "ghooks": "^1.3.2",
     "gkatsev-grunt-sass": "^1.1.1",
     "grunt": "^0.4.4",
-    "grunt-aws-s3": "^0.12.1",
+    "grunt-accessibility": "^4.1.0",
+    "grunt-babel": "^6.0.0",
     "grunt-banner": "^0.4.0",
     "grunt-browserify": "3.5.1",
     "grunt-cli": "~0.1.13",
-    "grunt-concurrent": "^1.0.0",
+    "grunt-concurrent": "^2.3.1",
     "grunt-contrib-clean": "~0.4.0a",
     "grunt-contrib-concat": "^0.5.1",
     "grunt-contrib-connect": "~0.7.1",
     "grunt-contrib-copy": "^0.8.0",
-    "grunt-contrib-cssmin": "~0.6.0",
-    "grunt-contrib-jshint": "~0.11.3",
-    "grunt-contrib-less": "~0.6.4",
-    "grunt-contrib-uglify": "^0.8.0",
+    "grunt-contrib-cssmin": "~1.0.2",
+    "grunt-contrib-uglify": "~0.11.0",
     "grunt-contrib-watch": "~0.1.4",
     "grunt-coveralls": "^1.0.0",
-    "grunt-exorcise": "^1.0.1",
     "grunt-fastly": "^0.1.3",
     "grunt-github-releaser": "^0.1.17",
-    "grunt-karma": "^0.8.3",
+    "grunt-karma": "^2.0.0",
+    "grunt-shell": "^2.0.0",
     "grunt-version": "~0.3.0",
     "grunt-videojs-languages": "0.0.4",
     "grunt-zip": "0.10.2",
-    "karma": "^0.12.36",
-    "karma-browserify": "^4.0.0",
-    "karma-browserstack-launcher": "^0.1.4",
-    "karma-chrome-launcher": "^0.1.3",
-    "karma-coverage": "^0.4.0",
-    "karma-detect-browsers": "^2.0.2",
-    "karma-firefox-launcher": "^0.1.3",
-    "karma-ie-launcher": "^0.1.5",
-    "karma-opera-launcher": "~0.1.0",
-    "karma-qunit": "^0.1.2",
-    "karma-safari-launcher": "^0.1.1",
-    "karma-sinon": "^1.0.3",
+    "karma": "^1.2.0",
+    "karma-browserify": "^5.1.0",
+    "karma-browserstack-launcher": "^1.0.1",
+    "karma-chrome-launcher": "^2.0.0",
+    "karma-coverage": "^1.1.1",
+    "karma-detect-browsers": "^2.1.0",
+    "karma-firefox-launcher": "^1.0.0",
+    "karma-ie-launcher": "^1.0.0",
+    "karma-opera-launcher": "^1.0.0",
+    "karma-qunit": "^1.2.0",
+    "karma-safari-launcher": "^1.0.0",
+    "karma-sinon": "^1.0.5",
     "load-grunt-tasks": "^3.1.0",
+    "markdown-table": "^1.0.0",
     "proxyquireify": "^3.0.0",
-    "qunitjs": "^1.18.0",
+    "qunitjs": "^1.23.1",
+    "shelljs-nodecli": "^0.1.1",
     "sinon": "^1.16.1",
     "time-grunt": "^1.1.1",
-    "uglify-js": "~2.3.6",
-    "videojs-doc-generator": "0.0.1"
+    "uglify-js": "~2.7.3",
+    "videojs-doc-generator": "0.0.1",
+    "videojs-standard": "^5.2.0",
+    "webpack": "^1.13.2"
   },
-  "standard": {
+  "vjsstandard": {
     "ignore": [
       "**/Gruntfile.js",
+      "**/es5/**",
       "**/build/**",
       "**/dist/**",
       "**/docs/**",
       "**/lang/**",
       "**/sandbox/**",
-      "**/test/**"
+      "**/test/api/**",
+      "**/test/coverage/**",
+      "**/test/karma.conf.js"
     ]
+  },
+  "config": {
+    "ghooks": {
+      "pre-push": "npm run lint -- --errors"
+    }
   }
 }

src/css/_utilities.scss

@@ -86,7 +86,7 @@
   -webkit-user-select: $string;
   -moz-user-select: $string;
   -ms-user-select: $string;
-  user-select: $string
+  user-select: $string;
 }
 
 // https://developer.mozilla.org/en-US/docs/Web/CSS/box-shadow

src/css/components/_control-bar.scss

@@ -20,9 +20,6 @@
   @include transition($trans);
 }
 
-// IE 8 hack for media queries
-$ie8screen: "\\0screen";
-
 // Video has started playing AND user is inactive
 .vjs-has-started.vjs-user-inactive.vjs-playing .vjs-control-bar {
   // Remain visible for screen reader and keyboard users
@@ -32,10 +29,6 @@ $ie8screen: "\\0screen";
   $trans: visibility 1.0s, opacity 1.0s;
   @include transition($trans);
 
-  // Make controls hidden in IE8 for now
-  @media #{$ie8screen} {
-    visibility: hidden;
-  }
 }
 
 .vjs-controls-disabled .vjs-control-bar,
@@ -51,15 +44,6 @@ $ie8screen: "\\0screen";
   visibility: visible;
 }
 
-
-// IE8 is flakey with fonts, and you have to change the actual content to force
-// fonts to show/hide properly.
-// - "\9" IE8 hack didn't work for this
-// Found in XP IE8 from http://modern.ie. Does not show up in "IE8 mode" in IE9
-.vjs-user-inactive.vjs-playing .vjs-control-bar :before {
-  @media #{$ie8screen} { content: ""; }
-}
-
 // IE 8 + 9 Support
 .vjs-has-started.vjs-no-flex .vjs-control-bar {
   display: table;

src/css/components/_fullscreen.scss

@@ -1,8 +1,6 @@
 .video-js .vjs-fullscreen-control {
   cursor: pointer;
   @include flex(none);
-}
-.video-js .vjs-fullscreen-control {
   @extend .vjs-icon-fullscreen-enter;
 }
 // Switch to the exit icon when the player is in fullscreen

src/css/components/_play-pause.scss

@@ -1,8 +1,6 @@
 .video-js .vjs-play-control {
   cursor: pointer;
   @include flex(none);
-}
-.video-js .vjs-play-control {
   @extend .vjs-icon-play;
 }
 .video-js .vjs-play-control.vjs-playing {

src/css/components/_progress.scss

@@ -31,7 +31,7 @@
 
 // We need an increased hit area on hover
 .video-js .vjs-progress-control:hover .vjs-progress-holder {
-  font-size: 1.666666666666666666em
+  font-size: 1.666666666666666666em;
 }
 
 /* If we let the font size grow as much as everything else, the current time tooltip ends up

src/css/components/menu/_menu.scss

@@ -14,7 +14,8 @@
 
 .vjs-menu .vjs-menu-content {
   display: block;
-  padding: 0; margin: 0;
+  padding: 0;
+  margin: 0;
   overflow: auto;
   font-family: $text-font-family;
 }

src/css/ie8.css

@@ -0,0 +1,11 @@
+@media \0screen {
+  .vjs-user-inactive.vjs-playing .vjs-control-bar :before {
+    content: "";
+  }
+}
+
+@media \0screen {
+  .vjs-has-started.vjs-user-inactive.vjs-playing .vjs-control-bar {
+    visibility: hidden;
+  }
+}

src/js/base-styles.js

@@ -1,18 +0,0 @@
-/**
- * @file base-styles.js
- *
- * This code injects the required base styles in the head of the document.
- */
-import window from 'global/window';
-import document from 'global/document';
-
-if (window.VIDEOJS_NO_BASE_THEME) return;
-
-const styles = '{{GENERATED_STYLES}}';
-
-if (styles === '{{GENERATED'+'_STYLES}}');
-
-const styleNode = document.createElement('style');
-styleNode.innerHTML = styles;
-
-document.head.insertBefore(styleNode, document.head.firstChild);

src/js/button.js

@@ -3,10 +3,7 @@
  */
 import ClickableComponent from './clickable-component.js';
 import Component from './component';
-import * as Events from './utils/events.js';
-import * as Fn from './utils/fn.js';
 import log from './utils/log.js';
-import document from 'global/document';
 import assign from 'object.assign';
 
 /**
@@ -32,7 +29,7 @@ class Button extends ClickableComponent {
    * @return {Element}
    * @method createEl
    */
-  createEl(tag='button', props={}, attributes={}) {
+  createEl(tag = 'button', props = {}, attributes = {}) {
     props = assign({
       className: this.buildCSSClass()
     }, props);
@@ -53,11 +50,15 @@ class Button extends ClickableComponent {
 
     // Add attributes for button element
     attributes = assign({
-      type: 'button', // Necessary since the default button type is "submit"
-      'aria-live': 'polite' // let the screen reader user know that the text of the button may change
+
+      // Necessary since the default button type is "submit"
+      'type': 'button',
+
+      // let the screen reader user know that the text of the button may change
+      'aria-live': 'polite'
     }, attributes);
 
-    let el = Component.prototype.createEl.call(this, tag, props, attributes);
+    const el = Component.prototype.createEl.call(this, tag, props, attributes);
 
     this.createControlTextEl(el);
 
@@ -73,8 +74,9 @@ class Button extends ClickableComponent {
    * @deprecated
    * @method addChild
    */
-  addChild(child, options={}) {
-    let className = this.constructor.name;
+  addChild(child, options = {}) {
+    const className = this.constructor.name;
+
     log.warn(`Adding an actionable (user controllable) child to a Button (${className}) is not supported; use a ClickableComponent instead.`);
 
     // Avoid the error message generated by ClickableComponent's addChild method
@@ -87,13 +89,15 @@ class Button extends ClickableComponent {
    * @method handleKeyPress
    */
   handleKeyPress(event) {
+
     // Ignore Space (32) or Enter (13) key operation, which is handled by the browser for a button.
     if (event.which === 32 || event.which === 13) {
-    } else {
-      super.handleKeyPress(event); // Pass keypress handling up for unsupported keys
+      return;
     }
-  }
 
+    // Pass keypress handling up for unsupported keys
+    super.handleKeyPress(event);
+  }
 }
 
 Component.registerComponent('Button', Button);

src/js/clickable-component.js

@@ -39,7 +39,7 @@ class ClickableComponent extends Component {
    * @return {Element}
    * @method createEl
    */
-  createEl(tag='div', props={}, attributes={}) {
+  createEl(tag = 'div', props = {}, attributes = {}) {
     props = assign({
       className: this.buildCSSClass(),
       tabIndex: 0
@@ -51,11 +51,13 @@ class ClickableComponent extends Component {
 
     // Add ARIA attributes for clickable element which is not a native HTML button
     attributes = assign({
-      role: 'button',
-      'aria-live': 'polite' // let the screen reader user know that the text of the element may change
+      'role': 'button',
+
+      // let the screen reader user know that the text of the element may change
+      'aria-live': 'polite'
     }, attributes);
 
-    let el = super.createEl(tag, props, attributes);
+    const el = super.createEl(tag, props, attributes);
 
     this.createControlTextEl(el);
 
@@ -91,9 +93,11 @@ class ClickableComponent extends Component {
    * @return {String}
    * @method controlText
    */
-  controlText(text, el=this.el()) {
-    if (!text) return this.controlText_ || 'Need Text';
-    
+  controlText(text, el = this.el()) {
+    if (!text) {
+      return this.controlText_ || 'Need Text';
+    }
+
     const localizedText = this.localize(text);
 
     this.controlText_ = text;
@@ -121,14 +125,14 @@ class ClickableComponent extends Component {
    * @return {Component} The child component (created by this process if a string was used)
    * @method addChild
    */
-  addChild(child, options={}) {
+  addChild(child, options = {}) {
     // TODO: Fix adding an actionable child to a ClickableComponent; currently
     // it will cause issues with assistive technology (e.g. screen readers)
     // which support ARIA, since an element with role="button" cannot have
     // actionable child elements.
 
-    //let className = this.constructor.name;
-    //log.warn(`Adding a child to a ClickableComponent (${className}) can cause issues with assistive technology which supports ARIA, since an element with role="button" cannot have actionable child elements.`);
+    // let className = this.constructor.name;
+    // log.warn(`Adding a child to a ClickableComponent (${className}) can cause issues with assistive technology which supports ARIA, since an element with role="button" cannot have actionable child elements.`);
 
     return super.addChild(child, options);
   }
@@ -179,12 +183,15 @@ class ClickableComponent extends Component {
    * @method handleKeyPress
    */
   handleKeyPress(event) {
+
     // Support Space (32) or Enter (13) key operation to fire a click event
     if (event.which === 32 || event.which === 13) {
       event.preventDefault();
       this.handleClick(event);
     } else if (super.handleKeyPress) {
-      super.handleKeyPress(event); // Pass keypress handling up for unsupported keys
+
+      // Pass keypress handling up for unsupported keys
+      super.handleKeyPress(event);
     }
   }
 

src/js/component.js

@@ -3,7 +3,6 @@
  *
  * Player Component - Base class for all UI objects
  */
-
 import window from 'global/window';
 import * as Dom from './utils/dom.js';
 import * as Fn from './utils/fn.js';
@@ -13,7 +12,6 @@ import log from './utils/log.js';
 import toTitleCase from './utils/to-title-case.js';
 import mergeOptions from './utils/merge-options.js';
 
-
 /**
  * Base UI Component class
  * Components are embeddable UI objects that are represented by both a
@@ -31,7 +29,7 @@ import mergeOptions from './utils/merge-options.js';
  * ```
  * Components are also event targets.
  * ```js
- *     button.on('click', function(){
+ *     button.on('click', function() {
  *       console.log('Button Clicked!');
  *     });
  *     button.trigger('customevent');
@@ -65,7 +63,7 @@ class Component {
     // If there was no ID from the options, generate one
     if (!this.id_) {
       // Don't require the player ID function in the case of mock players
-      let id = player && player.id && player.id() || 'no_player';
+      const id = player && player.id && player.id() || 'no_player';
 
       this.id_ = `${id}_component_${Guid.newGUID()}`;
     }
@@ -218,21 +216,21 @@ class Component {
   }
 
   localize(string) {
-    let code = this.player_.language && this.player_.language();
-    let languages = this.player_.languages && this.player_.languages();
+    const code = this.player_.language && this.player_.language();
+    const languages = this.player_.languages && this.player_.languages();
 
     if (!code || !languages) {
       return string;
     }
 
-    let language = languages[code];
+    const language = languages[code];
 
     if (language && language[string]) {
       return language[string];
     }
 
-    let primaryCode = code.split('-')[0];
-    let primaryLang = languages[primaryCode];
+    const primaryCode = code.split('-')[0];
+    const primaryLang = languages[primaryCode];
 
     if (primaryLang && primaryLang[string]) {
       return primaryLang[string];
@@ -339,7 +337,7 @@ class Component {
    * @return {Component} The child component (created by this process if a string was used)
    * @method addChild
    */
-  addChild(child, options={}, index=this.children_.length) {
+  addChild(child, options = {}, index = this.children_.length) {
     let component;
     let componentName;
 
@@ -360,14 +358,14 @@ class Component {
 
       // If no componentClass in options, assume componentClass is the name lowercased
       // (e.g. playButton)
-      let componentClassName = options.componentClass || toTitleCase(componentName);
+      const componentClassName = options.componentClass || toTitleCase(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
-      let ComponentClass = Component.getComponent(componentClassName);
+      const ComponentClass = Component.getComponent(componentClassName);
 
       if (!ComponentClass) {
         throw new Error(`Component ${componentClassName} does not exist`);
@@ -405,8 +403,9 @@ class 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()) {
-      let childNodes = this.contentEl().children;
-      let refNode = childNodes[index] || null;
+      const childNodes = this.contentEl().children;
+      const refNode = childNodes[index] || null;
+
       this.contentEl().insertBefore(component.el(), refNode);
     }
 
@@ -447,7 +446,7 @@ class Component {
     this.childIndex_[component.id()] = null;
     this.childNameIndex_[component.name()] = null;
 
-    let compEl = component.el();
+    const compEl = component.el();
 
     if (compEl && compEl.parentNode === this.contentEl()) {
       this.contentEl().removeChild(component.el());
@@ -501,14 +500,14 @@ class Component {
    * @method initChildren
    */
   initChildren() {
-    let children = this.options_.children;
+    const children = this.options_.children;
 
     if (children) {
       // `this` is `parent`
-      let parentOptions = this.options_;
+      const parentOptions = this.options_;
 
-      let handleAdd = (child) => {
-        let name = child.name;
+      const handleAdd = (child) => {
+        const name = child.name;
         let opts = child.opts;
 
         // Allow options for children to be set at the parent options
@@ -538,7 +537,8 @@ class Component {
         // Add a direct reference to the child by name on the parent instance.
         // If two of the same component are used, different names should be supplied
         // for each
-        let newChild = this.addChild(name, opts);
+        const newChild = this.addChild(name, opts);
+
         if (newChild) {
           this[name] = newChild;
         }
@@ -546,7 +546,7 @@ class Component {
 
       // Allow for an array of children details to passed in the options
       let workingChildren;
-      let Tech = Component.getComponent('Tech');
+      const Tech = Component.getComponent('Tech');
 
       if (Array.isArray(children)) {
         workingChildren = children;
@@ -562,13 +562,13 @@ class Component {
                 return !workingChildren.some(function(wchild) {
                   if (typeof wchild === 'string') {
                     return child === wchild;
-                  } else {
-                    return child === wchild.name;
                   }
+                  return child === wchild.name;
                 });
               }))
       .map((child) => {
-        let name, opts;
+        let name;
+        let opts;
 
         if (typeof child === 'string') {
           name = child;
@@ -584,8 +584,9 @@ class Component {
         // we have to make sure that child.name isn't in the techOrder since
         // techs are registerd as Components but can't aren't compatible
         // See https://github.com/videojs/video.js/issues/2772
-        let c = Component.getComponent(child.opts.componentClass ||
+        const c = Component.getComponent(child.opts.componentClass ||
                                        toTitleCase(child.name));
+
         return c && !Tech.isTech(c);
       })
       .forEach(handleAdd);
@@ -607,7 +608,7 @@ class Component {
   /**
    * Add an event listener to this component's element
    * ```js
-   *     var myFunc = function(){
+   *     var myFunc = function() {
    *       var myComponent = this;
    *       // Do something when the event is fired
    *     };
@@ -796,7 +797,7 @@ class Component {
    * @return {Component}
    * @method ready
    */
-  ready(fn, sync=false) {
+  ready(fn, sync = false) {
     if (fn) {
       if (this.isReady_) {
         if (sync) {
@@ -823,14 +824,14 @@ class Component {
     this.isReady_ = true;
 
     // Ensure ready is triggerd asynchronously
-    this.setTimeout(function(){
-      let readyQueue = this.readyQueue_;
+    this.setTimeout(function() {
+      const readyQueue = this.readyQueue_;
 
       // Reset Ready Queue
       this.readyQueue_ = [];
 
       if (readyQueue && readyQueue.length > 0) {
-        readyQueue.forEach(function(fn){
+        readyQueue.forEach(function(fn) {
           fn.call(this);
         }, this);
       }
@@ -1076,8 +1077,8 @@ class Component {
     }
 
     // Get dimension value from style
-    let val = this.el_.style[widthOrHeight];
-    let pxIndex = val.indexOf('px');
+    const val = this.el_.style[widthOrHeight];
+    const pxIndex = val.indexOf('px');
 
     if (pxIndex !== -1) {
       // Return the pixel value with no 'px'
@@ -1105,11 +1106,13 @@ class Component {
 
     if (typeof window.getComputedStyle === 'function') {
       const computedStyle = window.getComputedStyle(this.el_);
+
       computedWidthOrHeight = computedStyle.getPropertyValue(widthOrHeight) || computedStyle[widthOrHeight];
     } else if (this.el_.currentStyle) {
       // ie 8 doesn't support computed style, shim it
       // return clientWidth or clientHeight instead for better accuracy
       const rule = `offset${toTitleCase(widthOrHeight)}`;
+
       computedWidthOrHeight = this.el_[rule];
     }
 
@@ -1196,7 +1199,7 @@ class Component {
         // So, if we moved only a small distance, this could still be a tap
         const xdiff = event.touches[0].pageX - firstTouch.pageX;
         const ydiff = event.touches[0].pageY - firstTouch.pageY;
-        const touchDistance = Math.sqrt(xdiff  * xdiff + ydiff  * ydiff);
+        const touchDistance = Math.sqrt(xdiff * xdiff + ydiff * ydiff);
 
         if (touchDistance > tapMovementThreshold) {
           couldBeTap = false;
@@ -1299,7 +1302,7 @@ class Component {
     fn = Fn.bind(this, fn);
 
     // window.setTimeout would be preferable here, but due to some bizarre issue with Sinon and/or Phantomjs, we can't.
-    let timeoutId = window.setTimeout(fn, timeout);
+    const timeoutId = window.setTimeout(fn, timeout);
 
     const disposeFn = function() {
       this.clearTimeout(timeoutId);
@@ -1342,7 +1345,7 @@ class Component {
   setInterval(fn, interval) {
     fn = Fn.bind(this, fn);
 
-    let intervalId = window.setInterval(fn, interval);
+    const intervalId = window.setInterval(fn, interval);
 
     const disposeFn = function() {
       this.clearInterval(intervalId);
@@ -1427,7 +1430,7 @@ class Component {
     // Set up the constructor using the supplied init method
     // or using the init of the parent object
     // Make sure to check the unobfuscated version for external libs
-    let init = props.init || props.init || this.prototype.init || this.prototype.init || function() {};
+    const init = props.init || props.init || this.prototype.init || this.prototype.init || function() {};
     // In Resig's simple class inheritance (previously used) the constructor
     //  is a function that calls `this.init.apply(arguments)`
     // However that would prevent us from using `ParentObject.call(this);`
@@ -1437,7 +1440,7 @@ class Component {
     //    `ParentObject.prototype.init.apply(this, arguments);`
     //  Bleh. We're not creating a _super() function, so it's good to keep
     //  the parent constructor reference simple.
-    let subObj = function() {
+    const subObj = function() {
       init.apply(this, arguments);
     };
 
@@ -1451,7 +1454,7 @@ class Component {
     subObj.extend = Component.extend;
 
     // Extend subObj's prototype with functions and other properties from props
-    for (let name in props) {
+    for (const name in props) {
       if (props.hasOwnProperty(name)) {
         subObj.prototype[name] = props[name];
       }

src/js/control-bar/audio-track-controls/audio-track-button.js

@@ -3,7 +3,6 @@
  */
 import TrackButton from '../track-button.js';
 import Component from '../../component.js';
-import * as Fn from '../../utils/fn.js';
 import AudioTrackMenuItem from './audio-track-menu-item.js';
 
 /**
@@ -40,25 +39,25 @@ class AudioTrackButton extends TrackButton {
    * @method createItems
    */
   createItems(items = []) {
-    let tracks = this.player_.audioTracks && this.player_.audioTracks();
+    const tracks = this.player_.audioTracks && this.player_.audioTracks();
 
     if (!tracks) {
       return items;
     }
 
     for (let i = 0; i < tracks.length; i++) {
-      let track = tracks[i];
+      const track = tracks[i];
 
       items.push(new AudioTrackMenuItem(this.player_, {
+        track,
         // MenuItem is selectable
-        'selectable': true,
-        'track': track
+        selectable: true
       }));
     }
 
     return items;
   }
 }
-
+AudioTrackButton.prototype.controlText_ = 'Audio Track';
 Component.registerComponent('AudioTrackButton', AudioTrackButton);
 export default AudioTrackButton;

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

@@ -15,8 +15,8 @@ import * as Fn from '../../utils/fn.js';
  */
 class AudioTrackMenuItem extends MenuItem {
   constructor(player, options) {
-    let track = options.track;
-    let tracks = player.audioTracks();
+    const track = options.track;
+    const tracks = player.audioTracks();
 
     // Modify options for parent MenuItem class's init.
     options.label = track.label || track.language || 'Unknown';
@@ -27,7 +27,7 @@ class AudioTrackMenuItem extends MenuItem {
     this.track = track;
 
     if (tracks) {
-      let changeHandler = Fn.bind(this, this.handleTracksChange);
+      const changeHandler = Fn.bind(this, this.handleTracksChange);
 
       tracks.addEventListener('change', changeHandler);
       this.on('dispose', () => {
@@ -42,18 +42,18 @@ class AudioTrackMenuItem extends MenuItem {
    * @method handleClick
    */
   handleClick(event) {
-    let tracks = this.player_.audioTracks();
+    const tracks = this.player_.audioTracks();
 
     super.handleClick(event);
 
-    if (!tracks) return;
+    if (!tracks) {
+      return;
+    }
 
     for (let i = 0; i < tracks.length; i++) {
-      let track = tracks[i];
+      const track = tracks[i];
 
-      if (track === this.track) {
-        track.enabled = true;
-      }
+      track.enabled = track === this.track;
     }
   }
 

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

@@ -4,24 +4,24 @@
 import Component from '../component.js';
 
 // Required children
-import PlayToggle from './play-toggle.js';
-import CurrentTimeDisplay from './time-controls/current-time-display.js';
-import DurationDisplay from './time-controls/duration-display.js';
-import TimeDivider from './time-controls/time-divider.js';
-import RemainingTimeDisplay from './time-controls/remaining-time-display.js';
-import LiveDisplay from './live-display.js';
-import ProgressControl from './progress-control/progress-control.js';
-import FullscreenToggle from './fullscreen-toggle.js';
-import VolumeControl from './volume-control/volume-control.js';
-import VolumeMenuButton from './volume-menu-button.js';
-import MuteToggle from './mute-toggle.js';
-import ChaptersButton from './text-track-controls/chapters-button.js';
-import DescriptionsButton from './text-track-controls/descriptions-button.js';
-import SubtitlesButton from './text-track-controls/subtitles-button.js';
-import CaptionsButton from './text-track-controls/captions-button.js';
-import AudioTrackButton from './audio-track-controls/audio-track-button.js';
-import PlaybackRateMenuButton from './playback-rate-menu/playback-rate-menu-button.js';
-import CustomControlSpacer from './spacer-controls/custom-control-spacer.js';
+import './play-toggle.js';
+import './time-controls/current-time-display.js';
+import './time-controls/duration-display.js';
+import './time-controls/time-divider.js';
+import './time-controls/remaining-time-display.js';
+import './live-display.js';
+import './progress-control/progress-control.js';
+import './fullscreen-toggle.js';
+import './volume-control/volume-control.js';
+import './volume-menu-button.js';
+import './mute-toggle.js';
+import './text-track-controls/chapters-button.js';
+import './text-track-controls/descriptions-button.js';
+import './text-track-controls/subtitles-button.js';
+import './text-track-controls/captions-button.js';
+import './audio-track-controls/audio-track-button.js';
+import './playback-rate-menu/playback-rate-menu-button.js';
+import './spacer-controls/custom-control-spacer.js';
 
 /**
  * Container of main controls
@@ -42,7 +42,8 @@ class ControlBar extends Component {
       className: 'vjs-control-bar',
       dir: 'ltr'
     }, {
-      'role': 'group' // The control bar is a group, so it can contain menuitems
+      // The control bar is a group, so it can contain menuitems
+      role: 'group'
     });
   }
 }

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

@@ -37,7 +37,7 @@ class FullscreenToggle extends Button {
     } else {
       this.controlText('Fullscreen');
     }
-  }  
+  }
   /**
    * Handles click for full screen
    *

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

@@ -27,7 +27,7 @@ class LiveDisplay extends Component {
    * @method createEl
    */
   createEl() {
-    var el = super.createEl('div', {
+    const el = super.createEl('div', {
       className: 'vjs-live-control vjs-control'
     });
 

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

@@ -21,14 +21,15 @@ class MuteToggle extends Button {
     this.on(player, 'volumechange', this.update);
 
     // hide mute toggle if the current tech doesn't support volume control
-    if (player.tech_ && player.tech_['featuresVolumeControl'] === false) {
+    if (player.tech_ && player.tech_.featuresVolumeControl === false) {
       this.addClass('vjs-hidden');
     }
 
     this.on(player, 'loadstart', function() {
-      this.update(); // We need to update the button to account for a default muted state.
+      // We need to update the button to account for a default muted state.
+      this.update();
 
-      if (player.tech_['featuresVolumeControl'] === false) {
+      if (player.tech_.featuresVolumeControl === false) {
         this.addClass('vjs-hidden');
       } else {
         this.removeClass('vjs-hidden');
@@ -52,7 +53,7 @@ class MuteToggle extends Button {
    * @method handleClick
    */
   handleClick() {
-    this.player_.muted( this.player_.muted() ? false : true );
+    this.player_.muted(this.player_.muted() ? false : true);
   }
 
   /**
@@ -61,8 +62,8 @@ class MuteToggle extends Button {
    * @method update
    */
   update() {
-    var vol = this.player_.volume(),
-        level = 3;
+    const vol = this.player_.volume();
+    let level = 3;
 
     if (vol === 0 || this.player_.muted()) {
       level = 0;
@@ -75,13 +76,14 @@ class MuteToggle extends Button {
     // 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.
-    let toMute = this.player_.muted() ? 'Unmute' : 'Mute';
+    const toMute = this.player_.muted() ? 'Unmute' : 'Mute';
+
     if (this.controlText() !== toMute) {
       this.controlText(toMute);
     }
 
-    /* TODO improve muted icon classes */
-    for (var i = 0; i < 4; i++) {
+    // TODO improve muted icon classes
+    for (let i = 0; i < 4; i++) {
       Dom.removeElClass(this.el_, `vjs-vol-${i}`);
     }
     Dom.addElClass(this.el_, `vjs-vol-${level}`);

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

@@ -14,7 +14,7 @@ import Component from '../component.js';
  */
 class PlayToggle extends Button {
 
-  constructor(player, options){
+  constructor(player, options) {
     super(player, options);
 
     this.on(player, 'play', this.handlePlay);
@@ -52,7 +52,8 @@ class PlayToggle extends Button {
   handlePlay() {
     this.removeClass('vjs-paused');
     this.addClass('vjs-playing');
-    this.controlText('Pause'); // change the button text to "Pause"
+    // change the button text to "Pause"
+    this.controlText('Pause');
   }
 
   /**
@@ -63,7 +64,8 @@ class PlayToggle extends Button {
   handlePause() {
     this.removeClass('vjs-playing');
     this.addClass('vjs-paused');
-    this.controlText('Play'); // change the button text to "Play"
+    // change the button text to "Play"
+    this.controlText('Play');
   }
 
 }

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

@@ -17,7 +17,7 @@ import * as Dom from '../../utils/dom.js';
  */
 class PlaybackRateMenuButton extends MenuButton {
 
-  constructor(player, options){
+  constructor(player, options) {
     super(player, options);
 
     this.updateVisibility();
@@ -34,7 +34,7 @@ class PlaybackRateMenuButton extends MenuButton {
    * @method createEl
    */
   createEl() {
-    let el = super.createEl();
+    const el = super.createEl();
 
     this.labelEl_ = Dom.createEl('div', {
       className: 'vjs-playback-rate-value',
@@ -63,13 +63,13 @@ class PlaybackRateMenuButton extends MenuButton {
    * @method createMenu
    */
   createMenu() {
-    let menu = new Menu(this.player());
-    let rates = this.playbackRates();
+    const menu = new Menu(this.player());
+    const rates = this.playbackRates();
 
     if (rates) {
       for (let i = rates.length - 1; i >= 0; i--) {
         menu.addChild(
-          new PlaybackRateMenuItem(this.player(), { 'rate': rates[i] + 'x'})
+          new PlaybackRateMenuItem(this.player(), {rate: rates[i] + 'x'})
         );
       }
     }
@@ -94,12 +94,13 @@ class PlaybackRateMenuButton extends MenuButton {
    */
   handleClick() {
     // select next rate option
-    let currentRate = this.player().playbackRate();
-    let rates = this.playbackRates();
+    const currentRate = this.player().playbackRate();
+    const rates = this.playbackRates();
 
     // this will select first one if the last one currently selected
     let newRate = rates[0];
-    for (let i = 0; i < rates.length ; i++) {
+
+    for (let i = 0; i < rates.length; i++) {
       if (rates[i] > currentRate) {
         newRate = rates[i];
         break;
@@ -115,7 +116,7 @@ class PlaybackRateMenuButton extends MenuButton {
    * @method playbackRates
    */
   playbackRates() {
-    return this.options_['playbackRates'] || (this.options_.playerOptions && this.options_.playerOptions['playbackRates']);
+    return this.options_.playbackRates || (this.options_.playerOptions && this.options_.playerOptions.playbackRates);
   }
 
   /**
@@ -126,10 +127,10 @@ class PlaybackRateMenuButton extends MenuButton {
    * @method playbackRateSupported
    */
   playbackRateSupported() {
-    return this.player().tech_
-      && this.player().tech_['featuresPlaybackRate']
-      && this.playbackRates()
-      && this.playbackRates().length > 0
+    return this.player().tech_ &&
+      this.player().tech_.featuresPlaybackRate &&
+      this.playbackRates() &&
+      this.playbackRates().length > 0
     ;
   }
 

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

@@ -14,13 +14,13 @@ import Component from '../../component.js';
  */
 class PlaybackRateMenuItem extends MenuItem {
 
-  constructor(player, options){
-    let label = options['rate'];
-    let rate = parseFloat(label, 10);
+  constructor(player, options) {
+    const label = options.rate;
+    const rate = parseFloat(label, 10);
 
     // Modify options for parent MenuItem class's init.
-    options['label'] = label;
-    options['selected'] = rate === 1;
+    options.label = label;
+    options.selected = rate === 1;
     super(player, options);
 
     this.label = label;

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

@@ -14,8 +14,9 @@ import * as Dom from '../../utils/dom.js';
  */
 class LoadProgressBar extends Component {
 
-  constructor(player, options){
+  constructor(player, options) {
     super(player, options);
+    this.partEls_ = [];
     this.on(player, 'progress', this.update);
   }
 
@@ -38,14 +39,16 @@ class LoadProgressBar extends Component {
    * @method update
    */
   update() {
-    let buffered = this.player_.buffered();
-    let duration = this.player_.duration();
-    let bufferedEnd = this.player_.bufferedEnd();
-    let children = this.el_.children;
+    const buffered = this.player_.buffered();
+    const duration = this.player_.duration();
+    const bufferedEnd = this.player_.bufferedEnd();
+    const children = this.partEls_;
 
     // get the percent width of a time compared to the total end
-    let percentify = function (time, end){
-      let percent = (time / end) || 0; // no NaN
+    const percentify = function(time, end) {
+      // no NaN
+      const percent = (time / end) || 0;
+
       return ((percent >= 1 ? 1 : percent) * 100) + '%';
     };
 
@@ -54,12 +57,13 @@ class LoadProgressBar extends Component {
 
     // add child elements to represent the individual buffered time ranges
     for (let i = 0; i < buffered.length; i++) {
-      let start = buffered.start(i);
-      let end = buffered.end(i);
+      const start = buffered.start(i);
+      const end = buffered.end(i);
       let part = children[i];
 
       if (!part) {
         part = this.el_.appendChild(Dom.createEl());
+        children[i] = part;
       }
 
       // set the percent based on the width of the progress bar (bufferedEnd)
@@ -69,8 +73,9 @@ class LoadProgressBar extends Component {
 
     // remove unused buffered range elements
     for (let i = children.length; i > buffered.length; i--) {
-      this.el_.removeChild(children[i-1]);
+      this.el_.removeChild(children[i - 1]);
     }
+    children.length = buffered.length;
   }
 
 }

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

@@ -55,24 +55,24 @@ class MouseTimeDisplay extends Component {
   }
 
   handleMouseMove(event) {
-    let duration = this.player_.duration();
-    let newTime = this.calculateDistance(event) * duration;
-    let position = event.pageX - Dom.findElPosition(this.el().parentNode).left;
+    const duration = this.player_.duration();
+    const newTime = this.calculateDistance(event) * duration;
+    const position = event.pageX - Dom.findElPosition(this.el().parentNode).left;
 
     this.update(newTime, position);
   }
 
   update(newTime, position) {
-    let time = formatTime(newTime, this.player_.duration());
+    const time = formatTime(newTime, this.player_.duration());
 
     this.el().style.left = position + 'px';
     this.el().setAttribute('data-current-time', time);
 
     if (this.keepTooltipsInside) {
-      let clampedPosition = this.clampPosition_(position);
-      let difference = position - clampedPosition + 1;
-      let tooltipWidth = parseFloat(window.getComputedStyle(this.tooltip).width);
-      let tooltipWidthHalf = tooltipWidth / 2;
+      const clampedPosition = this.clampPosition_(position);
+      const difference = position - clampedPosition + 1;
+      const tooltipWidth = parseFloat(window.getComputedStyle(this.tooltip).width);
+      const tooltipWidthHalf = tooltipWidth / 2;
 
       this.tooltip.innerHTML = time;
       this.tooltip.style.right = `-${tooltipWidthHalf - difference}px`;
@@ -98,9 +98,9 @@ class MouseTimeDisplay extends Component {
       return position;
     }
 
-    let playerWidth = parseFloat(window.getComputedStyle(this.player().el()).width);
-    let tooltipWidth = parseFloat(window.getComputedStyle(this.tooltip).width);
-    let tooltipWidthHalf = tooltipWidth / 2;
+    const playerWidth = parseFloat(window.getComputedStyle(this.player().el()).width);
+    const tooltipWidth = parseFloat(window.getComputedStyle(this.tooltip).width);
+    const tooltipWidthHalf = tooltipWidth / 2;
     let actualPosition = position;
 
     if (position < tooltipWidthHalf) {

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

@@ -3,7 +3,6 @@
  */
 import Component from '../../component.js';
 import * as Fn from '../../utils/fn.js';
-import * as Dom from '../../utils/dom.js';
 import formatTime from '../../utils/format-time.js';
 
 /**
@@ -16,7 +15,7 @@ import formatTime from '../../utils/format-time.js';
  */
 class PlayProgressBar extends Component {
 
-  constructor(player, options){
+  constructor(player, options) {
     super(player, options);
     this.updateDataAttr();
     this.on(player, 'timeupdate', this.updateDataAttr);
@@ -48,7 +47,8 @@ class PlayProgressBar extends Component {
   }
 
   updateDataAttr() {
-    let time = (this.player_.scrubbing()) ? this.player_.getCache().currentTime : this.player_.currentTime();
+    const time = (this.player_.scrubbing()) ? this.player_.getCache().currentTime : this.player_.currentTime();
+
     this.el_.setAttribute('data-current-time', formatTime(time, this.player_.duration()));
   }
 

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

@@ -2,8 +2,9 @@
  * @file progress-control.js
  */
 import Component from '../../component.js';
-import SeekBar from './seek-bar.js';
-import MouseTimeDisplay from './mouse-time-display.js';
+
+import './seek-bar.js';
+import './mouse-time-display.js';
 
 /**
  * The Progress Control component contains the seek bar, load progress,

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

@@ -4,12 +4,12 @@
 import window from 'global/window';
 import Slider from '../../slider/slider.js';
 import Component from '../../component.js';
-import LoadProgressBar from './load-progress-bar.js';
-import PlayProgressBar from './play-progress-bar.js';
-import TooltipProgressBar from './tooltip-progress-bar.js';
 import * as Fn from '../../utils/fn.js';
 import formatTime from '../../utils/format-time.js';
-import assign from 'object.assign';
+
+import './load-progress-bar.js';
+import './play-progress-bar.js';
+import './tooltip-progress-bar.js';
 
 /**
  * Seek Bar and holder for the progress bars
@@ -21,7 +21,7 @@ import assign from 'object.assign';
  */
 class SeekBar extends Slider {
 
-  constructor(player, options){
+  constructor(player, options) {
     super(player, options);
     this.on(player, 'timeupdate', this.updateProgress);
     this.on(player, 'ended', this.updateProgress);
@@ -65,9 +65,10 @@ class SeekBar extends Slider {
       this.updateAriaAttributes(this.tooltipProgressBar.el_);
       this.tooltipProgressBar.el_.style.width = this.bar.el_.style.width;
 
-      let playerWidth = parseFloat(window.getComputedStyle(this.player().el()).width);
-      let tooltipWidth = parseFloat(window.getComputedStyle(this.tooltipProgressBar.tooltip).width);
-      let tooltipStyle = this.tooltipProgressBar.el().style;
+      const playerWidth = parseFloat(window.getComputedStyle(this.player().el()).width);
+      const tooltipWidth = parseFloat(window.getComputedStyle(this.tooltipProgressBar.tooltip).width);
+      const tooltipStyle = this.tooltipProgressBar.el().style;
+
       tooltipStyle.maxWidth = Math.floor(playerWidth - (tooltipWidth / 2)) + 'px';
       tooltipStyle.minWidth = Math.ceil(tooltipWidth / 2) + 'px';
       tooltipStyle.right = `-${tooltipWidth / 2}px`;
@@ -76,9 +77,12 @@ class SeekBar extends Slider {
 
   updateAriaAttributes(el) {
     // Allows for smooth scrubbing, when player can't keep up.
-    let time = (this.player_.scrubbing()) ? this.player_.getCache().currentTime : this.player_.currentTime();
-    el.setAttribute('aria-valuenow', (this.getPercent() * 100).toFixed(2)); // machine readable value of progress bar (percentage complete)
-    el.setAttribute('aria-valuetext', formatTime(time, this.player_.duration())); // human readable value of progress bar (time complete)
+    const time = (this.player_.scrubbing()) ? this.player_.getCache().currentTime : this.player_.currentTime();
+
+    // machine readable value of progress bar (percentage complete)
+    el.setAttribute('aria-valuenow', (this.getPercent() * 100).toFixed(2));
+    // human readable value of progress bar (time complete)
+    el.setAttribute('aria-valuetext', formatTime(time, this.player_.duration()));
   }
 
   /**
@@ -88,7 +92,8 @@ class SeekBar extends Slider {
    * @method getPercent
    */
   getPercent() {
-    let percent = this.player_.currentTime() / this.player_.duration();
+    const percent = this.player_.currentTime() / this.player_.duration();
+
     return percent >= 1 ? 1 : percent;
   }
 
@@ -115,7 +120,9 @@ class SeekBar extends Slider {
     let newTime = this.calculateDistance(event) * this.player_.duration();
 
     // Don't let video end while scrubbing.
-    if (newTime === this.player_.duration()) { newTime = newTime - 0.1; }
+    if (newTime === this.player_.duration()) {
+      newTime = newTime - 0.1;
+    }
 
     // Set new time (tell player to seek to new time)
     this.player_.currentTime(newTime);
@@ -141,7 +148,8 @@ class SeekBar extends Slider {
    * @method stepForward
    */
   stepForward() {
-    this.player_.currentTime(this.player_.currentTime() + 5); // more quickly fast forward for keyboard-only users
+    // more quickly fast forward for keyboard-only users
+    this.player_.currentTime(this.player_.currentTime() + 5);
   }
 
   /**
@@ -150,7 +158,8 @@ class SeekBar extends Slider {
    * @method stepBack
    */
   stepBack() {
-    this.player_.currentTime(this.player_.currentTime() - 5); // more quickly rewind for keyboard-only users
+    // more quickly rewind for keyboard-only users
+    this.player_.currentTime(this.player_.currentTime() - 5);
   }
 
 }
@@ -161,7 +170,7 @@ SeekBar.prototype.options_ = {
     'mouseTimeDisplay',
     'playProgressBar'
   ],
-  'barName': 'playProgressBar'
+  barName: 'playProgressBar'
 };
 
 SeekBar.prototype.playerEvent = 'timeupdate';

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

@@ -3,7 +3,6 @@
  */
 import Component from '../../component.js';
 import * as Fn from '../../utils/fn.js';
-import * as Dom from '../../utils/dom.js';
 import formatTime from '../../utils/format-time.js';
 
 /**
@@ -16,7 +15,7 @@ import formatTime from '../../utils/format-time.js';
  */
 class TooltipProgressBar extends Component {
 
-  constructor(player, options){
+  constructor(player, options) {
     super(player, options);
     this.updateDataAttr();
     this.on(player, 'timeupdate', this.updateDataAttr);
@@ -30,7 +29,7 @@ class TooltipProgressBar extends Component {
    * @method createEl
    */
   createEl() {
-    let el = super.createEl('div', {
+    const el = super.createEl('div', {
       className: 'vjs-tooltip-progress-bar vjs-slider-bar',
       innerHTML: `<div class="vjs-time-tooltip"></div>
         <span class="vjs-control-text"><span>${this.localize('Progress')}</span>: 0%</span>`
@@ -42,8 +41,9 @@ class TooltipProgressBar extends Component {
   }
 
   updateDataAttr() {
-    let time = (this.player_.scrubbing()) ? this.player_.getCache().currentTime : this.player_.currentTime();
-    let formattedTime = formatTime(time, this.player_.duration());
+    const time = (this.player_.scrubbing()) ? this.player_.getCache().currentTime : this.player_.currentTime();
+    const formattedTime = formatTime(time, this.player_.duration());
+
     this.el_.setAttribute('data-current-time', formattedTime);
     this.tooltip.innerHTML = formattedTime;
   }

src/js/control-bar/spacer-controls/custom-control-spacer.js

@@ -29,8 +29,8 @@ class CustomControlSpacer extends Spacer {
    * @method createEl
    */
   createEl() {
-    let el = super.createEl({
-      className: this.buildCSSClass(),
+    const el = super.createEl({
+      className: this.buildCSSClass()
     });
 
     // No-flex/table-cell mode requires there be some content

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

@@ -12,24 +12,24 @@ import Component from '../../component.js';
  * @extends TextTrackMenuItem
  * @class CaptionSettingsMenuItem
  */
- class CaptionSettingsMenuItem extends TextTrackMenuItem {
+class CaptionSettingsMenuItem extends TextTrackMenuItem {
 
   constructor(player, options) {
-    options['track'] = {
-      'kind': options['kind'],
-      'player': player,
-      'label': options['kind'] + ' settings',
-      'selectable': false,
-      'default': false,
+    options.track = {
+      player,
+      kind: options.kind,
+      label: options.kind + ' settings',
+      selectable: false,
+      default: false,
       mode: 'disabled'
     };
 
     // CaptionSettingsMenuItem has no concept of 'selected'
-    options['selectable'] = false;
+    options.selectable = false;
 
     super(player, options);
     this.addClass('vjs-texttrack-settings');
-    this.controlText(', opens ' + options['kind'] + ' settings dialog');
+    this.controlText(', opens ' + options.kind + ' settings dialog');
   }
 
   /**

src/js/control-bar/text-track-controls/captions-button.js

@@ -16,9 +16,9 @@ import CaptionSettingsMenuItem from './caption-settings-menu-item.js';
  */
 class CaptionsButton extends TextTrackButton {
 
-  constructor(player, options, ready){
+  constructor(player, options, ready) {
     super(player, options, ready);
-    this.el_.setAttribute('aria-label','Captions Menu');
+    this.el_.setAttribute('aria-label', 'Captions Menu');
   }
 
   /**
@@ -38,10 +38,11 @@ class CaptionsButton extends TextTrackButton {
    */
   update() {
     let threshold = 2;
+
     super.update();
 
     // if native, then threshold is 1 because no settings button
-    if (this.player().tech_ && this.player().tech_['featuresNativeTextTracks']) {
+    if (this.player().tech_ && this.player().tech_.featuresNativeTextTracks) {
       threshold = 1;
     }
 
@@ -59,10 +60,10 @@ class CaptionsButton extends TextTrackButton {
    * @method createItems
    */
   createItems() {
-    let items = [];
+    const items = [];
 
-    if (!(this.player().tech_ && this.player().tech_['featuresNativeTextTracks'])) {
-      items.push(new CaptionSettingsMenuItem(this.player_, { 'kind': this.kind_ }));
+    if (!(this.player().tech_ && this.player().tech_.featuresNativeTextTracks)) {
+      items.push(new CaptionSettingsMenuItem(this.player_, {kind: this.kind_}));
     }
 
     return super.createItems(items);

src/js/control-bar/text-track-controls/chapters-button.js

@@ -7,9 +7,7 @@ import TextTrackMenuItem from './text-track-menu-item.js';
 import ChaptersTrackMenuItem from './chapters-track-menu-item.js';
 import Menu from '../../menu/menu.js';
 import * as Dom from '../../utils/dom.js';
-import * as Fn from '../../utils/fn.js';
 import toTitleCase from '../../utils/to-title-case.js';
-import window from 'global/window';
 
 /**
  * The button component for toggling and selecting chapters
@@ -24,9 +22,9 @@ import window from 'global/window';
  */
 class ChaptersButton extends TextTrackButton {
 
-  constructor(player, options, ready){
+  constructor(player, options, ready) {
     super(player, options, ready);
-    this.el_.setAttribute('aria-label','Chapters Menu');
+    this.el_.setAttribute('aria-label', 'Chapters Menu');
   }
 
   /**
@@ -46,20 +44,18 @@ class ChaptersButton extends TextTrackButton {
    * @method createItems
    */
   createItems() {
-    let items = [];
-
-    let tracks = this.player_.textTracks();
+    const items = [];
+    const tracks = this.player_.textTracks();
 
     if (!tracks) {
       return items;
     }
 
     for (let i = 0; i < tracks.length; i++) {
-      let track = tracks[i];
-      if (track['kind'] === this.kind_) {
-        items.push(new TextTrackMenuItem(this.player_, {
-          'track': track
-        }));
+      const track = tracks[i];
+
+      if (track.kind === this.kind_) {
+        items.push(new TextTrackMenuItem(this.player_, {track}));
       }
     }
 
@@ -73,16 +69,16 @@ class ChaptersButton extends TextTrackButton {
    * @method createMenu
    */
   createMenu() {
-    let tracks = this.player_.textTracks() || [];
+    const tracks = this.player_.textTracks() || [];
     let chaptersTrack;
     let items = this.items || [];
 
     for (let i = tracks.length - 1; i >= 0; i--) {
 
       // We will always choose the last track as our chaptersTrack
-      let track = tracks[i];
+      const track = tracks[i];
 
-      if (track['kind'] === this.kind_) {
+      if (track.kind === this.kind_) {
         chaptersTrack = track;
 
         break;
@@ -90,27 +86,30 @@ class ChaptersButton extends TextTrackButton {
     }
 
     let menu = this.menu;
+
     if (menu === undefined) {
       menu = new Menu(this.player_);
-      let title = Dom.createEl('li', {
+
+      const title = Dom.createEl('li', {
         className: 'vjs-menu-title',
         innerHTML: toTitleCase(this.kind_),
         tabIndex: -1
       });
+
       menu.children_.unshift(title);
       Dom.insertElFirst(title, menu.contentEl());
     } else {
-        // We will empty out the menu children each time because we want a 
-        // fresh new menu child list each time
-        items.forEach(item => menu.removeChild(item));
-        // Empty out the ChaptersButton menu items because we no longer need them
-        items = [];
+      // We will empty out the menu children each time because we want a
+      // fresh new menu child list each time
+      items.forEach(item => menu.removeChild(item));
+      // Empty out the ChaptersButton menu items because we no longer need them
+      items = [];
     }
 
-    if (chaptersTrack && chaptersTrack.cues == null) {
-      chaptersTrack['mode'] = 'hidden';
+    if (chaptersTrack && (chaptersTrack.cues === null || chaptersTrack.cues === undefined)) {
+      chaptersTrack.mode = 'hidden';
 
-      let remoteTextTrackEl = this.player_.remoteTextTrackEls().getTrackElementByTrack_(chaptersTrack);
+      const remoteTextTrackEl = this.player_.remoteTextTrackEls().getTrackElementByTrack_(chaptersTrack);
 
       if (remoteTextTrackEl) {
         remoteTextTrackEl.addEventListener('load', (event) => this.update());
@@ -118,14 +117,14 @@ class ChaptersButton extends TextTrackButton {
     }
 
     if (chaptersTrack && chaptersTrack.cues && chaptersTrack.cues.length > 0) {
-      let cues = chaptersTrack['cues'], cue;
+      const cues = chaptersTrack.cues;
 
       for (let i = 0, l = cues.length; i < l; i++) {
-        cue = cues[i];
+        const cue = cues[i];
 
-        let mi = new ChaptersTrackMenuItem(this.player_, {
-          'track': chaptersTrack,
-          'cue': cue
+        const mi = new ChaptersTrackMenuItem(this.player_, {
+          cue,
+          track: chaptersTrack
         });
 
         items.push(mi);

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

@@ -15,14 +15,14 @@ import * as Fn from '../../utils/fn.js';
  */
 class ChaptersTrackMenuItem extends MenuItem {
 
-  constructor(player, options){
-    let track = options['track'];
-    let cue = options['cue'];
-    let currentTime = player.currentTime();
+  constructor(player, options) {
+    const track = options.track;
+    const cue = options.cue;
+    const currentTime = player.currentTime();
 
     // Modify options for parent MenuItem class's init.
-    options['label'] = cue.text;
-    options['selected'] = (cue['startTime'] <= currentTime && currentTime < cue['endTime']);
+    options.label = cue.text;
+    options.selected = (cue.startTime <= currentTime && currentTime < cue.endTime);
     super(player, options);
 
     this.track = track;
@@ -47,11 +47,11 @@ class ChaptersTrackMenuItem extends MenuItem {
    * @method update
    */
   update() {
-    let cue = this.cue;
-    let currentTime = this.player_.currentTime();
+    const cue = this.cue;
+    const currentTime = this.player_.currentTime();
 
     // vjs.log(currentTime, cue.startTime);
-    this.selected(cue['startTime'] <= currentTime && currentTime < cue['endTime']);
+    this.selected(cue.startTime <= currentTime && currentTime < cue.endTime);
   }
 
 }

src/js/control-bar/text-track-controls/descriptions-button.js

@@ -16,14 +16,14 @@ import * as Fn from '../../utils/fn.js';
  */
 class DescriptionsButton extends TextTrackButton {
 
-  constructor(player, options, ready){
+  constructor(player, options, ready) {
     super(player, options, ready);
     this.el_.setAttribute('aria-label', 'Descriptions Menu');
 
-    let tracks = player.textTracks();
+    const tracks = player.textTracks();
 
     if (tracks) {
-      let changeHandler = Fn.bind(this, this.handleTracksChange);
+      const changeHandler = Fn.bind(this, this.handleTracksChange);
 
       tracks.addEventListener('change', changeHandler);
       this.on('dispose', function() {
@@ -37,14 +37,15 @@ class DescriptionsButton extends TextTrackButton {
    *
    * @method handleTracksChange
    */
-  handleTracksChange(event){
-    let tracks = this.player().textTracks();
+  handleTracksChange(event) {
+    const tracks = this.player().textTracks();
     let disabled = false;
 
     // Check whether a track of a different kind is showing
     for (let i = 0, l = tracks.length; i < l; i++) {
-      let track = tracks[i];
-      if (track['kind'] !== this.kind_ && track['mode'] === 'showing') {
+      const track = tracks[i];
+
+      if (track.kind !== this.kind_ && track.mode === 'showing') {
         disabled = true;
         break;
       }

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

@@ -14,19 +14,19 @@ import Component from '../../component.js';
  */
 class OffTextTrackMenuItem extends TextTrackMenuItem {
 
-  constructor(player, options){
+  constructor(player, options) {
     // Create pseudo track info
     // Requires options['kind']
-    options['track'] = {
-      'kind': options['kind'],
-      'player': player,
-      'label': options['kind'] + ' off',
-      'default': false,
-      'mode': 'disabled'
+    options.track = {
+      player,
+      kind: options.kind,
+      label: options.kind + ' off',
+      default: false,
+      mode: 'disabled'
     };
 
     // MenuItem is selectable
-    options['selectable'] = true;
+    options.selectable = true;
 
     super(player, options);
     this.selected(true);
@@ -38,13 +38,14 @@ class OffTextTrackMenuItem extends TextTrackMenuItem {
    * @param {Object} event Event object
    * @method handleTracksChange
    */
-  handleTracksChange(event){
-    let tracks = this.player().textTracks();
+  handleTracksChange(event) {
+    const tracks = this.player().textTracks();
     let selected = true;
 
     for (let i = 0, l = tracks.length; i < l; i++) {
-      let track = tracks[i];
-      if (track['kind'] === this.track['kind'] && track['mode'] === 'showing') {
+      const track = tracks[i];
+
+      if (track.kind === this.track.kind && track.mode === 'showing') {
         selected = false;
         break;
       }

src/js/control-bar/text-track-controls/subtitles-button.js

@@ -15,9 +15,9 @@ import Component from '../../component.js';
  */
 class SubtitlesButton extends TextTrackButton {
 
-  constructor(player, options, ready){
+  constructor(player, options, ready) {
     super(player, options, ready);
-    this.el_.setAttribute('aria-label','Subtitles Menu');
+    this.el_.setAttribute('aria-label', 'Subtitles Menu');
   }
 
   /**

src/js/control-bar/text-track-controls/text-track-button.js

@@ -3,7 +3,6 @@
  */
 import TrackButton from '../track-button.js';
 import Component from '../../component.js';
-import * as Fn from '../../utils/fn.js';
 import TextTrackMenuItem from './text-track-menu-item.js';
 import OffTextTrackMenuItem from './off-text-track-menu-item.js';
 
@@ -17,7 +16,7 @@ import OffTextTrackMenuItem from './off-text-track-menu-item.js';
  */
 class TextTrackButton extends TrackButton {
 
-  constructor(player, options = {}){
+  constructor(player, options = {}) {
     options.tracks = player.textTracks();
 
     super(player, options);
@@ -29,25 +28,25 @@ class TextTrackButton extends TrackButton {
    * @return {Array} Array of menu items
    * @method createItems
    */
-  createItems(items=[]) {
+  createItems(items = []) {
     // Add an OFF menu item to turn all tracks off
-    items.push(new OffTextTrackMenuItem(this.player_, { 'kind': this.kind_ }));
+    items.push(new OffTextTrackMenuItem(this.player_, {kind: this.kind_}));
 
-    let tracks = this.player_.textTracks();
+    const tracks = this.player_.textTracks();
 
     if (!tracks) {
       return items;
     }
 
     for (let i = 0; i < tracks.length; i++) {
-      let track = tracks[i];
+      const track = tracks[i];
 
       // only add tracks that are of the appropriate kind and have a label
-      if (track['kind'] === this.kind_) {
+      if (track.kind === this.kind_) {
         items.push(new TextTrackMenuItem(this.player_, {
+          track,
           // MenuItem is selectable
-          'selectable': true,
-          'track': track
+          selectable: true
         }));
       }
     }

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

@@ -17,20 +17,20 @@ import document from 'global/document';
  */
 class TextTrackMenuItem extends MenuItem {
 
-  constructor(player, options){
-    let track = options['track'];
-    let tracks = player.textTracks();
+  constructor(player, options) {
+    const track = options.track;
+    const tracks = player.textTracks();
 
     // Modify options for parent MenuItem class's init.
-    options['label'] = track['label'] || track['language'] || 'Unknown';
-    options['selected'] = track['default'] || track['mode'] === 'showing';
+    options.label = track.label || track.language || 'Unknown';
+    options.selected = track.default || track.mode === 'showing';
 
     super(player, options);
 
     this.track = track;
 
     if (tracks) {
-      let changeHandler = Fn.bind(this, this.handleTracksChange);
+      const changeHandler = Fn.bind(this, this.handleTracksChange);
 
       tracks.addEventListener('change', changeHandler);
       this.on('dispose', function() {
@@ -52,7 +52,9 @@ class TextTrackMenuItem extends MenuItem {
           // Android 2.3 throws an Illegal Constructor error for window.Event
           try {
             event = new window.Event('change');
-          } catch(err){}
+          } catch (err) {
+            // continue regardless of error
+          }
         }
 
         if (!event) {
@@ -71,24 +73,26 @@ class TextTrackMenuItem extends MenuItem {
    * @method handleClick
    */
   handleClick(event) {
-    let kind = this.track['kind'];
-    let tracks = this.player_.textTracks();
+    const kind = this.track.kind;
+    const tracks = this.player_.textTracks();
 
     super.handleClick(event);
 
-    if (!tracks) return;
+    if (!tracks) {
+      return;
+    }
 
     for (let i = 0; i < tracks.length; i++) {
-      let track = tracks[i];
+      const track = tracks[i];
 
-      if (track['kind'] !== kind) {
+      if (track.kind !== kind) {
         continue;
       }
 
       if (track === this.track) {
-        track['mode'] = 'showing';
+        track.mode = 'showing';
       } else {
-        track['mode'] = 'disabled';
+        track.mode = 'disabled';
       }
     }
   }
@@ -98,8 +102,8 @@ class TextTrackMenuItem extends MenuItem {
    *
    * @method handleTracksChange
    */
-  handleTracksChange(event){
-    this.selected(this.track['mode'] === 'showing');
+  handleTracksChange(event) {
+    this.selected(this.track.mode === 'showing');
   }
 
 }

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

@@ -15,7 +15,7 @@ import formatTime from '../../utils/format-time.js';
  */
 class CurrentTimeDisplay extends Component {
 
-  constructor(player, options){
+  constructor(player, options) {
     super(player, options);
 
     this.on(player, 'timeupdate', this.updateContent);
@@ -28,14 +28,14 @@ class CurrentTimeDisplay extends Component {
    * @method createEl
    */
   createEl() {
-    let el = super.createEl('div', {
+    const el = super.createEl('div', {
       className: 'vjs-current-time vjs-time-control vjs-control'
     });
 
     this.contentEl_ = Dom.createEl('div', {
       className: 'vjs-current-time-display',
       // label the current time for screen reader users
-      innerHTML: '<span class="vjs-control-text">Current Time </span>' + '0:00',
+      innerHTML: '<span class="vjs-control-text">Current Time </span>' + '0:00'
     }, {
       // tell screen readers not to automatically read the time as it changes
       'aria-live': 'off'
@@ -52,9 +52,10 @@ class CurrentTimeDisplay extends Component {
    */
   updateContent() {
     // Allows for smooth scrubbing, when player can't keep up.
-    let time = (this.player_.scrubbing()) ? this.player_.getCache().currentTime : this.player_.currentTime();
-    let localizedText = this.localize('Current Time');
-    let formattedTime = formatTime(time, this.player_.duration());
+    const time = (this.player_.scrubbing()) ? this.player_.getCache().currentTime : this.player_.currentTime();
+    const localizedText = this.localize('Current Time');
+    const formattedTime = formatTime(time, this.player_.duration());
+
     if (formattedTime !== this.formattedTime_) {
       this.formattedTime_ = formattedTime;
       this.contentEl_.innerHTML = `<span class="vjs-control-text">${localizedText}</span> ${formattedTime}`;

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

@@ -15,7 +15,7 @@ import formatTime from '../../utils/format-time.js';
  */
 class DurationDisplay extends Component {
 
-  constructor(player, options){
+  constructor(player, options) {
     super(player, options);
 
     this.on(player, 'durationchange', this.updateContent);
@@ -28,7 +28,7 @@ class DurationDisplay extends Component {
    * @method createEl
    */
   createEl() {
-    let el = super.createEl('div', {
+    const el = super.createEl('div', {
       className: 'vjs-duration vjs-time-control vjs-control'
     });
 
@@ -51,12 +51,15 @@ class DurationDisplay extends Component {
    * @method updateContent
    */
   updateContent() {
-    let duration = this.player_.duration();
+    const duration = this.player_.duration();
+
     if (duration && this.duration_ !== duration) {
       this.duration_ = duration;
-      let localizedText = this.localize('Duration Time');
-      let formattedTime = formatTime(duration);
-      this.contentEl_.innerHTML = `<span class="vjs-control-text">${localizedText}</span> ${formattedTime}`; // label the duration time for screen reader users
+      const localizedText = this.localize('Duration Time');
+      const formattedTime = formatTime(duration);
+
+      // label the duration time for screen reader users
+      this.contentEl_.innerHTML = `<span class="vjs-control-text">${localizedText}</span> ${formattedTime}`;
     }
   }
 

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

@@ -15,7 +15,7 @@ import formatTime from '../../utils/format-time.js';
  */
 class RemainingTimeDisplay extends Component {
 
-  constructor(player, options){
+  constructor(player, options) {
     super(player, options);
 
     this.on(player, 'timeupdate', this.updateContent);
@@ -29,14 +29,14 @@ class RemainingTimeDisplay extends Component {
    * @method createEl
    */
   createEl() {
-    let el = super.createEl('div', {
+    const el = super.createEl('div', {
       className: 'vjs-remaining-time vjs-time-control vjs-control'
     });
 
     this.contentEl_ = Dom.createEl('div', {
       className: 'vjs-remaining-time-display',
       // label the remaining time for screen reader users
-      innerHTML: `<span class="vjs-control-text">${this.localize('Remaining Time')}</span> -0:00`,
+      innerHTML: `<span class="vjs-control-text">${this.localize('Remaining Time')}</span> -0:00`
     }, {
       // tell screen readers not to automatically read the time as it changes
       'aria-live': 'off'
@@ -55,6 +55,7 @@ class RemainingTimeDisplay extends Component {
     if (this.player_.duration()) {
       const localizedText = this.localize('Remaining Time');
       const formattedTime = formatTime(this.player_.remainingTime());
+
       if (formattedTime !== this.formattedTime_) {
         this.formattedTime_ = formattedTime;
         this.contentEl_.innerHTML = `<span class="vjs-control-text">${localizedText}</span> -${formattedTime}`;

src/js/control-bar/track-button.js

@@ -15,8 +15,8 @@ import * as Fn from '../utils/fn.js';
  */
 class TrackButton extends MenuButton {
 
-  constructor(player, options){
-    let tracks = options.tracks;
+  constructor(player, options) {
+    const tracks = options.tracks;
 
     super(player, options);
 
@@ -28,7 +28,8 @@ class TrackButton extends MenuButton {
       return;
     }
 
-    let updateHandler = Fn.bind(this, this.update);
+    const updateHandler = Fn.bind(this, this.update);
+
     tracks.addEventListener('removetrack', updateHandler);
     tracks.addEventListener('addtrack', updateHandler);
 

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

@@ -6,7 +6,7 @@ import Component from '../../component.js';
 import * as Fn from '../../utils/fn.js';
 
 // Required children
-import VolumeLevel from './volume-level.js';
+import './volume-level.js';
 
 /**
  * The bar that contains the volume level and can be clicked on to adjust the level
@@ -18,7 +18,7 @@ import VolumeLevel from './volume-level.js';
  */
 class VolumeBar extends Slider {
 
-  constructor(player, options){
+  constructor(player, options) {
     super(player, options);
     this.on(player, 'volumechange', this.updateARIAAttributes);
     player.ready(Fn.bind(this, this.updateARIAAttributes));
@@ -63,9 +63,8 @@ class VolumeBar extends Slider {
   getPercent() {
     if (this.player_.muted()) {
       return 0;
-    } else {
-      return this.player_.volume();
     }
+    return this.player_.volume();
   }
 
   /**
@@ -95,7 +94,8 @@ class VolumeBar extends Slider {
    */
   updateARIAAttributes() {
     // Current value of volume bar as a percentage
-    let volume = (this.player_.volume() * 100).toFixed(2);
+    const volume = (this.player_.volume() * 100).toFixed(2);
+
     this.el_.setAttribute('aria-valuenow', volume);
     this.el_.setAttribute('aria-valuetext', volume + '%');
   }
@@ -106,7 +106,7 @@ VolumeBar.prototype.options_ = {
   children: [
     'volumeLevel'
   ],
-  'barName': 'volumeLevel'
+  barName: 'volumeLevel'
 };
 
 VolumeBar.prototype.playerEvent = 'volumechange';

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

@@ -4,7 +4,7 @@
 import Component from '../../component.js';
 
 // Required children
-import VolumeBar from './volume-bar.js';
+import './volume-bar.js';
 
 /**
  * The component for controlling the volume level
@@ -16,15 +16,15 @@ import VolumeBar from './volume-bar.js';
  */
 class VolumeControl extends Component {
 
-  constructor(player, options){
+  constructor(player, options) {
     super(player, options);
 
     // hide volume controls when they're not supported by the current tech
-    if (player.tech_ && player.tech_['featuresVolumeControl'] === false) {
+    if (player.tech_ && player.tech_.featuresVolumeControl === false) {
       this.addClass('vjs-hidden');
     }
-    this.on(player, 'loadstart', function(){
-      if (player.tech_['featuresVolumeControl'] === false) {
+    this.on(player, 'loadstart', function() {
+      if (player.tech_.featuresVolumeControl === false) {
         this.addClass('vjs-hidden');
       } else {
         this.removeClass('vjs-hidden');

src/js/control-bar/volume-menu-button.js

@@ -18,7 +18,7 @@ import VolumeBar from './volume-control/volume-bar.js';
  */
 class VolumeMenuButton extends PopupButton {
 
-  constructor(player, options={}){
+  constructor(player, options = {}) {
     // Default to inline
     if (options.inline === undefined) {
       options.inline = true;
@@ -48,7 +48,7 @@ class VolumeMenuButton extends PopupButton {
 
     // hide mute toggle if the current tech doesn't support volume control
     function updateVisibility() {
-      if (player.tech_ && player.tech_['featuresVolumeControl'] === false) {
+      if (player.tech_ && player.tech_.featuresVolumeControl === false) {
         this.addClass('vjs-hidden');
       } else {
         this.removeClass('vjs-hidden');
@@ -58,19 +58,19 @@ class VolumeMenuButton extends PopupButton {
     updateVisibility.call(this);
     this.on(player, 'loadstart', updateVisibility);
 
-    this.on(this.volumeBar, ['slideractive', 'focus'], function(){
+    this.on(this.volumeBar, ['slideractive', 'focus'], function() {
       this.addClass('vjs-slider-active');
     });
 
-    this.on(this.volumeBar, ['sliderinactive', 'blur'], function(){
+    this.on(this.volumeBar, ['sliderinactive', 'blur'], function() {
       this.removeClass('vjs-slider-active');
     });
 
-    this.on(this.volumeBar, ['focus'], function(){
+    this.on(this.volumeBar, ['focus'], function() {
       this.addClass('vjs-lock-showing');
     });
 
-    this.on(this.volumeBar, ['blur'], function(){
+    this.on(this.volumeBar, ['blur'], function() {
       this.removeClass('vjs-lock-showing');
     });
   }
@@ -83,7 +83,8 @@ class VolumeMenuButton extends PopupButton {
    */
   buildCSSClass() {
     let orientationClass = '';
-    if (!!this.options_.vertical) {
+
+    if (this.options_.vertical) {
       orientationClass = 'vjs-volume-menu-button-vertical';
     } else {
       orientationClass = 'vjs-volume-menu-button-horizontal';
@@ -99,11 +100,11 @@ class VolumeMenuButton extends PopupButton {
    * @method createPopup
    */
   createPopup() {
-    let popup = new Popup(this.player_, {
+    const popup = new Popup(this.player_, {
       contentElType: 'div'
     });
 
-    let vb = new VolumeBar(this.player_, this.options_.volumeBar);
+    const vb = new VolumeBar(this.player_, this.options_.volumeBar);
 
     popup.addChild(vb);
 

src/js/error-display.js

@@ -3,8 +3,6 @@
  */
 import Component from './component';
 import ModalDialog from './modal-dialog';
-
-import * as Dom from './utils/dom';
 import mergeOptions from './utils/merge-options';
 
 /**
@@ -45,7 +43,8 @@ class ErrorDisplay extends ModalDialog {
    * @return {String|Null}
    */
   content() {
-    let error = this.player().error();
+    const error = this.player().error();
+
     return error ? this.localize(error.message) : '';
   }
 }

src/js/event-target.js

@@ -3,41 +3,43 @@
  */
 import * as Events from './utils/events.js';
 
-var EventTarget = function() {};
+const EventTarget = function() {};
 
 EventTarget.prototype.allowedEvents_ = {};
 
 EventTarget.prototype.on = function(type, fn) {
   // Remove the addEventListener alias before calling Events.on
   // so we don't get into an infinite type loop
-  let ael = this.addEventListener;
+  const ael = this.addEventListener;
+
   this.addEventListener = () => {};
   Events.on(this, type, fn);
   this.addEventListener = ael;
 };
+
 EventTarget.prototype.addEventListener = EventTarget.prototype.on;
 
 EventTarget.prototype.off = function(type, fn) {
   Events.off(this, type, fn);
 };
+
 EventTarget.prototype.removeEventListener = EventTarget.prototype.off;
 
 EventTarget.prototype.one = function(type, fn) {
   // Remove the addEventListener alias before calling Events.on
   // so we don't get into an infinite type loop
-  let ael = this.addEventListener;
+  const ael = this.addEventListener;
+
   this.addEventListener = () => {};
   Events.one(this, type, fn);
   this.addEventListener = ael;
 };
 
 EventTarget.prototype.trigger = function(event) {
-  let type = event.type || event;
+  const type = event.type || event;
 
   if (typeof event === 'string') {
-    event = {
-      type: type
-    };
+    event = {type};
   }
   event = Events.fixEvent(event);
 
@@ -47,6 +49,7 @@ EventTarget.prototype.trigger = function(event) {
 
   Events.trigger(this, event);
 };
+
 // The standard DOM EventTarget.dispatchEvent() is aliased to trigger()
 EventTarget.prototype.dispatchEvent = EventTarget.prototype.trigger;
 

src/js/extend.js

@@ -7,7 +7,7 @@ import log from './utils/log';
  * Both work the same but node adds `super_` to the subClass
  * and Bable adds the superClass as __proto__. Both seem useful.
  */
-const _inherits = function (subClass, superClass) {
+const _inherits = function(subClass, superClass) {
   if (typeof superClass !== 'function' && superClass !== null) {
     throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass);
   }
@@ -44,10 +44,11 @@ const _inherits = function (subClass, superClass) {
  * });
  * ```
  */
-const extendFn = function(superClass, subClassMethods={}) {
+const extendFn = function(superClass, subClassMethods = {}) {
   let subClass = function() {
     superClass.apply(this, arguments);
   };
+
   let methods = {};
 
   if (typeof subClassMethods === 'object') {
@@ -66,7 +67,7 @@ const extendFn = function(superClass, subClassMethods={}) {
   _inherits(subClass, superClass);
 
   // Extend subObj's prototype with functions and other properties from props
-  for (var name in methods) {
+  for (const name in methods) {
     if (methods.hasOwnProperty(name)) {
       subClass.prototype[name] = methods[name];
     }

src/js/fullscreen-api.js

@@ -8,7 +8,7 @@ import document from 'global/document';
  * @type {Object|undefined}
  * @private
  */
-let FullscreenApi = {};
+const FullscreenApi = {};
 
 // browser API methods
 // map approach from Screenful.js - https://github.com/sindresorhus/screenfull.js
@@ -60,7 +60,7 @@ const apiMap = [
   ]
 ];
 
-let specApi = apiMap[0];
+const specApi = apiMap[0];
 let browserApi;
 
 // determine the supported set of functions
@@ -74,7 +74,7 @@ for (let i = 0; i < apiMap.length; i++) {
 
 // map the browser API names to the spec API names
 if (browserApi) {
-  for (let i=0; i<browserApi.length; i++) {
+  for (let i = 0; i < browserApi.length; i++) {
     FullscreenApi[specApi[i]] = browserApi[i];
   }
 }

src/js/media-error.js

@@ -4,24 +4,45 @@
 import assign from 'object.assign';
 
 /*
- * Custom MediaError to mimic the HTML5 MediaError
+ * Custom MediaError class which mimics the standard HTML5 MediaError class.
  *
- * @param {Number} code The media error code
+ * @param {Number|String|Object|MediaError} value
+ *        This can be of multiple types:
+ *        - Number: should be a standard error code
+ *        - String: an error message (the code will be 0)
+ *        - Object: arbitrary properties
+ *        - MediaError (native): used to populate a video.js MediaError object
+ *        - MediaError (video.js): will return itself if it's already a
+ *          video.js MediaError object.
  */
-let MediaError = function(code){
-  if (typeof code === 'number') {
-    this.code = code;
-  } else if (typeof code === 'string') {
+function MediaError(value) {
+
+  // Allow redundant calls to this constructor to avoid having `instanceof`
+  // checks peppered around the code.
+  if (value instanceof MediaError) {
+    return value;
+  }
+
+  if (typeof value === 'number') {
+    this.code = value;
+  } else if (typeof value === 'string') {
     // default code is zero, so this is a custom error
-    this.message = code;
-  } else if (typeof code === 'object') { // object
-    assign(this, code);
+    this.message = value;
+  } else if (typeof value === 'object') {
+
+    // We assign the `code` property manually because native MediaError objects
+    // do not expose it as an own/enumerable property of the object.
+    if (typeof value.code === 'number') {
+      this.code = value.code;
+    }
+
+    assign(this, value);
   }
 
   if (!this.message) {
     this.message = MediaError.defaultMessages[this.code] || '';
   }
-};
+}
 
 /*
  * The error code that refers two one of the defined
@@ -52,13 +73,15 @@ MediaError.prototype.message = '';
  */
 MediaError.prototype.status = null;
 
+// These errors are indexed by the W3C standard numeric value. The order
+// should not be changed!
 MediaError.errorTypes = [
-  'MEDIA_ERR_CUSTOM',            // = 0
-  'MEDIA_ERR_ABORTED',           // = 1
-  'MEDIA_ERR_NETWORK',           // = 2
-  'MEDIA_ERR_DECODE',            // = 3
-  'MEDIA_ERR_SRC_NOT_SUPPORTED', // = 4
-  'MEDIA_ERR_ENCRYPTED'          // = 5
+  'MEDIA_ERR_CUSTOM',
+  'MEDIA_ERR_ABORTED',
+  'MEDIA_ERR_NETWORK',
+  'MEDIA_ERR_DECODE',
+  'MEDIA_ERR_SRC_NOT_SUPPORTED',
+  'MEDIA_ERR_ENCRYPTED'
 ];
 
 MediaError.defaultMessages = {
@@ -71,7 +94,7 @@ MediaError.defaultMessages = {
 
 // Add types as properties on MediaError
 // e.g. MediaError.MEDIA_ERR_SRC_NOT_SUPPORTED = 4;
-for (var errNum = 0; errNum < MediaError.errorTypes.length; errNum++) {
+for (let errNum = 0; errNum < MediaError.errorTypes.length; errNum++) {
   MediaError[MediaError.errorTypes[errNum]] = errNum;
   // values should be accessible on both the class and instance
   MediaError.prototype[MediaError.errorTypes[errNum]] = errNum;

src/js/menu/menu-button.js

@@ -18,7 +18,7 @@ import toTitleCase from '../utils/to-title-case.js';
  */
 class MenuButton extends ClickableComponent {
 
-  constructor(player, options={}){
+  constructor(player, options = {}) {
     super(player, options);
 
     this.update();
@@ -36,7 +36,7 @@ class MenuButton extends ClickableComponent {
    * @method update
    */
   update() {
-    let menu = this.createMenu();
+    const menu = this.createMenu();
 
     if (this.menu) {
       this.removeChild(this.menu);
@@ -68,24 +68,25 @@ class MenuButton extends ClickableComponent {
    * @method createMenu
    */
   createMenu() {
-    var menu = new Menu(this.player_);
+    const menu = new Menu(this.player_);
 
     // Add a title list item to the top
     if (this.options_.title) {
-      let title = Dom.createEl('li', {
+      const title = Dom.createEl('li', {
         className: 'vjs-menu-title',
         innerHTML: toTitleCase(this.options_.title),
         tabIndex: -1
       });
+
       menu.children_.unshift(title);
       Dom.insertElFirst(title, menu.contentEl());
     }
 
-    this.items = this['createItems']();
+    this.items = this.createItems();
 
     if (this.items) {
       // Add menu items to the menu
-      for (var i = 0; i < this.items.length; i++) {
+      for (let i = 0; i < this.items.length; i++) {
         menu.addItem(this.items[i]);
       }
     }
@@ -98,7 +99,7 @@ class MenuButton extends ClickableComponent {
    *
    * @method createItems
    */
-  createItems(){}
+  createItems() {}
 
   /**
    * Create the component's DOM element
@@ -119,7 +120,7 @@ class MenuButton extends ClickableComponent {
    * @method buildCSSClass
    */
   buildCSSClass() {
-    var menuButtonClass = 'vjs-menu-button';
+    let menuButtonClass = 'vjs-menu-button';
 
     // If the inline option is passed, we want to use different styles altogether.
     if (this.options_.inline === true) {
@@ -141,11 +142,11 @@ class MenuButton extends ClickableComponent {
    * @method handleClick
    */
   handleClick() {
-    this.one(this.menu.contentEl(), 'mouseleave', Fn.bind(this, function(e){
+    this.one(this.menu.contentEl(), 'mouseleave', Fn.bind(this, function(e) {
       this.unpressButton();
       this.el_.blur();
     }));
-    if (this.buttonPressed_){
+    if (this.buttonPressed_) {
       this.unpressButton();
     } else {
       this.pressButton();
@@ -189,8 +190,8 @@ class MenuButton extends ClickableComponent {
   handleSubmenuKeyPress(event) {
 
     // Escape (27) key or Tab (9) key unpress the 'button'
-    if (event.which === 27 || event.which === 9){
-      if (this.buttonPressed_){
+    if (event.which === 27 || event.which === 9) {
+      if (this.buttonPressed_) {
         this.unpressButton();
       }
       // Don't preventDefault for Tab key - we still want to lose focus
@@ -210,7 +211,8 @@ class MenuButton extends ClickableComponent {
       this.buttonPressed_ = true;
       this.menu.lockShowing();
       this.el_.setAttribute('aria-expanded', 'true');
-      this.menu.focus(); // set the focus into the submenu
+      // set the focus into the submenu
+      this.menu.focus();
     }
   }
 
@@ -224,7 +226,8 @@ class MenuButton extends ClickableComponent {
       this.buttonPressed_ = false;
       this.menu.unlockShowing();
       this.el_.setAttribute('aria-expanded', 'false');
-      this.el_.focus(); // Set focus back to this menu button
+      // Set focus back to this menu button
+      this.el_.focus();
     }
   }
 

src/js/menu/menu-item.js

@@ -18,9 +18,9 @@ class MenuItem extends ClickableComponent {
   constructor(player, options) {
     super(player, options);
 
-    this.selectable = options['selectable'];
+    this.selectable = options.selectable;
 
-    this.selected(options['selected']);
+    this.selected(options.selected);
 
     if (this.selectable) {
       // TODO: May need to be either menuitemcheckbox or menuitemradio,
@@ -42,7 +42,7 @@ class MenuItem extends ClickableComponent {
   createEl(type, props, attrs) {
     return super.createEl('li', assign({
       className: 'vjs-menu-item',
-      innerHTML: this.localize(this.options_['label']),
+      innerHTML: this.localize(this.options_.label),
       tabIndex: -1
     }, props), attrs);
   }
@@ -66,13 +66,13 @@ class MenuItem extends ClickableComponent {
     if (this.selectable) {
       if (selected) {
         this.addClass('vjs-selected');
-        this.el_.setAttribute('aria-checked','true');
+        this.el_.setAttribute('aria-checked', 'true');
         // aria-checked isn't fully supported by browsers/screen readers,
         // so indicate selected state to screen reader in the control text.
         this.controlText(', selected');
       } else {
         this.removeClass('vjs-selected');
-        this.el_.setAttribute('aria-checked','false');
+        this.el_.setAttribute('aria-checked', 'false');
         // Indicate un-selected state to screen reader
         // Note that a space clears out the selected state text
         this.controlText(' ');

src/js/menu/menu.js

@@ -15,7 +15,7 @@ import * as Events from '../utils/events.js';
  */
 class Menu extends Component {
 
-  constructor (player, options) {
+  constructor(player, options) {
     super(player, options);
 
     this.focusedChild_ = -1;
@@ -31,9 +31,9 @@ class Menu extends Component {
    */
   addItem(component) {
     this.addChild(component);
-    component.on('click', Fn.bind(this, function(){
+    component.on('click', Fn.bind(this, function() {
       this.unlockShowing();
-      //TODO: Need to set keyboard focus back to the menuButton
+      // TODO: Need to set keyboard focus back to the menuButton
     }));
   }
 
@@ -44,21 +44,25 @@ class Menu extends Component {
    * @method createEl
    */
   createEl() {
-    let contentElType = this.options_.contentElType || 'ul';
+    const contentElType = this.options_.contentElType || 'ul';
+
     this.contentEl_ = Dom.createEl(contentElType, {
       className: 'vjs-menu-content'
     });
+
     this.contentEl_.setAttribute('role', 'menu');
-    var el = super.createEl('div', {
+
+    const el = super.createEl('div', {
       append: this.contentEl_,
       className: 'vjs-menu'
     });
+
     el.setAttribute('role', 'presentation');
     el.appendChild(this.contentEl_);
 
     // Prevent clicks from bubbling up. Needed for Menu Buttons,
     // where a click on the parent is significant
-    Events.on(el, 'click', function(event){
+    Events.on(el, 'click', function(event) {
       event.preventDefault();
       event.stopImmediatePropagation();
     });
@@ -72,11 +76,14 @@ class Menu extends Component {
    * @param {Object} event Event object
    * @method handleKeyPress
    */
-  handleKeyPress (event) {
-    if (event.which === 37 || event.which === 40) { // Left and Down Arrows
+  handleKeyPress(event) {
+    // Left and Down Arrows
+    if (event.which === 37 || event.which === 40) {
       event.preventDefault();
       this.stepForward();
-    } else if (event.which === 38 || event.which === 39) { // Up and Right Arrows
+
+    // Up and Right Arrows
+    } else if (event.which === 38 || event.which === 39) {
       event.preventDefault();
       this.stepBack();
     }
@@ -87,21 +94,21 @@ class Menu extends Component {
    *
    * @method stepForward
    */
-   stepForward () {
-     let stepChild = 0;
+  stepForward() {
+    let stepChild = 0;
 
-     if (this.focusedChild_ !== undefined) {
-       stepChild = this.focusedChild_ + 1;
-     }
-     this.focus(stepChild);
-   }
+    if (this.focusedChild_ !== undefined) {
+      stepChild = this.focusedChild_ + 1;
+    }
+    this.focus(stepChild);
+  }
 
-   /**
-    * Move to previous (higher) menu item for keyboard users
-    *
-    * @method stepBack
-    */
-  stepBack () {
+  /**
+   * Move to previous (higher) menu item for keyboard users
+   *
+   * @method stepBack
+   */
+  stepBack() {
     let stepChild = 0;
 
     if (this.focusedChild_ !== undefined) {
@@ -116,10 +123,10 @@ class Menu extends Component {
    * @param {Object|String} item Index of child item set focus on
    * @method focus
    */
-  focus (item = 0) {
-    let children = this.children().slice();
-    let haveTitle = children.length && children[0].className &&
-      /vjs-menu-title/.test(children[0].className);
+  focus(item = 0) {
+    const children = this.children().slice();
+    const haveTitle = children.length && children[0].className &&
+      (/vjs-menu-title/).test(children[0].className);
 
     if (haveTitle) {
       children.shift();

src/js/modal-dialog.js

@@ -3,10 +3,7 @@
  */
 import * as Dom from './utils/dom';
 import * as Fn from './utils/fn';
-import log from './utils/log';
-
 import Component from './component';
-import CloseButton from './close-button';
 
 const MODAL_CLASS_NAME = 'vjs-modal-dialog';
 const ESC = 27;
@@ -92,7 +89,7 @@ class ModalDialog extends Component {
       'aria-describedby': `${this.id()}_description`,
       'aria-hidden': 'true',
       'aria-label': this.label(),
-      role: 'dialog'
+      'role': 'dialog'
     });
   }
 
@@ -153,7 +150,7 @@ class ModalDialog extends Component {
    */
   open() {
     if (!this.opened_) {
-      let player = this.player();
+      const player = this.player();
 
       this.trigger('beforemodalopen');
       this.opened_ = true;
@@ -209,7 +206,7 @@ class ModalDialog extends Component {
    */
   close() {
     if (this.opened_) {
-      let player = this.player();
+      const player = this.player();
 
       this.trigger('beforemodalclose');
       this.opened_ = false;
@@ -245,7 +242,7 @@ class ModalDialog extends Component {
    */
   closeable(value) {
     if (typeof value === 'boolean') {
-      let closeable = this.closeable_ = !!value;
+      const closeable = this.closeable_ = !!value;
       let close = this.getChild('closeButton');
 
       // If this is being made closeable and has no close button, add one.
@@ -253,7 +250,8 @@ class ModalDialog extends Component {
 
         // The close button should be a child of the modal - not its
         // content element, so temporarily change the content element.
-        let temp = this.contentEl_;
+        const temp = this.contentEl_;
+
         this.contentEl_ = this.el_;
         close = this.addChild('closeButton', {controlText: 'Close Modal Dialog'});
         this.contentEl_ = temp;
@@ -294,9 +292,9 @@ class ModalDialog extends Component {
    * @return {ModalDialog}
    */
   fillWith(content) {
-    let contentEl = this.contentEl();
-    let parentEl = contentEl.parentNode;
-    let nextSiblingEl = contentEl.nextSibling;
+    const contentEl = this.contentEl();
+    const parentEl = contentEl.parentNode;
+    const nextSiblingEl = contentEl.nextSibling;
 
     this.trigger('beforemodalfill');
     this.hasBeenFilled_ = true;

src/js/plugins.js

@@ -10,7 +10,7 @@ import Player from './player.js';
  * @param  {Function} init The function that is run when the player inits
  * @method plugin
  */
-var plugin = function(name, init){
+const plugin = function(name, init) {
   Player.prototype[name] = init;
 };
 

src/js/popup/popup-button.js

@@ -3,10 +3,6 @@
  */
 import ClickableComponent from '../clickable-component.js';
 import Component from '../component.js';
-import Popup from './popup.js';
-import * as Dom from '../utils/dom.js';
-import * as Fn from '../utils/fn.js';
-import toTitleCase from '../utils/to-title-case.js';
 
 /**
  * A button class with a popup control
@@ -18,7 +14,7 @@ import toTitleCase from '../utils/to-title-case.js';
  */
 class PopupButton extends ClickableComponent {
 
-  constructor(player, options={}){
+  constructor(player, options = {}) {
     super(player, options);
 
     this.update();
@@ -30,7 +26,7 @@ class PopupButton extends ClickableComponent {
    * @method update
    */
   update() {
-    let popup = this.createPopup();
+    const popup = this.createPopup();
 
     if (this.popup) {
       this.removeChild(this.popup);
@@ -73,7 +69,7 @@ class PopupButton extends ClickableComponent {
    * @method buildCSSClass
    */
   buildCSSClass() {
-    var menuButtonClass = 'vjs-menu-button';
+    let menuButtonClass = 'vjs-menu-button';
 
     // If the inline option is passed, we want to use different styles altogether.
     if (this.options_.inline === true) {

src/js/popup/popup.js

@@ -22,7 +22,7 @@ class Popup extends Component {
    */
   addItem(component) {
     this.addChild(component);
-    component.on('click', Fn.bind(this, function(){
+    component.on('click', Fn.bind(this, function() {
       this.unlockShowing();
     }));
   }
@@ -34,19 +34,22 @@ class Popup extends Component {
    * @method createEl
    */
   createEl() {
-    let contentElType = this.options_.contentElType || 'ul';
+    const contentElType = this.options_.contentElType || 'ul';
+
     this.contentEl_ = Dom.createEl(contentElType, {
       className: 'vjs-menu-content'
     });
-    var el = super.createEl('div', {
+
+    const el = super.createEl('div', {
       append: this.contentEl_,
       className: 'vjs-menu'
     });
+
     el.appendChild(this.contentEl_);
 
     // Prevent clicks from bubbling up. Needed for Popup Buttons,
     // where a click on the parent is significant
-    Events.on(el, 'click', function(event){
+    Events.on(el, 'click', function(event) {
       event.preventDefault();
       event.stopImmediatePropagation();
     });

src/js/poster-image.js

@@ -17,7 +17,7 @@ import * as browser from './utils/browser.js';
  */
 class PosterImage extends ClickableComponent {
 
-  constructor(player, options){
+  constructor(player, options) {
     super(player, options);
 
     this.update();
@@ -41,7 +41,7 @@ class PosterImage extends ClickableComponent {
    * @method createEl
    */
   createEl() {
-    let el = Dom.createEl('div', {
+    const el = Dom.createEl('div', {
       className: 'vjs-poster',
 
       // Don't want poster to be tabbable.
@@ -66,7 +66,7 @@ class PosterImage extends ClickableComponent {
    * @method update
    */
   update() {
-    let url = this.player().poster();
+    const url = this.player().poster();
 
     this.setSrc(url);
 
@@ -90,6 +90,7 @@ class PosterImage extends ClickableComponent {
       this.fallbackImg_.src = url;
     } else {
       let backgroundImage = '';
+
       // Any falsey values should stay as an empty string, otherwise
       // this will throw an extra error
       if (url) {

src/js/setup.js

@@ -11,26 +11,27 @@ import window from 'global/window';
 let _windowLoaded = false;
 let videojs;
 
-
 // Automatically set up any tags that have a data-setup attribute
-var autoSetup = function(){
+const autoSetup = function() {
   // One day, when we stop supporting IE8, go back to this, but in the meantime...*hack hack hack*
   // var vids = Array.prototype.slice.call(document.getElementsByTagName('video'));
   // var audios = Array.prototype.slice.call(document.getElementsByTagName('audio'));
   // var mediaEls = vids.concat(audios);
 
-  // Because IE8 doesn't support calling slice on a node list, we need to loop through each list of elements
-  // to build up a new, combined list of elements.
-  var vids = document.getElementsByTagName('video');
-  var audios = document.getElementsByTagName('audio');
-  var mediaEls = [];
+  // Because IE8 doesn't support calling slice on a node list, we need to loop
+  // through each list of elements to build up a new, combined list of elements.
+  const vids = document.getElementsByTagName('video');
+  const audios = document.getElementsByTagName('audio');
+  const mediaEls = [];
+
   if (vids && vids.length > 0) {
-    for(let i=0, e=vids.length; i<e; i++) {
+    for (let i = 0, e = vids.length; i < e; i++) {
       mediaEls.push(vids[i]);
     }
   }
+
   if (audios && audios.length > 0) {
-    for(let i=0, e=audios.length; i<e; i++) {
+    for (let i = 0, e = audios.length; i < e; i++) {
       mediaEls.push(audios[i]);
     }
   }
@@ -38,22 +39,23 @@ var autoSetup = function(){
   // Check if any media elements exist
   if (mediaEls && mediaEls.length > 0) {
 
-    for (let i=0, e=mediaEls.length; i<e; i++) {
-      let mediaEl = mediaEls[i];
+    for (let i = 0, e = mediaEls.length; i < e; i++) {
+      const mediaEl = mediaEls[i];
 
       // Check if element exists, has getAttribute func.
-      // IE seems to consider typeof el.getAttribute == 'object' instead of 'function' like expected, at least when loading the player immediately.
+      // IE seems to consider typeof el.getAttribute == 'object' instead of
+      // 'function' like expected, at least when loading the player immediately.
       if (mediaEl && mediaEl.getAttribute) {
 
         // Make sure this player hasn't already been set up.
-        if (mediaEl['player'] === undefined) {
-          let options = mediaEl.getAttribute('data-setup');
+        if (mediaEl.player === undefined) {
+          const options = mediaEl.getAttribute('data-setup');
 
           // Check if data-setup attr exists.
           // We only auto-setup if they've added the data-setup attr.
           if (options !== null) {
             // Create new video.js instance.
-            let player = videojs(mediaEl);
+            videojs(mediaEl);
           }
         }
 
@@ -71,23 +73,23 @@ var autoSetup = function(){
 };
 
 // Pause to let the DOM keep processing
-var autoSetupTimeout = function(wait, vjs){
+function autoSetupTimeout(wait, vjs) {
   if (vjs) {
     videojs = vjs;
   }
 
   setTimeout(autoSetup, wait);
-};
+}
 
 if (document.readyState === 'complete') {
   _windowLoaded = true;
 } else {
-  Events.one(window, 'load', function(){
+  Events.one(window, 'load', function() {
     _windowLoaded = true;
   });
 }
 
-var hasLoaded = function() {
+const hasLoaded = function() {
   return _windowLoaded;
 };