v5.2.1 dist

CHANGELOG.md

@@ -6,16 +6,6 @@ _(none)_
 
 --------------------
 
-## 5.2.3 (2015-11-24)
-* @gkatsev fixed clearing out errors ([view](https://github.com/videojs/video.js/pull/2850))
-
-## 5.2.2 (2015-11-23)
-* @DatTran fixed bower paths. Fixes #2740 ([view](https://github.com/videojs/video.js/pull/2775))
-* @nbibler ensured classes begin with alpha characters. Fixes #2828 ([view](https://github.com/videojs/video.js/pull/2829))
-* @bcvio fixed returning current source rather than blob url ([view](https://github.com/videojs/video.js/pull/2833))
-* @tomaspinho added ended event to API docs ([view](https://github.com/videojs/video.js/pull/2836))
-* @paladox updated xhr from deprecated ver to v2.2 ([view](https://github.com/videojs/video.js/pull/2837))
-
 ## 5.2.1 (2015-11-16)
 * @dmlap Check a component is a function before new-ing ([view](https://github.com/videojs/video.js/pull/2814))
 * @ksjun corrected the registerTech export ([view](https://github.com/videojs/video.js/pull/2816))

bower.json

@@ -2,8 +2,8 @@
   "name": "video.js",
   "description": "An HTML5 and Flash video player with a common API and skin for both.",
   "main": [
-    "dist/video.js",
-    "dist/video-js.css"
+    "src/js/video.js",
+    "src/css/video-js.scss"
   ],
   "moduleType": "es6",
   "keywords": [

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

dist/alt/video.novtt.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Video.js 5.2.3 <http://videojs.com/>
+ * Video.js 5.2.1 <http://videojs.com/>
  * Copyright Brightcove, Inc. <https://www.brightcove.com/>
  * Available under Apache License Version 2.0
  * <https://github.com/videojs/video.js/blob/master/LICENSE>
@@ -2209,27 +2209,14 @@ module.exports = function tsml (sa) {
 "use strict";
 var window = _dereq_("global/window")
 var once = _dereq_("once")
-var isFunction = _dereq_("is-function")
 var parseHeaders = _dereq_("parse-headers")
-var xtend = _dereq_("xtend")
+
+
 
 module.exports = createXHR
 createXHR.XMLHttpRequest = window.XMLHttpRequest || noop
 createXHR.XDomainRequest = "withCredentials" in (new createXHR.XMLHttpRequest()) ? createXHR.XMLHttpRequest : window.XDomainRequest
 
-forEachArray(["get", "put", "post", "patch", "head", "delete"], function(method) {
-    createXHR[method === "delete" ? "del" : method] = function(uri, options, callback) {
-        options = initParams(uri, options, callback)
-        options.method = method.toUpperCase()
-        return _createXHR(options)
-    }
-})
-
-function forEachArray(array, iterator) {
-    for (var i = 0; i < array.length; i++) {
-        iterator(array[i])
-    }
-}
 
 function isEmpty(obj){
     for(var i in obj){
@@ -2238,34 +2225,7 @@ function isEmpty(obj){
     return true
 }
 
-function initParams(uri, options, callback) {
-    var params = uri
-
-    if (isFunction(options)) {
-        callback = options
-        if (typeof uri === "string") {
-            params = {uri:uri}
-        }
-    } else {
-        params = xtend(options, {uri: uri})
-    }
-
-    params.callback = callback
-    return params
-}
-
-function createXHR(uri, options, callback) {
-    options = initParams(uri, options, callback)
-    return _createXHR(options)
-}
-
-function _createXHR(options) {
-    var callback = options.callback
-    if(typeof callback === "undefined"){
-        throw new Error("callback argument missing")
-    }
-    callback = once(callback)
-
+function createXHR(options, callback) {
     function readystatechange() {
         if (xhr.readyState === 4) {
             loadFunc()
@@ -2342,6 +2302,16 @@ function _createXHR(options) {
 
     }
 
+    if (typeof options === "string") {
+        options = { uri: options }
+    }
+
+    options = options || {}
+    if(typeof callback === "undefined"){
+        throw new Error("callback argument missing")
+    }
+    callback = once(callback)
+
     var xhr = options.xhr || null
 
     if (!xhr) {
@@ -2356,7 +2326,7 @@ function _createXHR(options) {
     var aborted
     var uri = xhr.url = options.uri || options.url
     var method = xhr.method = options.method || "GET"
-    var body = options.body || options.data || null
+    var body = options.body || options.data
     var headers = xhr.headers = options.headers || {}
     var sync = !!options.sync
     var isJson = false
@@ -2426,24 +2396,7 @@ function _createXHR(options) {
 
 function noop() {}
 
-},{"global/window":2,"is-function":56,"once":57,"parse-headers":60,"xtend":61}],56:[function(_dereq_,module,exports){
-module.exports = isFunction
-
-var toString = Object.prototype.toString
-
-function isFunction (fn) {
-  var string = toString.call(fn)
-  return string === '[object Function]' ||
-    (typeof fn === 'function' && string !== '[object RegExp]') ||
-    (typeof window !== 'undefined' &&
-     // IE8 and below
-     (fn === window.setTimeout ||
-      fn === window.alert ||
-      fn === window.confirm ||
-      fn === window.prompt))
-};
-
-},{}],57:[function(_dereq_,module,exports){
+},{"global/window":2,"once":56,"parse-headers":60}],56:[function(_dereq_,module,exports){
 module.exports = once
 
 once.proto = once(function () {
@@ -2464,7 +2417,7 @@ function once (fn) {
   }
 }
 
-},{}],58:[function(_dereq_,module,exports){
+},{}],57:[function(_dereq_,module,exports){
 var isFunction = _dereq_('is-function')
 
 module.exports = forEach
@@ -2512,7 +2465,24 @@ function forEachObject(object, iterator, context) {
     }
 }
 
-},{"is-function":56}],59:[function(_dereq_,module,exports){
+},{"is-function":58}],58:[function(_dereq_,module,exports){
+module.exports = isFunction
+
+var toString = Object.prototype.toString
+
+function isFunction (fn) {
+  var string = toString.call(fn)
+  return string === '[object Function]' ||
+    (typeof fn === 'function' && string !== '[object RegExp]') ||
+    (typeof window !== 'undefined' &&
+     // IE8 and below
+     (fn === window.setTimeout ||
+      fn === window.alert ||
+      fn === window.confirm ||
+      fn === window.prompt))
+};
+
+},{}],59:[function(_dereq_,module,exports){
 
 exports = module.exports = trim;
 
@@ -2560,28 +2530,7 @@ module.exports = function (headers) {
 
   return result
 }
-},{"for-each":58,"trim":59}],61:[function(_dereq_,module,exports){
-module.exports = extend
-
-var hasOwnProperty = Object.prototype.hasOwnProperty;
-
-function extend() {
-    var target = {}
-
-    for (var i = 0; i < arguments.length; i++) {
-        var source = arguments[i]
-
-        for (var key in source) {
-            if (hasOwnProperty.call(source, key)) {
-                target[key] = source[key]
-            }
-        }
-    }
-
-    return target
-}
-
-},{}],62:[function(_dereq_,module,exports){
+},{"for-each":57,"trim":59}],61:[function(_dereq_,module,exports){
 /**
  * @file big-play-button.js
  */
@@ -2652,7 +2601,7 @@ _componentJs2['default'].registerComponent('BigPlayButton', BigPlayButton);
 exports['default'] = BigPlayButton;
 module.exports = exports['default'];
 
-},{"./button.js":63,"./component.js":65}],63:[function(_dereq_,module,exports){
+},{"./button.js":62,"./component.js":64}],62:[function(_dereq_,module,exports){
 /**
  * @file button.js
  */
@@ -2833,7 +2782,7 @@ _component2['default'].registerComponent('Button', Button);
 exports['default'] = Button;
 module.exports = exports['default'];
 
-},{"./component":65,"./utils/dom.js":126,"./utils/events.js":127,"./utils/fn.js":128,"global/document":1,"object.assign":45}],64:[function(_dereq_,module,exports){
+},{"./component":64,"./utils/dom.js":125,"./utils/events.js":126,"./utils/fn.js":127,"global/document":1,"object.assign":45}],63:[function(_dereq_,module,exports){
 'use strict';
 
 exports.__esModule = true;
@@ -2885,7 +2834,7 @@ _component2['default'].registerComponent('CloseButton', CloseButton);
 exports['default'] = CloseButton;
 module.exports = exports['default'];
 
-},{"./button":63,"./component":65}],65:[function(_dereq_,module,exports){
+},{"./button":62,"./component":64}],64:[function(_dereq_,module,exports){
 /**
  * @file component.js
  *
@@ -4389,7 +4338,7 @@ Component.registerComponent('Component', Component);
 exports['default'] = Component;
 module.exports = exports['default'];
 
-},{"./utils/dom.js":126,"./utils/events.js":127,"./utils/fn.js":128,"./utils/guid.js":130,"./utils/log.js":131,"./utils/merge-options.js":132,"./utils/to-title-case.js":135,"global/window":2,"object.assign":45}],66:[function(_dereq_,module,exports){
+},{"./utils/dom.js":125,"./utils/events.js":126,"./utils/fn.js":127,"./utils/guid.js":129,"./utils/log.js":130,"./utils/merge-options.js":131,"./utils/to-title-case.js":134,"global/window":2,"object.assign":45}],65:[function(_dereq_,module,exports){
 /**
  * @file control-bar.js
  */
@@ -4514,7 +4463,7 @@ _componentJs2['default'].registerComponent('ControlBar', ControlBar);
 exports['default'] = ControlBar;
 module.exports = exports['default'];
 
-},{"../component.js":65,"./fullscreen-toggle.js":67,"./live-display.js":68,"./mute-toggle.js":69,"./play-toggle.js":70,"./playback-rate-menu/playback-rate-menu-button.js":71,"./progress-control/progress-control.js":76,"./spacer-controls/custom-control-spacer.js":78,"./text-track-controls/captions-button.js":81,"./text-track-controls/chapters-button.js":82,"./text-track-controls/subtitles-button.js":85,"./time-controls/current-time-display.js":88,"./time-controls/duration-display.js":89,"./time-controls/remaining-time-display.js":90,"./time-controls/time-divider.js":91,"./volume-control/volume-control.js":93,"./volume-menu-button.js":95}],67:[function(_dereq_,module,exports){
+},{"../component.js":64,"./fullscreen-toggle.js":66,"./live-display.js":67,"./mute-toggle.js":68,"./play-toggle.js":69,"./playback-rate-menu/playback-rate-menu-button.js":70,"./progress-control/progress-control.js":75,"./spacer-controls/custom-control-spacer.js":77,"./text-track-controls/captions-button.js":80,"./text-track-controls/chapters-button.js":81,"./text-track-controls/subtitles-button.js":84,"./time-controls/current-time-display.js":87,"./time-controls/duration-display.js":88,"./time-controls/remaining-time-display.js":89,"./time-controls/time-divider.js":90,"./volume-control/volume-control.js":92,"./volume-menu-button.js":94}],66:[function(_dereq_,module,exports){
 /**
  * @file fullscreen-toggle.js
  */
@@ -4588,7 +4537,7 @@ _componentJs2['default'].registerComponent('FullscreenToggle', FullscreenToggle)
 exports['default'] = FullscreenToggle;
 module.exports = exports['default'];
 
-},{"../button.js":63,"../component.js":65}],68:[function(_dereq_,module,exports){
+},{"../button.js":62,"../component.js":64}],67:[function(_dereq_,module,exports){
 /**
  * @file live-display.js
  */
@@ -4670,7 +4619,7 @@ _component2['default'].registerComponent('LiveDisplay', LiveDisplay);
 exports['default'] = LiveDisplay;
 module.exports = exports['default'];
 
-},{"../component":65,"../utils/dom.js":126}],69:[function(_dereq_,module,exports){
+},{"../component":64,"../utils/dom.js":125}],68:[function(_dereq_,module,exports){
 /**
  * @file mute-toggle.js
  */
@@ -4797,7 +4746,7 @@ _component2['default'].registerComponent('MuteToggle', MuteToggle);
 exports['default'] = MuteToggle;
 module.exports = exports['default'];
 
-},{"../button":63,"../component":65,"../utils/dom.js":126}],70:[function(_dereq_,module,exports){
+},{"../button":62,"../component":64,"../utils/dom.js":125}],69:[function(_dereq_,module,exports){
 /**
  * @file play-toggle.js
  */
@@ -4898,7 +4847,7 @@ _componentJs2['default'].registerComponent('PlayToggle', PlayToggle);
 exports['default'] = PlayToggle;
 module.exports = exports['default'];
 
-},{"../button.js":63,"../component.js":65}],71:[function(_dereq_,module,exports){
+},{"../button.js":62,"../component.js":64}],70:[function(_dereq_,module,exports){
 /**
  * @file playback-rate-menu-button.js
  */
@@ -5099,7 +5048,7 @@ _componentJs2['default'].registerComponent('PlaybackRateMenuButton', PlaybackRat
 exports['default'] = PlaybackRateMenuButton;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"../../menu/menu-button.js":102,"../../menu/menu.js":104,"../../utils/dom.js":126,"./playback-rate-menu-item.js":72}],72:[function(_dereq_,module,exports){
+},{"../../component.js":64,"../../menu/menu-button.js":101,"../../menu/menu.js":103,"../../utils/dom.js":125,"./playback-rate-menu-item.js":71}],71:[function(_dereq_,module,exports){
 /**
  * @file playback-rate-menu-item.js
  */
@@ -5180,7 +5129,7 @@ _componentJs2['default'].registerComponent('PlaybackRateMenuItem', PlaybackRateM
 exports['default'] = PlaybackRateMenuItem;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"../../menu/menu-item.js":103}],73:[function(_dereq_,module,exports){
+},{"../../component.js":64,"../../menu/menu-item.js":102}],72:[function(_dereq_,module,exports){
 /**
  * @file load-progress-bar.js
  */
@@ -5286,7 +5235,7 @@ _componentJs2['default'].registerComponent('LoadProgressBar', LoadProgressBar);
 exports['default'] = LoadProgressBar;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"../../utils/dom.js":126}],74:[function(_dereq_,module,exports){
+},{"../../component.js":64,"../../utils/dom.js":125}],73:[function(_dereq_,module,exports){
 /**
  * @file mouse-time-display.js
  */
@@ -5388,7 +5337,7 @@ _componentJs2['default'].registerComponent('MouseTimeDisplay', MouseTimeDisplay)
 exports['default'] = MouseTimeDisplay;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"../../utils/dom.js":126,"../../utils/fn.js":128,"../../utils/format-time.js":129,"lodash-compat/function/throttle":7}],75:[function(_dereq_,module,exports){
+},{"../../component.js":64,"../../utils/dom.js":125,"../../utils/fn.js":127,"../../utils/format-time.js":128,"lodash-compat/function/throttle":7}],74:[function(_dereq_,module,exports){
 /**
  * @file play-progress-bar.js
  */
@@ -5463,7 +5412,7 @@ _componentJs2['default'].registerComponent('PlayProgressBar', PlayProgressBar);
 exports['default'] = PlayProgressBar;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"../../utils/fn.js":128,"../../utils/format-time.js":129}],76:[function(_dereq_,module,exports){
+},{"../../component.js":64,"../../utils/fn.js":127,"../../utils/format-time.js":128}],75:[function(_dereq_,module,exports){
 /**
  * @file progress-control.js
  */
@@ -5532,7 +5481,7 @@ _componentJs2['default'].registerComponent('ProgressControl', ProgressControl);
 exports['default'] = ProgressControl;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"./mouse-time-display.js":74,"./seek-bar.js":77}],77:[function(_dereq_,module,exports){
+},{"../../component.js":64,"./mouse-time-display.js":73,"./seek-bar.js":76}],76:[function(_dereq_,module,exports){
 /**
  * @file seek-bar.js
  */
@@ -5718,7 +5667,7 @@ _componentJs2['default'].registerComponent('SeekBar', SeekBar);
 exports['default'] = SeekBar;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"../../slider/slider.js":110,"../../utils/fn.js":128,"../../utils/format-time.js":129,"./load-progress-bar.js":73,"./play-progress-bar.js":75,"object.assign":45}],78:[function(_dereq_,module,exports){
+},{"../../component.js":64,"../../slider/slider.js":109,"../../utils/fn.js":127,"../../utils/format-time.js":128,"./load-progress-bar.js":72,"./play-progress-bar.js":74,"object.assign":45}],77:[function(_dereq_,module,exports){
 /**
  * @file custom-control-spacer.js
  */
@@ -5792,7 +5741,7 @@ _componentJs2['default'].registerComponent('CustomControlSpacer', CustomControlS
 exports['default'] = CustomControlSpacer;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"./spacer.js":79}],79:[function(_dereq_,module,exports){
+},{"../../component.js":64,"./spacer.js":78}],78:[function(_dereq_,module,exports){
 /**
  * @file spacer.js
  */
@@ -5859,7 +5808,7 @@ _componentJs2['default'].registerComponent('Spacer', Spacer);
 exports['default'] = Spacer;
 module.exports = exports['default'];
 
-},{"../../component.js":65}],80:[function(_dereq_,module,exports){
+},{"../../component.js":64}],79:[function(_dereq_,module,exports){
 /**
  * @file caption-settings-menu-item.js
  */
@@ -5925,7 +5874,7 @@ _componentJs2['default'].registerComponent('CaptionSettingsMenuItem', CaptionSet
 exports['default'] = CaptionSettingsMenuItem;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"./text-track-menu-item.js":87}],81:[function(_dereq_,module,exports){
+},{"../../component.js":64,"./text-track-menu-item.js":86}],80:[function(_dereq_,module,exports){
 /**
  * @file captions-button.js
  */
@@ -6031,7 +5980,7 @@ _componentJs2['default'].registerComponent('CaptionsButton', CaptionsButton);
 exports['default'] = CaptionsButton;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"./caption-settings-menu-item.js":80,"./text-track-button.js":86}],82:[function(_dereq_,module,exports){
+},{"../../component.js":64,"./caption-settings-menu-item.js":79,"./text-track-button.js":85}],81:[function(_dereq_,module,exports){
 /**
  * @file chapters-button.js
  */
@@ -6220,7 +6169,7 @@ _componentJs2['default'].registerComponent('ChaptersButton', ChaptersButton);
 exports['default'] = ChaptersButton;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"../../menu/menu.js":104,"../../utils/dom.js":126,"../../utils/fn.js":128,"../../utils/to-title-case.js":135,"./chapters-track-menu-item.js":83,"./text-track-button.js":86,"./text-track-menu-item.js":87,"global/window":2}],83:[function(_dereq_,module,exports){
+},{"../../component.js":64,"../../menu/menu.js":103,"../../utils/dom.js":125,"../../utils/fn.js":127,"../../utils/to-title-case.js":134,"./chapters-track-menu-item.js":82,"./text-track-button.js":85,"./text-track-menu-item.js":86,"global/window":2}],82:[function(_dereq_,module,exports){
 /**
  * @file chapters-track-menu-item.js
  */
@@ -6310,7 +6259,7 @@ _componentJs2['default'].registerComponent('ChaptersTrackMenuItem', ChaptersTrac
 exports['default'] = ChaptersTrackMenuItem;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"../../menu/menu-item.js":103,"../../utils/fn.js":128}],84:[function(_dereq_,module,exports){
+},{"../../component.js":64,"../../menu/menu-item.js":102,"../../utils/fn.js":127}],83:[function(_dereq_,module,exports){
 /**
  * @file off-text-track-menu-item.js
  */
@@ -6390,7 +6339,7 @@ _componentJs2['default'].registerComponent('OffTextTrackMenuItem', OffTextTrackM
 exports['default'] = OffTextTrackMenuItem;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"./text-track-menu-item.js":87}],85:[function(_dereq_,module,exports){
+},{"../../component.js":64,"./text-track-menu-item.js":86}],84:[function(_dereq_,module,exports){
 /**
  * @file subtitles-button.js
  */
@@ -6453,7 +6402,7 @@ _componentJs2['default'].registerComponent('SubtitlesButton', SubtitlesButton);
 exports['default'] = SubtitlesButton;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"./text-track-button.js":86}],86:[function(_dereq_,module,exports){
+},{"../../component.js":64,"./text-track-button.js":85}],85:[function(_dereq_,module,exports){
 /**
  * @file text-track-button.js
  */
@@ -6561,7 +6510,7 @@ _componentJs2['default'].registerComponent('TextTrackButton', TextTrackButton);
 exports['default'] = TextTrackButton;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"../../menu/menu-button.js":102,"../../utils/fn.js":128,"./off-text-track-menu-item.js":84,"./text-track-menu-item.js":87}],87:[function(_dereq_,module,exports){
+},{"../../component.js":64,"../../menu/menu-button.js":101,"../../utils/fn.js":127,"./off-text-track-menu-item.js":83,"./text-track-menu-item.js":86}],86:[function(_dereq_,module,exports){
 /**
  * @file text-track-menu-item.js
  */
@@ -6710,7 +6659,7 @@ _componentJs2['default'].registerComponent('TextTrackMenuItem', TextTrackMenuIte
 exports['default'] = TextTrackMenuItem;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"../../menu/menu-item.js":103,"../../utils/fn.js":128,"global/document":1,"global/window":2}],88:[function(_dereq_,module,exports){
+},{"../../component.js":64,"../../menu/menu-item.js":102,"../../utils/fn.js":127,"global/document":1,"global/window":2}],87:[function(_dereq_,module,exports){
 /**
  * @file current-time-display.js
  */
@@ -6804,7 +6753,7 @@ _componentJs2['default'].registerComponent('CurrentTimeDisplay', CurrentTimeDisp
 exports['default'] = CurrentTimeDisplay;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"../../utils/dom.js":126,"../../utils/format-time.js":129}],89:[function(_dereq_,module,exports){
+},{"../../component.js":64,"../../utils/dom.js":125,"../../utils/format-time.js":128}],88:[function(_dereq_,module,exports){
 /**
  * @file duration-display.js
  */
@@ -6905,7 +6854,7 @@ _componentJs2['default'].registerComponent('DurationDisplay', DurationDisplay);
 exports['default'] = DurationDisplay;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"../../utils/dom.js":126,"../../utils/format-time.js":129}],90:[function(_dereq_,module,exports){
+},{"../../component.js":64,"../../utils/dom.js":125,"../../utils/format-time.js":128}],89:[function(_dereq_,module,exports){
 /**
  * @file remaining-time-display.js
  */
@@ -7003,7 +6952,7 @@ _componentJs2['default'].registerComponent('RemainingTimeDisplay', RemainingTime
 exports['default'] = RemainingTimeDisplay;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"../../utils/dom.js":126,"../../utils/format-time.js":129}],91:[function(_dereq_,module,exports){
+},{"../../component.js":64,"../../utils/dom.js":125,"../../utils/format-time.js":128}],90:[function(_dereq_,module,exports){
 /**
  * @file time-divider.js
  */
@@ -7061,7 +7010,7 @@ _componentJs2['default'].registerComponent('TimeDivider', TimeDivider);
 exports['default'] = TimeDivider;
 module.exports = exports['default'];
 
-},{"../../component.js":65}],92:[function(_dereq_,module,exports){
+},{"../../component.js":64}],91:[function(_dereq_,module,exports){
 /**
  * @file volume-bar.js
  */
@@ -7206,7 +7155,7 @@ _componentJs2['default'].registerComponent('VolumeBar', VolumeBar);
 exports['default'] = VolumeBar;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"../../slider/slider.js":110,"../../utils/fn.js":128,"./volume-level.js":94}],93:[function(_dereq_,module,exports){
+},{"../../component.js":64,"../../slider/slider.js":109,"../../utils/fn.js":127,"./volume-level.js":93}],92:[function(_dereq_,module,exports){
 /**
  * @file volume-control.js
  */
@@ -7284,7 +7233,7 @@ _componentJs2['default'].registerComponent('VolumeControl', VolumeControl);
 exports['default'] = VolumeControl;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"./volume-bar.js":92}],94:[function(_dereq_,module,exports){
+},{"../../component.js":64,"./volume-bar.js":91}],93:[function(_dereq_,module,exports){
 /**
  * @file volume-level.js
  */
@@ -7341,7 +7290,7 @@ _componentJs2['default'].registerComponent('VolumeLevel', VolumeLevel);
 exports['default'] = VolumeLevel;
 module.exports = exports['default'];
 
-},{"../../component.js":65}],95:[function(_dereq_,module,exports){
+},{"../../component.js":64}],94:[function(_dereq_,module,exports){
 /**
  * @file volume-menu-button.js
  */
@@ -7503,7 +7452,7 @@ _componentJs2['default'].registerComponent('VolumeMenuButton', VolumeMenuButton)
 exports['default'] = VolumeMenuButton;
 module.exports = exports['default'];
 
-},{"../button.js":63,"../component.js":65,"../menu/menu-button.js":102,"../menu/menu.js":104,"./mute-toggle.js":69,"./volume-control/volume-bar.js":92}],96:[function(_dereq_,module,exports){
+},{"../button.js":62,"../component.js":64,"../menu/menu-button.js":101,"../menu/menu.js":103,"./mute-toggle.js":68,"./volume-control/volume-bar.js":91}],95:[function(_dereq_,module,exports){
 /**
  * @file error-display.js
  */
@@ -7596,7 +7545,7 @@ _component2['default'].registerComponent('ErrorDisplay', ErrorDisplay);
 exports['default'] = ErrorDisplay;
 module.exports = exports['default'];
 
-},{"./component":65,"./modal-dialog":105,"./utils/dom":126,"./utils/merge-options":132}],97:[function(_dereq_,module,exports){
+},{"./component":64,"./modal-dialog":104,"./utils/dom":125,"./utils/merge-options":131}],96:[function(_dereq_,module,exports){
 /**
  * @file event-target.js
  */
@@ -7655,7 +7604,7 @@ EventTarget.prototype.dispatchEvent = EventTarget.prototype.trigger;
 exports['default'] = EventTarget;
 module.exports = exports['default'];
 
-},{"./utils/events.js":127}],98:[function(_dereq_,module,exports){
+},{"./utils/events.js":126}],97:[function(_dereq_,module,exports){
 'use strict';
 
 exports.__esModule = true;
@@ -7746,7 +7695,7 @@ var extendFn = function extendFn(superClass) {
 exports['default'] = extendFn;
 module.exports = exports['default'];
 
-},{"./utils/log":131}],99:[function(_dereq_,module,exports){
+},{"./utils/log":130}],98:[function(_dereq_,module,exports){
 /**
  * @file fullscreen-api.js
  */
@@ -7803,7 +7752,7 @@ if (browserApi) {
 exports['default'] = FullscreenApi;
 module.exports = exports['default'];
 
-},{"global/document":1}],100:[function(_dereq_,module,exports){
+},{"global/document":1}],99:[function(_dereq_,module,exports){
 /**
  * @file loading-spinner.js
  */
@@ -7858,7 +7807,7 @@ _component2['default'].registerComponent('LoadingSpinner', LoadingSpinner);
 exports['default'] = LoadingSpinner;
 module.exports = exports['default'];
 
-},{"./component":65}],101:[function(_dereq_,module,exports){
+},{"./component":64}],100:[function(_dereq_,module,exports){
 /**
  * @file media-error.js
  */
@@ -7949,7 +7898,7 @@ for (var errNum = 0; errNum < MediaError.errorTypes.length; errNum++) {
 exports['default'] = MediaError;
 module.exports = exports['default'];
 
-},{"object.assign":45}],102:[function(_dereq_,module,exports){
+},{"object.assign":45}],101:[function(_dereq_,module,exports){
 /**
  * @file menu-button.js
  */
@@ -8223,7 +8172,7 @@ _componentJs2['default'].registerComponent('MenuButton', MenuButton);
 exports['default'] = MenuButton;
 module.exports = exports['default'];
 
-},{"../button.js":63,"../component.js":65,"../utils/dom.js":126,"../utils/fn.js":128,"../utils/to-title-case.js":135,"./menu.js":104}],103:[function(_dereq_,module,exports){
+},{"../button.js":62,"../component.js":64,"../utils/dom.js":125,"../utils/fn.js":127,"../utils/to-title-case.js":134,"./menu.js":103}],102:[function(_dereq_,module,exports){
 /**
  * @file menu-item.js
  */
@@ -8318,7 +8267,7 @@ _componentJs2['default'].registerComponent('MenuItem', MenuItem);
 exports['default'] = MenuItem;
 module.exports = exports['default'];
 
-},{"../button.js":63,"../component.js":65,"object.assign":45}],104:[function(_dereq_,module,exports){
+},{"../button.js":62,"../component.js":64,"object.assign":45}],103:[function(_dereq_,module,exports){
 /**
  * @file menu.js
  */
@@ -8416,7 +8365,7 @@ _componentJs2['default'].registerComponent('Menu', Menu);
 exports['default'] = Menu;
 module.exports = exports['default'];
 
-},{"../component.js":65,"../utils/dom.js":126,"../utils/events.js":127,"../utils/fn.js":128}],105:[function(_dereq_,module,exports){
+},{"../component.js":64,"../utils/dom.js":125,"../utils/events.js":126,"../utils/fn.js":127}],104:[function(_dereq_,module,exports){
 /**
  * @file modal-dialog.js
  */
@@ -8839,7 +8788,7 @@ _component2['default'].registerComponent('ModalDialog', ModalDialog);
 exports['default'] = ModalDialog;
 module.exports = exports['default'];
 
-},{"./close-button":64,"./component":65,"./utils/dom":126,"./utils/fn":128,"./utils/log":131,"global/document":1}],106:[function(_dereq_,module,exports){
+},{"./close-button":63,"./component":64,"./utils/dom":125,"./utils/fn":127,"./utils/log":130,"global/document":1}],105:[function(_dereq_,module,exports){
 /**
  * @file player.js
  */
@@ -9380,7 +9329,6 @@ var Player = (function (_Component) {
     var width = undefined;
     var height = undefined;
     var aspectRatio = undefined;
-    var idClass = undefined;
 
     // The aspect ratio is either used directly or to calculate width and height.
     if (this.aspectRatio_ !== undefined && this.aspectRatio_ !== 'auto') {
@@ -9417,12 +9365,7 @@ var Player = (function (_Component) {
       height = width * ratioMultiplier;
     }
 
-    // Ensure the CSS class is valid by starting with an alpha character
-    if (/^[^a-zA-Z]/.test(this.id())) {
-      idClass = 'dimensions-' + this.id();
-    } else {
-      idClass = this.id() + '-dimensions';
-    }
+    var idClass = this.id() + '-dimensions';
 
     // Ensure the right class is still on the player for the style element
     this.addClass(idClass);
@@ -11136,7 +11079,6 @@ var Player = (function (_Component) {
     if (err === null) {
       this.error_ = err;
       this.removeClass('vjs-error');
-      this.errorDisplay.close();
       return this;
     }
 
@@ -11147,6 +11089,9 @@ var Player = (function (_Component) {
       this.error_ = new _mediaErrorJs2['default'](err);
     }
 
+    // fire an error event on the player
+    this.trigger('error');
+
     // add the vjs-error classname to the player
     this.addClass('vjs-error');
 
@@ -11154,9 +11099,6 @@ var Player = (function (_Component) {
     // ie8 just logs "[object object]" if you just log the error object
     _utilsLogJs2['default'].error('(CODE:' + this.error_.code + ' ' + _mediaErrorJs2['default'].errorTypes[this.error_.code] + ')', this.error_.message, this.error_);
 
-    // fire an error event on the player
-    this.trigger('error');
-
     return this;
   };
 
@@ -11768,13 +11710,6 @@ Player.prototype.handleUserInactive_;
  */
 Player.prototype.handleTimeUpdate_;
 
-/**
- * Fired when video playback ends
- *
- * @event ended
- */
-Player.prototype.handleTechEnded_;
-
 /**
  * Fired when the volume changes
  *
@@ -11802,7 +11737,7 @@ exports['default'] = Player;
 module.exports = exports['default'];
 // If empty string, make it a parsable json object.
 
-},{"./big-play-button.js":62,"./component.js":65,"./control-bar/control-bar.js":66,"./error-display.js":96,"./fullscreen-api.js":99,"./loading-spinner.js":100,"./media-error.js":101,"./modal-dialog":105,"./poster-image.js":108,"./tech/html5.js":113,"./tech/loader.js":114,"./tech/tech.js":115,"./tracks/text-track-display.js":117,"./tracks/text-track-list-converter.js":119,"./tracks/text-track-settings.js":121,"./utils/browser.js":123,"./utils/buffer.js":124,"./utils/dom.js":126,"./utils/events.js":127,"./utils/fn.js":128,"./utils/guid.js":130,"./utils/log.js":131,"./utils/merge-options.js":132,"./utils/stylesheet.js":133,"./utils/time-ranges.js":134,"./utils/to-title-case.js":135,"global/document":1,"global/window":2,"object.assign":45,"safe-json-parse/tuple":53}],107:[function(_dereq_,module,exports){
+},{"./big-play-button.js":61,"./component.js":64,"./control-bar/control-bar.js":65,"./error-display.js":95,"./fullscreen-api.js":98,"./loading-spinner.js":99,"./media-error.js":100,"./modal-dialog":104,"./poster-image.js":107,"./tech/html5.js":112,"./tech/loader.js":113,"./tech/tech.js":114,"./tracks/text-track-display.js":116,"./tracks/text-track-list-converter.js":118,"./tracks/text-track-settings.js":120,"./utils/browser.js":122,"./utils/buffer.js":123,"./utils/dom.js":125,"./utils/events.js":126,"./utils/fn.js":127,"./utils/guid.js":129,"./utils/log.js":130,"./utils/merge-options.js":131,"./utils/stylesheet.js":132,"./utils/time-ranges.js":133,"./utils/to-title-case.js":134,"global/document":1,"global/window":2,"object.assign":45,"safe-json-parse/tuple":53}],106:[function(_dereq_,module,exports){
 /**
  * @file plugins.js
  */
@@ -11830,7 +11765,7 @@ var plugin = function plugin(name, init) {
 exports['default'] = plugin;
 module.exports = exports['default'];
 
-},{"./player.js":106}],108:[function(_dereq_,module,exports){
+},{"./player.js":105}],107:[function(_dereq_,module,exports){
 /**
  * @file poster-image.js
  */
@@ -11990,7 +11925,7 @@ _componentJs2['default'].registerComponent('PosterImage', PosterImage);
 exports['default'] = PosterImage;
 module.exports = exports['default'];
 
-},{"./button.js":63,"./component.js":65,"./utils/browser.js":123,"./utils/dom.js":126,"./utils/fn.js":128}],109:[function(_dereq_,module,exports){
+},{"./button.js":62,"./component.js":64,"./utils/browser.js":122,"./utils/dom.js":125,"./utils/fn.js":127}],108:[function(_dereq_,module,exports){
 /**
  * @file setup.js
  *
@@ -12100,7 +12035,7 @@ exports.autoSetup = autoSetup;
 exports.autoSetupTimeout = autoSetupTimeout;
 exports.hasLoaded = hasLoaded;
 
-},{"./utils/events.js":127,"global/document":1,"global/window":2}],110:[function(_dereq_,module,exports){
+},{"./utils/events.js":126,"global/document":1,"global/window":2}],109:[function(_dereq_,module,exports){
 /**
  * @file slider.js
  */
@@ -12379,7 +12314,7 @@ _componentJs2['default'].registerComponent('Slider', Slider);
 exports['default'] = Slider;
 module.exports = exports['default'];
 
-},{"../component.js":65,"../utils/dom.js":126,"global/document":1,"object.assign":45}],111:[function(_dereq_,module,exports){
+},{"../component.js":64,"../utils/dom.js":125,"global/document":1,"object.assign":45}],110:[function(_dereq_,module,exports){
 /**
  * @file flash-rtmp.js
  */
@@ -12498,7 +12433,7 @@ function FlashRtmpDecorator(Flash) {
 exports['default'] = FlashRtmpDecorator;
 module.exports = exports['default'];
 
-},{}],112:[function(_dereq_,module,exports){
+},{}],111:[function(_dereq_,module,exports){
 /**
  * @file flash.js
  * VideoJS-SWF - Custom Flash Player with HTML5-ish API
@@ -13113,7 +13048,7 @@ _tech2['default'].registerTech('Flash', Flash);
 exports['default'] = Flash;
 module.exports = exports['default'];
 
-},{"../component":65,"../utils/dom.js":126,"../utils/time-ranges.js":134,"../utils/url.js":136,"./flash-rtmp":111,"./tech":115,"global/window":2,"object.assign":45}],113:[function(_dereq_,module,exports){
+},{"../component":64,"../utils/dom.js":125,"../utils/time-ranges.js":133,"../utils/url.js":135,"./flash-rtmp":110,"./tech":114,"global/window":2,"object.assign":45}],112:[function(_dereq_,module,exports){
 /**
  * @file html5.js
  * HTML5 Media Controller - Wrapper for HTML5 Media API
@@ -13717,11 +13652,7 @@ var Html5 = (function (_Tech) {
    */
 
   Html5.prototype.currentSrc = function currentSrc() {
-    if (this.currentSource_) {
-      return this.currentSource_.src;
-    } else {
-      return this.el_.currentSrc;
-    }
+    return this.el_.currentSrc;
   };
 
   /**
@@ -14363,7 +14294,7 @@ _techJs2['default'].registerTech('Html5', Html5);
 exports['default'] = Html5;
 module.exports = exports['default'];
 
-},{"../component":65,"../utils/browser.js":123,"../utils/dom.js":126,"../utils/fn.js":128,"../utils/log.js":131,"../utils/merge-options.js":132,"../utils/url.js":136,"./tech.js":115,"global/document":1,"global/window":2,"object.assign":45}],114:[function(_dereq_,module,exports){
+},{"../component":64,"../utils/browser.js":122,"../utils/dom.js":125,"../utils/fn.js":127,"../utils/log.js":130,"../utils/merge-options.js":131,"../utils/url.js":135,"./tech.js":114,"global/document":1,"global/window":2,"object.assign":45}],113:[function(_dereq_,module,exports){
 /**
  * @file loader.js
  */
@@ -14447,7 +14378,7 @@ _componentJs2['default'].registerComponent('MediaLoader', MediaLoader);
 exports['default'] = MediaLoader;
 module.exports = exports['default'];
 
-},{"../component.js":65,"../utils/to-title-case.js":135,"./tech.js":115,"global/window":2}],115:[function(_dereq_,module,exports){
+},{"../component.js":64,"../utils/to-title-case.js":134,"./tech.js":114,"global/window":2}],114:[function(_dereq_,module,exports){
 /**
  * @file tech.js
  * Media Technology Controller - Base class for media playback
@@ -15225,7 +15156,7 @@ Tech.registerTech('Tech', Tech);
 exports['default'] = Tech;
 module.exports = exports['default'];
 
-},{"../component":65,"../media-error.js":101,"../tracks/text-track":122,"../tracks/text-track-list":120,"../utils/buffer.js":124,"../utils/fn.js":128,"../utils/log.js":131,"../utils/time-ranges.js":134,"global/document":1,"global/window":2}],116:[function(_dereq_,module,exports){
+},{"../component":64,"../media-error.js":100,"../tracks/text-track":121,"../tracks/text-track-list":119,"../utils/buffer.js":123,"../utils/fn.js":127,"../utils/log.js":130,"../utils/time-ranges.js":133,"global/document":1,"global/window":2}],115:[function(_dereq_,module,exports){
 /**
  * @file text-track-cue-list.js
  */
@@ -15324,7 +15255,7 @@ TextTrackCueList.prototype.getCueById = function (id) {
 exports['default'] = TextTrackCueList;
 module.exports = exports['default'];
 
-},{"../utils/browser.js":123,"global/document":1}],117:[function(_dereq_,module,exports){
+},{"../utils/browser.js":122,"global/document":1}],116:[function(_dereq_,module,exports){
 /**
  * @file text-track-display.js
  */
@@ -15595,7 +15526,7 @@ _component2['default'].registerComponent('TextTrackDisplay', TextTrackDisplay);
 exports['default'] = TextTrackDisplay;
 module.exports = exports['default'];
 
-},{"../component":65,"../menu/menu-button.js":102,"../menu/menu-item.js":103,"../menu/menu.js":104,"../utils/fn.js":128,"global/document":1,"global/window":2}],118:[function(_dereq_,module,exports){
+},{"../component":64,"../menu/menu-button.js":101,"../menu/menu-item.js":102,"../menu/menu.js":103,"../utils/fn.js":127,"global/document":1,"global/window":2}],117:[function(_dereq_,module,exports){
 /**
  * @file text-track-enums.js
  *
@@ -15628,7 +15559,7 @@ var TextTrackKind = {
 exports.TextTrackMode = TextTrackMode;
 exports.TextTrackKind = TextTrackKind;
 
-},{}],119:[function(_dereq_,module,exports){
+},{}],118:[function(_dereq_,module,exports){
 /**
  * Utilities for capturing text track state and re-creating tracks
  * based on a capture.
@@ -15719,7 +15650,7 @@ var jsonToTextTracks = function jsonToTextTracks(json, tech) {
 exports['default'] = { textTracksToJson: textTracksToJson, jsonToTextTracks: jsonToTextTracks, trackToJson_: trackToJson_ };
 module.exports = exports['default'];
 
-},{}],120:[function(_dereq_,module,exports){
+},{}],119:[function(_dereq_,module,exports){
 /**
  * @file text-track-list.js
  */
@@ -15866,7 +15797,7 @@ TextTrackList.prototype.getTrackById = function (id) {
 exports['default'] = TextTrackList;
 module.exports = exports['default'];
 
-},{"../event-target":97,"../utils/browser.js":123,"../utils/fn.js":128,"global/document":1}],121:[function(_dereq_,module,exports){
+},{"../event-target":96,"../utils/browser.js":122,"../utils/fn.js":127,"global/document":1}],120:[function(_dereq_,module,exports){
 /**
  * @file text-track-settings.js
  */
@@ -16154,7 +16085,7 @@ function captionOptionsMenuTemplate() {
 exports['default'] = TextTrackSettings;
 module.exports = exports['default'];
 
-},{"../component":65,"../utils/events.js":127,"../utils/fn.js":128,"../utils/log.js":131,"global/window":2,"safe-json-parse/tuple":53}],122:[function(_dereq_,module,exports){
+},{"../component":64,"../utils/events.js":126,"../utils/fn.js":127,"../utils/log.js":130,"global/window":2,"safe-json-parse/tuple":53}],121:[function(_dereq_,module,exports){
 /**
  * @file text-track.js
  */
@@ -16507,7 +16438,7 @@ var indexOf = function indexOf(searchElement, fromIndex) {
 exports['default'] = TextTrack;
 module.exports = exports['default'];
 
-},{"../event-target":97,"../utils/browser.js":123,"../utils/fn.js":128,"../utils/guid.js":130,"../utils/log.js":131,"../utils/url.js":136,"./text-track-cue-list":116,"./text-track-enums":118,"global/document":1,"global/window":2,"xhr":55}],123:[function(_dereq_,module,exports){
+},{"../event-target":96,"../utils/browser.js":122,"../utils/fn.js":127,"../utils/guid.js":129,"../utils/log.js":130,"../utils/url.js":135,"./text-track-cue-list":115,"./text-track-enums":117,"global/document":1,"global/window":2,"xhr":55}],122:[function(_dereq_,module,exports){
 /**
  * @file browser.js
  */
@@ -16596,7 +16527,7 @@ exports.TOUCH_ENABLED = TOUCH_ENABLED;
 var BACKGROUND_SIZE_SUPPORTED = ('backgroundSize' in _globalDocument2['default'].createElement('video').style);
 exports.BACKGROUND_SIZE_SUPPORTED = BACKGROUND_SIZE_SUPPORTED;
 
-},{"global/document":1,"global/window":2}],124:[function(_dereq_,module,exports){
+},{"global/document":1,"global/window":2}],123:[function(_dereq_,module,exports){
 /**
  * @file buffer.js
  */
@@ -16645,7 +16576,7 @@ function bufferedPercent(buffered, duration) {
   return bufferedDuration / duration;
 }
 
-},{"./time-ranges.js":134}],125:[function(_dereq_,module,exports){
+},{"./time-ranges.js":133}],124:[function(_dereq_,module,exports){
 'use strict';
 
 exports.__esModule = true;
@@ -16716,7 +16647,7 @@ exports['default'] = function (target) {
 
 module.exports = exports['default'];
 
-},{"./log.js":131}],126:[function(_dereq_,module,exports){
+},{"./log.js":130}],125:[function(_dereq_,module,exports){
 /**
  * @file dom.js
  */
@@ -17445,7 +17376,7 @@ exports.$ = $;
 var $$ = createQuerier('querySelectorAll');
 exports.$$ = $$;
 
-},{"./guid.js":130,"./log.js":131,"global/document":1,"global/window":2,"tsml":54}],127:[function(_dereq_,module,exports){
+},{"./guid.js":129,"./log.js":130,"global/document":1,"global/window":2,"tsml":54}],126:[function(_dereq_,module,exports){
 /**
  * @file events.js
  *
@@ -17853,7 +17784,7 @@ function _handleMultipleEvents(fn, elem, types, callback) {
   });
 }
 
-},{"./dom.js":126,"./guid.js":130,"global/document":1,"global/window":2}],128:[function(_dereq_,module,exports){
+},{"./dom.js":125,"./guid.js":129,"global/document":1,"global/window":2}],127:[function(_dereq_,module,exports){
 /**
  * @file fn.js
  */
@@ -17897,7 +17828,7 @@ var bind = function bind(context, fn, uid) {
 };
 exports.bind = bind;
 
-},{"./guid.js":130}],129:[function(_dereq_,module,exports){
+},{"./guid.js":129}],128:[function(_dereq_,module,exports){
 /**
  * @file format-time.js
  *
@@ -17947,7 +17878,7 @@ function formatTime(seconds) {
 exports['default'] = formatTime;
 module.exports = exports['default'];
 
-},{}],130:[function(_dereq_,module,exports){
+},{}],129:[function(_dereq_,module,exports){
 /**
  * @file guid.js
  *
@@ -17972,7 +17903,7 @@ function newGUID() {
   return _guid++;
 }
 
-},{}],131:[function(_dereq_,module,exports){
+},{}],130:[function(_dereq_,module,exports){
 /**
  * @file log.js
  */
@@ -18062,7 +17993,7 @@ function _logType(type, args) {
 exports['default'] = log;
 module.exports = exports['default'];
 
-},{"global/window":2}],132:[function(_dereq_,module,exports){
+},{"global/window":2}],131:[function(_dereq_,module,exports){
 /**
  * @file merge-options.js
  */
@@ -18133,7 +18064,7 @@ function mergeOptions() {
 
 module.exports = exports['default'];
 
-},{"lodash-compat/object/merge":40}],133:[function(_dereq_,module,exports){
+},{"lodash-compat/object/merge":40}],132:[function(_dereq_,module,exports){
 'use strict';
 
 exports.__esModule = true;
@@ -18161,7 +18092,7 @@ var setTextContent = function setTextContent(el, content) {
 };
 exports.setTextContent = setTextContent;
 
-},{"global/document":1}],134:[function(_dereq_,module,exports){
+},{"global/document":1}],133:[function(_dereq_,module,exports){
 'use strict';
 
 exports.__esModule = true;
@@ -18232,7 +18163,7 @@ function rangeCheck(fnName, index, maxIndex) {
   }
 }
 
-},{"./log.js":131}],135:[function(_dereq_,module,exports){
+},{"./log.js":130}],134:[function(_dereq_,module,exports){
 /**
  * @file to-title-case.js
  *
@@ -18253,7 +18184,7 @@ function toTitleCase(string) {
 exports["default"] = toTitleCase;
 module.exports = exports["default"];
 
-},{}],136:[function(_dereq_,module,exports){
+},{}],135:[function(_dereq_,module,exports){
 /**
  * @file url.js
  */
@@ -18389,7 +18320,7 @@ var isCrossOrigin = function isCrossOrigin(url) {
 };
 exports.isCrossOrigin = isCrossOrigin;
 
-},{"global/document":1,"global/window":2}],137:[function(_dereq_,module,exports){
+},{"global/document":1,"global/window":2}],136:[function(_dereq_,module,exports){
 /**
  * @file video.js
  */
@@ -18588,7 +18519,7 @@ setup.autoSetupTimeout(1, videojs);
  *
  * @type {String}
  */
-videojs.VERSION = '5.2.3';
+videojs.VERSION = '5.2.1';
 
 /**
  * The global options object. These are the settings that take effect
@@ -19174,7 +19105,7 @@ if (typeof define === 'function' && define['amd']) {
 exports['default'] = videojs;
 module.exports = exports['default'];
 
-},{"../../src/js/utils/merge-options.js":132,"./component":65,"./event-target":97,"./extend.js":98,"./player":106,"./plugins.js":107,"./setup":109,"./tech/flash.js":112,"./tech/html5.js":113,"./tech/tech.js":115,"./tracks/text-track.js":122,"./utils/browser.js":123,"./utils/create-deprecation-proxy.js":125,"./utils/dom.js":126,"./utils/events.js":127,"./utils/fn.js":128,"./utils/format-time.js":129,"./utils/log.js":131,"./utils/stylesheet.js":133,"./utils/time-ranges.js":134,"./utils/url.js":136,"global/document":1,"lodash-compat/object/merge":40,"object.assign":45,"xhr":55}]},{},[137])(137)
+},{"../../src/js/utils/merge-options.js":131,"./component":64,"./event-target":96,"./extend.js":97,"./player":105,"./plugins.js":106,"./setup":108,"./tech/flash.js":111,"./tech/html5.js":112,"./tech/tech.js":114,"./tracks/text-track.js":121,"./utils/browser.js":122,"./utils/create-deprecation-proxy.js":124,"./utils/dom.js":125,"./utils/events.js":126,"./utils/fn.js":127,"./utils/format-time.js":128,"./utils/log.js":130,"./utils/stylesheet.js":132,"./utils/time-ranges.js":133,"./utils/url.js":135,"global/document":1,"lodash-compat/object/merge":40,"object.assign":45,"xhr":55}]},{},[136])(136)
 });
 
 

dist/video.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Video.js 5.2.3 <http://videojs.com/>
+ * Video.js 5.2.1 <http://videojs.com/>
  * Copyright Brightcove, Inc. <https://www.brightcove.com/>
  * Available under Apache License Version 2.0
  * <https://github.com/videojs/video.js/blob/master/LICENSE>
@@ -2213,27 +2213,14 @@ module.exports = function tsml (sa) {
 "use strict";
 var window = _dereq_("global/window")
 var once = _dereq_("once")
-var isFunction = _dereq_("is-function")
 var parseHeaders = _dereq_("parse-headers")
-var xtend = _dereq_("xtend")
+
+
 
 module.exports = createXHR
 createXHR.XMLHttpRequest = window.XMLHttpRequest || noop
 createXHR.XDomainRequest = "withCredentials" in (new createXHR.XMLHttpRequest()) ? createXHR.XMLHttpRequest : window.XDomainRequest
 
-forEachArray(["get", "put", "post", "patch", "head", "delete"], function(method) {
-    createXHR[method === "delete" ? "del" : method] = function(uri, options, callback) {
-        options = initParams(uri, options, callback)
-        options.method = method.toUpperCase()
-        return _createXHR(options)
-    }
-})
-
-function forEachArray(array, iterator) {
-    for (var i = 0; i < array.length; i++) {
-        iterator(array[i])
-    }
-}
 
 function isEmpty(obj){
     for(var i in obj){
@@ -2242,34 +2229,7 @@ function isEmpty(obj){
     return true
 }
 
-function initParams(uri, options, callback) {
-    var params = uri
-
-    if (isFunction(options)) {
-        callback = options
-        if (typeof uri === "string") {
-            params = {uri:uri}
-        }
-    } else {
-        params = xtend(options, {uri: uri})
-    }
-
-    params.callback = callback
-    return params
-}
-
-function createXHR(uri, options, callback) {
-    options = initParams(uri, options, callback)
-    return _createXHR(options)
-}
-
-function _createXHR(options) {
-    var callback = options.callback
-    if(typeof callback === "undefined"){
-        throw new Error("callback argument missing")
-    }
-    callback = once(callback)
-
+function createXHR(options, callback) {
     function readystatechange() {
         if (xhr.readyState === 4) {
             loadFunc()
@@ -2346,6 +2306,16 @@ function _createXHR(options) {
 
     }
 
+    if (typeof options === "string") {
+        options = { uri: options }
+    }
+
+    options = options || {}
+    if(typeof callback === "undefined"){
+        throw new Error("callback argument missing")
+    }
+    callback = once(callback)
+
     var xhr = options.xhr || null
 
     if (!xhr) {
@@ -2360,7 +2330,7 @@ function _createXHR(options) {
     var aborted
     var uri = xhr.url = options.uri || options.url
     var method = xhr.method = options.method || "GET"
-    var body = options.body || options.data || null
+    var body = options.body || options.data
     var headers = xhr.headers = options.headers || {}
     var sync = !!options.sync
     var isJson = false
@@ -2430,24 +2400,7 @@ function _createXHR(options) {
 
 function noop() {}
 
-},{"global/window":2,"is-function":56,"once":57,"parse-headers":60,"xtend":61}],56:[function(_dereq_,module,exports){
-module.exports = isFunction
-
-var toString = Object.prototype.toString
-
-function isFunction (fn) {
-  var string = toString.call(fn)
-  return string === '[object Function]' ||
-    (typeof fn === 'function' && string !== '[object RegExp]') ||
-    (typeof window !== 'undefined' &&
-     // IE8 and below
-     (fn === window.setTimeout ||
-      fn === window.alert ||
-      fn === window.confirm ||
-      fn === window.prompt))
-};
-
-},{}],57:[function(_dereq_,module,exports){
+},{"global/window":2,"once":56,"parse-headers":60}],56:[function(_dereq_,module,exports){
 module.exports = once
 
 once.proto = once(function () {
@@ -2468,7 +2421,7 @@ function once (fn) {
   }
 }
 
-},{}],58:[function(_dereq_,module,exports){
+},{}],57:[function(_dereq_,module,exports){
 var isFunction = _dereq_('is-function')
 
 module.exports = forEach
@@ -2516,7 +2469,24 @@ function forEachObject(object, iterator, context) {
     }
 }
 
-},{"is-function":56}],59:[function(_dereq_,module,exports){
+},{"is-function":58}],58:[function(_dereq_,module,exports){
+module.exports = isFunction
+
+var toString = Object.prototype.toString
+
+function isFunction (fn) {
+  var string = toString.call(fn)
+  return string === '[object Function]' ||
+    (typeof fn === 'function' && string !== '[object RegExp]') ||
+    (typeof window !== 'undefined' &&
+     // IE8 and below
+     (fn === window.setTimeout ||
+      fn === window.alert ||
+      fn === window.confirm ||
+      fn === window.prompt))
+};
+
+},{}],59:[function(_dereq_,module,exports){
 
 exports = module.exports = trim;
 
@@ -2564,28 +2534,7 @@ module.exports = function (headers) {
 
   return result
 }
-},{"for-each":58,"trim":59}],61:[function(_dereq_,module,exports){
-module.exports = extend
-
-var hasOwnProperty = Object.prototype.hasOwnProperty;
-
-function extend() {
-    var target = {}
-
-    for (var i = 0; i < arguments.length; i++) {
-        var source = arguments[i]
-
-        for (var key in source) {
-            if (hasOwnProperty.call(source, key)) {
-                target[key] = source[key]
-            }
-        }
-    }
-
-    return target
-}
-
-},{}],62:[function(_dereq_,module,exports){
+},{"for-each":57,"trim":59}],61:[function(_dereq_,module,exports){
 /**
  * @file big-play-button.js
  */
@@ -2656,7 +2605,7 @@ _componentJs2['default'].registerComponent('BigPlayButton', BigPlayButton);
 exports['default'] = BigPlayButton;
 module.exports = exports['default'];
 
-},{"./button.js":63,"./component.js":65}],63:[function(_dereq_,module,exports){
+},{"./button.js":62,"./component.js":64}],62:[function(_dereq_,module,exports){
 /**
  * @file button.js
  */
@@ -2837,7 +2786,7 @@ _component2['default'].registerComponent('Button', Button);
 exports['default'] = Button;
 module.exports = exports['default'];
 
-},{"./component":65,"./utils/dom.js":126,"./utils/events.js":127,"./utils/fn.js":128,"global/document":1,"object.assign":45}],64:[function(_dereq_,module,exports){
+},{"./component":64,"./utils/dom.js":125,"./utils/events.js":126,"./utils/fn.js":127,"global/document":1,"object.assign":45}],63:[function(_dereq_,module,exports){
 'use strict';
 
 exports.__esModule = true;
@@ -2889,7 +2838,7 @@ _component2['default'].registerComponent('CloseButton', CloseButton);
 exports['default'] = CloseButton;
 module.exports = exports['default'];
 
-},{"./button":63,"./component":65}],65:[function(_dereq_,module,exports){
+},{"./button":62,"./component":64}],64:[function(_dereq_,module,exports){
 /**
  * @file component.js
  *
@@ -4393,7 +4342,7 @@ Component.registerComponent('Component', Component);
 exports['default'] = Component;
 module.exports = exports['default'];
 
-},{"./utils/dom.js":126,"./utils/events.js":127,"./utils/fn.js":128,"./utils/guid.js":130,"./utils/log.js":131,"./utils/merge-options.js":132,"./utils/to-title-case.js":135,"global/window":2,"object.assign":45}],66:[function(_dereq_,module,exports){
+},{"./utils/dom.js":125,"./utils/events.js":126,"./utils/fn.js":127,"./utils/guid.js":129,"./utils/log.js":130,"./utils/merge-options.js":131,"./utils/to-title-case.js":134,"global/window":2,"object.assign":45}],65:[function(_dereq_,module,exports){
 /**
  * @file control-bar.js
  */
@@ -4518,7 +4467,7 @@ _componentJs2['default'].registerComponent('ControlBar', ControlBar);
 exports['default'] = ControlBar;
 module.exports = exports['default'];
 
-},{"../component.js":65,"./fullscreen-toggle.js":67,"./live-display.js":68,"./mute-toggle.js":69,"./play-toggle.js":70,"./playback-rate-menu/playback-rate-menu-button.js":71,"./progress-control/progress-control.js":76,"./spacer-controls/custom-control-spacer.js":78,"./text-track-controls/captions-button.js":81,"./text-track-controls/chapters-button.js":82,"./text-track-controls/subtitles-button.js":85,"./time-controls/current-time-display.js":88,"./time-controls/duration-display.js":89,"./time-controls/remaining-time-display.js":90,"./time-controls/time-divider.js":91,"./volume-control/volume-control.js":93,"./volume-menu-button.js":95}],67:[function(_dereq_,module,exports){
+},{"../component.js":64,"./fullscreen-toggle.js":66,"./live-display.js":67,"./mute-toggle.js":68,"./play-toggle.js":69,"./playback-rate-menu/playback-rate-menu-button.js":70,"./progress-control/progress-control.js":75,"./spacer-controls/custom-control-spacer.js":77,"./text-track-controls/captions-button.js":80,"./text-track-controls/chapters-button.js":81,"./text-track-controls/subtitles-button.js":84,"./time-controls/current-time-display.js":87,"./time-controls/duration-display.js":88,"./time-controls/remaining-time-display.js":89,"./time-controls/time-divider.js":90,"./volume-control/volume-control.js":92,"./volume-menu-button.js":94}],66:[function(_dereq_,module,exports){
 /**
  * @file fullscreen-toggle.js
  */
@@ -4592,7 +4541,7 @@ _componentJs2['default'].registerComponent('FullscreenToggle', FullscreenToggle)
 exports['default'] = FullscreenToggle;
 module.exports = exports['default'];
 
-},{"../button.js":63,"../component.js":65}],68:[function(_dereq_,module,exports){
+},{"../button.js":62,"../component.js":64}],67:[function(_dereq_,module,exports){
 /**
  * @file live-display.js
  */
@@ -4674,7 +4623,7 @@ _component2['default'].registerComponent('LiveDisplay', LiveDisplay);
 exports['default'] = LiveDisplay;
 module.exports = exports['default'];
 
-},{"../component":65,"../utils/dom.js":126}],69:[function(_dereq_,module,exports){
+},{"../component":64,"../utils/dom.js":125}],68:[function(_dereq_,module,exports){
 /**
  * @file mute-toggle.js
  */
@@ -4801,7 +4750,7 @@ _component2['default'].registerComponent('MuteToggle', MuteToggle);
 exports['default'] = MuteToggle;
 module.exports = exports['default'];
 
-},{"../button":63,"../component":65,"../utils/dom.js":126}],70:[function(_dereq_,module,exports){
+},{"../button":62,"../component":64,"../utils/dom.js":125}],69:[function(_dereq_,module,exports){
 /**
  * @file play-toggle.js
  */
@@ -4902,7 +4851,7 @@ _componentJs2['default'].registerComponent('PlayToggle', PlayToggle);
 exports['default'] = PlayToggle;
 module.exports = exports['default'];
 
-},{"../button.js":63,"../component.js":65}],71:[function(_dereq_,module,exports){
+},{"../button.js":62,"../component.js":64}],70:[function(_dereq_,module,exports){
 /**
  * @file playback-rate-menu-button.js
  */
@@ -5103,7 +5052,7 @@ _componentJs2['default'].registerComponent('PlaybackRateMenuButton', PlaybackRat
 exports['default'] = PlaybackRateMenuButton;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"../../menu/menu-button.js":102,"../../menu/menu.js":104,"../../utils/dom.js":126,"./playback-rate-menu-item.js":72}],72:[function(_dereq_,module,exports){
+},{"../../component.js":64,"../../menu/menu-button.js":101,"../../menu/menu.js":103,"../../utils/dom.js":125,"./playback-rate-menu-item.js":71}],71:[function(_dereq_,module,exports){
 /**
  * @file playback-rate-menu-item.js
  */
@@ -5184,7 +5133,7 @@ _componentJs2['default'].registerComponent('PlaybackRateMenuItem', PlaybackRateM
 exports['default'] = PlaybackRateMenuItem;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"../../menu/menu-item.js":103}],73:[function(_dereq_,module,exports){
+},{"../../component.js":64,"../../menu/menu-item.js":102}],72:[function(_dereq_,module,exports){
 /**
  * @file load-progress-bar.js
  */
@@ -5290,7 +5239,7 @@ _componentJs2['default'].registerComponent('LoadProgressBar', LoadProgressBar);
 exports['default'] = LoadProgressBar;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"../../utils/dom.js":126}],74:[function(_dereq_,module,exports){
+},{"../../component.js":64,"../../utils/dom.js":125}],73:[function(_dereq_,module,exports){
 /**
  * @file mouse-time-display.js
  */
@@ -5392,7 +5341,7 @@ _componentJs2['default'].registerComponent('MouseTimeDisplay', MouseTimeDisplay)
 exports['default'] = MouseTimeDisplay;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"../../utils/dom.js":126,"../../utils/fn.js":128,"../../utils/format-time.js":129,"lodash-compat/function/throttle":7}],75:[function(_dereq_,module,exports){
+},{"../../component.js":64,"../../utils/dom.js":125,"../../utils/fn.js":127,"../../utils/format-time.js":128,"lodash-compat/function/throttle":7}],74:[function(_dereq_,module,exports){
 /**
  * @file play-progress-bar.js
  */
@@ -5467,7 +5416,7 @@ _componentJs2['default'].registerComponent('PlayProgressBar', PlayProgressBar);
 exports['default'] = PlayProgressBar;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"../../utils/fn.js":128,"../../utils/format-time.js":129}],76:[function(_dereq_,module,exports){
+},{"../../component.js":64,"../../utils/fn.js":127,"../../utils/format-time.js":128}],75:[function(_dereq_,module,exports){
 /**
  * @file progress-control.js
  */
@@ -5536,7 +5485,7 @@ _componentJs2['default'].registerComponent('ProgressControl', ProgressControl);
 exports['default'] = ProgressControl;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"./mouse-time-display.js":74,"./seek-bar.js":77}],77:[function(_dereq_,module,exports){
+},{"../../component.js":64,"./mouse-time-display.js":73,"./seek-bar.js":76}],76:[function(_dereq_,module,exports){
 /**
  * @file seek-bar.js
  */
@@ -5722,7 +5671,7 @@ _componentJs2['default'].registerComponent('SeekBar', SeekBar);
 exports['default'] = SeekBar;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"../../slider/slider.js":110,"../../utils/fn.js":128,"../../utils/format-time.js":129,"./load-progress-bar.js":73,"./play-progress-bar.js":75,"object.assign":45}],78:[function(_dereq_,module,exports){
+},{"../../component.js":64,"../../slider/slider.js":109,"../../utils/fn.js":127,"../../utils/format-time.js":128,"./load-progress-bar.js":72,"./play-progress-bar.js":74,"object.assign":45}],77:[function(_dereq_,module,exports){
 /**
  * @file custom-control-spacer.js
  */
@@ -5796,7 +5745,7 @@ _componentJs2['default'].registerComponent('CustomControlSpacer', CustomControlS
 exports['default'] = CustomControlSpacer;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"./spacer.js":79}],79:[function(_dereq_,module,exports){
+},{"../../component.js":64,"./spacer.js":78}],78:[function(_dereq_,module,exports){
 /**
  * @file spacer.js
  */
@@ -5863,7 +5812,7 @@ _componentJs2['default'].registerComponent('Spacer', Spacer);
 exports['default'] = Spacer;
 module.exports = exports['default'];
 
-},{"../../component.js":65}],80:[function(_dereq_,module,exports){
+},{"../../component.js":64}],79:[function(_dereq_,module,exports){
 /**
  * @file caption-settings-menu-item.js
  */
@@ -5929,7 +5878,7 @@ _componentJs2['default'].registerComponent('CaptionSettingsMenuItem', CaptionSet
 exports['default'] = CaptionSettingsMenuItem;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"./text-track-menu-item.js":87}],81:[function(_dereq_,module,exports){
+},{"../../component.js":64,"./text-track-menu-item.js":86}],80:[function(_dereq_,module,exports){
 /**
  * @file captions-button.js
  */
@@ -6035,7 +5984,7 @@ _componentJs2['default'].registerComponent('CaptionsButton', CaptionsButton);
 exports['default'] = CaptionsButton;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"./caption-settings-menu-item.js":80,"./text-track-button.js":86}],82:[function(_dereq_,module,exports){
+},{"../../component.js":64,"./caption-settings-menu-item.js":79,"./text-track-button.js":85}],81:[function(_dereq_,module,exports){
 /**
  * @file chapters-button.js
  */
@@ -6224,7 +6173,7 @@ _componentJs2['default'].registerComponent('ChaptersButton', ChaptersButton);
 exports['default'] = ChaptersButton;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"../../menu/menu.js":104,"../../utils/dom.js":126,"../../utils/fn.js":128,"../../utils/to-title-case.js":135,"./chapters-track-menu-item.js":83,"./text-track-button.js":86,"./text-track-menu-item.js":87,"global/window":2}],83:[function(_dereq_,module,exports){
+},{"../../component.js":64,"../../menu/menu.js":103,"../../utils/dom.js":125,"../../utils/fn.js":127,"../../utils/to-title-case.js":134,"./chapters-track-menu-item.js":82,"./text-track-button.js":85,"./text-track-menu-item.js":86,"global/window":2}],82:[function(_dereq_,module,exports){
 /**
  * @file chapters-track-menu-item.js
  */
@@ -6314,7 +6263,7 @@ _componentJs2['default'].registerComponent('ChaptersTrackMenuItem', ChaptersTrac
 exports['default'] = ChaptersTrackMenuItem;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"../../menu/menu-item.js":103,"../../utils/fn.js":128}],84:[function(_dereq_,module,exports){
+},{"../../component.js":64,"../../menu/menu-item.js":102,"../../utils/fn.js":127}],83:[function(_dereq_,module,exports){
 /**
  * @file off-text-track-menu-item.js
  */
@@ -6394,7 +6343,7 @@ _componentJs2['default'].registerComponent('OffTextTrackMenuItem', OffTextTrackM
 exports['default'] = OffTextTrackMenuItem;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"./text-track-menu-item.js":87}],85:[function(_dereq_,module,exports){
+},{"../../component.js":64,"./text-track-menu-item.js":86}],84:[function(_dereq_,module,exports){
 /**
  * @file subtitles-button.js
  */
@@ -6457,7 +6406,7 @@ _componentJs2['default'].registerComponent('SubtitlesButton', SubtitlesButton);
 exports['default'] = SubtitlesButton;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"./text-track-button.js":86}],86:[function(_dereq_,module,exports){
+},{"../../component.js":64,"./text-track-button.js":85}],85:[function(_dereq_,module,exports){
 /**
  * @file text-track-button.js
  */
@@ -6565,7 +6514,7 @@ _componentJs2['default'].registerComponent('TextTrackButton', TextTrackButton);
 exports['default'] = TextTrackButton;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"../../menu/menu-button.js":102,"../../utils/fn.js":128,"./off-text-track-menu-item.js":84,"./text-track-menu-item.js":87}],87:[function(_dereq_,module,exports){
+},{"../../component.js":64,"../../menu/menu-button.js":101,"../../utils/fn.js":127,"./off-text-track-menu-item.js":83,"./text-track-menu-item.js":86}],86:[function(_dereq_,module,exports){
 /**
  * @file text-track-menu-item.js
  */
@@ -6714,7 +6663,7 @@ _componentJs2['default'].registerComponent('TextTrackMenuItem', TextTrackMenuIte
 exports['default'] = TextTrackMenuItem;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"../../menu/menu-item.js":103,"../../utils/fn.js":128,"global/document":1,"global/window":2}],88:[function(_dereq_,module,exports){
+},{"../../component.js":64,"../../menu/menu-item.js":102,"../../utils/fn.js":127,"global/document":1,"global/window":2}],87:[function(_dereq_,module,exports){
 /**
  * @file current-time-display.js
  */
@@ -6808,7 +6757,7 @@ _componentJs2['default'].registerComponent('CurrentTimeDisplay', CurrentTimeDisp
 exports['default'] = CurrentTimeDisplay;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"../../utils/dom.js":126,"../../utils/format-time.js":129}],89:[function(_dereq_,module,exports){
+},{"../../component.js":64,"../../utils/dom.js":125,"../../utils/format-time.js":128}],88:[function(_dereq_,module,exports){
 /**
  * @file duration-display.js
  */
@@ -6909,7 +6858,7 @@ _componentJs2['default'].registerComponent('DurationDisplay', DurationDisplay);
 exports['default'] = DurationDisplay;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"../../utils/dom.js":126,"../../utils/format-time.js":129}],90:[function(_dereq_,module,exports){
+},{"../../component.js":64,"../../utils/dom.js":125,"../../utils/format-time.js":128}],89:[function(_dereq_,module,exports){
 /**
  * @file remaining-time-display.js
  */
@@ -7007,7 +6956,7 @@ _componentJs2['default'].registerComponent('RemainingTimeDisplay', RemainingTime
 exports['default'] = RemainingTimeDisplay;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"../../utils/dom.js":126,"../../utils/format-time.js":129}],91:[function(_dereq_,module,exports){
+},{"../../component.js":64,"../../utils/dom.js":125,"../../utils/format-time.js":128}],90:[function(_dereq_,module,exports){
 /**
  * @file time-divider.js
  */
@@ -7065,7 +7014,7 @@ _componentJs2['default'].registerComponent('TimeDivider', TimeDivider);
 exports['default'] = TimeDivider;
 module.exports = exports['default'];
 
-},{"../../component.js":65}],92:[function(_dereq_,module,exports){
+},{"../../component.js":64}],91:[function(_dereq_,module,exports){
 /**
  * @file volume-bar.js
  */
@@ -7210,7 +7159,7 @@ _componentJs2['default'].registerComponent('VolumeBar', VolumeBar);
 exports['default'] = VolumeBar;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"../../slider/slider.js":110,"../../utils/fn.js":128,"./volume-level.js":94}],93:[function(_dereq_,module,exports){
+},{"../../component.js":64,"../../slider/slider.js":109,"../../utils/fn.js":127,"./volume-level.js":93}],92:[function(_dereq_,module,exports){
 /**
  * @file volume-control.js
  */
@@ -7288,7 +7237,7 @@ _componentJs2['default'].registerComponent('VolumeControl', VolumeControl);
 exports['default'] = VolumeControl;
 module.exports = exports['default'];
 
-},{"../../component.js":65,"./volume-bar.js":92}],94:[function(_dereq_,module,exports){
+},{"../../component.js":64,"./volume-bar.js":91}],93:[function(_dereq_,module,exports){
 /**
  * @file volume-level.js
  */
@@ -7345,7 +7294,7 @@ _componentJs2['default'].registerComponent('VolumeLevel', VolumeLevel);
 exports['default'] = VolumeLevel;
 module.exports = exports['default'];
 
-},{"../../component.js":65}],95:[function(_dereq_,module,exports){
+},{"../../component.js":64}],94:[function(_dereq_,module,exports){
 /**
  * @file volume-menu-button.js
  */
@@ -7507,7 +7456,7 @@ _componentJs2['default'].registerComponent('VolumeMenuButton', VolumeMenuButton)
 exports['default'] = VolumeMenuButton;
 module.exports = exports['default'];
 
-},{"../button.js":63,"../component.js":65,"../menu/menu-button.js":102,"../menu/menu.js":104,"./mute-toggle.js":69,"./volume-control/volume-bar.js":92}],96:[function(_dereq_,module,exports){
+},{"../button.js":62,"../component.js":64,"../menu/menu-button.js":101,"../menu/menu.js":103,"./mute-toggle.js":68,"./volume-control/volume-bar.js":91}],95:[function(_dereq_,module,exports){
 /**
  * @file error-display.js
  */
@@ -7600,7 +7549,7 @@ _component2['default'].registerComponent('ErrorDisplay', ErrorDisplay);
 exports['default'] = ErrorDisplay;
 module.exports = exports['default'];
 
-},{"./component":65,"./modal-dialog":105,"./utils/dom":126,"./utils/merge-options":132}],97:[function(_dereq_,module,exports){
+},{"./component":64,"./modal-dialog":104,"./utils/dom":125,"./utils/merge-options":131}],96:[function(_dereq_,module,exports){
 /**
  * @file event-target.js
  */
@@ -7659,7 +7608,7 @@ EventTarget.prototype.dispatchEvent = EventTarget.prototype.trigger;
 exports['default'] = EventTarget;
 module.exports = exports['default'];
 
-},{"./utils/events.js":127}],98:[function(_dereq_,module,exports){
+},{"./utils/events.js":126}],97:[function(_dereq_,module,exports){
 'use strict';
 
 exports.__esModule = true;
@@ -7750,7 +7699,7 @@ var extendFn = function extendFn(superClass) {
 exports['default'] = extendFn;
 module.exports = exports['default'];
 
-},{"./utils/log":131}],99:[function(_dereq_,module,exports){
+},{"./utils/log":130}],98:[function(_dereq_,module,exports){
 /**
  * @file fullscreen-api.js
  */
@@ -7807,7 +7756,7 @@ if (browserApi) {
 exports['default'] = FullscreenApi;
 module.exports = exports['default'];
 
-},{"global/document":1}],100:[function(_dereq_,module,exports){
+},{"global/document":1}],99:[function(_dereq_,module,exports){
 /**
  * @file loading-spinner.js
  */
@@ -7862,7 +7811,7 @@ _component2['default'].registerComponent('LoadingSpinner', LoadingSpinner);
 exports['default'] = LoadingSpinner;
 module.exports = exports['default'];
 
-},{"./component":65}],101:[function(_dereq_,module,exports){
+},{"./component":64}],100:[function(_dereq_,module,exports){
 /**
  * @file media-error.js
  */
@@ -7953,7 +7902,7 @@ for (var errNum = 0; errNum < MediaError.errorTypes.length; errNum++) {
 exports['default'] = MediaError;
 module.exports = exports['default'];
 
-},{"object.assign":45}],102:[function(_dereq_,module,exports){
+},{"object.assign":45}],101:[function(_dereq_,module,exports){
 /**
  * @file menu-button.js
  */
@@ -8227,7 +8176,7 @@ _componentJs2['default'].registerComponent('MenuButton', MenuButton);
 exports['default'] = MenuButton;
 module.exports = exports['default'];
 
-},{"../button.js":63,"../component.js":65,"../utils/dom.js":126,"../utils/fn.js":128,"../utils/to-title-case.js":135,"./menu.js":104}],103:[function(_dereq_,module,exports){
+},{"../button.js":62,"../component.js":64,"../utils/dom.js":125,"../utils/fn.js":127,"../utils/to-title-case.js":134,"./menu.js":103}],102:[function(_dereq_,module,exports){
 /**
  * @file menu-item.js
  */
@@ -8322,7 +8271,7 @@ _componentJs2['default'].registerComponent('MenuItem', MenuItem);
 exports['default'] = MenuItem;
 module.exports = exports['default'];
 
-},{"../button.js":63,"../component.js":65,"object.assign":45}],104:[function(_dereq_,module,exports){
+},{"../button.js":62,"../component.js":64,"object.assign":45}],103:[function(_dereq_,module,exports){
 /**
  * @file menu.js
  */
@@ -8420,7 +8369,7 @@ _componentJs2['default'].registerComponent('Menu', Menu);
 exports['default'] = Menu;
 module.exports = exports['default'];
 
-},{"../component.js":65,"../utils/dom.js":126,"../utils/events.js":127,"../utils/fn.js":128}],105:[function(_dereq_,module,exports){
+},{"../component.js":64,"../utils/dom.js":125,"../utils/events.js":126,"../utils/fn.js":127}],104:[function(_dereq_,module,exports){
 /**
  * @file modal-dialog.js
  */
@@ -8843,7 +8792,7 @@ _component2['default'].registerComponent('ModalDialog', ModalDialog);
 exports['default'] = ModalDialog;
 module.exports = exports['default'];
 
-},{"./close-button":64,"./component":65,"./utils/dom":126,"./utils/fn":128,"./utils/log":131,"global/document":1}],106:[function(_dereq_,module,exports){
+},{"./close-button":63,"./component":64,"./utils/dom":125,"./utils/fn":127,"./utils/log":130,"global/document":1}],105:[function(_dereq_,module,exports){
 /**
  * @file player.js
  */
@@ -9384,7 +9333,6 @@ var Player = (function (_Component) {
     var width = undefined;
     var height = undefined;
     var aspectRatio = undefined;
-    var idClass = undefined;
 
     // The aspect ratio is either used directly or to calculate width and height.
     if (this.aspectRatio_ !== undefined && this.aspectRatio_ !== 'auto') {
@@ -9421,12 +9369,7 @@ var Player = (function (_Component) {
       height = width * ratioMultiplier;
     }
 
-    // Ensure the CSS class is valid by starting with an alpha character
-    if (/^[^a-zA-Z]/.test(this.id())) {
-      idClass = 'dimensions-' + this.id();
-    } else {
-      idClass = this.id() + '-dimensions';
-    }
+    var idClass = this.id() + '-dimensions';
 
     // Ensure the right class is still on the player for the style element
     this.addClass(idClass);
@@ -11140,7 +11083,6 @@ var Player = (function (_Component) {
     if (err === null) {
       this.error_ = err;
       this.removeClass('vjs-error');
-      this.errorDisplay.close();
       return this;
     }
 
@@ -11151,6 +11093,9 @@ var Player = (function (_Component) {
       this.error_ = new _mediaErrorJs2['default'](err);
     }
 
+    // fire an error event on the player
+    this.trigger('error');
+
     // add the vjs-error classname to the player
     this.addClass('vjs-error');
 
@@ -11158,9 +11103,6 @@ var Player = (function (_Component) {
     // ie8 just logs "[object object]" if you just log the error object
     _utilsLogJs2['default'].error('(CODE:' + this.error_.code + ' ' + _mediaErrorJs2['default'].errorTypes[this.error_.code] + ')', this.error_.message, this.error_);
 
-    // fire an error event on the player
-    this.trigger('error');
-
     return this;
   };
 
@@ -11772,13 +11714,6 @@ Player.prototype.handleUserInactive_;
  */
 Player.prototype.handleTimeUpdate_;
 
-/**
- * Fired when video playback ends
- *
- * @event ended
- */
-Player.prototype.handleTechEnded_;
-
 /**
  * Fired when the volume changes
  *
@@ -11806,7 +11741,7 @@ exports['default'] = Player;
 module.exports = exports['default'];
 // If empty string, make it a parsable json object.
 
-},{"./big-play-button.js":62,"./component.js":65,"./control-bar/control-bar.js":66,"./error-display.js":96,"./fullscreen-api.js":99,"./loading-spinner.js":100,"./media-error.js":101,"./modal-dialog":105,"./poster-image.js":108,"./tech/html5.js":113,"./tech/loader.js":114,"./tech/tech.js":115,"./tracks/text-track-display.js":117,"./tracks/text-track-list-converter.js":119,"./tracks/text-track-settings.js":121,"./utils/browser.js":123,"./utils/buffer.js":124,"./utils/dom.js":126,"./utils/events.js":127,"./utils/fn.js":128,"./utils/guid.js":130,"./utils/log.js":131,"./utils/merge-options.js":132,"./utils/stylesheet.js":133,"./utils/time-ranges.js":134,"./utils/to-title-case.js":135,"global/document":1,"global/window":2,"object.assign":45,"safe-json-parse/tuple":53}],107:[function(_dereq_,module,exports){
+},{"./big-play-button.js":61,"./component.js":64,"./control-bar/control-bar.js":65,"./error-display.js":95,"./fullscreen-api.js":98,"./loading-spinner.js":99,"./media-error.js":100,"./modal-dialog":104,"./poster-image.js":107,"./tech/html5.js":112,"./tech/loader.js":113,"./tech/tech.js":114,"./tracks/text-track-display.js":116,"./tracks/text-track-list-converter.js":118,"./tracks/text-track-settings.js":120,"./utils/browser.js":122,"./utils/buffer.js":123,"./utils/dom.js":125,"./utils/events.js":126,"./utils/fn.js":127,"./utils/guid.js":129,"./utils/log.js":130,"./utils/merge-options.js":131,"./utils/stylesheet.js":132,"./utils/time-ranges.js":133,"./utils/to-title-case.js":134,"global/document":1,"global/window":2,"object.assign":45,"safe-json-parse/tuple":53}],106:[function(_dereq_,module,exports){
 /**
  * @file plugins.js
  */
@@ -11834,7 +11769,7 @@ var plugin = function plugin(name, init) {
 exports['default'] = plugin;
 module.exports = exports['default'];
 
-},{"./player.js":106}],108:[function(_dereq_,module,exports){
+},{"./player.js":105}],107:[function(_dereq_,module,exports){
 /**
  * @file poster-image.js
  */
@@ -11994,7 +11929,7 @@ _componentJs2['default'].registerComponent('PosterImage', PosterImage);
 exports['default'] = PosterImage;
 module.exports = exports['default'];
 
-},{"./button.js":63,"./component.js":65,"./utils/browser.js":123,"./utils/dom.js":126,"./utils/fn.js":128}],109:[function(_dereq_,module,exports){
+},{"./button.js":62,"./component.js":64,"./utils/browser.js":122,"./utils/dom.js":125,"./utils/fn.js":127}],108:[function(_dereq_,module,exports){
 /**
  * @file setup.js
  *
@@ -12104,7 +12039,7 @@ exports.autoSetup = autoSetup;
 exports.autoSetupTimeout = autoSetupTimeout;
 exports.hasLoaded = hasLoaded;
 
-},{"./utils/events.js":127,"global/document":1,"global/window":2}],110:[function(_dereq_,module,exports){
+},{"./utils/events.js":126,"global/document":1,"global/window":2}],109:[function(_dereq_,module,exports){
 /**
  * @file slider.js
  */
@@ -12383,7 +12318,7 @@ _componentJs2['default'].registerComponent('Slider', Slider);
 exports['default'] = Slider;
 module.exports = exports['default'];
 
-},{"../component.js":65,"../utils/dom.js":126,"global/document":1,"object.assign":45}],111:[function(_dereq_,module,exports){
+},{"../component.js":64,"../utils/dom.js":125,"global/document":1,"object.assign":45}],110:[function(_dereq_,module,exports){
 /**
  * @file flash-rtmp.js
  */
@@ -12502,7 +12437,7 @@ function FlashRtmpDecorator(Flash) {
 exports['default'] = FlashRtmpDecorator;
 module.exports = exports['default'];
 
-},{}],112:[function(_dereq_,module,exports){
+},{}],111:[function(_dereq_,module,exports){
 /**
  * @file flash.js
  * VideoJS-SWF - Custom Flash Player with HTML5-ish API
@@ -13117,7 +13052,7 @@ _tech2['default'].registerTech('Flash', Flash);
 exports['default'] = Flash;
 module.exports = exports['default'];
 
-},{"../component":65,"../utils/dom.js":126,"../utils/time-ranges.js":134,"../utils/url.js":136,"./flash-rtmp":111,"./tech":115,"global/window":2,"object.assign":45}],113:[function(_dereq_,module,exports){
+},{"../component":64,"../utils/dom.js":125,"../utils/time-ranges.js":133,"../utils/url.js":135,"./flash-rtmp":110,"./tech":114,"global/window":2,"object.assign":45}],112:[function(_dereq_,module,exports){
 /**
  * @file html5.js
  * HTML5 Media Controller - Wrapper for HTML5 Media API
@@ -13721,11 +13656,7 @@ var Html5 = (function (_Tech) {
    */
 
   Html5.prototype.currentSrc = function currentSrc() {
-    if (this.currentSource_) {
-      return this.currentSource_.src;
-    } else {
-      return this.el_.currentSrc;
-    }
+    return this.el_.currentSrc;
   };
 
   /**
@@ -14367,7 +14298,7 @@ _techJs2['default'].registerTech('Html5', Html5);
 exports['default'] = Html5;
 module.exports = exports['default'];
 
-},{"../component":65,"../utils/browser.js":123,"../utils/dom.js":126,"../utils/fn.js":128,"../utils/log.js":131,"../utils/merge-options.js":132,"../utils/url.js":136,"./tech.js":115,"global/document":1,"global/window":2,"object.assign":45}],114:[function(_dereq_,module,exports){
+},{"../component":64,"../utils/browser.js":122,"../utils/dom.js":125,"../utils/fn.js":127,"../utils/log.js":130,"../utils/merge-options.js":131,"../utils/url.js":135,"./tech.js":114,"global/document":1,"global/window":2,"object.assign":45}],113:[function(_dereq_,module,exports){
 /**
  * @file loader.js
  */
@@ -14451,7 +14382,7 @@ _componentJs2['default'].registerComponent('MediaLoader', MediaLoader);
 exports['default'] = MediaLoader;
 module.exports = exports['default'];
 
-},{"../component.js":65,"../utils/to-title-case.js":135,"./tech.js":115,"global/window":2}],115:[function(_dereq_,module,exports){
+},{"../component.js":64,"../utils/to-title-case.js":134,"./tech.js":114,"global/window":2}],114:[function(_dereq_,module,exports){
 /**
  * @file tech.js
  * Media Technology Controller - Base class for media playback
@@ -15229,7 +15160,7 @@ Tech.registerTech('Tech', Tech);
 exports['default'] = Tech;
 module.exports = exports['default'];
 
-},{"../component":65,"../media-error.js":101,"../tracks/text-track":122,"../tracks/text-track-list":120,"../utils/buffer.js":124,"../utils/fn.js":128,"../utils/log.js":131,"../utils/time-ranges.js":134,"global/document":1,"global/window":2}],116:[function(_dereq_,module,exports){
+},{"../component":64,"../media-error.js":100,"../tracks/text-track":121,"../tracks/text-track-list":119,"../utils/buffer.js":123,"../utils/fn.js":127,"../utils/log.js":130,"../utils/time-ranges.js":133,"global/document":1,"global/window":2}],115:[function(_dereq_,module,exports){
 /**
  * @file text-track-cue-list.js
  */
@@ -15328,7 +15259,7 @@ TextTrackCueList.prototype.getCueById = function (id) {
 exports['default'] = TextTrackCueList;
 module.exports = exports['default'];
 
-},{"../utils/browser.js":123,"global/document":1}],117:[function(_dereq_,module,exports){
+},{"../utils/browser.js":122,"global/document":1}],116:[function(_dereq_,module,exports){
 /**
  * @file text-track-display.js
  */
@@ -15599,7 +15530,7 @@ _component2['default'].registerComponent('TextTrackDisplay', TextTrackDisplay);
 exports['default'] = TextTrackDisplay;
 module.exports = exports['default'];
 
-},{"../component":65,"../menu/menu-button.js":102,"../menu/menu-item.js":103,"../menu/menu.js":104,"../utils/fn.js":128,"global/document":1,"global/window":2}],118:[function(_dereq_,module,exports){
+},{"../component":64,"../menu/menu-button.js":101,"../menu/menu-item.js":102,"../menu/menu.js":103,"../utils/fn.js":127,"global/document":1,"global/window":2}],117:[function(_dereq_,module,exports){
 /**
  * @file text-track-enums.js
  *
@@ -15632,7 +15563,7 @@ var TextTrackKind = {
 exports.TextTrackMode = TextTrackMode;
 exports.TextTrackKind = TextTrackKind;
 
-},{}],119:[function(_dereq_,module,exports){
+},{}],118:[function(_dereq_,module,exports){
 /**
  * Utilities for capturing text track state and re-creating tracks
  * based on a capture.
@@ -15723,7 +15654,7 @@ var jsonToTextTracks = function jsonToTextTracks(json, tech) {
 exports['default'] = { textTracksToJson: textTracksToJson, jsonToTextTracks: jsonToTextTracks, trackToJson_: trackToJson_ };
 module.exports = exports['default'];
 
-},{}],120:[function(_dereq_,module,exports){
+},{}],119:[function(_dereq_,module,exports){
 /**
  * @file text-track-list.js
  */
@@ -15870,7 +15801,7 @@ TextTrackList.prototype.getTrackById = function (id) {
 exports['default'] = TextTrackList;
 module.exports = exports['default'];
 
-},{"../event-target":97,"../utils/browser.js":123,"../utils/fn.js":128,"global/document":1}],121:[function(_dereq_,module,exports){
+},{"../event-target":96,"../utils/browser.js":122,"../utils/fn.js":127,"global/document":1}],120:[function(_dereq_,module,exports){
 /**
  * @file text-track-settings.js
  */
@@ -16158,7 +16089,7 @@ function captionOptionsMenuTemplate() {
 exports['default'] = TextTrackSettings;
 module.exports = exports['default'];
 
-},{"../component":65,"../utils/events.js":127,"../utils/fn.js":128,"../utils/log.js":131,"global/window":2,"safe-json-parse/tuple":53}],122:[function(_dereq_,module,exports){
+},{"../component":64,"../utils/events.js":126,"../utils/fn.js":127,"../utils/log.js":130,"global/window":2,"safe-json-parse/tuple":53}],121:[function(_dereq_,module,exports){
 /**
  * @file text-track.js
  */
@@ -16511,7 +16442,7 @@ var indexOf = function indexOf(searchElement, fromIndex) {
 exports['default'] = TextTrack;
 module.exports = exports['default'];
 
-},{"../event-target":97,"../utils/browser.js":123,"../utils/fn.js":128,"../utils/guid.js":130,"../utils/log.js":131,"../utils/url.js":136,"./text-track-cue-list":116,"./text-track-enums":118,"global/document":1,"global/window":2,"xhr":55}],123:[function(_dereq_,module,exports){
+},{"../event-target":96,"../utils/browser.js":122,"../utils/fn.js":127,"../utils/guid.js":129,"../utils/log.js":130,"../utils/url.js":135,"./text-track-cue-list":115,"./text-track-enums":117,"global/document":1,"global/window":2,"xhr":55}],122:[function(_dereq_,module,exports){
 /**
  * @file browser.js
  */
@@ -16600,7 +16531,7 @@ exports.TOUCH_ENABLED = TOUCH_ENABLED;
 var BACKGROUND_SIZE_SUPPORTED = ('backgroundSize' in _globalDocument2['default'].createElement('video').style);
 exports.BACKGROUND_SIZE_SUPPORTED = BACKGROUND_SIZE_SUPPORTED;
 
-},{"global/document":1,"global/window":2}],124:[function(_dereq_,module,exports){
+},{"global/document":1,"global/window":2}],123:[function(_dereq_,module,exports){
 /**
  * @file buffer.js
  */
@@ -16649,7 +16580,7 @@ function bufferedPercent(buffered, duration) {
   return bufferedDuration / duration;
 }
 
-},{"./time-ranges.js":134}],125:[function(_dereq_,module,exports){
+},{"./time-ranges.js":133}],124:[function(_dereq_,module,exports){
 'use strict';
 
 exports.__esModule = true;
@@ -16720,7 +16651,7 @@ exports['default'] = function (target) {
 
 module.exports = exports['default'];
 
-},{"./log.js":131}],126:[function(_dereq_,module,exports){
+},{"./log.js":130}],125:[function(_dereq_,module,exports){
 /**
  * @file dom.js
  */
@@ -17449,7 +17380,7 @@ exports.$ = $;
 var $$ = createQuerier('querySelectorAll');
 exports.$$ = $$;
 
-},{"./guid.js":130,"./log.js":131,"global/document":1,"global/window":2,"tsml":54}],127:[function(_dereq_,module,exports){
+},{"./guid.js":129,"./log.js":130,"global/document":1,"global/window":2,"tsml":54}],126:[function(_dereq_,module,exports){
 /**
  * @file events.js
  *
@@ -17857,7 +17788,7 @@ function _handleMultipleEvents(fn, elem, types, callback) {
   });
 }
 
-},{"./dom.js":126,"./guid.js":130,"global/document":1,"global/window":2}],128:[function(_dereq_,module,exports){
+},{"./dom.js":125,"./guid.js":129,"global/document":1,"global/window":2}],127:[function(_dereq_,module,exports){
 /**
  * @file fn.js
  */
@@ -17901,7 +17832,7 @@ var bind = function bind(context, fn, uid) {
 };
 exports.bind = bind;
 
-},{"./guid.js":130}],129:[function(_dereq_,module,exports){
+},{"./guid.js":129}],128:[function(_dereq_,module,exports){
 /**
  * @file format-time.js
  *
@@ -17951,7 +17882,7 @@ function formatTime(seconds) {
 exports['default'] = formatTime;
 module.exports = exports['default'];
 
-},{}],130:[function(_dereq_,module,exports){
+},{}],129:[function(_dereq_,module,exports){
 /**
  * @file guid.js
  *
@@ -17976,7 +17907,7 @@ function newGUID() {
   return _guid++;
 }
 
-},{}],131:[function(_dereq_,module,exports){
+},{}],130:[function(_dereq_,module,exports){
 /**
  * @file log.js
  */
@@ -18066,7 +17997,7 @@ function _logType(type, args) {
 exports['default'] = log;
 module.exports = exports['default'];
 
-},{"global/window":2}],132:[function(_dereq_,module,exports){
+},{"global/window":2}],131:[function(_dereq_,module,exports){
 /**
  * @file merge-options.js
  */
@@ -18137,7 +18068,7 @@ function mergeOptions() {
 
 module.exports = exports['default'];
 
-},{"lodash-compat/object/merge":40}],133:[function(_dereq_,module,exports){
+},{"lodash-compat/object/merge":40}],132:[function(_dereq_,module,exports){
 'use strict';
 
 exports.__esModule = true;
@@ -18165,7 +18096,7 @@ var setTextContent = function setTextContent(el, content) {
 };
 exports.setTextContent = setTextContent;
 
-},{"global/document":1}],134:[function(_dereq_,module,exports){
+},{"global/document":1}],133:[function(_dereq_,module,exports){
 'use strict';
 
 exports.__esModule = true;
@@ -18236,7 +18167,7 @@ function rangeCheck(fnName, index, maxIndex) {
   }
 }
 
-},{"./log.js":131}],135:[function(_dereq_,module,exports){
+},{"./log.js":130}],134:[function(_dereq_,module,exports){
 /**
  * @file to-title-case.js
  *
@@ -18257,7 +18188,7 @@ function toTitleCase(string) {
 exports["default"] = toTitleCase;
 module.exports = exports["default"];
 
-},{}],136:[function(_dereq_,module,exports){
+},{}],135:[function(_dereq_,module,exports){
 /**
  * @file url.js
  */
@@ -18393,7 +18324,7 @@ var isCrossOrigin = function isCrossOrigin(url) {
 };
 exports.isCrossOrigin = isCrossOrigin;
 
-},{"global/document":1,"global/window":2}],137:[function(_dereq_,module,exports){
+},{"global/document":1,"global/window":2}],136:[function(_dereq_,module,exports){
 /**
  * @file video.js
  */
@@ -18592,7 +18523,7 @@ setup.autoSetupTimeout(1, videojs);
  *
  * @type {String}
  */
-videojs.VERSION = '5.2.3';
+videojs.VERSION = '5.2.1';
 
 /**
  * The global options object. These are the settings that take effect
@@ -19178,7 +19109,7 @@ if (typeof define === 'function' && define['amd']) {
 exports['default'] = videojs;
 module.exports = exports['default'];
 
-},{"../../src/js/utils/merge-options.js":132,"./component":65,"./event-target":97,"./extend.js":98,"./player":106,"./plugins.js":107,"./setup":109,"./tech/flash.js":112,"./tech/html5.js":113,"./tech/tech.js":115,"./tracks/text-track.js":122,"./utils/browser.js":123,"./utils/create-deprecation-proxy.js":125,"./utils/dom.js":126,"./utils/events.js":127,"./utils/fn.js":128,"./utils/format-time.js":129,"./utils/log.js":131,"./utils/stylesheet.js":133,"./utils/time-ranges.js":134,"./utils/url.js":136,"global/document":1,"lodash-compat/object/merge":40,"object.assign":45,"xhr":55}]},{},[137])(137)
+},{"../../src/js/utils/merge-options.js":131,"./component":64,"./event-target":96,"./extend.js":97,"./player":105,"./plugins.js":106,"./setup":108,"./tech/flash.js":111,"./tech/html5.js":112,"./tech/tech.js":114,"./tracks/text-track.js":121,"./utils/browser.js":122,"./utils/create-deprecation-proxy.js":124,"./utils/dom.js":125,"./utils/events.js":126,"./utils/fn.js":127,"./utils/format-time.js":128,"./utils/log.js":130,"./utils/stylesheet.js":132,"./utils/time-ranges.js":133,"./utils/url.js":135,"global/document":1,"lodash-compat/object/merge":40,"object.assign":45,"xhr":55}]},{},[136])(136)
 });
 
 

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.2.3",
+  "version": "5.2.1",
   "copyright": "Copyright Brightcove, Inc. <https://www.brightcove.com/>",
   "license": "Apache-2.0",
   "keywords": [
@@ -32,7 +32,7 @@
     "videojs-ie8": "1.1.0",
     "videojs-swf": "5.0.1",
     "vtt.js": "git+https://github.com/gkatsev/vtt.js.git#vjs-v0.12.1",
-    "xhr": "~2.2.0"
+    "xhr": "2.1.0"
   },
   "devDependencies": {
     "babel": "^5.2.2",

src/js/player.js

@@ -415,7 +415,6 @@ class Player extends Component {
     let width;
     let height;
     let aspectRatio;
-    let idClass;
 
     // The aspect ratio is either used directly or to calculate width and height.
     if (this.aspectRatio_ !== undefined && this.aspectRatio_ !== 'auto') {
@@ -452,12 +451,7 @@ class Player extends Component {
       height = width  * ratioMultiplier;
     }
 
-    // Ensure the CSS class is valid by starting with an alpha character
-    if (/^[^a-zA-Z]/.test(this.id())) {
-      idClass = 'dimensions-'+this.id();
-    } else {
-      idClass = this.id()+'-dimensions';
-    }
+    let idClass = this.id()+'-dimensions';
 
     // Ensure the right class is still on the player for the style element
     this.addClass(idClass);
@@ -2107,7 +2101,6 @@ class Player extends Component {
     if (err === null) {
       this.error_ = err;
       this.removeClass('vjs-error');
-      this.errorDisplay.close();
       return this;
     }
 
@@ -2118,6 +2111,9 @@ class Player extends Component {
       this.error_ = new MediaError(err);
     }
 
+    // fire an error event on the player
+    this.trigger('error');
+
     // add the vjs-error classname to the player
     this.addClass('vjs-error');
 
@@ -2125,9 +2121,6 @@ class Player extends Component {
     // ie8 just logs "[object object]" if you just log the error object
     log.error(`(CODE:${this.error_.code} ${MediaError.errorTypes[this.error_.code]})`, this.error_.message, this.error_);
 
-    // fire an error event on the player
-    this.trigger('error');
-
     return this;
   }
 
@@ -2718,13 +2711,6 @@ Player.prototype.handleUserInactive_;
  */
 Player.prototype.handleTimeUpdate_;
 
-/**
- * Fired when video playback ends
- *
- * @event ended
- */
-Player.prototype.handleTechEnded_;
-
 /**
  * Fired when the volume changes
  *

src/js/tech/html5.js

@@ -492,13 +492,7 @@ class Html5 extends Tech {
    * @return {Object}
    * @method currentSrc
    */
-  currentSrc() { 
-    if (this.currentSource_) {
-      return this.currentSource_.src;
-    } else {
-      return this.el_.currentSrc;
-    }
-  }
+  currentSrc() { return this.el_.currentSrc; }
 
   /**
    * Get poster

test/unit/player.test.js

@@ -17,6 +17,36 @@ q.module('Player', {
   }
 });
 
+// Compiler doesn't like using 'this' in setup/teardown.
+// module("Player", {
+//   /**
+//    * @this {*}
+//    */
+//   setup: function(){
+//     window.player1 = true; // using window works
+//   },
+
+//   /**
+//    * @this {*}
+//    */
+//   teardown: function(){
+//     // if (this.player && this.player.el() !== null) {
+//     //   this.player.dispose();
+//     //   this.player = null;
+//     // }
+//   }
+// });
+
+// Object.size = function(obj) {
+//     var size = 0, key;
+//     for (key in obj) {
+//         console.log('key', key)
+//         if (obj.hasOwnProperty(key)) size++;
+//     }
+//     return size;
+// };
+
+
 test('should create player instance that inherits from component and dispose it', function(){
   var player = TestHelpers.makePlayer();
 
@@ -169,21 +199,6 @@ test('should set the width, height, and aspect ratio via a css class', function(
   ok(confirmSetting('padding-top', '25%'), 'aspect ratio percent should match the newly set aspect ratio');
 });
 
-test('should use an class name that begins with an alpha character', function(){
-  let alphaPlayer = TestHelpers.makePlayer({ id: 'alpha1' });
-  let numericPlayer = TestHelpers.makePlayer({ id: '1numeric' });
-
-  let getStyleText = function(styleEl){
-    return (styleEl.styleSheet && styleEl.styleSheet.cssText) || styleEl.innerHTML;
-  };
-
-  alphaPlayer.width(100);
-  numericPlayer.width(100);
-
-  ok(/\s*\.alpha1-dimensions\s*\{/.test(getStyleText(alphaPlayer.styleEl_)), 'appends -dimensions to an alpha player ID');
-  ok(/\s*\.dimensions-1numeric\s*\{/.test(getStyleText(numericPlayer.styleEl_)), 'prepends dimensions- to a numeric player ID');
-});
-
 test('should wrap the original tag in the player div', function(){
   var tag = TestHelpers.makeTag();
   var container = document.createElement('div');
@@ -309,6 +324,24 @@ test('should set controls and trigger events', function() {
   player.dispose();
 });
 
+// Can't figure out how to test fullscreen events with tests
+// Browsers aren't triggering the events at least
+// asyncTest('should trigger the fullscreenchange event', function() {
+//   expect(3);
+
+//   var player = TestHelpers.makePlayer();
+//   player.on('fullscreenchange', function(){
+//     ok(true, 'fullscreenchange event fired');
+//     ok(this.isFullscreen() === true, 'isFullscreen is true');
+//     ok(this.el().className.indexOf('vjs-fullscreen') !== -1, 'vjs-fullscreen class added');
+
+//     player.dispose();
+//     start();
+//   });
+
+//   player.requestFullscreen();
+// });
+
 test('should toggle user the user state between active and inactive', function(){
   var player = TestHelpers.makePlayer({});
 
@@ -408,6 +441,28 @@ test('make sure that controls listeners do not get added too many times', functi
   player.dispose();
 });
 
+// test('should use custom message when encountering an unsupported video type',
+//     function() {
+//   videojs.options['notSupportedMessage'] = 'Video no go <a href="">link</a>';
+//   var fixture = document.getElementById('qunit-fixture');
+
+//   var html =
+//       '<video id="example_1">' +
+//           '<source src="fake.foo" type="video/foo">' +
+//           '</video>';
+
+//   fixture.innerHTML += html;
+
+//   var tag = document.getElementById('example_1');
+//   var player = new Player(tag, { techOrder: ['techFaker'] });
+
+//   var incompatibilityMessage = player.el().getElementsByTagName('p')[0];
+//   // ie8 capitalizes tag names
+//   equal(incompatibilityMessage.innerHTML.toLowerCase(), 'video no go <a href="">link</a>');
+
+//   player.dispose();
+// });
+
 test('should register players with generated ids', function(){
   var fixture, video, player, id;
   fixture = document.getElementById('qunit-fixture');
@@ -804,21 +859,3 @@ test('createModal() options object', function() {
   strictEqual(modal.options_.label, 'boo', 'modal options are set properly');
   modal.close();
 });
-
-test('you can clear error in the error event', function() {
-  let player = TestHelpers.makePlayer();
-
-  sinon.stub(log, 'error');
-
-  player.error({code: 4});
-  ok(player.error(), 'we have an error');
-  player.error(null);
-
-  player.one('error', function() {
-    player.error(null);
-  });
-  player.error({code: 4});
-  ok(!player.error(), 'we no longer have an error');
-
-  log.error.restore();
-});

test/unit/tech/html5.test.js

@@ -249,12 +249,6 @@ if (Html5.supportsNativeTextTracks()) {
     equal(adds[2][0], rems[2][0], 'removetrack event handler removed');
   });
 }
-test('should always return currentSource_ if set', function(){
-  let currentSrc = Html5.prototype.currentSrc;
-  equal(currentSrc.call({el_: {currentSrc:'test1'}}), 'test1', 'sould return source from element if nothing else set');
-  equal(currentSrc.call({currentSource_:{src: 'test2'}}), 'test2', 'sould return source from currentSource_, if nothing else set');
-  equal(currentSrc.call({currentSource_:{src: 'test2'}, el_:{currentSrc:'test1'}}), 'test2', 'sould return source from  source set, not from element');
-});
 
 test('should fire makeup events when a video tag is initialized late', function(){
   let lateInit = Html5.prototype.handleLateInit_;