Comparar commits

..

10 Commits

Autor SHA1 Mensagem Data
paladox bef4c96a4b v5.2.2 dist 2015-11-23 17:32:00 +00:00
paladox 552d8cbda3 v5.2.2 2015-11-23 17:31:27 +00:00
paladox 8d0de0fa51 @paladox updated xhr from deprecated ver to v2.2. closes #2837 2015-11-23 12:22:07 -05:00
tomaspinho c4dbd2488b @tomaspinho added 'ended' event to API docs. closes #2836 2015-11-23 12:15:50 -05:00
Violeta Marculescu c0d5f471bc @bcvio fixed returning current source rather than blob url. closes #2833 2015-11-23 12:04:31 -05:00
Nathaniel Bibler 3a40b10fa6 @nbibler ensured classes begin with alpha characters. Fixes #2828. closes #2829 2015-11-20 17:38:05 -05:00
Dat Tran 7dff83b2a4 @DatTran fixed bower paths. Fixes #2740. closes #2775 2015-11-20 17:22:49 -05:00
Kay 6bbd6f1a65 v5.2.1 2015-11-16 16:43:29 +00:00
Kay J d9b5fbc60d @ksjun corrected the registerTech export. closes #2816 2015-11-16 10:42:35 -05:00
David LaPalomento 385266338a @dmlap Check a component is a function before new-ing. closes #2814 2015-11-16 10:18:09 -05:00
18 arquivos alterados com 507 adições e 376 exclusões
+11
Ver Arquivo
@@ -6,6 +6,17 @@ _(none)_
--------------------
## 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))
## 5.2.0 (2015-11-10)
* @gkatsev made initListeners more general and added Tech.isTech. Fixes #2767 ([view](https://github.com/videojs/video.js/pull/2773))
* @dmlap updated swf to 5.0.1 ([view](https://github.com/videojs/video.js/pull/2795))
+2 -2
Ver Arquivo
@@ -2,8 +2,8 @@
"name": "video.js",
"description": "An HTML5 and Flash video player with a common API and skin for both.",
"main": [
"src/js/video.js",
"src/css/video-js.scss"
"dist/video.js",
"dist/video-js.css"
],
"moduleType": "es6",
"keywords": [
+1 -1
Ver Arquivo
@@ -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.0",
"version": "5.2.2",
"keywords": [
"videojs",
"html5",
+203 -169
Ver Arquivo
@@ -1,6 +1,6 @@
/**
* @license
* Video.js 5.2.0 <http://videojs.com/>
* Video.js 5.2.2 <http://videojs.com/>
* Copyright Brightcove, Inc. <https://www.brightcove.com/>
* Available under Apache License Version 2.0
* <https://github.com/videojs/video.js/blob/master/LICENSE>
@@ -1782,14 +1782,8 @@ module.exports = function hasSymbols() {
var obj = {};
var sym = Symbol('test');
if (typeof sym === 'string') { return false; }
// temp disabled per https://github.com/ljharb/object.assign/issues/17
// if (sym instanceof Symbol) { return false; }
// temp disabled per https://github.com/WebReflection/get-own-property-symbols/issues/4
// if (!(Object(sym) instanceof Symbol)) { return false; }
var symVal = 42;
obj[sym] = symVal;
if (sym instanceof Symbol) { return false; }
obj[sym] = 42;
for (sym in obj) { return false; }
if (keys(obj).length !== 0) { return false; }
if (typeof Object.keys === 'function' && Object.keys(obj).length !== 0) { return false; }
@@ -1803,7 +1797,7 @@ module.exports = function hasSymbols() {
if (typeof Object.getOwnPropertyDescriptor === 'function') {
var descriptor = Object.getOwnPropertyDescriptor(obj, sym);
if (descriptor.value !== symVal || descriptor.enumerable !== true) { return false; }
if (descriptor.value !== 42 || descriptor.enumerable !== true) { return false; }
}
return true;
@@ -1826,25 +1820,20 @@ var propIsEnumerable = bind.call(Function.call, Object.prototype.propertyIsEnume
module.exports = function assign(target, source1) {
if (!canBeObject(target)) { throw new TypeError('target must be an object'); }
var objTarget = toObject(target);
var s, source, i, props, syms, value, key;
var s, source, i, props, syms;
for (s = 1; s < arguments.length; ++s) {
source = toObject(arguments[s]);
props = keys(source);
if (hasSymbols && Object.getOwnPropertySymbols) {
syms = Object.getOwnPropertySymbols(source);
for (i = 0; i < syms.length; ++i) {
key = syms[i];
if (propIsEnumerable(source, key)) {
push(props, key);
if (propIsEnumerable(source, syms[i])) {
push(props, syms[i]);
}
}
}
for (i = 0; i < props.length; ++i) {
key = props[i];
value = source[key];
if (propIsEnumerable(source, key)) {
objTarget[key] = value;
}
objTarget[props[i]] = source[props[i]];
}
}
return objTarget;
@@ -2153,26 +2142,6 @@ module.exports = function isArguments(value) {
var implementation = _dereq_('./implementation');
var lacksProperEnumerationOrder = function () {
if (!Object.assign) {
return false;
}
// v8, specifically in node 4.x, has a bug with incorrect property enumeration order
// note: this does not detect the bug unless there's 20 characters
var str = 'abcdefghijklmnopqrst';
var letters = str.split('');
var map = {};
for (var i = 0; i < letters.length; ++i) {
map[letters[i]] = letters[i];
}
var obj = Object.assign({}, map);
var actual = '';
for (var k in obj) {
actual += k;
}
return str !== actual;
};
var assignHasPendingExceptions = function () {
if (!Object.assign || !Object.preventExtensions) {
return false;
@@ -2188,16 +2157,7 @@ var assignHasPendingExceptions = function () {
};
module.exports = function getPolyfill() {
if (!Object.assign) {
return implementation;
}
if (lacksProperEnumerationOrder()) {
return implementation;
}
if (assignHasPendingExceptions()) {
return implementation;
}
return Object.assign;
return !Object.assign || assignHasPendingExceptions() ? implementation : Object.assign;
};
},{"./implementation":44}],52:[function(_dereq_,module,exports){
@@ -2208,11 +2168,9 @@ var getPolyfill = _dereq_('./polyfill');
module.exports = function shimAssign() {
var polyfill = getPolyfill();
define(
Object,
{ assign: polyfill },
{ assign: function () { return Object.assign !== polyfill; } }
);
if (Object.assign !== polyfill) {
define(Object, { assign: polyfill });
}
return polyfill;
};
@@ -2251,14 +2209,27 @@ 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){
@@ -2267,7 +2238,34 @@ function isEmpty(obj){
return true
}
function createXHR(options, callback) {
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 readystatechange() {
if (xhr.readyState === 4) {
loadFunc()
@@ -2344,16 +2342,6 @@ function createXHR(options, callback) {
}
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) {
@@ -2368,7 +2356,7 @@ function createXHR(options, callback) {
var aborted
var uri = xhr.url = options.uri || options.url
var method = xhr.method = options.method || "GET"
var body = options.body || options.data
var body = options.body || options.data || null
var headers = xhr.headers = options.headers || {}
var sync = !!options.sync
var isJson = false
@@ -2438,7 +2426,24 @@ function createXHR(options, callback) {
function noop() {}
},{"global/window":2,"once":56,"parse-headers":60}],56:[function(_dereq_,module,exports){
},{"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){
module.exports = once
once.proto = once(function () {
@@ -2459,7 +2464,7 @@ function once (fn) {
}
}
},{}],57:[function(_dereq_,module,exports){
},{}],58:[function(_dereq_,module,exports){
var isFunction = _dereq_('is-function')
module.exports = forEach
@@ -2507,24 +2512,7 @@ function forEachObject(object, iterator, context) {
}
}
},{"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){
},{"is-function":56}],59:[function(_dereq_,module,exports){
exports = module.exports = trim;
@@ -2572,7 +2560,28 @@ module.exports = function (headers) {
return result
}
},{"for-each":57,"trim":59}],61:[function(_dereq_,module,exports){
},{"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){
/**
* @file big-play-button.js
*/
@@ -2643,7 +2652,7 @@ _componentJs2['default'].registerComponent('BigPlayButton', BigPlayButton);
exports['default'] = BigPlayButton;
module.exports = exports['default'];
},{"./button.js":62,"./component.js":64}],62:[function(_dereq_,module,exports){
},{"./button.js":63,"./component.js":65}],63:[function(_dereq_,module,exports){
/**
* @file button.js
*/
@@ -2824,7 +2833,7 @@ _component2['default'].registerComponent('Button', Button);
exports['default'] = Button;
module.exports = exports['default'];
},{"./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){
},{"./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){
'use strict';
exports.__esModule = true;
@@ -2876,7 +2885,7 @@ _component2['default'].registerComponent('CloseButton', CloseButton);
exports['default'] = CloseButton;
module.exports = exports['default'];
},{"./button":62,"./component":64}],64:[function(_dereq_,module,exports){
},{"./button":63,"./component":65}],65:[function(_dereq_,module,exports){
/**
* @file component.js
*
@@ -3302,6 +3311,14 @@ var Component = (function () {
throw new Error('Component ' + componentClassName + ' does not exist');
}
// data stored directly on the videojs object may be
// misidentified as a component to retain
// backwards-compatibility with 4.x. check to make sure the
// component class can be instantiated.
if (typeof ComponentClass !== 'function') {
return null;
}
component = new ComponentClass(this.player_ || this, options);
// child is a component instance
@@ -4372,7 +4389,7 @@ Component.registerComponent('Component', Component);
exports['default'] = Component;
module.exports = exports['default'];
},{"./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){
},{"./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){
/**
* @file control-bar.js
*/
@@ -4497,7 +4514,7 @@ _componentJs2['default'].registerComponent('ControlBar', ControlBar);
exports['default'] = ControlBar;
module.exports = exports['default'];
},{"../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){
},{"../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){
/**
* @file fullscreen-toggle.js
*/
@@ -4571,7 +4588,7 @@ _componentJs2['default'].registerComponent('FullscreenToggle', FullscreenToggle)
exports['default'] = FullscreenToggle;
module.exports = exports['default'];
},{"../button.js":62,"../component.js":64}],67:[function(_dereq_,module,exports){
},{"../button.js":63,"../component.js":65}],68:[function(_dereq_,module,exports){
/**
* @file live-display.js
*/
@@ -4653,7 +4670,7 @@ _component2['default'].registerComponent('LiveDisplay', LiveDisplay);
exports['default'] = LiveDisplay;
module.exports = exports['default'];
},{"../component":64,"../utils/dom.js":125}],68:[function(_dereq_,module,exports){
},{"../component":65,"../utils/dom.js":126}],69:[function(_dereq_,module,exports){
/**
* @file mute-toggle.js
*/
@@ -4780,7 +4797,7 @@ _component2['default'].registerComponent('MuteToggle', MuteToggle);
exports['default'] = MuteToggle;
module.exports = exports['default'];
},{"../button":62,"../component":64,"../utils/dom.js":125}],69:[function(_dereq_,module,exports){
},{"../button":63,"../component":65,"../utils/dom.js":126}],70:[function(_dereq_,module,exports){
/**
* @file play-toggle.js
*/
@@ -4881,7 +4898,7 @@ _componentJs2['default'].registerComponent('PlayToggle', PlayToggle);
exports['default'] = PlayToggle;
module.exports = exports['default'];
},{"../button.js":62,"../component.js":64}],70:[function(_dereq_,module,exports){
},{"../button.js":63,"../component.js":65}],71:[function(_dereq_,module,exports){
/**
* @file playback-rate-menu-button.js
*/
@@ -5082,7 +5099,7 @@ _componentJs2['default'].registerComponent('PlaybackRateMenuButton', PlaybackRat
exports['default'] = PlaybackRateMenuButton;
module.exports = exports['default'];
},{"../../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){
},{"../../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){
/**
* @file playback-rate-menu-item.js
*/
@@ -5163,7 +5180,7 @@ _componentJs2['default'].registerComponent('PlaybackRateMenuItem', PlaybackRateM
exports['default'] = PlaybackRateMenuItem;
module.exports = exports['default'];
},{"../../component.js":64,"../../menu/menu-item.js":102}],72:[function(_dereq_,module,exports){
},{"../../component.js":65,"../../menu/menu-item.js":103}],73:[function(_dereq_,module,exports){
/**
* @file load-progress-bar.js
*/
@@ -5269,7 +5286,7 @@ _componentJs2['default'].registerComponent('LoadProgressBar', LoadProgressBar);
exports['default'] = LoadProgressBar;
module.exports = exports['default'];
},{"../../component.js":64,"../../utils/dom.js":125}],73:[function(_dereq_,module,exports){
},{"../../component.js":65,"../../utils/dom.js":126}],74:[function(_dereq_,module,exports){
/**
* @file mouse-time-display.js
*/
@@ -5371,7 +5388,7 @@ _componentJs2['default'].registerComponent('MouseTimeDisplay', MouseTimeDisplay)
exports['default'] = MouseTimeDisplay;
module.exports = exports['default'];
},{"../../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){
},{"../../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){
/**
* @file play-progress-bar.js
*/
@@ -5446,7 +5463,7 @@ _componentJs2['default'].registerComponent('PlayProgressBar', PlayProgressBar);
exports['default'] = PlayProgressBar;
module.exports = exports['default'];
},{"../../component.js":64,"../../utils/fn.js":127,"../../utils/format-time.js":128}],75:[function(_dereq_,module,exports){
},{"../../component.js":65,"../../utils/fn.js":128,"../../utils/format-time.js":129}],76:[function(_dereq_,module,exports){
/**
* @file progress-control.js
*/
@@ -5515,7 +5532,7 @@ _componentJs2['default'].registerComponent('ProgressControl', ProgressControl);
exports['default'] = ProgressControl;
module.exports = exports['default'];
},{"../../component.js":64,"./mouse-time-display.js":73,"./seek-bar.js":76}],76:[function(_dereq_,module,exports){
},{"../../component.js":65,"./mouse-time-display.js":74,"./seek-bar.js":77}],77:[function(_dereq_,module,exports){
/**
* @file seek-bar.js
*/
@@ -5701,7 +5718,7 @@ _componentJs2['default'].registerComponent('SeekBar', SeekBar);
exports['default'] = SeekBar;
module.exports = exports['default'];
},{"../../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){
},{"../../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){
/**
* @file custom-control-spacer.js
*/
@@ -5775,7 +5792,7 @@ _componentJs2['default'].registerComponent('CustomControlSpacer', CustomControlS
exports['default'] = CustomControlSpacer;
module.exports = exports['default'];
},{"../../component.js":64,"./spacer.js":78}],78:[function(_dereq_,module,exports){
},{"../../component.js":65,"./spacer.js":79}],79:[function(_dereq_,module,exports){
/**
* @file spacer.js
*/
@@ -5842,7 +5859,7 @@ _componentJs2['default'].registerComponent('Spacer', Spacer);
exports['default'] = Spacer;
module.exports = exports['default'];
},{"../../component.js":64}],79:[function(_dereq_,module,exports){
},{"../../component.js":65}],80:[function(_dereq_,module,exports){
/**
* @file caption-settings-menu-item.js
*/
@@ -5908,7 +5925,7 @@ _componentJs2['default'].registerComponent('CaptionSettingsMenuItem', CaptionSet
exports['default'] = CaptionSettingsMenuItem;
module.exports = exports['default'];
},{"../../component.js":64,"./text-track-menu-item.js":86}],80:[function(_dereq_,module,exports){
},{"../../component.js":65,"./text-track-menu-item.js":87}],81:[function(_dereq_,module,exports){
/**
* @file captions-button.js
*/
@@ -6014,7 +6031,7 @@ _componentJs2['default'].registerComponent('CaptionsButton', CaptionsButton);
exports['default'] = CaptionsButton;
module.exports = exports['default'];
},{"../../component.js":64,"./caption-settings-menu-item.js":79,"./text-track-button.js":85}],81:[function(_dereq_,module,exports){
},{"../../component.js":65,"./caption-settings-menu-item.js":80,"./text-track-button.js":86}],82:[function(_dereq_,module,exports){
/**
* @file chapters-button.js
*/
@@ -6203,7 +6220,7 @@ _componentJs2['default'].registerComponent('ChaptersButton', ChaptersButton);
exports['default'] = ChaptersButton;
module.exports = exports['default'];
},{"../../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){
},{"../../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){
/**
* @file chapters-track-menu-item.js
*/
@@ -6293,7 +6310,7 @@ _componentJs2['default'].registerComponent('ChaptersTrackMenuItem', ChaptersTrac
exports['default'] = ChaptersTrackMenuItem;
module.exports = exports['default'];
},{"../../component.js":64,"../../menu/menu-item.js":102,"../../utils/fn.js":127}],83:[function(_dereq_,module,exports){
},{"../../component.js":65,"../../menu/menu-item.js":103,"../../utils/fn.js":128}],84:[function(_dereq_,module,exports){
/**
* @file off-text-track-menu-item.js
*/
@@ -6373,7 +6390,7 @@ _componentJs2['default'].registerComponent('OffTextTrackMenuItem', OffTextTrackM
exports['default'] = OffTextTrackMenuItem;
module.exports = exports['default'];
},{"../../component.js":64,"./text-track-menu-item.js":86}],84:[function(_dereq_,module,exports){
},{"../../component.js":65,"./text-track-menu-item.js":87}],85:[function(_dereq_,module,exports){
/**
* @file subtitles-button.js
*/
@@ -6436,7 +6453,7 @@ _componentJs2['default'].registerComponent('SubtitlesButton', SubtitlesButton);
exports['default'] = SubtitlesButton;
module.exports = exports['default'];
},{"../../component.js":64,"./text-track-button.js":85}],85:[function(_dereq_,module,exports){
},{"../../component.js":65,"./text-track-button.js":86}],86:[function(_dereq_,module,exports){
/**
* @file text-track-button.js
*/
@@ -6544,7 +6561,7 @@ _componentJs2['default'].registerComponent('TextTrackButton', TextTrackButton);
exports['default'] = TextTrackButton;
module.exports = exports['default'];
},{"../../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){
},{"../../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){
/**
* @file text-track-menu-item.js
*/
@@ -6693,7 +6710,7 @@ _componentJs2['default'].registerComponent('TextTrackMenuItem', TextTrackMenuIte
exports['default'] = TextTrackMenuItem;
module.exports = exports['default'];
},{"../../component.js":64,"../../menu/menu-item.js":102,"../../utils/fn.js":127,"global/document":1,"global/window":2}],87:[function(_dereq_,module,exports){
},{"../../component.js":65,"../../menu/menu-item.js":103,"../../utils/fn.js":128,"global/document":1,"global/window":2}],88:[function(_dereq_,module,exports){
/**
* @file current-time-display.js
*/
@@ -6787,7 +6804,7 @@ _componentJs2['default'].registerComponent('CurrentTimeDisplay', CurrentTimeDisp
exports['default'] = CurrentTimeDisplay;
module.exports = exports['default'];
},{"../../component.js":64,"../../utils/dom.js":125,"../../utils/format-time.js":128}],88:[function(_dereq_,module,exports){
},{"../../component.js":65,"../../utils/dom.js":126,"../../utils/format-time.js":129}],89:[function(_dereq_,module,exports){
/**
* @file duration-display.js
*/
@@ -6888,7 +6905,7 @@ _componentJs2['default'].registerComponent('DurationDisplay', DurationDisplay);
exports['default'] = DurationDisplay;
module.exports = exports['default'];
},{"../../component.js":64,"../../utils/dom.js":125,"../../utils/format-time.js":128}],89:[function(_dereq_,module,exports){
},{"../../component.js":65,"../../utils/dom.js":126,"../../utils/format-time.js":129}],90:[function(_dereq_,module,exports){
/**
* @file remaining-time-display.js
*/
@@ -6986,7 +7003,7 @@ _componentJs2['default'].registerComponent('RemainingTimeDisplay', RemainingTime
exports['default'] = RemainingTimeDisplay;
module.exports = exports['default'];
},{"../../component.js":64,"../../utils/dom.js":125,"../../utils/format-time.js":128}],90:[function(_dereq_,module,exports){
},{"../../component.js":65,"../../utils/dom.js":126,"../../utils/format-time.js":129}],91:[function(_dereq_,module,exports){
/**
* @file time-divider.js
*/
@@ -7044,7 +7061,7 @@ _componentJs2['default'].registerComponent('TimeDivider', TimeDivider);
exports['default'] = TimeDivider;
module.exports = exports['default'];
},{"../../component.js":64}],91:[function(_dereq_,module,exports){
},{"../../component.js":65}],92:[function(_dereq_,module,exports){
/**
* @file volume-bar.js
*/
@@ -7189,7 +7206,7 @@ _componentJs2['default'].registerComponent('VolumeBar', VolumeBar);
exports['default'] = VolumeBar;
module.exports = exports['default'];
},{"../../component.js":64,"../../slider/slider.js":109,"../../utils/fn.js":127,"./volume-level.js":93}],92:[function(_dereq_,module,exports){
},{"../../component.js":65,"../../slider/slider.js":110,"../../utils/fn.js":128,"./volume-level.js":94}],93:[function(_dereq_,module,exports){
/**
* @file volume-control.js
*/
@@ -7267,7 +7284,7 @@ _componentJs2['default'].registerComponent('VolumeControl', VolumeControl);
exports['default'] = VolumeControl;
module.exports = exports['default'];
},{"../../component.js":64,"./volume-bar.js":91}],93:[function(_dereq_,module,exports){
},{"../../component.js":65,"./volume-bar.js":92}],94:[function(_dereq_,module,exports){
/**
* @file volume-level.js
*/
@@ -7324,7 +7341,7 @@ _componentJs2['default'].registerComponent('VolumeLevel', VolumeLevel);
exports['default'] = VolumeLevel;
module.exports = exports['default'];
},{"../../component.js":64}],94:[function(_dereq_,module,exports){
},{"../../component.js":65}],95:[function(_dereq_,module,exports){
/**
* @file volume-menu-button.js
*/
@@ -7486,7 +7503,7 @@ _componentJs2['default'].registerComponent('VolumeMenuButton', VolumeMenuButton)
exports['default'] = VolumeMenuButton;
module.exports = exports['default'];
},{"../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){
},{"../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){
/**
* @file error-display.js
*/
@@ -7579,7 +7596,7 @@ _component2['default'].registerComponent('ErrorDisplay', ErrorDisplay);
exports['default'] = ErrorDisplay;
module.exports = exports['default'];
},{"./component":64,"./modal-dialog":104,"./utils/dom":125,"./utils/merge-options":131}],96:[function(_dereq_,module,exports){
},{"./component":65,"./modal-dialog":105,"./utils/dom":126,"./utils/merge-options":132}],97:[function(_dereq_,module,exports){
/**
* @file event-target.js
*/
@@ -7638,7 +7655,7 @@ EventTarget.prototype.dispatchEvent = EventTarget.prototype.trigger;
exports['default'] = EventTarget;
module.exports = exports['default'];
},{"./utils/events.js":126}],97:[function(_dereq_,module,exports){
},{"./utils/events.js":127}],98:[function(_dereq_,module,exports){
'use strict';
exports.__esModule = true;
@@ -7729,7 +7746,7 @@ var extendFn = function extendFn(superClass) {
exports['default'] = extendFn;
module.exports = exports['default'];
},{"./utils/log":130}],98:[function(_dereq_,module,exports){
},{"./utils/log":131}],99:[function(_dereq_,module,exports){
/**
* @file fullscreen-api.js
*/
@@ -7786,7 +7803,7 @@ if (browserApi) {
exports['default'] = FullscreenApi;
module.exports = exports['default'];
},{"global/document":1}],99:[function(_dereq_,module,exports){
},{"global/document":1}],100:[function(_dereq_,module,exports){
/**
* @file loading-spinner.js
*/
@@ -7841,7 +7858,7 @@ _component2['default'].registerComponent('LoadingSpinner', LoadingSpinner);
exports['default'] = LoadingSpinner;
module.exports = exports['default'];
},{"./component":64}],100:[function(_dereq_,module,exports){
},{"./component":65}],101:[function(_dereq_,module,exports){
/**
* @file media-error.js
*/
@@ -7932,7 +7949,7 @@ for (var errNum = 0; errNum < MediaError.errorTypes.length; errNum++) {
exports['default'] = MediaError;
module.exports = exports['default'];
},{"object.assign":45}],101:[function(_dereq_,module,exports){
},{"object.assign":45}],102:[function(_dereq_,module,exports){
/**
* @file menu-button.js
*/
@@ -8206,7 +8223,7 @@ _componentJs2['default'].registerComponent('MenuButton', MenuButton);
exports['default'] = MenuButton;
module.exports = exports['default'];
},{"../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){
},{"../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){
/**
* @file menu-item.js
*/
@@ -8301,7 +8318,7 @@ _componentJs2['default'].registerComponent('MenuItem', MenuItem);
exports['default'] = MenuItem;
module.exports = exports['default'];
},{"../button.js":62,"../component.js":64,"object.assign":45}],103:[function(_dereq_,module,exports){
},{"../button.js":63,"../component.js":65,"object.assign":45}],104:[function(_dereq_,module,exports){
/**
* @file menu.js
*/
@@ -8399,7 +8416,7 @@ _componentJs2['default'].registerComponent('Menu', Menu);
exports['default'] = Menu;
module.exports = exports['default'];
},{"../component.js":64,"../utils/dom.js":125,"../utils/events.js":126,"../utils/fn.js":127}],104:[function(_dereq_,module,exports){
},{"../component.js":65,"../utils/dom.js":126,"../utils/events.js":127,"../utils/fn.js":128}],105:[function(_dereq_,module,exports){
/**
* @file modal-dialog.js
*/
@@ -8822,7 +8839,7 @@ _component2['default'].registerComponent('ModalDialog', ModalDialog);
exports['default'] = ModalDialog;
module.exports = exports['default'];
},{"./close-button":63,"./component":64,"./utils/dom":125,"./utils/fn":127,"./utils/log":130,"global/document":1}],105:[function(_dereq_,module,exports){
},{"./close-button":64,"./component":65,"./utils/dom":126,"./utils/fn":128,"./utils/log":131,"global/document":1}],106:[function(_dereq_,module,exports){
/**
* @file player.js
*/
@@ -9363,6 +9380,7 @@ 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') {
@@ -9399,7 +9417,12 @@ var Player = (function (_Component) {
height = width * ratioMultiplier;
}
var idClass = this.id() + '-dimensions';
// 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';
}
// Ensure the right class is still on the player for the style element
this.addClass(idClass);
@@ -11744,6 +11767,13 @@ Player.prototype.handleUserInactive_;
*/
Player.prototype.handleTimeUpdate_;
/**
* Fired when video playback ends
*
* @event ended
*/
Player.prototype.handleTechEnded_;
/**
* Fired when the volume changes
*
@@ -11771,7 +11801,7 @@ exports['default'] = Player;
module.exports = exports['default'];
// If empty string, make it a parsable json object.
},{"./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){
},{"./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){
/**
* @file plugins.js
*/
@@ -11799,7 +11829,7 @@ var plugin = function plugin(name, init) {
exports['default'] = plugin;
module.exports = exports['default'];
},{"./player.js":105}],107:[function(_dereq_,module,exports){
},{"./player.js":106}],108:[function(_dereq_,module,exports){
/**
* @file poster-image.js
*/
@@ -11959,7 +11989,7 @@ _componentJs2['default'].registerComponent('PosterImage', PosterImage);
exports['default'] = PosterImage;
module.exports = exports['default'];
},{"./button.js":62,"./component.js":64,"./utils/browser.js":122,"./utils/dom.js":125,"./utils/fn.js":127}],108:[function(_dereq_,module,exports){
},{"./button.js":63,"./component.js":65,"./utils/browser.js":123,"./utils/dom.js":126,"./utils/fn.js":128}],109:[function(_dereq_,module,exports){
/**
* @file setup.js
*
@@ -12069,7 +12099,7 @@ exports.autoSetup = autoSetup;
exports.autoSetupTimeout = autoSetupTimeout;
exports.hasLoaded = hasLoaded;
},{"./utils/events.js":126,"global/document":1,"global/window":2}],109:[function(_dereq_,module,exports){
},{"./utils/events.js":127,"global/document":1,"global/window":2}],110:[function(_dereq_,module,exports){
/**
* @file slider.js
*/
@@ -12348,7 +12378,7 @@ _componentJs2['default'].registerComponent('Slider', Slider);
exports['default'] = Slider;
module.exports = exports['default'];
},{"../component.js":64,"../utils/dom.js":125,"global/document":1,"object.assign":45}],110:[function(_dereq_,module,exports){
},{"../component.js":65,"../utils/dom.js":126,"global/document":1,"object.assign":45}],111:[function(_dereq_,module,exports){
/**
* @file flash-rtmp.js
*/
@@ -12467,7 +12497,7 @@ function FlashRtmpDecorator(Flash) {
exports['default'] = FlashRtmpDecorator;
module.exports = exports['default'];
},{}],111:[function(_dereq_,module,exports){
},{}],112:[function(_dereq_,module,exports){
/**
* @file flash.js
* VideoJS-SWF - Custom Flash Player with HTML5-ish API
@@ -13082,7 +13112,7 @@ _tech2['default'].registerTech('Flash', Flash);
exports['default'] = Flash;
module.exports = exports['default'];
},{"../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){
},{"../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){
/**
* @file html5.js
* HTML5 Media Controller - Wrapper for HTML5 Media API
@@ -13686,7 +13716,11 @@ var Html5 = (function (_Tech) {
*/
Html5.prototype.currentSrc = function currentSrc() {
return this.el_.currentSrc;
if (this.currentSource_) {
return this.currentSource_.src;
} else {
return this.el_.currentSrc;
}
};
/**
@@ -14328,7 +14362,7 @@ _techJs2['default'].registerTech('Html5', Html5);
exports['default'] = Html5;
module.exports = exports['default'];
},{"../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){
},{"../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){
/**
* @file loader.js
*/
@@ -14412,7 +14446,7 @@ _componentJs2['default'].registerComponent('MediaLoader', MediaLoader);
exports['default'] = MediaLoader;
module.exports = exports['default'];
},{"../component.js":64,"../utils/to-title-case.js":134,"./tech.js":114,"global/window":2}],114:[function(_dereq_,module,exports){
},{"../component.js":65,"../utils/to-title-case.js":135,"./tech.js":115,"global/window":2}],115:[function(_dereq_,module,exports){
/**
* @file tech.js
* Media Technology Controller - Base class for media playback
@@ -15190,7 +15224,7 @@ Tech.registerTech('Tech', Tech);
exports['default'] = Tech;
module.exports = exports['default'];
},{"../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){
},{"../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){
/**
* @file text-track-cue-list.js
*/
@@ -15289,7 +15323,7 @@ TextTrackCueList.prototype.getCueById = function (id) {
exports['default'] = TextTrackCueList;
module.exports = exports['default'];
},{"../utils/browser.js":122,"global/document":1}],116:[function(_dereq_,module,exports){
},{"../utils/browser.js":123,"global/document":1}],117:[function(_dereq_,module,exports){
/**
* @file text-track-display.js
*/
@@ -15560,7 +15594,7 @@ _component2['default'].registerComponent('TextTrackDisplay', TextTrackDisplay);
exports['default'] = TextTrackDisplay;
module.exports = exports['default'];
},{"../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){
},{"../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){
/**
* @file text-track-enums.js
*
@@ -15593,7 +15627,7 @@ var TextTrackKind = {
exports.TextTrackMode = TextTrackMode;
exports.TextTrackKind = TextTrackKind;
},{}],118:[function(_dereq_,module,exports){
},{}],119:[function(_dereq_,module,exports){
/**
* Utilities for capturing text track state and re-creating tracks
* based on a capture.
@@ -15684,7 +15718,7 @@ var jsonToTextTracks = function jsonToTextTracks(json, tech) {
exports['default'] = { textTracksToJson: textTracksToJson, jsonToTextTracks: jsonToTextTracks, trackToJson_: trackToJson_ };
module.exports = exports['default'];
},{}],119:[function(_dereq_,module,exports){
},{}],120:[function(_dereq_,module,exports){
/**
* @file text-track-list.js
*/
@@ -15831,7 +15865,7 @@ TextTrackList.prototype.getTrackById = function (id) {
exports['default'] = TextTrackList;
module.exports = exports['default'];
},{"../event-target":96,"../utils/browser.js":122,"../utils/fn.js":127,"global/document":1}],120:[function(_dereq_,module,exports){
},{"../event-target":97,"../utils/browser.js":123,"../utils/fn.js":128,"global/document":1}],121:[function(_dereq_,module,exports){
/**
* @file text-track-settings.js
*/
@@ -16119,7 +16153,7 @@ function captionOptionsMenuTemplate() {
exports['default'] = TextTrackSettings;
module.exports = exports['default'];
},{"../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){
},{"../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){
/**
* @file text-track.js
*/
@@ -16472,7 +16506,7 @@ var indexOf = function indexOf(searchElement, fromIndex) {
exports['default'] = TextTrack;
module.exports = exports['default'];
},{"../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){
},{"../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){
/**
* @file browser.js
*/
@@ -16561,7 +16595,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}],123:[function(_dereq_,module,exports){
},{"global/document":1,"global/window":2}],124:[function(_dereq_,module,exports){
/**
* @file buffer.js
*/
@@ -16610,7 +16644,7 @@ function bufferedPercent(buffered, duration) {
return bufferedDuration / duration;
}
},{"./time-ranges.js":133}],124:[function(_dereq_,module,exports){
},{"./time-ranges.js":134}],125:[function(_dereq_,module,exports){
'use strict';
exports.__esModule = true;
@@ -16681,7 +16715,7 @@ exports['default'] = function (target) {
module.exports = exports['default'];
},{"./log.js":130}],125:[function(_dereq_,module,exports){
},{"./log.js":131}],126:[function(_dereq_,module,exports){
/**
* @file dom.js
*/
@@ -17410,7 +17444,7 @@ exports.$ = $;
var $$ = createQuerier('querySelectorAll');
exports.$$ = $$;
},{"./guid.js":129,"./log.js":130,"global/document":1,"global/window":2,"tsml":54}],126:[function(_dereq_,module,exports){
},{"./guid.js":130,"./log.js":131,"global/document":1,"global/window":2,"tsml":54}],127:[function(_dereq_,module,exports){
/**
* @file events.js
*
@@ -17818,7 +17852,7 @@ function _handleMultipleEvents(fn, elem, types, callback) {
});
}
},{"./dom.js":125,"./guid.js":129,"global/document":1,"global/window":2}],127:[function(_dereq_,module,exports){
},{"./dom.js":126,"./guid.js":130,"global/document":1,"global/window":2}],128:[function(_dereq_,module,exports){
/**
* @file fn.js
*/
@@ -17862,7 +17896,7 @@ var bind = function bind(context, fn, uid) {
};
exports.bind = bind;
},{"./guid.js":129}],128:[function(_dereq_,module,exports){
},{"./guid.js":130}],129:[function(_dereq_,module,exports){
/**
* @file format-time.js
*
@@ -17912,7 +17946,7 @@ function formatTime(seconds) {
exports['default'] = formatTime;
module.exports = exports['default'];
},{}],129:[function(_dereq_,module,exports){
},{}],130:[function(_dereq_,module,exports){
/**
* @file guid.js
*
@@ -17937,7 +17971,7 @@ function newGUID() {
return _guid++;
}
},{}],130:[function(_dereq_,module,exports){
},{}],131:[function(_dereq_,module,exports){
/**
* @file log.js
*/
@@ -18027,7 +18061,7 @@ function _logType(type, args) {
exports['default'] = log;
module.exports = exports['default'];
},{"global/window":2}],131:[function(_dereq_,module,exports){
},{"global/window":2}],132:[function(_dereq_,module,exports){
/**
* @file merge-options.js
*/
@@ -18098,7 +18132,7 @@ function mergeOptions() {
module.exports = exports['default'];
},{"lodash-compat/object/merge":40}],132:[function(_dereq_,module,exports){
},{"lodash-compat/object/merge":40}],133:[function(_dereq_,module,exports){
'use strict';
exports.__esModule = true;
@@ -18126,7 +18160,7 @@ var setTextContent = function setTextContent(el, content) {
};
exports.setTextContent = setTextContent;
},{"global/document":1}],133:[function(_dereq_,module,exports){
},{"global/document":1}],134:[function(_dereq_,module,exports){
'use strict';
exports.__esModule = true;
@@ -18197,7 +18231,7 @@ function rangeCheck(fnName, index, maxIndex) {
}
}
},{"./log.js":130}],134:[function(_dereq_,module,exports){
},{"./log.js":131}],135:[function(_dereq_,module,exports){
/**
* @file to-title-case.js
*
@@ -18218,7 +18252,7 @@ function toTitleCase(string) {
exports["default"] = toTitleCase;
module.exports = exports["default"];
},{}],135:[function(_dereq_,module,exports){
},{}],136:[function(_dereq_,module,exports){
/**
* @file url.js
*/
@@ -18354,7 +18388,7 @@ var isCrossOrigin = function isCrossOrigin(url) {
};
exports.isCrossOrigin = isCrossOrigin;
},{"global/document":1,"global/window":2}],136:[function(_dereq_,module,exports){
},{"global/document":1,"global/window":2}],137:[function(_dereq_,module,exports){
/**
* @file video.js
*/
@@ -18553,7 +18587,7 @@ setup.autoSetupTimeout(1, videojs);
*
* @type {String}
*/
videojs.VERSION = '5.2.0';
videojs.VERSION = '5.2.2';
/**
* The global options object. These are the settings that take effect
@@ -18674,7 +18708,7 @@ videojs.getTech = _techTechJs2['default'].getTech;
* @mixes videojs
* @method registerTech
*/
videojs.registerTech = _component2['default'].registerTech;
videojs.registerTech = _techTechJs2['default'].registerTech;
/**
* A suite of browser and device tests
@@ -19139,7 +19173,7 @@ if (typeof define === 'function' && define['amd']) {
exports['default'] = videojs;
module.exports = exports['default'];
},{"../../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)
},{"../../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)
});
+9 -8
Ver Arquivo
Diff do arquivo suprimido porque uma ou mais linhas são muito longas
Diff do arquivo suprimido porque uma ou mais linhas são muito longas
Arquivo binário não exibido.
+203 -169
Ver Arquivo
@@ -1,6 +1,6 @@
/**
* @license
* Video.js 5.2.0 <http://videojs.com/>
* Video.js 5.2.2 <http://videojs.com/>
* Copyright Brightcove, Inc. <https://www.brightcove.com/>
* Available under Apache License Version 2.0
* <https://github.com/videojs/video.js/blob/master/LICENSE>
@@ -1786,14 +1786,8 @@ module.exports = function hasSymbols() {
var obj = {};
var sym = Symbol('test');
if (typeof sym === 'string') { return false; }
// temp disabled per https://github.com/ljharb/object.assign/issues/17
// if (sym instanceof Symbol) { return false; }
// temp disabled per https://github.com/WebReflection/get-own-property-symbols/issues/4
// if (!(Object(sym) instanceof Symbol)) { return false; }
var symVal = 42;
obj[sym] = symVal;
if (sym instanceof Symbol) { return false; }
obj[sym] = 42;
for (sym in obj) { return false; }
if (keys(obj).length !== 0) { return false; }
if (typeof Object.keys === 'function' && Object.keys(obj).length !== 0) { return false; }
@@ -1807,7 +1801,7 @@ module.exports = function hasSymbols() {
if (typeof Object.getOwnPropertyDescriptor === 'function') {
var descriptor = Object.getOwnPropertyDescriptor(obj, sym);
if (descriptor.value !== symVal || descriptor.enumerable !== true) { return false; }
if (descriptor.value !== 42 || descriptor.enumerable !== true) { return false; }
}
return true;
@@ -1830,25 +1824,20 @@ var propIsEnumerable = bind.call(Function.call, Object.prototype.propertyIsEnume
module.exports = function assign(target, source1) {
if (!canBeObject(target)) { throw new TypeError('target must be an object'); }
var objTarget = toObject(target);
var s, source, i, props, syms, value, key;
var s, source, i, props, syms;
for (s = 1; s < arguments.length; ++s) {
source = toObject(arguments[s]);
props = keys(source);
if (hasSymbols && Object.getOwnPropertySymbols) {
syms = Object.getOwnPropertySymbols(source);
for (i = 0; i < syms.length; ++i) {
key = syms[i];
if (propIsEnumerable(source, key)) {
push(props, key);
if (propIsEnumerable(source, syms[i])) {
push(props, syms[i]);
}
}
}
for (i = 0; i < props.length; ++i) {
key = props[i];
value = source[key];
if (propIsEnumerable(source, key)) {
objTarget[key] = value;
}
objTarget[props[i]] = source[props[i]];
}
}
return objTarget;
@@ -2157,26 +2146,6 @@ module.exports = function isArguments(value) {
var implementation = _dereq_('./implementation');
var lacksProperEnumerationOrder = function () {
if (!Object.assign) {
return false;
}
// v8, specifically in node 4.x, has a bug with incorrect property enumeration order
// note: this does not detect the bug unless there's 20 characters
var str = 'abcdefghijklmnopqrst';
var letters = str.split('');
var map = {};
for (var i = 0; i < letters.length; ++i) {
map[letters[i]] = letters[i];
}
var obj = Object.assign({}, map);
var actual = '';
for (var k in obj) {
actual += k;
}
return str !== actual;
};
var assignHasPendingExceptions = function () {
if (!Object.assign || !Object.preventExtensions) {
return false;
@@ -2192,16 +2161,7 @@ var assignHasPendingExceptions = function () {
};
module.exports = function getPolyfill() {
if (!Object.assign) {
return implementation;
}
if (lacksProperEnumerationOrder()) {
return implementation;
}
if (assignHasPendingExceptions()) {
return implementation;
}
return Object.assign;
return !Object.assign || assignHasPendingExceptions() ? implementation : Object.assign;
};
},{"./implementation":44}],52:[function(_dereq_,module,exports){
@@ -2212,11 +2172,9 @@ var getPolyfill = _dereq_('./polyfill');
module.exports = function shimAssign() {
var polyfill = getPolyfill();
define(
Object,
{ assign: polyfill },
{ assign: function () { return Object.assign !== polyfill; } }
);
if (Object.assign !== polyfill) {
define(Object, { assign: polyfill });
}
return polyfill;
};
@@ -2255,14 +2213,27 @@ 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){
@@ -2271,7 +2242,34 @@ function isEmpty(obj){
return true
}
function createXHR(options, callback) {
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 readystatechange() {
if (xhr.readyState === 4) {
loadFunc()
@@ -2348,16 +2346,6 @@ function createXHR(options, callback) {
}
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) {
@@ -2372,7 +2360,7 @@ function createXHR(options, callback) {
var aborted
var uri = xhr.url = options.uri || options.url
var method = xhr.method = options.method || "GET"
var body = options.body || options.data
var body = options.body || options.data || null
var headers = xhr.headers = options.headers || {}
var sync = !!options.sync
var isJson = false
@@ -2442,7 +2430,24 @@ function createXHR(options, callback) {
function noop() {}
},{"global/window":2,"once":56,"parse-headers":60}],56:[function(_dereq_,module,exports){
},{"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){
module.exports = once
once.proto = once(function () {
@@ -2463,7 +2468,7 @@ function once (fn) {
}
}
},{}],57:[function(_dereq_,module,exports){
},{}],58:[function(_dereq_,module,exports){
var isFunction = _dereq_('is-function')
module.exports = forEach
@@ -2511,24 +2516,7 @@ function forEachObject(object, iterator, context) {
}
}
},{"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){
},{"is-function":56}],59:[function(_dereq_,module,exports){
exports = module.exports = trim;
@@ -2576,7 +2564,28 @@ module.exports = function (headers) {
return result
}
},{"for-each":57,"trim":59}],61:[function(_dereq_,module,exports){
},{"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){
/**
* @file big-play-button.js
*/
@@ -2647,7 +2656,7 @@ _componentJs2['default'].registerComponent('BigPlayButton', BigPlayButton);
exports['default'] = BigPlayButton;
module.exports = exports['default'];
},{"./button.js":62,"./component.js":64}],62:[function(_dereq_,module,exports){
},{"./button.js":63,"./component.js":65}],63:[function(_dereq_,module,exports){
/**
* @file button.js
*/
@@ -2828,7 +2837,7 @@ _component2['default'].registerComponent('Button', Button);
exports['default'] = Button;
module.exports = exports['default'];
},{"./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){
},{"./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){
'use strict';
exports.__esModule = true;
@@ -2880,7 +2889,7 @@ _component2['default'].registerComponent('CloseButton', CloseButton);
exports['default'] = CloseButton;
module.exports = exports['default'];
},{"./button":62,"./component":64}],64:[function(_dereq_,module,exports){
},{"./button":63,"./component":65}],65:[function(_dereq_,module,exports){
/**
* @file component.js
*
@@ -3306,6 +3315,14 @@ var Component = (function () {
throw new Error('Component ' + componentClassName + ' does not exist');
}
// data stored directly on the videojs object may be
// misidentified as a component to retain
// backwards-compatibility with 4.x. check to make sure the
// component class can be instantiated.
if (typeof ComponentClass !== 'function') {
return null;
}
component = new ComponentClass(this.player_ || this, options);
// child is a component instance
@@ -4376,7 +4393,7 @@ Component.registerComponent('Component', Component);
exports['default'] = Component;
module.exports = exports['default'];
},{"./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){
},{"./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){
/**
* @file control-bar.js
*/
@@ -4501,7 +4518,7 @@ _componentJs2['default'].registerComponent('ControlBar', ControlBar);
exports['default'] = ControlBar;
module.exports = exports['default'];
},{"../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){
},{"../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){
/**
* @file fullscreen-toggle.js
*/
@@ -4575,7 +4592,7 @@ _componentJs2['default'].registerComponent('FullscreenToggle', FullscreenToggle)
exports['default'] = FullscreenToggle;
module.exports = exports['default'];
},{"../button.js":62,"../component.js":64}],67:[function(_dereq_,module,exports){
},{"../button.js":63,"../component.js":65}],68:[function(_dereq_,module,exports){
/**
* @file live-display.js
*/
@@ -4657,7 +4674,7 @@ _component2['default'].registerComponent('LiveDisplay', LiveDisplay);
exports['default'] = LiveDisplay;
module.exports = exports['default'];
},{"../component":64,"../utils/dom.js":125}],68:[function(_dereq_,module,exports){
},{"../component":65,"../utils/dom.js":126}],69:[function(_dereq_,module,exports){
/**
* @file mute-toggle.js
*/
@@ -4784,7 +4801,7 @@ _component2['default'].registerComponent('MuteToggle', MuteToggle);
exports['default'] = MuteToggle;
module.exports = exports['default'];
},{"../button":62,"../component":64,"../utils/dom.js":125}],69:[function(_dereq_,module,exports){
},{"../button":63,"../component":65,"../utils/dom.js":126}],70:[function(_dereq_,module,exports){
/**
* @file play-toggle.js
*/
@@ -4885,7 +4902,7 @@ _componentJs2['default'].registerComponent('PlayToggle', PlayToggle);
exports['default'] = PlayToggle;
module.exports = exports['default'];
},{"../button.js":62,"../component.js":64}],70:[function(_dereq_,module,exports){
},{"../button.js":63,"../component.js":65}],71:[function(_dereq_,module,exports){
/**
* @file playback-rate-menu-button.js
*/
@@ -5086,7 +5103,7 @@ _componentJs2['default'].registerComponent('PlaybackRateMenuButton', PlaybackRat
exports['default'] = PlaybackRateMenuButton;
module.exports = exports['default'];
},{"../../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){
},{"../../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){
/**
* @file playback-rate-menu-item.js
*/
@@ -5167,7 +5184,7 @@ _componentJs2['default'].registerComponent('PlaybackRateMenuItem', PlaybackRateM
exports['default'] = PlaybackRateMenuItem;
module.exports = exports['default'];
},{"../../component.js":64,"../../menu/menu-item.js":102}],72:[function(_dereq_,module,exports){
},{"../../component.js":65,"../../menu/menu-item.js":103}],73:[function(_dereq_,module,exports){
/**
* @file load-progress-bar.js
*/
@@ -5273,7 +5290,7 @@ _componentJs2['default'].registerComponent('LoadProgressBar', LoadProgressBar);
exports['default'] = LoadProgressBar;
module.exports = exports['default'];
},{"../../component.js":64,"../../utils/dom.js":125}],73:[function(_dereq_,module,exports){
},{"../../component.js":65,"../../utils/dom.js":126}],74:[function(_dereq_,module,exports){
/**
* @file mouse-time-display.js
*/
@@ -5375,7 +5392,7 @@ _componentJs2['default'].registerComponent('MouseTimeDisplay', MouseTimeDisplay)
exports['default'] = MouseTimeDisplay;
module.exports = exports['default'];
},{"../../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){
},{"../../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){
/**
* @file play-progress-bar.js
*/
@@ -5450,7 +5467,7 @@ _componentJs2['default'].registerComponent('PlayProgressBar', PlayProgressBar);
exports['default'] = PlayProgressBar;
module.exports = exports['default'];
},{"../../component.js":64,"../../utils/fn.js":127,"../../utils/format-time.js":128}],75:[function(_dereq_,module,exports){
},{"../../component.js":65,"../../utils/fn.js":128,"../../utils/format-time.js":129}],76:[function(_dereq_,module,exports){
/**
* @file progress-control.js
*/
@@ -5519,7 +5536,7 @@ _componentJs2['default'].registerComponent('ProgressControl', ProgressControl);
exports['default'] = ProgressControl;
module.exports = exports['default'];
},{"../../component.js":64,"./mouse-time-display.js":73,"./seek-bar.js":76}],76:[function(_dereq_,module,exports){
},{"../../component.js":65,"./mouse-time-display.js":74,"./seek-bar.js":77}],77:[function(_dereq_,module,exports){
/**
* @file seek-bar.js
*/
@@ -5705,7 +5722,7 @@ _componentJs2['default'].registerComponent('SeekBar', SeekBar);
exports['default'] = SeekBar;
module.exports = exports['default'];
},{"../../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){
},{"../../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){
/**
* @file custom-control-spacer.js
*/
@@ -5779,7 +5796,7 @@ _componentJs2['default'].registerComponent('CustomControlSpacer', CustomControlS
exports['default'] = CustomControlSpacer;
module.exports = exports['default'];
},{"../../component.js":64,"./spacer.js":78}],78:[function(_dereq_,module,exports){
},{"../../component.js":65,"./spacer.js":79}],79:[function(_dereq_,module,exports){
/**
* @file spacer.js
*/
@@ -5846,7 +5863,7 @@ _componentJs2['default'].registerComponent('Spacer', Spacer);
exports['default'] = Spacer;
module.exports = exports['default'];
},{"../../component.js":64}],79:[function(_dereq_,module,exports){
},{"../../component.js":65}],80:[function(_dereq_,module,exports){
/**
* @file caption-settings-menu-item.js
*/
@@ -5912,7 +5929,7 @@ _componentJs2['default'].registerComponent('CaptionSettingsMenuItem', CaptionSet
exports['default'] = CaptionSettingsMenuItem;
module.exports = exports['default'];
},{"../../component.js":64,"./text-track-menu-item.js":86}],80:[function(_dereq_,module,exports){
},{"../../component.js":65,"./text-track-menu-item.js":87}],81:[function(_dereq_,module,exports){
/**
* @file captions-button.js
*/
@@ -6018,7 +6035,7 @@ _componentJs2['default'].registerComponent('CaptionsButton', CaptionsButton);
exports['default'] = CaptionsButton;
module.exports = exports['default'];
},{"../../component.js":64,"./caption-settings-menu-item.js":79,"./text-track-button.js":85}],81:[function(_dereq_,module,exports){
},{"../../component.js":65,"./caption-settings-menu-item.js":80,"./text-track-button.js":86}],82:[function(_dereq_,module,exports){
/**
* @file chapters-button.js
*/
@@ -6207,7 +6224,7 @@ _componentJs2['default'].registerComponent('ChaptersButton', ChaptersButton);
exports['default'] = ChaptersButton;
module.exports = exports['default'];
},{"../../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){
},{"../../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){
/**
* @file chapters-track-menu-item.js
*/
@@ -6297,7 +6314,7 @@ _componentJs2['default'].registerComponent('ChaptersTrackMenuItem', ChaptersTrac
exports['default'] = ChaptersTrackMenuItem;
module.exports = exports['default'];
},{"../../component.js":64,"../../menu/menu-item.js":102,"../../utils/fn.js":127}],83:[function(_dereq_,module,exports){
},{"../../component.js":65,"../../menu/menu-item.js":103,"../../utils/fn.js":128}],84:[function(_dereq_,module,exports){
/**
* @file off-text-track-menu-item.js
*/
@@ -6377,7 +6394,7 @@ _componentJs2['default'].registerComponent('OffTextTrackMenuItem', OffTextTrackM
exports['default'] = OffTextTrackMenuItem;
module.exports = exports['default'];
},{"../../component.js":64,"./text-track-menu-item.js":86}],84:[function(_dereq_,module,exports){
},{"../../component.js":65,"./text-track-menu-item.js":87}],85:[function(_dereq_,module,exports){
/**
* @file subtitles-button.js
*/
@@ -6440,7 +6457,7 @@ _componentJs2['default'].registerComponent('SubtitlesButton', SubtitlesButton);
exports['default'] = SubtitlesButton;
module.exports = exports['default'];
},{"../../component.js":64,"./text-track-button.js":85}],85:[function(_dereq_,module,exports){
},{"../../component.js":65,"./text-track-button.js":86}],86:[function(_dereq_,module,exports){
/**
* @file text-track-button.js
*/
@@ -6548,7 +6565,7 @@ _componentJs2['default'].registerComponent('TextTrackButton', TextTrackButton);
exports['default'] = TextTrackButton;
module.exports = exports['default'];
},{"../../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){
},{"../../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){
/**
* @file text-track-menu-item.js
*/
@@ -6697,7 +6714,7 @@ _componentJs2['default'].registerComponent('TextTrackMenuItem', TextTrackMenuIte
exports['default'] = TextTrackMenuItem;
module.exports = exports['default'];
},{"../../component.js":64,"../../menu/menu-item.js":102,"../../utils/fn.js":127,"global/document":1,"global/window":2}],87:[function(_dereq_,module,exports){
},{"../../component.js":65,"../../menu/menu-item.js":103,"../../utils/fn.js":128,"global/document":1,"global/window":2}],88:[function(_dereq_,module,exports){
/**
* @file current-time-display.js
*/
@@ -6791,7 +6808,7 @@ _componentJs2['default'].registerComponent('CurrentTimeDisplay', CurrentTimeDisp
exports['default'] = CurrentTimeDisplay;
module.exports = exports['default'];
},{"../../component.js":64,"../../utils/dom.js":125,"../../utils/format-time.js":128}],88:[function(_dereq_,module,exports){
},{"../../component.js":65,"../../utils/dom.js":126,"../../utils/format-time.js":129}],89:[function(_dereq_,module,exports){
/**
* @file duration-display.js
*/
@@ -6892,7 +6909,7 @@ _componentJs2['default'].registerComponent('DurationDisplay', DurationDisplay);
exports['default'] = DurationDisplay;
module.exports = exports['default'];
},{"../../component.js":64,"../../utils/dom.js":125,"../../utils/format-time.js":128}],89:[function(_dereq_,module,exports){
},{"../../component.js":65,"../../utils/dom.js":126,"../../utils/format-time.js":129}],90:[function(_dereq_,module,exports){
/**
* @file remaining-time-display.js
*/
@@ -6990,7 +7007,7 @@ _componentJs2['default'].registerComponent('RemainingTimeDisplay', RemainingTime
exports['default'] = RemainingTimeDisplay;
module.exports = exports['default'];
},{"../../component.js":64,"../../utils/dom.js":125,"../../utils/format-time.js":128}],90:[function(_dereq_,module,exports){
},{"../../component.js":65,"../../utils/dom.js":126,"../../utils/format-time.js":129}],91:[function(_dereq_,module,exports){
/**
* @file time-divider.js
*/
@@ -7048,7 +7065,7 @@ _componentJs2['default'].registerComponent('TimeDivider', TimeDivider);
exports['default'] = TimeDivider;
module.exports = exports['default'];
},{"../../component.js":64}],91:[function(_dereq_,module,exports){
},{"../../component.js":65}],92:[function(_dereq_,module,exports){
/**
* @file volume-bar.js
*/
@@ -7193,7 +7210,7 @@ _componentJs2['default'].registerComponent('VolumeBar', VolumeBar);
exports['default'] = VolumeBar;
module.exports = exports['default'];
},{"../../component.js":64,"../../slider/slider.js":109,"../../utils/fn.js":127,"./volume-level.js":93}],92:[function(_dereq_,module,exports){
},{"../../component.js":65,"../../slider/slider.js":110,"../../utils/fn.js":128,"./volume-level.js":94}],93:[function(_dereq_,module,exports){
/**
* @file volume-control.js
*/
@@ -7271,7 +7288,7 @@ _componentJs2['default'].registerComponent('VolumeControl', VolumeControl);
exports['default'] = VolumeControl;
module.exports = exports['default'];
},{"../../component.js":64,"./volume-bar.js":91}],93:[function(_dereq_,module,exports){
},{"../../component.js":65,"./volume-bar.js":92}],94:[function(_dereq_,module,exports){
/**
* @file volume-level.js
*/
@@ -7328,7 +7345,7 @@ _componentJs2['default'].registerComponent('VolumeLevel', VolumeLevel);
exports['default'] = VolumeLevel;
module.exports = exports['default'];
},{"../../component.js":64}],94:[function(_dereq_,module,exports){
},{"../../component.js":65}],95:[function(_dereq_,module,exports){
/**
* @file volume-menu-button.js
*/
@@ -7490,7 +7507,7 @@ _componentJs2['default'].registerComponent('VolumeMenuButton', VolumeMenuButton)
exports['default'] = VolumeMenuButton;
module.exports = exports['default'];
},{"../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){
},{"../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){
/**
* @file error-display.js
*/
@@ -7583,7 +7600,7 @@ _component2['default'].registerComponent('ErrorDisplay', ErrorDisplay);
exports['default'] = ErrorDisplay;
module.exports = exports['default'];
},{"./component":64,"./modal-dialog":104,"./utils/dom":125,"./utils/merge-options":131}],96:[function(_dereq_,module,exports){
},{"./component":65,"./modal-dialog":105,"./utils/dom":126,"./utils/merge-options":132}],97:[function(_dereq_,module,exports){
/**
* @file event-target.js
*/
@@ -7642,7 +7659,7 @@ EventTarget.prototype.dispatchEvent = EventTarget.prototype.trigger;
exports['default'] = EventTarget;
module.exports = exports['default'];
},{"./utils/events.js":126}],97:[function(_dereq_,module,exports){
},{"./utils/events.js":127}],98:[function(_dereq_,module,exports){
'use strict';
exports.__esModule = true;
@@ -7733,7 +7750,7 @@ var extendFn = function extendFn(superClass) {
exports['default'] = extendFn;
module.exports = exports['default'];
},{"./utils/log":130}],98:[function(_dereq_,module,exports){
},{"./utils/log":131}],99:[function(_dereq_,module,exports){
/**
* @file fullscreen-api.js
*/
@@ -7790,7 +7807,7 @@ if (browserApi) {
exports['default'] = FullscreenApi;
module.exports = exports['default'];
},{"global/document":1}],99:[function(_dereq_,module,exports){
},{"global/document":1}],100:[function(_dereq_,module,exports){
/**
* @file loading-spinner.js
*/
@@ -7845,7 +7862,7 @@ _component2['default'].registerComponent('LoadingSpinner', LoadingSpinner);
exports['default'] = LoadingSpinner;
module.exports = exports['default'];
},{"./component":64}],100:[function(_dereq_,module,exports){
},{"./component":65}],101:[function(_dereq_,module,exports){
/**
* @file media-error.js
*/
@@ -7936,7 +7953,7 @@ for (var errNum = 0; errNum < MediaError.errorTypes.length; errNum++) {
exports['default'] = MediaError;
module.exports = exports['default'];
},{"object.assign":45}],101:[function(_dereq_,module,exports){
},{"object.assign":45}],102:[function(_dereq_,module,exports){
/**
* @file menu-button.js
*/
@@ -8210,7 +8227,7 @@ _componentJs2['default'].registerComponent('MenuButton', MenuButton);
exports['default'] = MenuButton;
module.exports = exports['default'];
},{"../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){
},{"../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){
/**
* @file menu-item.js
*/
@@ -8305,7 +8322,7 @@ _componentJs2['default'].registerComponent('MenuItem', MenuItem);
exports['default'] = MenuItem;
module.exports = exports['default'];
},{"../button.js":62,"../component.js":64,"object.assign":45}],103:[function(_dereq_,module,exports){
},{"../button.js":63,"../component.js":65,"object.assign":45}],104:[function(_dereq_,module,exports){
/**
* @file menu.js
*/
@@ -8403,7 +8420,7 @@ _componentJs2['default'].registerComponent('Menu', Menu);
exports['default'] = Menu;
module.exports = exports['default'];
},{"../component.js":64,"../utils/dom.js":125,"../utils/events.js":126,"../utils/fn.js":127}],104:[function(_dereq_,module,exports){
},{"../component.js":65,"../utils/dom.js":126,"../utils/events.js":127,"../utils/fn.js":128}],105:[function(_dereq_,module,exports){
/**
* @file modal-dialog.js
*/
@@ -8826,7 +8843,7 @@ _component2['default'].registerComponent('ModalDialog', ModalDialog);
exports['default'] = ModalDialog;
module.exports = exports['default'];
},{"./close-button":63,"./component":64,"./utils/dom":125,"./utils/fn":127,"./utils/log":130,"global/document":1}],105:[function(_dereq_,module,exports){
},{"./close-button":64,"./component":65,"./utils/dom":126,"./utils/fn":128,"./utils/log":131,"global/document":1}],106:[function(_dereq_,module,exports){
/**
* @file player.js
*/
@@ -9367,6 +9384,7 @@ 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') {
@@ -9403,7 +9421,12 @@ var Player = (function (_Component) {
height = width * ratioMultiplier;
}
var idClass = this.id() + '-dimensions';
// 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';
}
// Ensure the right class is still on the player for the style element
this.addClass(idClass);
@@ -11748,6 +11771,13 @@ Player.prototype.handleUserInactive_;
*/
Player.prototype.handleTimeUpdate_;
/**
* Fired when video playback ends
*
* @event ended
*/
Player.prototype.handleTechEnded_;
/**
* Fired when the volume changes
*
@@ -11775,7 +11805,7 @@ exports['default'] = Player;
module.exports = exports['default'];
// If empty string, make it a parsable json object.
},{"./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){
},{"./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){
/**
* @file plugins.js
*/
@@ -11803,7 +11833,7 @@ var plugin = function plugin(name, init) {
exports['default'] = plugin;
module.exports = exports['default'];
},{"./player.js":105}],107:[function(_dereq_,module,exports){
},{"./player.js":106}],108:[function(_dereq_,module,exports){
/**
* @file poster-image.js
*/
@@ -11963,7 +11993,7 @@ _componentJs2['default'].registerComponent('PosterImage', PosterImage);
exports['default'] = PosterImage;
module.exports = exports['default'];
},{"./button.js":62,"./component.js":64,"./utils/browser.js":122,"./utils/dom.js":125,"./utils/fn.js":127}],108:[function(_dereq_,module,exports){
},{"./button.js":63,"./component.js":65,"./utils/browser.js":123,"./utils/dom.js":126,"./utils/fn.js":128}],109:[function(_dereq_,module,exports){
/**
* @file setup.js
*
@@ -12073,7 +12103,7 @@ exports.autoSetup = autoSetup;
exports.autoSetupTimeout = autoSetupTimeout;
exports.hasLoaded = hasLoaded;
},{"./utils/events.js":126,"global/document":1,"global/window":2}],109:[function(_dereq_,module,exports){
},{"./utils/events.js":127,"global/document":1,"global/window":2}],110:[function(_dereq_,module,exports){
/**
* @file slider.js
*/
@@ -12352,7 +12382,7 @@ _componentJs2['default'].registerComponent('Slider', Slider);
exports['default'] = Slider;
module.exports = exports['default'];
},{"../component.js":64,"../utils/dom.js":125,"global/document":1,"object.assign":45}],110:[function(_dereq_,module,exports){
},{"../component.js":65,"../utils/dom.js":126,"global/document":1,"object.assign":45}],111:[function(_dereq_,module,exports){
/**
* @file flash-rtmp.js
*/
@@ -12471,7 +12501,7 @@ function FlashRtmpDecorator(Flash) {
exports['default'] = FlashRtmpDecorator;
module.exports = exports['default'];
},{}],111:[function(_dereq_,module,exports){
},{}],112:[function(_dereq_,module,exports){
/**
* @file flash.js
* VideoJS-SWF - Custom Flash Player with HTML5-ish API
@@ -13086,7 +13116,7 @@ _tech2['default'].registerTech('Flash', Flash);
exports['default'] = Flash;
module.exports = exports['default'];
},{"../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){
},{"../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){
/**
* @file html5.js
* HTML5 Media Controller - Wrapper for HTML5 Media API
@@ -13690,7 +13720,11 @@ var Html5 = (function (_Tech) {
*/
Html5.prototype.currentSrc = function currentSrc() {
return this.el_.currentSrc;
if (this.currentSource_) {
return this.currentSource_.src;
} else {
return this.el_.currentSrc;
}
};
/**
@@ -14332,7 +14366,7 @@ _techJs2['default'].registerTech('Html5', Html5);
exports['default'] = Html5;
module.exports = exports['default'];
},{"../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){
},{"../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){
/**
* @file loader.js
*/
@@ -14416,7 +14450,7 @@ _componentJs2['default'].registerComponent('MediaLoader', MediaLoader);
exports['default'] = MediaLoader;
module.exports = exports['default'];
},{"../component.js":64,"../utils/to-title-case.js":134,"./tech.js":114,"global/window":2}],114:[function(_dereq_,module,exports){
},{"../component.js":65,"../utils/to-title-case.js":135,"./tech.js":115,"global/window":2}],115:[function(_dereq_,module,exports){
/**
* @file tech.js
* Media Technology Controller - Base class for media playback
@@ -15194,7 +15228,7 @@ Tech.registerTech('Tech', Tech);
exports['default'] = Tech;
module.exports = exports['default'];
},{"../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){
},{"../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){
/**
* @file text-track-cue-list.js
*/
@@ -15293,7 +15327,7 @@ TextTrackCueList.prototype.getCueById = function (id) {
exports['default'] = TextTrackCueList;
module.exports = exports['default'];
},{"../utils/browser.js":122,"global/document":1}],116:[function(_dereq_,module,exports){
},{"../utils/browser.js":123,"global/document":1}],117:[function(_dereq_,module,exports){
/**
* @file text-track-display.js
*/
@@ -15564,7 +15598,7 @@ _component2['default'].registerComponent('TextTrackDisplay', TextTrackDisplay);
exports['default'] = TextTrackDisplay;
module.exports = exports['default'];
},{"../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){
},{"../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){
/**
* @file text-track-enums.js
*
@@ -15597,7 +15631,7 @@ var TextTrackKind = {
exports.TextTrackMode = TextTrackMode;
exports.TextTrackKind = TextTrackKind;
},{}],118:[function(_dereq_,module,exports){
},{}],119:[function(_dereq_,module,exports){
/**
* Utilities for capturing text track state and re-creating tracks
* based on a capture.
@@ -15688,7 +15722,7 @@ var jsonToTextTracks = function jsonToTextTracks(json, tech) {
exports['default'] = { textTracksToJson: textTracksToJson, jsonToTextTracks: jsonToTextTracks, trackToJson_: trackToJson_ };
module.exports = exports['default'];
},{}],119:[function(_dereq_,module,exports){
},{}],120:[function(_dereq_,module,exports){
/**
* @file text-track-list.js
*/
@@ -15835,7 +15869,7 @@ TextTrackList.prototype.getTrackById = function (id) {
exports['default'] = TextTrackList;
module.exports = exports['default'];
},{"../event-target":96,"../utils/browser.js":122,"../utils/fn.js":127,"global/document":1}],120:[function(_dereq_,module,exports){
},{"../event-target":97,"../utils/browser.js":123,"../utils/fn.js":128,"global/document":1}],121:[function(_dereq_,module,exports){
/**
* @file text-track-settings.js
*/
@@ -16123,7 +16157,7 @@ function captionOptionsMenuTemplate() {
exports['default'] = TextTrackSettings;
module.exports = exports['default'];
},{"../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){
},{"../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){
/**
* @file text-track.js
*/
@@ -16476,7 +16510,7 @@ var indexOf = function indexOf(searchElement, fromIndex) {
exports['default'] = TextTrack;
module.exports = exports['default'];
},{"../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){
},{"../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){
/**
* @file browser.js
*/
@@ -16565,7 +16599,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}],123:[function(_dereq_,module,exports){
},{"global/document":1,"global/window":2}],124:[function(_dereq_,module,exports){
/**
* @file buffer.js
*/
@@ -16614,7 +16648,7 @@ function bufferedPercent(buffered, duration) {
return bufferedDuration / duration;
}
},{"./time-ranges.js":133}],124:[function(_dereq_,module,exports){
},{"./time-ranges.js":134}],125:[function(_dereq_,module,exports){
'use strict';
exports.__esModule = true;
@@ -16685,7 +16719,7 @@ exports['default'] = function (target) {
module.exports = exports['default'];
},{"./log.js":130}],125:[function(_dereq_,module,exports){
},{"./log.js":131}],126:[function(_dereq_,module,exports){
/**
* @file dom.js
*/
@@ -17414,7 +17448,7 @@ exports.$ = $;
var $$ = createQuerier('querySelectorAll');
exports.$$ = $$;
},{"./guid.js":129,"./log.js":130,"global/document":1,"global/window":2,"tsml":54}],126:[function(_dereq_,module,exports){
},{"./guid.js":130,"./log.js":131,"global/document":1,"global/window":2,"tsml":54}],127:[function(_dereq_,module,exports){
/**
* @file events.js
*
@@ -17822,7 +17856,7 @@ function _handleMultipleEvents(fn, elem, types, callback) {
});
}
},{"./dom.js":125,"./guid.js":129,"global/document":1,"global/window":2}],127:[function(_dereq_,module,exports){
},{"./dom.js":126,"./guid.js":130,"global/document":1,"global/window":2}],128:[function(_dereq_,module,exports){
/**
* @file fn.js
*/
@@ -17866,7 +17900,7 @@ var bind = function bind(context, fn, uid) {
};
exports.bind = bind;
},{"./guid.js":129}],128:[function(_dereq_,module,exports){
},{"./guid.js":130}],129:[function(_dereq_,module,exports){
/**
* @file format-time.js
*
@@ -17916,7 +17950,7 @@ function formatTime(seconds) {
exports['default'] = formatTime;
module.exports = exports['default'];
},{}],129:[function(_dereq_,module,exports){
},{}],130:[function(_dereq_,module,exports){
/**
* @file guid.js
*
@@ -17941,7 +17975,7 @@ function newGUID() {
return _guid++;
}
},{}],130:[function(_dereq_,module,exports){
},{}],131:[function(_dereq_,module,exports){
/**
* @file log.js
*/
@@ -18031,7 +18065,7 @@ function _logType(type, args) {
exports['default'] = log;
module.exports = exports['default'];
},{"global/window":2}],131:[function(_dereq_,module,exports){
},{"global/window":2}],132:[function(_dereq_,module,exports){
/**
* @file merge-options.js
*/
@@ -18102,7 +18136,7 @@ function mergeOptions() {
module.exports = exports['default'];
},{"lodash-compat/object/merge":40}],132:[function(_dereq_,module,exports){
},{"lodash-compat/object/merge":40}],133:[function(_dereq_,module,exports){
'use strict';
exports.__esModule = true;
@@ -18130,7 +18164,7 @@ var setTextContent = function setTextContent(el, content) {
};
exports.setTextContent = setTextContent;
},{"global/document":1}],133:[function(_dereq_,module,exports){
},{"global/document":1}],134:[function(_dereq_,module,exports){
'use strict';
exports.__esModule = true;
@@ -18201,7 +18235,7 @@ function rangeCheck(fnName, index, maxIndex) {
}
}
},{"./log.js":130}],134:[function(_dereq_,module,exports){
},{"./log.js":131}],135:[function(_dereq_,module,exports){
/**
* @file to-title-case.js
*
@@ -18222,7 +18256,7 @@ function toTitleCase(string) {
exports["default"] = toTitleCase;
module.exports = exports["default"];
},{}],135:[function(_dereq_,module,exports){
},{}],136:[function(_dereq_,module,exports){
/**
* @file url.js
*/
@@ -18358,7 +18392,7 @@ var isCrossOrigin = function isCrossOrigin(url) {
};
exports.isCrossOrigin = isCrossOrigin;
},{"global/document":1,"global/window":2}],136:[function(_dereq_,module,exports){
},{"global/document":1,"global/window":2}],137:[function(_dereq_,module,exports){
/**
* @file video.js
*/
@@ -18557,7 +18591,7 @@ setup.autoSetupTimeout(1, videojs);
*
* @type {String}
*/
videojs.VERSION = '5.2.0';
videojs.VERSION = '5.2.2';
/**
* The global options object. These are the settings that take effect
@@ -18678,7 +18712,7 @@ videojs.getTech = _techTechJs2['default'].getTech;
* @mixes videojs
* @method registerTech
*/
videojs.registerTech = _component2['default'].registerTech;
videojs.registerTech = _techTechJs2['default'].registerTech;
/**
* A suite of browser and device tests
@@ -19143,7 +19177,7 @@ if (typeof define === 'function' && define['amd']) {
exports['default'] = videojs;
module.exports = exports['default'];
},{"../../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)
},{"../../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)
});
+14 -12
Ver Arquivo
Diff do arquivo suprimido porque uma ou mais linhas são muito longas
+9 -8
Ver Arquivo
Diff do arquivo suprimido porque uma ou mais linhas são muito longas
+1 -1
Ver Arquivo
Diff do arquivo suprimido porque uma ou mais linhas são muito longas
+2 -2
Ver Arquivo
@@ -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.0",
"version": "5.2.2",
"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.1.0"
"xhr": "~2.2.0"
},
"devDependencies": {
"babel": "^5.2.2",
+8
Ver Arquivo
@@ -373,6 +373,14 @@ class Component {
throw new Error(`Component ${componentClassName} does not exist`);
}
// data stored directly on the videojs object may be
// misidentified as a component to retain
// backwards-compatibility with 4.x. check to make sure the
// component class can be instantiated.
if (typeof ComponentClass !== 'function') {
return null;
}
component = new ComponentClass(this.player_ || this, options);
// child is a component instance
+14 -1
Ver Arquivo
@@ -415,6 +415,7 @@ 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') {
@@ -451,7 +452,12 @@ class Player extends Component {
height = width * ratioMultiplier;
}
let idClass = this.id()+'-dimensions';
// 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';
}
// Ensure the right class is still on the player for the style element
this.addClass(idClass);
@@ -2711,6 +2717,13 @@ Player.prototype.handleUserInactive_;
*/
Player.prototype.handleTimeUpdate_;
/**
* Fired when video playback ends
*
* @event ended
*/
Player.prototype.handleTechEnded_;
/**
* Fired when the volume changes
*
+7 -1
Ver Arquivo
@@ -492,7 +492,13 @@ class Html5 extends Tech {
* @return {Object}
* @method currentSrc
*/
currentSrc() { return this.el_.currentSrc; }
currentSrc() {
if (this.currentSource_) {
return this.currentSource_.src;
} else {
return this.el_.currentSrc;
}
}
/**
* Get poster
+1 -1
Ver Arquivo
@@ -246,7 +246,7 @@ videojs.getTech = Tech.getTech;
* @mixes videojs
* @method registerTech
*/
videojs.registerTech = Component.registerTech;
videojs.registerTech = Tech.registerTech;
/**
* A suite of browser and device tests
+15
Ver Arquivo
@@ -199,6 +199,21 @@ 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');
+6
Ver Arquivo
@@ -249,6 +249,12 @@ 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_;