v5.8.2 dist

.gitignore

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

.travis.yml

@@ -23,3 +23,5 @@ sudo: false
 cache:
   directories:
     - node_modules
+addons:
+  firefox: latest

CHANGELOG.md

@@ -6,6 +6,42 @@ _(none)_
 
 --------------------
 
+## 5.8.2 (2016-03-09)
+* @gkatsev fixed chapters menu. Fixes #3062 ([view](https://github.com/videojs/video.js/pull/3163))
+
+## 5.8.1 (2016-03-07)
+* @gkatsev updated videojs badges in the README ([view](https://github.com/videojs/video.js/pull/3134))
+* @BrandonOCasey converted remaining text-track modules to ES6 ([view](https://github.com/videojs/video.js/pull/3130))
+* @gkatsev cleared waiting/spinner on timeupdate. Fixes #3124 ([view](https://github.com/videojs/video.js/pull/3138))
+* @BrandonOCasey updated text track unit tests to use full es6 syntax ([view](https://github.com/videojs/video.js/pull/3148))
+* @defli added missing var to sandbox index.html example ([view](https://github.com/videojs/video.js/pull/3155))
+* @defli fixed typo and updated Turkish translations ([view](https://github.com/videojs/video.js/pull/3156))
+* @OwenEdwards fixed menu closing on ios, specifically ipad ([view](https://github.com/videojs/video.js/pull/3158))
+
+## 5.8.0 (2016-02-19)
+* @gkatsev added issue and PR templates for github ([view](https://github.com/videojs/video.js/pull/3117))
+* @Nipoto added fa.json (farsi/persian lang file) ([view](https://github.com/videojs/video.js/pull/3116))
+* @forbesjo updated travis to use latest firefox ([view](https://github.com/videojs/video.js/pull/3112))
+* @Naouak updated time display to not change if values do not change ([view](https://github.com/videojs/video.js/pull/3101))
+* @forbesjo updated track settings to not fail restoring settings when localStorage is not available ([view](https://github.com/videojs/video.js/pull/3120))
+* @mister-ben Added en.json as localization template ([view](https://github.com/videojs/video.js/pull/3096))
+* @misteroneill added alt css as video-js-cdn.css ([view](https://github.com/videojs/video.js/pull/3118))
+
+## 5.7.1 (2016-02-11)
+* @alex-phillips fixed reference to videojs-vtt.js dependency ([view](https://github.com/videojs/video.js/pull/3080))
+* @gkatsev fixed minified videojs in IE8. Fixes #3064 and #3070 ([view](https://github.com/videojs/video.js/pull/3104))
+
+## 5.7.0 (2016-02-04)
+* @forbesjo updated emulated tracks to have listeners removed when they are removed ([view](https://github.com/videojs/video.js/pull/3046))
+* @incompl improved the UX of time tooltips ([view](https://github.com/videojs/video.js/pull/3060))
+* @gkatsev updated README to include links to plugins page and getting started and cleaner link to LICENSE ([view](https://github.com/videojs/video.js/pull/3066))
+* @hartman Corrected adaptive layout selectors to match their intent ([view](https://github.com/videojs/video.js/pull/2923))
+* @mister-ben updated Umuted to Unmute in lang files ([view](https://github.com/videojs/video.js/pull/3053))
+* @hartman updated fullscreen and time controls for more consistent widths ([view](https://github.com/videojs/video.js/pull/2893))
+* @hartman Set a min-width for the progress slider of 4em ([view](https://github.com/videojs/video.js/pull/2902))
+* @misteroneill fixed iphone useragent detection ([view](https://github.com/videojs/video.js/pull/3077))
+* @erikyuzwa added ability to add child component at specific index ([view](https://github.com/videojs/video.js/pull/2540))
+
 ## 5.6.0 (2016-01-26)
 * @OwenEdwards added ClickableComponent. Fixed keyboard operation of buttons ([view](https://github.com/videojs/video.js/pull/3032))
 * @OwenEdwards Fixed menu keyboard access and ARIA labeling for screen readers ([view](https://github.com/videojs/video.js/pull/3033))

ISSUE_TEMPLATE.md

@@ -0,0 +1,32 @@
+## Description
+Briefly describe the issue.
+Include a [reduced test case](https://css-tricks.com/reduced-test-cases/), we have a [starter template](http://jsbin.com/axedog/edit?html,output) on JSBin you can use.
+
+## Steps to reproduce
+Explain in detail the exact steps necessary to reproduce the issue.
+
+1.
+2.
+3.
+
+## Results
+### Expected
+Please describe what you expected to see.
+
+### Actual
+Please describe what actually happened.
+
+### Error output
+If there are any errors at all, please include them here.
+
+## Additional Information
+Please include any additional information necessary here. Including the following:
+### versions
+#### videojs
+what version of videojs does this occur with?
+#### browsers
+what browser are affected?
+#### OSes
+what platforms (operating systems and devices) are affected?
+### plugins
+are any videojs plugins being used on the page? If so, please list them below.

PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,16 @@
+## Description
+Please describe the change as necessary.
+If it's a feature or enhancement please be as detailed as possible.
+If it's a bug fix, please link the issue that it fixes or describe the bug in as much detail.
+
+
+## Specific Changes proposed
+Please list the specific changes involved in this pull request.
+
+## Requirements Checklist
+- [ ] Feature implemented / Bug fixed
+- [ ] If necessary, more likely in a feature request than a bug fix
+  - [ ] Unit Tests updated or fixed
+  - [ ] Docs/guides updated
+  - [ ] Example created ([starter template on JSBin](http://jsbin.com/axedog/edit?html,output))
+- [ ] Reviewed by Two Core Contributors

README.md

@@ -1,11 +1,17 @@
 ![Video.js logo](http://videojs.com/img/logo.png)
 
-# [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)
+# [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)
+
+[![NPM](https://nodei.co/npm/video.js.png?downloads=true&downloadRank=true)](https://nodei.co/npm/video.js/)
 
 > Video.js is a web video player built from the ground up for an HTML5 world. It supports HTML5 and Flash video, as well as YouTube and Vimeo (through [plugins](https://github.com/videojs/video.js/wiki/Plugins)). It supports video playback on desktops and mobile devices. This project was started mid 2010, and the player is now used on over ~~50,000~~ ~~100,000~~ 200,000 websites.
 
 ## Quick start
-Thanks to the awesome folks over at [Fastly](http://www.fastly.com/), there's a free, CDN hosted version of Video.js that anyone can use. Simply add these includes to your document's
+Thanks to the awesome folks over at [Fastly](http://www.fastly.com/), there's a free, CDN hosted version of Video.js that anyone can use.
+Also, check out the [Getting Started](http://videojs.com/getting-started/) page on our website which has the latest urls as well.
+Simply add these includes to your document's
 `<head>`:
 
 ```html
@@ -14,7 +20,7 @@ Thanks to the awesome folks over at [Fastly](http://www.fastly.com/), there's a
 ```
 
 Then, whenever you want to use Video.js you can simply use the `<video>` element as your normally would, but with an additional `data-setup` attribute containing any Video.js options. These options
-can include any Video.js option plus potential [plugin](https://github.com/videojs/video.js/wiki/Plugins) options, just make sure they're valid JSON!
+can include any Video.js option plus potential [plugin](http://videojs.com/plugins/) options, just make sure they're valid JSON!
 
 ```html
 <video id="really-cool-video" class="video-js vjs-default-skin" controls
@@ -55,5 +61,3 @@ To build your own custom version read the section on [contributing code](CONTRIB
 ## License
 
 Video.js is licensed under the Apache License, Version 2.0. [View the license file](LICENSE)
-
-Copyright 2014-2015 Brightcove, Inc.

build/grunt.js

@@ -149,6 +149,10 @@ module.exports = function(grunt) {
     },
     dist: {},
     watch: {
+      minify: {
+        files: ['build/temp/video.js'],
+        tasks: ['uglify']
+      },
       skin: {
         files: ['src/css/**/*'],
         tasks: ['sass', 'wrapcodepoints']
@@ -188,7 +192,7 @@ module.exports = function(grunt) {
       minify: {
         expand: true,
         cwd: 'build/temp/',
-        src: ['video-js.css'],
+        src: ['video-js.css', 'alt/video-js-cdn.css'],
         dest: 'build/temp/',
         ext: '.min.css'
       }
@@ -196,7 +200,8 @@ module.exports = function(grunt) {
     sass: {
       build: {
         files: {
-          'build/temp/video-js.css': 'src/css/vjs.scss'
+          'build/temp/video-js.css': 'src/css/vjs.scss',
+          'build/temp/alt/video-js-cdn.css': 'src/css/vjs-cdn.scss'
         }
       }
     },
@@ -396,7 +401,7 @@ module.exports = function(grunt) {
         options: {
           separator: '\n',
         },
-        src: ['build/temp/video.js', 'node_modules/vtt.js/dist/vtt.js'],
+        src: ['build/temp/video.js', 'node_modules/videojs-vtt.js/dist/vtt.js'],
         dest: 'build/temp/video.js',
       },
     },

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

dist/lang/ar.js

@@ -11,7 +11,7 @@ videojs.addLanguage("ar",{
  "Fullscreen": "ملء الشاشة",
  "Non-Fullscreen": "غير ملء الشاشة",
  "Mute": "صامت",
- "Unmuted": "غير الصامت",
+ "Unmute": "غير الصامت",
  "Playback Rate": "معدل التشغيل",
  "Subtitles": "الترجمة",
  "subtitles off": "ايقاف الترجمة",

dist/lang/ba.js

@@ -11,7 +11,7 @@ videojs.addLanguage("ba",{
  "Fullscreen": "Puni ekran",
  "Non-Fullscreen": "Mali ekran",
  "Mute": "Prigušen",
- "Unmuted": "Ne-prigušen",
+ "Unmute": "Ne-prigušen",
  "Playback Rate": "Stopa reprodukcije",
  "Subtitles": "Podnaslov",
  "subtitles off": "Podnaslov deaktiviran",

dist/lang/bg.js

@@ -11,7 +11,7 @@ videojs.addLanguage("bg",{
  "Fullscreen": "Цял екран",
  "Non-Fullscreen": "Спиране на цял екран",
  "Mute": "Без звук",
- "Unmuted": "Със звук",
+ "Unmute": "Със звук",
  "Playback Rate": "Скорост на възпроизвеждане",
  "Subtitles": "Субтитри",
  "subtitles off": "Спряни субтитри",

dist/lang/ca.js

@@ -11,7 +11,7 @@ videojs.addLanguage("ca",{
  "Fullscreen": "Pantalla completa",
  "Non-Fullscreen": "Pantalla no completa",
  "Mute": "Silencia",
- "Unmuted": "Amb so",
+ "Unmute": "Amb so",
  "Playback Rate": "Velocitat de reproducció",
  "Subtitles": "Subtítols",
  "subtitles off": "Subtítols desactivats",

dist/lang/cs.js

@@ -11,7 +11,7 @@ videojs.addLanguage("cs",{
  "Fullscreen": "Celá obrazovka",
  "Non-Fullscreen": "Zmenšená obrazovka",
  "Mute": "Ztlumit zvuk",
- "Unmuted": "Přehrát zvuk",
+ "Unmute": "Přehrát zvuk",
  "Playback Rate": "Rychlost přehrávání",
  "Subtitles": "Titulky",
  "subtitles off": "Titulky vypnuty",

dist/lang/da.js

@@ -11,7 +11,7 @@ videojs.addLanguage("da",{
  "Fullscreen": "Fuldskærm",
  "Non-Fullscreen": "Luk fuldskærm",
  "Mute": "Uden lyd",
- "Unmuted": "Med lyd",
+ "Unmute": "Med lyd",
  "Playback Rate": "Afspilningsrate",
  "Subtitles": "Undertekster",
  "subtitles off": "Uden undertekster",

dist/lang/de.js

@@ -11,7 +11,7 @@ videojs.addLanguage("de",{
  "Fullscreen": "Vollbild",
  "Non-Fullscreen": "Kein Vollbild",
  "Mute": "Ton aus",
- "Unmuted": "Ton ein",
+ "Unmute": "Ton ein",
  "Playback Rate": "Wiedergabegeschwindigkeit",
  "Subtitles": "Untertitel",
  "subtitles off": "Untertitel aus",
@@ -22,5 +22,13 @@ videojs.addLanguage("de",{
  "A network error caused the media download to fail part-way.": "Der Videodownload ist aufgrund eines Netzwerkfehlers fehlgeschlagen.",
  "The media could not be loaded, either because the server or network failed or because the format is not supported.": "Das Video konnte nicht geladen werden, da entweder ein Server- oder Netzwerkfehler auftrat oder das Format nicht unterstützt wird.",
  "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "Die Videowiedergabe wurde entweder wegen eines Problems mit einem beschädigten Video oder wegen verwendeten Funktionen, die vom Browser nicht unterstützt werden, abgebrochen.",
- "No compatible source was found for this media.": "Für dieses Video wurde keine kompatible Quelle gefunden."
+ "No compatible source was found for this media.": "Für dieses Video wurde keine kompatible Quelle gefunden.",
+ "Play video": "Video abspielen",
+ "Close": "Schließen",
+ "Modal Window": "Modales Fenster",
+ "This is a modal window": "Dies ist ein modales Fenster",
+ "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)"
 });

dist/lang/en.js

@@ -0,0 +1,34 @@
+videojs.addLanguage("en",{
+ "Play": "Play",
+ "Pause": "Pause",
+ "Current Time": "Current Time",
+ "Duration Time": "Duration Time",
+ "Remaining Time": "Remaining Time",
+ "Stream Type": "Stream Type",
+ "LIVE": "LIVE",
+ "Loaded": "Loaded",
+ "Progress": "Progress",
+ "Fullscreen": "Fullscreen",
+ "Non-Fullscreen": "Non-Fullscreen",
+ "Mute": "Mute",
+ "Unmute": "Unmute",
+ "Playback Rate": "Playback Rate",
+ "Subtitles": "Subtitles",
+ "subtitles off": "subtitles off",
+ "Captions": "Captions",
+ "captions off": "captions off",
+ "Chapters": "Chapters",
+ "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.",
+ "Play video": "Play video",
+ "Close": "Close",
+ "Modal Window": "Modal Window",
+ "This is a modal window": "This is a modal window",
+ "This modal can be closed by pressing the Escape key or activating the close button.": "This modal can be closed by pressing the Escape key or activating the close button.",
+ ", opens captions settings dialog": ", opens captions settings dialog",
+ ", opens subtitles settings dialog": ", opens subtitles settings dialog",
+ ", selected": ", selected"
+});

dist/lang/es.js

@@ -11,7 +11,7 @@ videojs.addLanguage("es",{
  "Fullscreen": "Pantalla completa",
  "Non-Fullscreen": "Pantalla no completa",
  "Mute": "Silenciar",
- "Unmuted": "No silenciado",
+ "Unmute": "No silenciado",
  "Playback Rate": "Velocidad de reproducción",
  "Subtitles": "Subtítulos",
  "subtitles off": "Subtítulos desactivados",

dist/lang/fa.js

@@ -0,0 +1,26 @@
+videojs.addLanguage("fa",{
+ "Play": "پخش",
+ "Pause": "وقفه",
+ "Current Time": "زمان کنونی",
+ "Duration Time": "مدت زمان",
+ "Remaining Time": "زمان باقیمانده",
+ "Stream Type": "نوع استریم",
+ "LIVE": "زنده",
+ "Loaded": "فراخوانی شده",
+ "Progress": "پیشرفت",
+ "Fullscreen": "تمام صفحه",
+ "Non-Fullscreen": "نمایش عادی",
+ "Mute": "بی صدا",
+ "Unmute": "بهمراه صدا",
+ "Playback Rate": "سرعت پخش",
+ "Subtitles": "زیرنویس",
+ "subtitles off": "بدون زیرنویس",
+ "Captions": "عنوان",
+ "captions off": "بدون عنوان",
+ "Chapters": "فصل",
+ "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.": "هیچ ورودی ای برای این رسانه شناسایی نشد."
+});

dist/lang/fi.js

@@ -11,7 +11,7 @@ videojs.addLanguage("fi",{
  "Fullscreen": "Koko näyttö",
  "Non-Fullscreen": "Koko näyttö pois",
  "Mute": "Ääni pois",
- "Unmuted": "Ääni päällä",
+ "Unmute": "Ääni päällä",
  "Playback Rate": "Toistonopeus",
  "Subtitles": "Tekstitys",
  "subtitles off": "Tekstitys pois",

dist/lang/fr.js

@@ -11,7 +11,7 @@ videojs.addLanguage("fr",{
  "Fullscreen": "Plein écran",
  "Non-Fullscreen": "Fenêtré",
  "Mute": "Sourdine",
- "Unmuted": "Son activé",
+ "Unmute": "Son activé",
  "Playback Rate": "Vitesse de lecture",
  "Subtitles": "Sous-titres",
  "subtitles off": "Sous-titres désactivés",

dist/lang/hr.js

@@ -11,7 +11,7 @@ videojs.addLanguage("hr",{
  "Fullscreen": "Puni ekran",
  "Non-Fullscreen": "Mali ekran",
  "Mute": "Prigušen",
- "Unmuted": "Ne-prigušen",
+ "Unmute": "Ne-prigušen",
  "Playback Rate": "Stopa reprodukcije",
  "Subtitles": "Podnaslov",
  "subtitles off": "Podnaslov deaktiviran",

dist/lang/hu.js

@@ -11,7 +11,7 @@ videojs.addLanguage("hu",{
  "Fullscreen": "Teljes képernyő",
  "Non-Fullscreen": "Normál méret",
  "Mute": "Némítás",
- "Unmuted": "Némítás kikapcsolva",
+ "Unmute": "Némítás kikapcsolva",
  "Playback Rate": "Lejátszási sebesség",
  "Subtitles": "Feliratok",
  "subtitles off": "Feliratok kikapcsolva",

dist/lang/it.js

@@ -11,7 +11,7 @@ videojs.addLanguage("it",{
  "Fullscreen": "Schermo intero",
  "Non-Fullscreen": "Chiudi schermo intero",
  "Mute": "Muto",
- "Unmuted": "Audio",
+ "Unmute": "Audio",
  "Playback Rate": "Tasso di riproduzione",
  "Subtitles": "Sottotitoli",
  "subtitles off": "Senza sottotitoli",

dist/lang/ja.js

@@ -11,7 +11,7 @@ videojs.addLanguage("ja",{
  "Fullscreen": "フルスクリーン",
  "Non-Fullscreen": "フルスクリーン以外",
  "Mute": "ミュート",
- "Unmuted": "ミュート解除",
+ "Unmute": "ミュート解除",
  "Playback Rate": "再生レート",
  "Subtitles": "サブタイトル",
  "subtitles off": "サブタイトル オフ",

dist/lang/ko.js

@@ -11,7 +11,7 @@ videojs.addLanguage("ko",{
  "Fullscreen": "전체 화면",
  "Non-Fullscreen": "전체 화면 해제",
  "Mute": "음소거",
- "Unmuted": "음소거 해제",
+ "Unmute": "음소거 해제",
  "Playback Rate": "재생 비율",
  "Subtitles": "서브타이틀",
  "subtitles off": "서브타이틀 끄기",

dist/lang/nb.js

@@ -11,7 +11,7 @@ videojs.addLanguage("nb",{
  "Fullscreen": "Fullskjerm",
  "Non-Fullscreen": "Lukk fullskjerm",
  "Mute": "Lyd av",
- "Unmuted": "Lyd på",
+ "Unmute": "Lyd på",
  "Playback Rate": "Avspillingsrate",
  "Subtitles": "Undertekst på",
  "subtitles off": "Undertekst av",

dist/lang/nl.js

@@ -11,7 +11,7 @@ videojs.addLanguage("nl",{
  "Fullscreen": "Volledig scherm",
  "Non-Fullscreen": "Geen volledig scherm",
  "Mute": "Geluid uit",
- "Unmuted": "Geluid aan",
+ "Unmute": "Geluid aan",
  "Playback Rate": "Weergavesnelheid",
  "Subtitles": "Ondertiteling",
  "subtitles off": "Ondertiteling uit",

dist/lang/nn.js

@@ -11,7 +11,7 @@ videojs.addLanguage("nn",{
  "Fullscreen": "Fullskjerm",
  "Non-Fullscreen": "Stenga fullskjerm",
  "Mute": "Ljod av",
- "Unmuted": "Ljod på",
+ "Unmute": "Ljod på",
  "Playback Rate": "Avspelingsrate",
  "Subtitles": "Teksting på",
  "subtitles off": "Teksting av",

dist/lang/pt-BR.js

@@ -11,7 +11,7 @@ videojs.addLanguage("pt-BR",{
  "Fullscreen": "Tela Cheia",
  "Non-Fullscreen": "Tela Normal",
  "Mute": "Mudo",
- "Unmuted": "Habilitar Som",
+ "Unmute": "Habilitar Som",
  "Playback Rate": "Velocidade",
  "Subtitles": "Legendas",
  "subtitles off": "Sem Legendas",

dist/lang/ru.js

@@ -11,7 +11,7 @@ videojs.addLanguage("ru",{
  "Fullscreen": "Полноэкранный режим",
  "Non-Fullscreen": "Неполноэкранный режим",
  "Mute": "Без звука",
- "Unmuted": "Со звуком",
+ "Unmute": "Со звуком",
  "Playback Rate": "Скорость воспроизведения",
  "Subtitles": "Субтитры",
  "subtitles off": "Субтитры выкл.",

dist/lang/sr.js

@@ -11,7 +11,7 @@ videojs.addLanguage("sr",{
  "Fullscreen": "Puni ekran",
  "Non-Fullscreen": "Mali ekran",
  "Mute": "Prigušen",
- "Unmuted": "Ne-prigušen",
+ "Unmute": "Ne-prigušen",
  "Playback Rate": "Stopa reprodukcije",
  "Subtitles": "Podnaslov",
  "subtitles off": "Podnaslov deaktiviran",

dist/lang/sv.js

@@ -11,7 +11,7 @@ videojs.addLanguage("sv",{
  "Fullscreen": "Fullskärm",
  "Non-Fullscreen": "Ej fullskärm",
  "Mute": "Ljud av",
- "Unmuted": "Ljud på",
+ "Unmute": "Ljud på",
  "Playback Rate": "Uppspelningshastighet",
  "Subtitles": "Text på",
  "subtitles off": "Text av",

dist/lang/tr.js

@@ -11,10 +11,10 @@ videojs.addLanguage("tr",{
  "Fullscreen": "Tam Ekran",
  "Non-Fullscreen": "Küçük Ekran",
  "Mute": "Ses Kapa",
- "Unmuted": "Ses Aç",
+ "Unmute": "Ses Aç",
  "Playback Rate": "Oynatma Hızı",
  "Subtitles": "Altyazı",
- "subtitles off": "Altyazı Kapat",
+ "subtitles off": "Altyazı Kapalı",
  "Captions": "Ek Açıklamalar",
  "captions off": "Ek Açıklamalar Kapalı",
  "Chapters": "Bölümler",
@@ -22,5 +22,13 @@ videojs.addLanguage("tr",{
  "A network error caused the media download to fail part-way.": "Video indirilirken bağlantı sorunu oluştu.",
  "The media could not be loaded, either because the server or network failed or because the format is not supported.": "Video oynatılamadı, ağ ya da sunucu hatası veya belirtilen format desteklenmiyor.",
  "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "Tarayıcınız desteklemediği için videoda hata oluştu.",
- "No compatible source was found for this media.": "Video için kaynak bulunamadı."
+ "No compatible source was found for this media.": "Video için kaynak bulunamadı.",
+ "Play video": "Videoyu Oynat",
+ "Close": "Kapat",
+ "Modal Window": "Modal Penceresi",
+ "This is a modal window": "Bu bir modal penceresidir",
+ "This modal can be closed by pressing the Escape key or activating the close button.": "Bu modal ESC tuşuna basarak ya da kapata tıklanarak kapatılabilir.",
+ ", opens captions settings dialog": ", ek açıklama ayarları menüsünü açar",
+ ", opens subtitles settings dialog": ", altyazı ayarları menüsünü açar",
+ ", selected": ", seçildi"
 });

dist/lang/uk.js

@@ -11,7 +11,7 @@ videojs.addLanguage("uk",{
  "Fullscreen": "Повноекранний режим",
  "Non-Fullscreen": "Неповноекранний режим",
  "Mute": "Без звуку",
- "Unmuted": "Зі звуком",
+ "Unmute": "Зі звуком",
  "Playback Rate": "Швидкість відтворення",
  "Subtitles": "Субтитри",
  "subtitles off": "Без субтитрів",

dist/lang/vi.js

@@ -11,7 +11,7 @@ videojs.addLanguage("vi",{
  "Fullscreen": "Toàn màn hình",
  "Non-Fullscreen": "Thoát toàn màn hình",
  "Mute": "Tắt tiếng",
- "Unmuted": "Bật âm thanh",
+ "Unmute": "Bật âm thanh",
  "Playback Rate": "Tốc độ phát",
  "Subtitles": "Phụ đề",
  "subtitles off": "Tắt phụ đề",

dist/lang/zh-CN.js

@@ -11,7 +11,7 @@ videojs.addLanguage("zh-CN",{
  "Fullscreen": "全屏",
  "Non-Fullscreen": "退出全屏",
  "Mute": "静音",
- "Unmuted": "取消静音",
+ "Unmute": "取消静音",
  "Playback Rate": "播放码率",
  "Subtitles": "字幕",
  "subtitles off": "字幕关闭",

dist/lang/zh-TW.js

@@ -11,7 +11,7 @@ videojs.addLanguage("zh-TW",{
  "Fullscreen": "全螢幕",
  "Non-Fullscreen": "退出全螢幕",
  "Mute": "靜音",
- "Unmuted": "取消靜音",
+ "Unmute": "取消靜音",
  "Playback Rate": " 播放速率",
  "Subtitles": "字幕",
  "subtitles off": "關閉字幕",

dist/video-js.css

@@ -475,7 +475,7 @@ body.vjs-full-window {
   bottom: 1.5em;
   max-height: 15em; }
 
-.vjs-menu-button-popup:hover .vjs-menu,
+.vjs-workinghover .vjs-menu-button-popup:hover .vjs-menu,
 .vjs-menu-button-popup .vjs-menu.vjs-lock-showing {
   display: block; }
 
@@ -637,7 +637,8 @@ body.vjs-full-window {
   -webkit-box-align: center;
   -webkit-align-items: center;
   -ms-flex-align: center;
-  align-items: center; }
+  align-items: center;
+  min-width: 4em; }
 
 .vjs-live .vjs-progress-control {
   display: none; }
@@ -692,12 +693,12 @@ body.vjs-full-window {
 .video-js .vjs-play-progress:after {
   display: none;
   position: absolute;
-  top: -2.4em;
+  top: -3.4em;
   right: -1.5em;
   font-size: 0.9em;
   color: #000;
   content: attr(data-current-time);
-  padding: 0.2em 0.5em;
+  padding: 6px 8px 8px 8px;
   background-color: #fff;
   background-color: rgba(255, 255, 255, 0.8);
   -webkit-border-radius: 0.3em;
@@ -931,7 +932,11 @@ body.vjs-full-window {
   -ms-flex: none;
   flex: none;
   font-size: 1em;
-  line-height: 3em; }
+  line-height: 3em;
+  min-width: 2em;
+  width: auto;
+  padding-left: 1em;
+  padding-right: 1em; }
 
 .vjs-live .vjs-time-control {
   display: none; }
@@ -1001,7 +1006,6 @@ video::-webkit-media-text-track-display {
   transform: translateY(-1.5em); }
 
 .video-js .vjs-fullscreen-control {
-  width: 3.8em;
   cursor: pointer;
   -webkit-box-flex: none;
   -moz-box-flex: none;
@@ -1124,10 +1128,6 @@ video::-webkit-media-text-track-display {
   100% {
     border-top-color: #73859f; } }
 
-.vjs-chapters-button .vjs-menu {
-  left: -10em;
-  width: 0; }
-
 .vjs-chapters-button .vjs-menu ul {
   width: 24em; }
 
@@ -1141,22 +1141,22 @@ video::-webkit-media-text-track-display {
 .video-js.vjs-layout-tiny:not(.vjs-fullscreen).vjs-no-flex .vjs-custom-control-spacer {
   width: auto; }
 
-.video-js.vjs-layout-tiny:not(.vjs-fullscreen) .vjs-current-time, .video-js.vjs-layout-tiny:not(.vjs-fullscreen) .vjs-captions-button, .video-js.vjs-layout-tiny:not(.vjs-fullscreen) .vjs-time-divider,
-.video-js.vjs-layout-tiny:not(.vjs-fullscreen) .vjs-progress-control, .video-js.vjs-layout-tiny:not(.vjs-fullscreen) .vjs-duration, .video-js.vjs-layout-tiny:not(.vjs-fullscreen) .vjs-remaining-time, .video-js.vjs-layout-tiny:not(.vjs-fullscreen) .vjs-playback-rate,
-.video-js.vjs-layout-tiny:not(.vjs-fullscreen) .vjs-mute-control, .video-js.vjs-layout-tiny:not(.vjs-fullscreen) .vjs-volume-control, .video-js.vjs-layout-tiny:not(.vjs-fullscreen) .vjs-chapters-button, .video-js.vjs-layout-tiny:not(.vjs-fullscreen) .vjs-captions-button,
-.video-js.vjs-layout-tiny:not(.vjs-fullscreen) .vjs-subtitles-button, .video-js.vjs-layout-tiny:not(.vjs-fullscreen) .vjs-volume-menu-button {
+.video-js.vjs-layout-tiny:not(.vjs-fullscreen) .vjs-current-time, .video-js.vjs-layout-tiny:not(.vjs-fullscreen) .vjs-time-divider, .video-js.vjs-layout-tiny:not(.vjs-fullscreen) .vjs-duration, .video-js.vjs-layout-tiny:not(.vjs-fullscreen) .vjs-remaining-time,
+.video-js.vjs-layout-tiny:not(.vjs-fullscreen) .vjs-playback-rate, .video-js.vjs-layout-tiny:not(.vjs-fullscreen) .vjs-progress-control,
+.video-js.vjs-layout-tiny:not(.vjs-fullscreen) .vjs-mute-control, .video-js.vjs-layout-tiny:not(.vjs-fullscreen) .vjs-volume-control, .video-js.vjs-layout-tiny:not(.vjs-fullscreen) .vjs-volume-menu-button,
+.video-js.vjs-layout-tiny:not(.vjs-fullscreen) .vjs-chapters-button, .video-js.vjs-layout-tiny:not(.vjs-fullscreen) .vjs-captions-button, .video-js.vjs-layout-tiny:not(.vjs-fullscreen) .vjs-subtitles-button {
   display: none; }
 
-.video-js.vjs-layout-x-small:not(.vjs-fullscreen) .vjs-current-time, .video-js.vjs-layout-x-small:not(.vjs-fullscreen) .vjs-captions-button, .video-js.vjs-layout-x-small:not(.vjs-fullscreen) .vjs-time-divider,
-.video-js.vjs-layout-x-small:not(.vjs-fullscreen) .vjs-duration, .video-js.vjs-layout-x-small:not(.vjs-fullscreen) .vjs-remaining-time, .video-js.vjs-layout-x-small:not(.vjs-fullscreen) .vjs-playback-rate, .video-js.vjs-layout-x-small:not(.vjs-fullscreen) .vjs-captions-button,
-.video-js.vjs-layout-x-small:not(.vjs-fullscreen) .vjs-mute-control, .video-js.vjs-layout-x-small:not(.vjs-fullscreen) .vjs-volume-control, .video-js.vjs-layout-x-small:not(.vjs-fullscreen) .vjs-chapters-button,
-.video-js.vjs-layout-x-small:not(.vjs-fullscreen) .vjs-subtitles-button, .video-js.vjs-layout-x-small:not(.vjs-fullscreen) .vjs-volume-button, .video-js.vjs-layout-x-small:not(.vjs-fullscreen) .vjs-fullscreen-control {
+.video-js.vjs-layout-x-small:not(.vjs-fullscreen) .vjs-current-time, .video-js.vjs-layout-x-small:not(.vjs-fullscreen) .vjs-time-divider, .video-js.vjs-layout-x-small:not(.vjs-fullscreen) .vjs-duration, .video-js.vjs-layout-x-small:not(.vjs-fullscreen) .vjs-remaining-time,
+.video-js.vjs-layout-x-small:not(.vjs-fullscreen) .vjs-playback-rate,
+.video-js.vjs-layout-x-small:not(.vjs-fullscreen) .vjs-mute-control, .video-js.vjs-layout-x-small:not(.vjs-fullscreen) .vjs-volume-control, .video-js.vjs-layout-x-small:not(.vjs-fullscreen) .vjs-volume-menu-button,
+.video-js.vjs-layout-x-small:not(.vjs-fullscreen) .vjs-chapters-button, .video-js.vjs-layout-x-small:not(.vjs-fullscreen) .vjs-captions-button, .video-js.vjs-layout-x-small:not(.vjs-fullscreen) .vjs-subtitles-button {
   display: none; }
 
-.video-js.vjs-layout-small:not(.vjs-fullscreen) .vjs-current-time, .video-js.vjs-layout-small:not(.vjs-fullscreen) .vjs-captions-button, .video-js.vjs-layout-small:not(.vjs-fullscreen) .vjs-time-divider,
-.video-js.vjs-layout-small:not(.vjs-fullscreen) .vjs-duration, .video-js.vjs-layout-small:not(.vjs-fullscreen) .vjs-remaining-time, .video-js.vjs-layout-small:not(.vjs-fullscreen) .vjs-playback-rate,
-.video-js.vjs-layout-small:not(.vjs-fullscreen) .vjs-mute-control, .video-js.vjs-layout-small:not(.vjs-fullscreen) .vjs-volume-control, .video-js.vjs-layout-small:not(.vjs-fullscreen) .vjs-chapters-button,
-.video-js.vjs-layout-small:not(.vjs-fullscreen) .vjs-subtitles-button {
+.video-js.vjs-layout-small:not(.vjs-fullscreen) .vjs-current-time, .video-js.vjs-layout-small:not(.vjs-fullscreen) .vjs-time-divider, .video-js.vjs-layout-small:not(.vjs-fullscreen) .vjs-duration, .video-js.vjs-layout-small:not(.vjs-fullscreen) .vjs-remaining-time,
+.video-js.vjs-layout-small:not(.vjs-fullscreen) .vjs-playback-rate,
+.video-js.vjs-layout-small:not(.vjs-fullscreen) .vjs-mute-control, .video-js.vjs-layout-small:not(.vjs-fullscreen) .vjs-volume-control,
+.video-js.vjs-layout-small:not(.vjs-fullscreen) .vjs-chapters-button, .video-js.vjs-layout-small:not(.vjs-fullscreen) .vjs-captions-button, .video-js.vjs-layout-small:not(.vjs-fullscreen) .vjs-subtitles-button {
   display: none; }
 
 .vjs-caption-settings {

docs/guides/languages.md

@@ -5,7 +5,11 @@ Multiple language support allows for users of non-English locales to natively in
 
 Creating the Language File
 --------------------------
-Video.js uses key/value object dictionaries in JSON form. A sample dictionary for Spanish `['es']` would look as follows;
+Video.js uses key/value object dictionaries in JSON form.
+
+An English lang file is at [/lang/en.json](https://github.com/videojs/video.js/tree/master/lang/en.json) which should be used as a template for new files. This will be kept up to date with strings in the core player that need localizations.
+
+A sample dictionary for Spanish `['es']` would look as follows:
 
 ```JSON
 {
@@ -21,7 +25,7 @@ Video.js uses key/value object dictionaries in JSON form. A sample dictionary fo
   "Fullscreen": "Pantalla completa",
   "Non-Fullscreen": "Pantalla no completa",
   "Mute": "Silenciar",
-  "Unmuted": "No silenciado",
+  "Unmute": "No silenciado",
   "Playback Rate": "Velocidad de reproducción",
   "Subtitles": "Subtítulos",
   "subtitles off": "Subtítulos desactivados",
@@ -38,7 +42,7 @@ Video.js uses key/value object dictionaries in JSON form. A sample dictionary fo
 
 Notes:
 
-- The file name should always be in the format `XX.json`, where `XX` is the two letter value of the language reported to the browser (for options see the bottom of this document).
+- The file name should always be in the format `XX.json`, where `XX` is the language code. This should be a two letter code (for options see the bottom of this document) except for cases where a more specific code with sub-code is appropriate, e.g. `zh-CN.lang`.
 - For automatic inclusion at build time, add your language file to the `/lang` directory (see 'Adding Languages to Video.js below').
 
 Adding Languages to Video.js
@@ -69,7 +73,7 @@ NOTE: These need to be added after the core Video.js script.
     "Fullscreen": "Pantalla completa",
     "Non-Fullscreen": "Pantalla no completa",
     "Mute": "Silenciar",
-    "Unmuted": "No silenciado",
+    "Unmute": "No silenciado",
     "Playback Rate": "Velocidad de reproducción",
     "Subtitles": "Subtítulos",
     "subtitles off": "Subtítulos desactivados",

lang/ar.json

@@ -11,7 +11,7 @@
   "Fullscreen": "ملء الشاشة",
   "Non-Fullscreen": "غير ملء الشاشة",
   "Mute": "صامت",
-  "Unmuted": "غير الصامت",
+  "Unmute": "غير الصامت",
   "Playback Rate": "معدل التشغيل",
   "Subtitles": "الترجمة",
   "subtitles off": "ايقاف الترجمة",

lang/ba.json

@@ -11,7 +11,7 @@
   "Fullscreen": "Puni ekran",
   "Non-Fullscreen": "Mali ekran",
   "Mute": "Prigušen",
-  "Unmuted": "Ne-prigušen",
+  "Unmute": "Ne-prigušen",
   "Playback Rate": "Stopa reprodukcije",
   "Subtitles": "Podnaslov",
   "subtitles off": "Podnaslov deaktiviran",

lang/bg.json

@@ -11,7 +11,7 @@
   "Fullscreen": "Цял екран",
   "Non-Fullscreen": "Спиране на цял екран",
   "Mute": "Без звук",
-  "Unmuted": "Със звук",
+  "Unmute": "Със звук",
   "Playback Rate": "Скорост на възпроизвеждане",
   "Subtitles": "Субтитри",
   "subtitles off": "Спряни субтитри",

lang/ca.json

@@ -11,7 +11,7 @@
   "Fullscreen": "Pantalla completa",
   "Non-Fullscreen": "Pantalla no completa",
   "Mute": "Silencia",
-  "Unmuted": "Amb so",
+  "Unmute": "Amb so",
   "Playback Rate": "Velocitat de reproducció",
   "Subtitles": "Subtítols",
   "subtitles off": "Subtítols desactivats",

lang/cs.json

@@ -11,7 +11,7 @@
   "Fullscreen": "Celá obrazovka",
   "Non-Fullscreen": "Zmenšená obrazovka",
   "Mute": "Ztlumit zvuk",
-  "Unmuted": "Přehrát zvuk",
+  "Unmute": "Přehrát zvuk",
   "Playback Rate": "Rychlost přehrávání",
   "Subtitles": "Titulky",
   "subtitles off": "Titulky vypnuty",

lang/da.json

@@ -11,7 +11,7 @@
   "Fullscreen": "Fuldskærm",
   "Non-Fullscreen": "Luk fuldskærm",
   "Mute": "Uden lyd",
-  "Unmuted": "Med lyd",
+  "Unmute": "Med lyd",
   "Playback Rate": "Afspilningsrate",
   "Subtitles": "Undertekster",
   "subtitles off": "Uden undertekster",

lang/de.json

@@ -11,7 +11,7 @@
   "Fullscreen": "Vollbild",
   "Non-Fullscreen": "Kein Vollbild",
   "Mute": "Ton aus",
-  "Unmuted": "Ton ein",
+  "Unmute": "Ton ein",
   "Playback Rate": "Wiedergabegeschwindigkeit",
   "Subtitles": "Untertitel",
   "subtitles off": "Untertitel aus",
@@ -22,5 +22,13 @@
   "A network error caused the media download to fail part-way.": "Der Videodownload ist aufgrund eines Netzwerkfehlers fehlgeschlagen.",
   "The media could not be loaded, either because the server or network failed or because the format is not supported.": "Das Video konnte nicht geladen werden, da entweder ein Server- oder Netzwerkfehler auftrat oder das Format nicht unterstützt wird.",
   "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "Die Videowiedergabe wurde entweder wegen eines Problems mit einem beschädigten Video oder wegen verwendeten Funktionen, die vom Browser nicht unterstützt werden, abgebrochen.",
-  "No compatible source was found for this media.": "Für dieses Video wurde keine kompatible Quelle gefunden."
+  "No compatible source was found for this media.": "Für dieses Video wurde keine kompatible Quelle gefunden.",
+  "Play video": "Video abspielen",
+  "Close": "Schließen",
+  "Modal Window": "Modales Fenster",
+  "This is a modal window": "Dies ist ein modales Fenster",
+  "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)"
 }

lang/en.json

@@ -0,0 +1,34 @@
+{
+  "Play": "Play",
+  "Pause": "Pause",
+  "Current Time": "Current Time",
+  "Duration Time": "Duration Time",
+  "Remaining Time": "Remaining Time",
+  "Stream Type": "Stream Type",
+  "LIVE": "LIVE",
+  "Loaded": "Loaded",
+  "Progress": "Progress",
+  "Fullscreen": "Fullscreen",
+  "Non-Fullscreen": "Non-Fullscreen",
+  "Mute": "Mute",
+  "Unmute": "Unmute",
+  "Playback Rate": "Playback Rate",
+  "Subtitles": "Subtitles",
+  "subtitles off": "subtitles off",
+  "Captions": "Captions",
+  "captions off": "captions off",
+  "Chapters": "Chapters",
+  "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.",
+  "Play video": "Play video",
+  "Close": "Close",
+  "Modal Window": "Modal Window",
+  "This is a modal window": "This is a modal window",
+  "This modal can be closed by pressing the Escape key or activating the close button.": "This modal can be closed by pressing the Escape key or activating the close button.",
+  ", opens captions settings dialog": ", opens captions settings dialog",
+  ", opens subtitles settings dialog": ", opens subtitles settings dialog",
+  ", selected": ", selected"
+}

lang/es.json

@@ -11,7 +11,7 @@
   "Fullscreen": "Pantalla completa",
   "Non-Fullscreen": "Pantalla no completa",
   "Mute": "Silenciar",
-  "Unmuted": "No silenciado",
+  "Unmute": "No silenciado",
   "Playback Rate": "Velocidad de reproducción",
   "Subtitles": "Subtítulos",
   "subtitles off": "Subtítulos desactivados",

lang/fa.json

@@ -0,0 +1,26 @@
+{
+  "Play": "پخش",
+  "Pause": "وقفه",
+  "Current Time": "زمان کنونی",
+  "Duration Time": "مدت زمان",
+  "Remaining Time": "زمان باقیمانده",
+  "Stream Type": "نوع استریم",
+  "LIVE": "زنده",
+  "Loaded": "فراخوانی شده",
+  "Progress": "پیشرفت",
+  "Fullscreen": "تمام صفحه",
+  "Non-Fullscreen": "نمایش عادی",
+  "Mute": "بی صدا",
+  "Unmute": "بهمراه صدا",
+  "Playback Rate": "سرعت پخش",
+  "Subtitles": "زیرنویس",
+  "subtitles off": "بدون زیرنویس",
+  "Captions": "عنوان",
+  "captions off": "بدون عنوان",
+  "Chapters": "فصل",
+  "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.": "هیچ ورودی ای برای این رسانه شناسایی نشد."
+}

lang/fi.json

@@ -11,7 +11,7 @@
   "Fullscreen": "Koko näyttö",
   "Non-Fullscreen": "Koko näyttö pois",
   "Mute": "Ääni pois",
-  "Unmuted": "Ääni päällä",
+  "Unmute": "Ääni päällä",
   "Playback Rate": "Toistonopeus",
   "Subtitles": "Tekstitys",
   "subtitles off": "Tekstitys pois",

lang/fr.json

@@ -11,7 +11,7 @@
   "Fullscreen": "Plein écran",
   "Non-Fullscreen": "Fenêtré",
   "Mute": "Sourdine",
-  "Unmuted": "Son activé",
+  "Unmute": "Son activé",
   "Playback Rate": "Vitesse de lecture",
   "Subtitles": "Sous-titres",
   "subtitles off": "Sous-titres désactivés",

lang/hr.json

@@ -11,7 +11,7 @@
   "Fullscreen": "Puni ekran",
   "Non-Fullscreen": "Mali ekran",
   "Mute": "Prigušen",
-  "Unmuted": "Ne-prigušen",
+  "Unmute": "Ne-prigušen",
   "Playback Rate": "Stopa reprodukcije",
   "Subtitles": "Podnaslov",
   "subtitles off": "Podnaslov deaktiviran",

lang/hu.json

@@ -11,7 +11,7 @@
   "Fullscreen": "Teljes képernyő",
   "Non-Fullscreen": "Normál méret",
   "Mute": "Némítás",
-  "Unmuted": "Némítás kikapcsolva",
+  "Unmute": "Némítás kikapcsolva",
   "Playback Rate": "Lejátszási sebesség",
   "Subtitles": "Feliratok",
   "subtitles off": "Feliratok kikapcsolva",

lang/it.json

@@ -11,7 +11,7 @@
   "Fullscreen": "Schermo intero",
   "Non-Fullscreen": "Chiudi schermo intero",
   "Mute": "Muto",
-  "Unmuted": "Audio",
+  "Unmute": "Audio",
   "Playback Rate": "Tasso di riproduzione",
   "Subtitles": "Sottotitoli",
   "subtitles off": "Senza sottotitoli",

lang/ja.json

@@ -11,7 +11,7 @@
   "Fullscreen": "フルスクリーン",
   "Non-Fullscreen": "フルスクリーン以外",
   "Mute": "ミュート",
-  "Unmuted": "ミュート解除",
+  "Unmute": "ミュート解除",
   "Playback Rate": "再生レート",
   "Subtitles": "サブタイトル",
   "subtitles off": "サブタイトル オフ",

lang/ko.json

@@ -11,7 +11,7 @@
   "Fullscreen": "전체 화면",
   "Non-Fullscreen": "전체 화면 해제",
   "Mute": "음소거",
-  "Unmuted": "음소거 해제",
+  "Unmute": "음소거 해제",
   "Playback Rate": "재생 비율",
   "Subtitles": "서브타이틀",
   "subtitles off": "서브타이틀 끄기",

lang/nb.json

@@ -11,7 +11,7 @@
   "Fullscreen": "Fullskjerm",
   "Non-Fullscreen": "Lukk fullskjerm",
   "Mute": "Lyd av",
-  "Unmuted": "Lyd på",
+  "Unmute": "Lyd på",
   "Playback Rate": "Avspillingsrate",
   "Subtitles": "Undertekst på",
   "subtitles off": "Undertekst av",

lang/nl.json

@@ -11,7 +11,7 @@
   "Fullscreen": "Volledig scherm",
   "Non-Fullscreen": "Geen volledig scherm",
   "Mute": "Geluid uit",
-  "Unmuted": "Geluid aan",
+  "Unmute": "Geluid aan",
   "Playback Rate": "Weergavesnelheid",
   "Subtitles": "Ondertiteling",
   "subtitles off": "Ondertiteling uit",

lang/nn.json

@@ -11,7 +11,7 @@
   "Fullscreen": "Fullskjerm",
   "Non-Fullscreen": "Stenga fullskjerm",
   "Mute": "Ljod av",
-  "Unmuted": "Ljod på",
+  "Unmute": "Ljod på",
   "Playback Rate": "Avspelingsrate",
   "Subtitles": "Teksting på",
   "subtitles off": "Teksting av",

lang/pt-BR.json

@@ -11,7 +11,7 @@
   "Fullscreen": "Tela Cheia",
   "Non-Fullscreen": "Tela Normal",
   "Mute": "Mudo",
-  "Unmuted": "Habilitar Som",
+  "Unmute": "Habilitar Som",
   "Playback Rate": "Velocidade",
   "Subtitles": "Legendas",
   "subtitles off": "Sem Legendas",

lang/ru.json

@@ -11,7 +11,7 @@
  "Fullscreen": "Полноэкранный режим",
  "Non-Fullscreen": "Неполноэкранный режим",
  "Mute": "Без звука",
- "Unmuted": "Со звуком",
+ "Unmute": "Со звуком",
  "Playback Rate": "Скорость воспроизведения",
  "Subtitles": "Субтитры",
  "subtitles off": "Субтитры выкл.",

lang/sr.json

@@ -11,7 +11,7 @@
   "Fullscreen": "Puni ekran",
   "Non-Fullscreen": "Mali ekran",
   "Mute": "Prigušen",
-  "Unmuted": "Ne-prigušen",
+  "Unmute": "Ne-prigušen",
   "Playback Rate": "Stopa reprodukcije",
   "Subtitles": "Podnaslov",
   "subtitles off": "Podnaslov deaktiviran",

lang/sv.json

@@ -11,7 +11,7 @@
   "Fullscreen": "Fullskärm",
   "Non-Fullscreen": "Ej fullskärm",
   "Mute": "Ljud av",
-  "Unmuted": "Ljud på",
+  "Unmute": "Ljud på",
   "Playback Rate": "Uppspelningshastighet",
   "Subtitles": "Text på",
   "subtitles off": "Text av",

lang/tr.json

@@ -11,10 +11,10 @@
  "Fullscreen": "Tam Ekran",
  "Non-Fullscreen": "Küçük Ekran",
  "Mute": "Ses Kapa",
- "Unmuted": "Ses Aç",
+ "Unmute": "Ses Aç",
  "Playback Rate": "Oynatma Hızı",
  "Subtitles": "Altyazı",
- "subtitles off": "Altyazı Kapat",
+ "subtitles off": "Altyazı Kapalı",
  "Captions": "Ek Açıklamalar",
  "captions off": "Ek Açıklamalar Kapalı",
  "Chapters": "Bölümler",
@@ -22,5 +22,13 @@
  "A network error caused the media download to fail part-way.": "Video indirilirken bağlantı sorunu oluştu.",
  "The media could not be loaded, either because the server or network failed or because the format is not supported.": "Video oynatılamadı, ağ ya da sunucu hatası veya belirtilen format desteklenmiyor.",
  "The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "Tarayıcınız desteklemediği için videoda hata oluştu.",
- "No compatible source was found for this media.": "Video için kaynak bulunamadı."
+ "No compatible source was found for this media.": "Video için kaynak bulunamadı.",
+ "Play video": "Videoyu Oynat",
+ "Close": "Kapat",
+ "Modal Window": "Modal Penceresi",
+ "This is a modal window": "Bu bir modal penceresidir",
+ "This modal can be closed by pressing the Escape key or activating the close button.": "Bu modal ESC tuşuna basarak ya da kapata tıklanarak kapatılabilir.",
+ ", opens captions settings dialog": ", ek açıklama ayarları menüsünü açar",
+ ", opens subtitles settings dialog": ", altyazı ayarları menüsünü açar",
+ ", selected": ", seçildi"
 }

lang/uk.json

@@ -11,7 +11,7 @@
  "Fullscreen": "Повноекранний режим",
  "Non-Fullscreen": "Неповноекранний режим",
  "Mute": "Без звуку",
- "Unmuted": "Зі звуком",
+ "Unmute": "Зі звуком",
  "Playback Rate": "Швидкість відтворення",
  "Subtitles": "Субтитри",
  "subtitles off": "Без субтитрів",

lang/vi.json

@@ -11,7 +11,7 @@
   "Fullscreen": "Toàn màn hình",
   "Non-Fullscreen": "Thoát toàn màn hình",
   "Mute": "Tắt tiếng",
-  "Unmuted": "Bật âm thanh",
+  "Unmute": "Bật âm thanh",
   "Playback Rate": "Tốc độ phát",
   "Subtitles": "Phụ đề",
   "subtitles off": "Tắt phụ đề",

lang/zh-CN.json

@@ -11,7 +11,7 @@
   "Fullscreen": "全屏",
   "Non-Fullscreen": "退出全屏",
   "Mute": "静音",
-  "Unmuted": "取消静音",
+  "Unmute": "取消静音",
   "Playback Rate": "播放码率",
   "Subtitles": "字幕",
   "subtitles off": "字幕关闭",

lang/zh-TW.json

@@ -11,7 +11,7 @@
   "Fullscreen": "全螢幕",
   "Non-Fullscreen": "退出全螢幕",
   "Mute": "靜音",
-  "Unmuted": "取消靜音",
+  "Unmute": "取消靜音",
   "Playback Rate": " 播放速率",
   "Subtitles": "字幕",
   "subtitles off": "關閉字幕",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "video.js",
   "description": "An HTML5 and Flash video player with a common API and skin for both.",
-  "version": "5.6.0",
+  "version": "5.8.2",
   "copyright": "Copyright Brightcove, Inc. <https://www.brightcove.com/>",
   "license": "Apache-2.0",
   "keywords": [

sandbox/index.html.example

@@ -37,7 +37,7 @@
   </video>
 
   <script>
-    vid = document.getElementById("vid1");
+    var vid = document.getElementById("vid1");
   </script>
 
 </body>

sandbox/language.html.example

@@ -32,7 +32,7 @@
       "Fullscreen": "Pantalla Completa",
       "Non-Fullscreen": "No Pantalla Completa",
       "Mute": "Mudo",
-      "Unmuted": "Activar sonido",
+      "Unmute": "Activar sonido",
       "Playback Rate": "Reproduccion Cambio",
       "Subtitles": "Subtitulos",
       "subtitles off": "subtitulos fuera",

src/css/components/_adaptive.scss

@@ -5,10 +5,10 @@
   .vjs-custom-control-spacer { @include flex(auto); }
   &.vjs-no-flex .vjs-custom-control-spacer { width: auto; }
 
-  .vjs-current-time, .vjs-captions-button, .vjs-time-divider,
-  .vjs-progress-control, .vjs-duration, .vjs-remaining-time, .vjs-playback-rate,
-  .vjs-mute-control, .vjs-volume-control, .vjs-chapters-button, .vjs-captions-button,
-  .vjs-subtitles-button, .vjs-volume-menu-button { display: none; }
+  .vjs-current-time, .vjs-time-divider, .vjs-duration, .vjs-remaining-time,
+  .vjs-playback-rate, .vjs-progress-control,
+  .vjs-mute-control, .vjs-volume-control, .vjs-volume-menu-button,
+  .vjs-chapters-button, .vjs-captions-button, .vjs-subtitles-button { display: none; }
 }
 
 // When the player is x-small, display nothing but:
@@ -16,10 +16,10 @@
 // - Progress bar
 // - Fullscreen Button
 .video-js.vjs-layout-x-small:not(.vjs-fullscreen) {
-  .vjs-current-time, .vjs-captions-button, .vjs-time-divider,
-  .vjs-duration, .vjs-remaining-time, .vjs-playback-rate, .vjs-captions-button,
-  .vjs-mute-control, .vjs-volume-control, .vjs-chapters-button,
-  .vjs-subtitles-button, .vjs-volume-button, .vjs-fullscreen-control { display: none; }
+  .vjs-current-time, .vjs-time-divider, .vjs-duration, .vjs-remaining-time,
+  .vjs-playback-rate,
+  .vjs-mute-control, .vjs-volume-control, .vjs-volume-menu-button,
+  .vjs-chapters-button, .vjs-captions-button, .vjs-subtitles-button { display: none; }
 }
 
 
@@ -30,8 +30,8 @@
 // - Captions Button
 // - Fullscreen button
 .video-js.vjs-layout-small:not(.vjs-fullscreen) {
-  .vjs-current-time, .vjs-captions-button, .vjs-time-divider,
-  .vjs-duration, .vjs-remaining-time, .vjs-playback-rate,
-  .vjs-mute-control, .vjs-volume-control, .vjs-chapters-button,
-  .vjs-subtitles-button { display: none; }
+  .vjs-current-time, .vjs-time-divider, .vjs-duration, .vjs-remaining-time,
+  .vjs-playback-rate,
+  .vjs-mute-control, .vjs-volume-control,
+  .vjs-chapters-button, .vjs-captions-button, .vjs-subtitles-button { display: none; }
 }

src/css/components/_chapters.scss

@@ -2,11 +2,6 @@
   @extend .vjs-icon-chapters;
 }
 
-.vjs-chapters-button .vjs-menu {
-  left: -10em; // (Width of vjs-menu - width of vjs-control) / 2
-  width: 0;
-}
-
 .vjs-chapters-button .vjs-menu ul {
   width: 24em;
 }

src/css/components/_fullscreen.scss

@@ -1,5 +1,4 @@
 .video-js .vjs-fullscreen-control {
-  width: 3.8em;
   cursor: pointer;
   @include flex(none);
 }

src/css/components/_progress.scss

@@ -15,6 +15,7 @@
 .video-js .vjs-progress-control {
   @include flex(auto);
   @include display-flex(center);
+  min-width: 4em;
 }
 
 .vjs-live .vjs-progress-control {
@@ -86,12 +87,12 @@
 .video-js .vjs-play-progress:after {
   display: none;
   position: absolute;
-  top: -2.4em;
+  top: -3.4em;
   right: -1.5em;
   font-size: 0.9em;
   color: #000;
   content: attr(data-current-time);
-  padding: 0.2em 0.5em;
+  padding: 6px 8px 8px 8px;
   @include background-color-with-alpha(#fff, 0.8);
   @include border-radius(0.3em);
 }

src/css/components/_time.scss

@@ -2,6 +2,10 @@
   @include flex(none);
   font-size: 1em;
   line-height: 3em;
+  min-width: 2em;
+  width: auto;
+  padding-left: 1em;
+  padding-right: 1em;
 }
 
 .vjs-live .vjs-time-control {

src/css/components/menu/_menu-popup.scss

@@ -19,7 +19,7 @@
   max-height: 15em;
 }
 
-.vjs-menu-button-popup:hover .vjs-menu,
+.vjs-workinghover .vjs-menu-button-popup:hover .vjs-menu,
 .vjs-menu-button-popup .vjs-menu.vjs-lock-showing {
   display: block;
 }

src/css/vjs-cdn.scss

@@ -0,0 +1,3 @@
+$icon-font-path: '//vjs.zencdn.net/font/1.5.1';
+
+@import 'video-js';

src/js/component.js

@@ -336,10 +336,11 @@ class Component {
    *
    * @param {String|Component} child The class name or instance of a child to add
    * @param {Object=} options Options, including options to be passed to children of the child.
+   * @param {Number} index into our children array to attempt to add the child
    * @return {Component} The child component (created by this process if a string was used)
    * @method addChild
    */
-  addChild(child, options={}) {
+  addChild(child, options={}, index=this.children_.length) {
     let component;
     let componentName;
 
@@ -388,7 +389,7 @@ class Component {
       component = child;
     }
 
-    this.children_.push(component);
+    this.children_.splice(index, 0, component);
 
     if (typeof component.id === 'function') {
       this.childIndex_[component.id()] = component;
@@ -405,7 +406,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()) {
-      this.contentEl().appendChild(component.el());
+      let childNodes = this.contentEl().children;
+      let refNode = childNodes[index] || null;
+      this.contentEl().insertBefore(component.el(), refNode);
     }
 
     // Return so it can stored on parent object if desired.

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

@@ -90,11 +90,13 @@ class ChaptersButton extends TextTrackButton {
     let menu = this.menu;
     if (menu === undefined) {
       menu = new Menu(this.player_);
-      menu.contentEl().appendChild(Dom.createEl('li', {
+      let title = Dom.createEl('li', {
         className: 'vjs-menu-title',
         innerHTML: toTitleCase(this.kind_),
         tabIndex: -1
-      }));
+      });
+      menu.children_.unshift(title);
+      Dom.insertElFirst(title, menu.contentEl());
     }
 
     if (chaptersTrack && chaptersTrack.cues == null) {

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

@@ -55,7 +55,10 @@ class CurrentTimeDisplay extends Component {
     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());
-    this.contentEl_.innerHTML = `<span class="vjs-control-text">${localizedText}</span> ${formattedTime}`;
+    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

@@ -58,7 +58,8 @@ class DurationDisplay extends Component {
    */
   updateContent() {
     let duration = this.player_.duration();
-    if (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

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

@@ -54,7 +54,10 @@ class RemainingTimeDisplay extends Component {
     if (this.player_.duration()) {
       const localizedText = this.localize('Remaining Time');
       const formattedTime = formatTime(this.player_.remainingTime());
-      this.contentEl_.innerHTML = `<span class="vjs-control-text">${localizedText}</span> -${formattedTime}`;
+      if (formattedTime !== this.formattedTime_) {
+        this.formattedTime_ = formattedTime;
+        this.contentEl_.innerHTML = `<span class="vjs-control-text">${localizedText}</span> -${formattedTime}`;
+      }
     }
 
     // Allows for smooth scrubbing, when player can't keep up.

src/js/menu/menu-button.js

@@ -70,11 +70,13 @@ class MenuButton extends ClickableComponent {
 
     // Add a title list item to the top
     if (this.options_.title) {
-      menu.contentEl().appendChild(Dom.createEl('li', {
+      let 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']();

src/js/player.js

@@ -196,6 +196,11 @@ class Player extends Component {
     //   this.addClass('vjs-touch-enabled');
     // }
 
+    // iOS Safari has broken hover handling
+    if (!browser.IS_IOS) {
+      this.addClass('vjs-workinghover');
+    }
+
     // Make player easily findable by ID
     Player.players[this.id_] = this;
 
@@ -300,7 +305,12 @@ class Player extends Component {
     if (tag.parentNode) {
       tag.parentNode.insertBefore(el, tag);
     }
+
+    // insert the tag as the first child of the player element
+    // then manually add it to the children array so that this.addChild
+    // will work properly for other components
     Dom.insertElFirst(tag, el); // Breaks iPhone, fixed in HTML5 setup.
+    this.children_.unshift(tag);
 
     this.el_ = el;
 
@@ -807,6 +817,7 @@ class Player extends Component {
   handleTechWaiting_() {
     this.addClass('vjs-waiting');
     this.trigger('waiting');
+    this.one('timeupdate', () => this.removeClass('vjs-waiting'));
   }
 
   /**

src/js/tracks/text-track-cue-list.js

@@ -4,7 +4,8 @@
 import * as browser from '../utils/browser.js';
 import document from 'global/document';
 
-/*
+/**
+ * A List of text track cues as defined in:
  * https://html.spec.whatwg.org/multipage/embedded-content.html#texttrackcuelist
  *
  * interface TextTrackCueList {
@@ -12,72 +13,93 @@ import document from 'global/document';
  *   getter TextTrackCue (unsigned long index);
  *   TextTrackCue? getCueById(DOMString id);
  * };
+ *
+ * @param {Array} cues A list of cues to be initialized with
+ * @class TextTrackCueList
  */
 
-let TextTrackCueList = function(cues) {
-  let list = this;
+class TextTrackCueList {
+  constructor(cues) {
+    let list = this;
 
-  if (browser.IS_IE8) {
-    list = document.createElement('custom');
+    if (browser.IS_IE8) {
+      list = document.createElement('custom');
 
-    for (let prop in TextTrackCueList.prototype) {
-      if (prop !== 'constructor') {
-        list[prop] = TextTrackCueList.prototype[prop];
+      for (let prop in TextTrackCueList.prototype) {
+        if (prop !== 'constructor') {
+          list[prop] = TextTrackCueList.prototype[prop];
+        }
+      }
+    }
+
+    TextTrackCueList.prototype.setCues_.call(list, cues);
+
+    Object.defineProperty(list, 'length', {
+      get() {
+        return this.length_;
+      }
+    });
+
+    if (browser.IS_IE8) {
+      return list;
+    }
+  }
+
+  /**
+   * A setter for cues in this list
+   *
+   * @param {Array} cues an array of cues
+   * @method setCues_
+   * @private
+   */
+  setCues_(cues) {
+    let oldLength = this.length || 0;
+    let i = 0;
+    let l = cues.length;
+
+    this.cues_ = cues;
+    this.length_ = cues.length;
+
+    let defineProp = function(index) {
+      if (!('' + index in this)) {
+        Object.defineProperty(this, '' + index, {
+          get() {
+            return this.cues_[index];
+          }
+        });
+      }
+    };
+
+    if (oldLength < l) {
+      i = oldLength;
+
+      for (; i < l; i++) {
+        defineProp.call(this, i);
       }
     }
   }
 
-  TextTrackCueList.prototype.setCues_.call(list, cues);
+  /**
+   * Get a cue that is currently in the Cue list by id
+   *
+   * @param {String} id
+   * @method getCueById
+   * @return {Object} a single cue
+   */
+  getCueById(id) {
+    let result = null;
 
-  Object.defineProperty(list, 'length', {
-    get: function() {
-      return this.length_;
+    for (let i = 0, l = this.length; i < l; i++) {
+      let cue = this[i];
+
+      if (cue.id === id) {
+        result = cue;
+        break;
+      }
     }
-  });
 
-  if (browser.IS_IE8) {
-    return list;
+    return result;
   }
-};
-
-TextTrackCueList.prototype.setCues_ = function(cues) {
-  let oldLength = this.length || 0;
-  let i = 0;
-  let l = cues.length;
-
-  this.cues_ = cues;
-  this.length_ = cues.length;
-
-  let defineProp = function(i) {
-    if (!(''+i in this)) {
-      Object.defineProperty(this, '' + i, {
-        get: function() {
-          return this.cues_[i];
-        }
-      });
-    }
-  };
-
-  if (oldLength < l) {
-    i = oldLength;
-
-    for(; i < l; i++) {
-      defineProp.call(this, i);
-    }
-  }
-};
-
-TextTrackCueList.prototype.getCueById = function(id) {
-  let result = null;
-  for (let i = 0, l = this.length; i < l; i++) {
-    let cue = this[i];
-    if (cue.id === id) {
-      result = cue;
-      break;
-    }
-  }
-
-  return result;
-};
+}
 
 export default TextTrackCueList;

src/js/tracks/text-track-enums.js

@@ -1,27 +1,39 @@
 /**
  * @file text-track-enums.js
- *
+ */
+
+/**
  * https://html.spec.whatwg.org/multipage/embedded-content.html#texttrackmode
  *
  * enum TextTrackMode { "disabled",  "hidden",  "showing" };
  */
-var TextTrackMode = {
-  'disabled': 'disabled',
-  'hidden': 'hidden',
-  'showing': 'showing'
+const TextTrackMode = {
+  disabled: 'disabled',
+  hidden: 'hidden',
+  showing: 'showing'
 };
 
-/*
+/**
  * https://html.spec.whatwg.org/multipage/embedded-content.html#texttrackkind
  *
- * enum TextTrackKind { "subtitles",  "captions",  "descriptions",  "chapters",  "metadata" };
+ * enum TextTrackKind {
+ *   "subtitles",
+ *   "captions",
+ *   "descriptions",
+ *   "chapters",
+ *   "metadata"
+ * };
  */
-var TextTrackKind = {
-  'subtitles': 'subtitles',
-  'captions': 'captions',
-  'descriptions': 'descriptions',
-  'chapters': 'chapters',
-  'metadata': 'metadata'
+const TextTrackKind = {
+  subtitles: 'subtitles',
+  captions: 'captions',
+  descriptions: 'descriptions',
+  chapters: 'chapters',
+  metadata: 'metadata'
 };
 
+/* jshint ignore:start */
+// we ignore jshint here because it does not see
+// TextTrackMode or TextTrackKind as defined here somehow...
 export { TextTrackMode, TextTrackKind };
+/* jshint ignore:end */

src/js/tracks/text-track-list.js

@@ -6,7 +6,8 @@ import * as Fn from '../utils/fn.js';
 import * as browser from '../utils/browser.js';
 import document from 'global/document';
 
-/*
+/**
+ * A text track list as defined in:
  * https://html.spec.whatwg.org/multipage/embedded-content.html#texttracklist
  *
  * interface TextTrackList : EventTarget {
@@ -18,50 +19,140 @@ import document from 'global/document';
  *   attribute EventHandler onaddtrack;
  *   attribute EventHandler onremovetrack;
  * };
+ *
+ * @param {Track[]} tracks A list of tracks to initialize the list with
+ * @extends EventTarget
+ * @class TextTrackList
  */
-let TextTrackList = function(tracks) {
-  let list = this;
 
-  if (browser.IS_IE8) {
-    list = document.createElement('custom');
+class TextTrackList extends EventTarget {
+  constructor(tracks = []) {
+    super();
+    let list = this;
 
-    for (let prop in TextTrackList.prototype) {
-      if (prop !== 'constructor') {
-        list[prop] = TextTrackList.prototype[prop];
+    if (browser.IS_IE8) {
+      list = document.createElement('custom');
+
+      for (let prop in TextTrackList.prototype) {
+        if (prop !== 'constructor') {
+          list[prop] = TextTrackList.prototype[prop];
+        }
       }
     }
-  }
 
-  tracks = tracks || [];
-  list.tracks_ = [];
+    list.tracks_ = [];
 
-  Object.defineProperty(list, 'length', {
-    get: function() {
-      return this.tracks_.length;
+    Object.defineProperty(list, 'length', {
+      get() {
+        return this.tracks_.length;
+      }
+    });
+
+    for (let i = 0; i < tracks.length; i++) {
+      list.addTrack_(tracks[i]);
     }
-  });
 
-  for (let i = 0; i < tracks.length; i++) {
-    list.addTrack_(tracks[i]);
+    if (browser.IS_IE8) {
+      return list;
+    }
   }
 
-  if (browser.IS_IE8) {
-    return list;
+  /**
+   * Add TextTrack from TextTrackList
+   *
+   * @param {TextTrack} track
+   * @method addTrack_
+   * @private
+   */
+  addTrack_(track) {
+    let index = this.tracks_.length;
+
+    if (!('' + index in this)) {
+      Object.defineProperty(this, index, {
+        get() {
+          return this.tracks_[index];
+        }
+      });
+    }
+
+    track.addEventListener('modechange', Fn.bind(this, function() {
+      this.trigger('change');
+    }));
+    this.tracks_.push(track);
+
+    this.trigger({
+      track,
+      type: 'addtrack'
+    });
   }
-};
 
-TextTrackList.prototype = Object.create(EventTarget.prototype);
-TextTrackList.prototype.constructor = TextTrackList;
+  /**
+   * Remove TextTrack from TextTrackList
+   * NOTE: Be mindful of what is passed in as it may be a HTMLTrackElement
+   *
+   * @param {TextTrack} rtrack
+   * @method removeTrack_
+   * @private
+   */
+  removeTrack_(rtrack) {
+    let track;
 
-/*
+    for (let i = 0, l = this.length; i < l; i++) {
+      if (this[i] === rtrack) {
+        track = this[i];
+        if (track.off) {
+          track.off();
+        }
+
+        this.tracks_.splice(i, 1);
+
+        break;
+      }
+    }
+
+    if (!track) {
+      return;
+    }
+
+    this.trigger({
+      track,
+      type: 'removetrack'
+    });
+  }
+
+  /**
+   * Get a TextTrack from TextTrackList by a tracks id
+   *
+   * @param {String} id - the id of the track to get
+   * @method getTrackById
+   * @return {TextTrack}
+   * @private
+   */
+  getTrackById(id) {
+    let result = null;
+
+    for (let i = 0, l = this.length; i < l; i++) {
+      let track = this[i];
+
+      if (track.id === id) {
+        result = track;
+        break;
+      }
+    }
+
+    return result;
+  }
+}
+
+/**
  * change - One or more tracks in the track list have been enabled or disabled.
  * addtrack - A track has been added to the track list.
  * removetrack - A track has been removed from the track list.
  */
 TextTrackList.prototype.allowedEvents_ = {
-  'change': 'change',
-  'addtrack': 'addtrack',
-  'removetrack': 'removetrack'
+  change: 'change',
+  addtrack: 'addtrack',
+  removetrack: 'removetrack'
 };
 
 // emulate attribute EventHandler support to allow for feature detection
@@ -69,77 +160,4 @@ for (let event in TextTrackList.prototype.allowedEvents_) {
   TextTrackList.prototype['on' + event] = null;
 }
 
-/**
- * Add TextTrack from TextTrackList
- *
- * @param {TextTrack} track
- * @method addTrack_
- * @private
- */
-TextTrackList.prototype.addTrack_ = function(track) {
-  let index = this.tracks_.length;
-  if (!(''+index in this)) {
-    Object.defineProperty(this, index, {
-      get: function() {
-        return this.tracks_[index];
-      }
-    });
-  }
-
-  track.addEventListener('modechange', Fn.bind(this, function() {
-    this.trigger('change');
-  }));
-  this.tracks_.push(track);
-
-  this.trigger({
-    type: 'addtrack',
-    track: track
-  });
-};
-
-/**
- * Remove TextTrack from TextTrackList
- * NOTE: Be mindful of what is passed in as it may be a HTMLTrackElement
- *
- * @param {TextTrack} rtrack
- * @method removeTrack_
- * @private
- */
-TextTrackList.prototype.removeTrack_ = function(rtrack) {
-  let track;
-
-  for (let i = 0, l = this.length; i < l; i++) {
-    if (this[i] === rtrack) {
-      track = this[i];
-
-      this.tracks_.splice(i, 1);
-
-      break;
-    }
-  }
-
-  if (!track) {
-    return;
-  }
-
-  this.trigger({
-    type: 'removetrack',
-    track: track
-  });
-};
-
-TextTrackList.prototype.getTrackById = function(id) {
-  let result = null;
-
-  for (let i = 0, l = this.length; i < l; i++) {
-    let track = this[i];
-    if (track.id === id) {
-      result = track;
-      break;
-    }
-  }
-
-  return result;
-};
-
 export default TextTrackList;

src/js/tracks/text-track-settings.js

@@ -158,10 +158,16 @@ class TextTrackSettings extends Component {
    * @method restoreSettings
    */
   restoreSettings() {
-    let [err, values] = safeParseTuple(window.localStorage.getItem('vjs-text-track-settings'));
+    let err, values;
 
-    if (err) {
-      log.error(err);
+    try {
+      [err, values] = safeParseTuple(window.localStorage.getItem('vjs-text-track-settings'));
+
+      if (err) {
+        log.error(err);
+      }
+    } catch (e) {
+      log.warn(e);
     }
 
     if (values) {
@@ -186,7 +192,9 @@ class TextTrackSettings extends Component {
       } else {
         window.localStorage.removeItem('vjs-text-track-settings');
       }
-    } catch (e) {}
+    } catch (e) {
+      log.warn(e);
+    }
   }
 
   /**