59rc update

This commit is contained in:
Kasper Moskwiak 2015-08-21 08:31:50 +02:00
parent bb6f406b69
commit 04600fb672
12 changed files with 419 additions and 385 deletions

View file

@ -52,10 +52,10 @@
</div> </div>
<video id="video_1" class="video-js vjs-default-skin" width="1000" controls fluid='true' data-setup='{}' > <video id="video_1" class="video-js vjs-default-skin" width="1000" controls fluid='true' data-setup='{}' >
<source src="http://mirrorblender.top-ix.org/movies/sintel-1024-surround.mp4" type='video/mp4' label='SD' res='480' /> <source src="https://vjs.zencdn.net/v/oceans.mp4?sd" type='video/mp4' label='SD' res='480' />
<source src="http://media.xiph.org/mango/tears_of_steel_1080p.webm" type='video/webm' label='HD' res='1080'/> <source src="https://vjs.zencdn.net/v/oceans.mp4?hd" type='video/mp4' label='HD' res='1080'/>
<source src="http://media.xiph.org/mango/tears_of_steel_1080p.webm" type='video/webm' label='phone' res='144'/> <source src="https://vjs.zencdn.net/v/oceans.mp4?phone" type='video/mp4' label='phone' res='144'/>
<source src="http://media.xiph.org/mango/tears_of_steel_1080p.webm" type='video/webm' label='4k' res='2160'/> <source src="https://vjs.zencdn.net/v/oceans.mp4?4k" type='video/mp4' label='4k' res='2160'/>
</video> </video>
</div> </div>
<script src="node_modules/video.js/dist/video.js"></script> <script src="node_modules/video.js/dist/video.js"></script>
@ -78,13 +78,13 @@
window.player = player window.player = player
player.updateSrc([ player.updateSrc([
{ {
src: 'http://media.xiph.org/mango/tears_of_steel_1080p.webm', src: 'https://vjs.zencdn.net/v/oceans.mp4?SD',
type: 'video/webm', type: 'video/mp4',
label: 'SD', label: 'SD',
res: 360 res: 360
}, },
{ {
src: 'http://mirrorblender.top-ix.org/movies/sintel-1024-surround.mp4', src: 'https://vjs.zencdn.net/v/oceans.mp4?HD',
type: 'video/mp4', type: 'video/mp4',
label: 'HD', label: 'HD',
res: 720 res: 720

View file

@ -1,6 +1,6 @@
/** /**
* @license * @license
* Video.js 5.0.0-rc.52 <http://videojs.com/> * Video.js 5.0.0-rc.59 <http://videojs.com/>
* Copyright Brightcove, Inc. <https://www.brightcove.com/> * Copyright Brightcove, Inc. <https://www.brightcove.com/>
* Available under Apache License Version 2.0 * Available under Apache License Version 2.0
* <https://github.com/videojs/video.js/blob/master/LICENSE> * <https://github.com/videojs/video.js/blob/master/LICENSE>
@ -3590,7 +3590,7 @@ Component.registerComponent('Component', Component);
exports['default'] = Component; exports['default'] = Component;
module.exports = exports['default']; module.exports = exports['default'];
},{"./utils/dom.js":111,"./utils/events.js":112,"./utils/fn.js":113,"./utils/guid.js":115,"./utils/log.js":116,"./utils/merge-options.js":117,"./utils/to-title-case.js":119,"global/window":2,"object.assign":44}],53:[function(_dereq_,module,exports){ },{"./utils/dom.js":111,"./utils/events.js":112,"./utils/fn.js":113,"./utils/guid.js":115,"./utils/log.js":116,"./utils/merge-options.js":117,"./utils/to-title-case.js":120,"global/window":2,"object.assign":44}],53:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -5297,7 +5297,7 @@ _Component2['default'].registerComponent('ChaptersButton', ChaptersButton);
exports['default'] = ChaptersButton; exports['default'] = ChaptersButton;
module.exports = exports['default']; module.exports = exports['default'];
},{"../../component.js":52,"../../menu/menu.js":90,"../../utils/dom.js":111,"../../utils/fn.js":113,"../../utils/to-title-case.js":119,"./chapters-track-menu-item.js":69,"./text-track-button.js":72,"./text-track-menu-item.js":73,"global/window":2}],69:[function(_dereq_,module,exports){ },{"../../component.js":52,"../../menu/menu.js":90,"../../utils/dom.js":111,"../../utils/fn.js":113,"../../utils/to-title-case.js":120,"./chapters-track-menu-item.js":69,"./text-track-button.js":72,"./text-track-menu-item.js":73,"global/window":2}],69:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -7273,7 +7273,7 @@ _Component2['default'].registerComponent('MenuButton', MenuButton);
exports['default'] = MenuButton; exports['default'] = MenuButton;
module.exports = exports['default']; module.exports = exports['default'];
},{"../button.js":51,"../component.js":52,"../utils/dom.js":111,"../utils/fn.js":113,"../utils/to-title-case.js":119,"./menu.js":90}],89:[function(_dereq_,module,exports){ },{"../button.js":51,"../component.js":52,"../utils/dom.js":111,"../utils/fn.js":113,"../utils/to-title-case.js":120,"./menu.js":90}],89:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -7535,6 +7535,10 @@ var _createTimeRange = _dereq_('./utils/time-ranges.js');
var _bufferedPercent2 = _dereq_('./utils/buffer.js'); var _bufferedPercent2 = _dereq_('./utils/buffer.js');
var _import6 = _dereq_('./utils/stylesheet.js');
var stylesheet = _interopRequireWildcard(_import6);
var _FullscreenApi = _dereq_('./fullscreen-api.js'); var _FullscreenApi = _dereq_('./fullscreen-api.js');
var _FullscreenApi2 = _interopRequireWildcard(_FullscreenApi); var _FullscreenApi2 = _interopRequireWildcard(_FullscreenApi);
@ -7795,6 +7799,10 @@ var Player = (function (_Component) {
// prevent dispose from being called twice // prevent dispose from being called twice
this.off('dispose'); this.off('dispose');
if (this.styleEl_) {
this.styleEl_.parentNode.removeChild(this.styleEl_);
}
// Kill reference to this player // Kill reference to this player
Player.players[this.id_] = null; Player.players[this.id_] = null;
if (this.tag && this.tag.player) { if (this.tag && this.tag.player) {
@ -7854,8 +7862,10 @@ var Player = (function (_Component) {
// Add a style element in the player that we'll use to set the width/height // Add a style element in the player that we'll use to set the width/height
// of the player in a way that's still overrideable by CSS, just like the // of the player in a way that's still overrideable by CSS, just like the
// video element // video element
this.styleEl_ = _document2['default'].createElement('style'); this.styleEl_ = stylesheet.createStyleElement('vjs-styles-dimensions');
el.appendChild(this.styleEl_); var defaultsStyleEl = _document2['default'].querySelector('.vjs-styles-defaults');
var head = _document2['default'].querySelector('head');
head.insertBefore(this.styleEl_, defaultsStyleEl ? defaultsStyleEl.nextSibling : head.firstChild);
// Pass in the width/height/aspectRatio options which will update the style el // Pass in the width/height/aspectRatio options which will update the style el
this.width(this.options_.width); this.width(this.options_.width);
@ -8044,17 +8054,7 @@ var Player = (function (_Component) {
// Ensure the right class is still on the player for the style element // Ensure the right class is still on the player for the style element
this.addClass(idClass); this.addClass(idClass);
// Create the width/height CSS stylesheet.setTextContent(this.styleEl_, '\n .' + idClass + ' {\n width: ' + width + 'px;\n height: ' + height + 'px;\n }\n\n .' + idClass + '.vjs-fluid {\n padding-top: ' + ratioMultiplier * 100 + '%;\n }\n ');
var css = '.' + idClass + ' { width: ' + width + 'px; height: ' + height + 'px; }';
// Add the aspect ratio CSS for when using a fluid layout
css += '.' + idClass + '.vjs-fluid { padding-top: ' + ratioMultiplier * 100 + '%; }';
// Update the style el
if (this.styleEl_.styleSheet) {
this.styleEl_.styleSheet.cssText = css;
} else {
this.styleEl_.innerHTML = css;
}
}; };
/** /**
@ -10349,7 +10349,7 @@ _Component3['default'].registerComponent('Player', Player);
exports['default'] = Player; exports['default'] = Player;
module.exports = exports['default']; module.exports = exports['default'];
},{"./big-play-button.js":50,"./component.js":52,"./control-bar/control-bar.js":53,"./error-display.js":82,"./fullscreen-api.js":85,"./loading-spinner.js":86,"./media-error.js":87,"./poster-image.js":93,"./tech/html5.js":98,"./tech/loader.js":99,"./tracks/text-track-display.js":102,"./tracks/text-track-list-converter.js":104,"./tracks/text-track-settings.js":106,"./utils/browser.js":108,"./utils/buffer.js":109,"./utils/dom.js":111,"./utils/events.js":112,"./utils/fn.js":113,"./utils/guid.js":115,"./utils/log.js":116,"./utils/merge-options.js":117,"./utils/time-ranges.js":118,"./utils/to-title-case.js":119,"global/document":1,"global/window":2,"object.assign":44,"safe-json-parse/tuple":49}],92:[function(_dereq_,module,exports){ },{"./big-play-button.js":50,"./component.js":52,"./control-bar/control-bar.js":53,"./error-display.js":82,"./fullscreen-api.js":85,"./loading-spinner.js":86,"./media-error.js":87,"./poster-image.js":93,"./tech/html5.js":98,"./tech/loader.js":99,"./tracks/text-track-display.js":102,"./tracks/text-track-list-converter.js":104,"./tracks/text-track-settings.js":106,"./utils/browser.js":108,"./utils/buffer.js":109,"./utils/dom.js":111,"./utils/events.js":112,"./utils/fn.js":113,"./utils/guid.js":115,"./utils/log.js":116,"./utils/merge-options.js":117,"./utils/stylesheet.js":118,"./utils/time-ranges.js":119,"./utils/to-title-case.js":120,"global/document":1,"global/window":2,"object.assign":44,"safe-json-parse/tuple":49}],92:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -10688,9 +10688,8 @@ var Slider = (function (_Component) {
_Component.call(this, player, options); _Component.call(this, player, options);
// Set property names to bar and handle to match with the child Slider class is looking for // Set property names to bar to match with the child Slider class is looking for
this.bar = this.getChild(this.options_.barName); this.bar = this.getChild(this.options_.barName);
this.handle = this.getChild(this.options_.handleName);
// Set a horizontal or vertical class on the slider depending on the slider type // Set a horizontal or vertical class on the slider depending on the slider type
this.vertical(!!this.options_.vertical); this.vertical(!!this.options_.vertical);
@ -10826,9 +10825,8 @@ var Slider = (function (_Component) {
var box = Dom.findElPosition(el); var box = Dom.findElPosition(el);
var boxW = el.offsetWidth; var boxW = el.offsetWidth;
var boxH = el.offsetHeight; var boxH = el.offsetHeight;
var handle = this.handle;
if (this.options_.vertical) { if (this.vertical()) {
var boxY = box.top; var boxY = box.top;
var pageY = undefined; var pageY = undefined;
@ -10838,13 +10836,6 @@ var Slider = (function (_Component) {
pageY = event.pageY; pageY = event.pageY;
} }
if (handle) {
var handleH = handle.el().offsetHeight;
// Adjusted X and Width, so handle doesn't go outside the bar
boxY = boxY + handleH / 2;
boxH = boxH - handleH;
}
// Percent that the click is through the adjusted area // Percent that the click is through the adjusted area
return Math.max(0, Math.min(1, (boxY - pageY + boxH) / boxH)); return Math.max(0, Math.min(1, (boxY - pageY + boxH) / boxH));
} else { } else {
@ -10857,14 +10848,6 @@ var Slider = (function (_Component) {
pageX = event.pageX; pageX = event.pageX;
} }
if (handle) {
var handleW = handle.el().offsetWidth;
// Adjusted X and Width, so handle doesn't go outside the bar
boxX = boxX + handleW / 2;
boxW = boxW - handleW;
}
// Percent that the click is through the adjusted area // Percent that the click is through the adjusted area
return Math.max(0, Math.min(1, (pageX - boxX) / boxW)); return Math.max(0, Math.min(1, (pageX - boxX) / boxW));
} }
@ -11650,7 +11633,7 @@ _Component2['default'].registerComponent('Flash', Flash);
exports['default'] = Flash; exports['default'] = Flash;
module.exports = exports['default']; module.exports = exports['default'];
},{"../component":52,"../utils/dom.js":111,"../utils/time-ranges.js":118,"../utils/url.js":120,"./flash-rtmp":96,"./tech":100,"global/window":2,"object.assign":44}],98:[function(_dereq_,module,exports){ },{"../component":52,"../utils/dom.js":111,"../utils/time-ranges.js":119,"../utils/url.js":121,"./flash-rtmp":96,"./tech":100,"global/window":2,"object.assign":44}],98:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -11762,8 +11745,6 @@ var Html5 = (function (_Tech) {
} }
if (this.featuresNativeTextTracks) { if (this.featuresNativeTextTracks) {
this.on('loadstart', Fn.bind(this, this.hideCaptions));
this.handleTextTrackChange_ = Fn.bind(this, this.handleTextTrackChange); this.handleTextTrackChange_ = Fn.bind(this, this.handleTextTrackChange);
this.handleTextTrackAdd_ = Fn.bind(this, this.handleTextTrackAdd); this.handleTextTrackAdd_ = Fn.bind(this, this.handleTextTrackAdd);
this.handleTextTrackRemove_ = Fn.bind(this, this.handleTextTrackRemove); this.handleTextTrackRemove_ = Fn.bind(this, this.handleTextTrackRemove);
@ -11794,7 +11775,7 @@ var Html5 = (function (_Tech) {
var emulatedTt = this.textTracks(); var emulatedTt = this.textTracks();
// remove native event listeners // remove native event listeners
if (tt) { if (tt && tt.removeEventListener) {
tt.removeEventListener('change', this.handleTextTrackChange_); tt.removeEventListener('change', this.handleTextTrackChange_);
tt.removeEventListener('addtrack', this.handleTextTrackAdd_); tt.removeEventListener('addtrack', this.handleTextTrackAdd_);
tt.removeEventListener('removetrack', this.handleTextTrackRemove_); tt.removeEventListener('removetrack', this.handleTextTrackRemove_);
@ -11828,7 +11809,7 @@ var Html5 = (function (_Tech) {
// If the original tag is still there, clone and remove it. // If the original tag is still there, clone and remove it.
if (el) { if (el) {
var clone = el.cloneNode(false); var clone = el.cloneNode(true);
el.parentNode.insertBefore(clone, el); el.parentNode.insertBefore(clone, el);
Html5.disposeMediaElement(el); Html5.disposeMediaElement(el);
el = clone; el = clone;
@ -11847,21 +11828,6 @@ var Html5 = (function (_Tech) {
'class': 'vjs-tech' 'class': 'vjs-tech'
})); }));
} }
if (this.options_.tracks) {
for (var i = 0; i < this.options_.tracks.length; i++) {
var _track = this.options_.tracks[i];
var trackEl = _document2['default'].createElement('track');
trackEl.kind = _track.kind;
trackEl.label = _track.label;
trackEl.srclang = _track.srclang;
trackEl.src = _track.src;
if ('default' in _track) {
trackEl.setAttribute('default', 'default');
}
el.appendChild(trackEl);
}
}
} }
// Update specific tag settings, in case they were overridden // Update specific tag settings, in case they were overridden
@ -11879,32 +11845,10 @@ var Html5 = (function (_Tech) {
// jenniisawesome = true; // jenniisawesome = true;
}; };
/**
* Hide captions from text track
*
* @method hideCaptions
*/
Html5.prototype.hideCaptions = function hideCaptions() {
var tracks = this.el_.querySelectorAll('track');
var i = tracks.length;
var kinds = {
captions: 1,
subtitles: 1
};
while (i--) {
var _track2 = tracks[i].track;
if (_track2 && _track2.kind in kinds && !tracks[i]['default']) {
_track2.mode = 'disabled';
}
}
};
Html5.prototype.proxyNativeTextTracks_ = function proxyNativeTextTracks_() { Html5.prototype.proxyNativeTextTracks_ = function proxyNativeTextTracks_() {
var tt = this.el().textTracks; var tt = this.el().textTracks;
if (tt) { if (tt && tt.addEventListener) {
tt.addEventListener('change', this.handleTextTrackChange_); tt.addEventListener('change', this.handleTextTrackChange_);
tt.addEventListener('addtrack', this.handleTextTrackAdd_); tt.addEventListener('addtrack', this.handleTextTrackAdd_);
tt.addEventListener('removetrack', this.handleTextTrackRemove_); tt.addEventListener('removetrack', this.handleTextTrackRemove_);
@ -12528,24 +12472,6 @@ var Html5 = (function (_Tech) {
this.el().appendChild(track); this.el().appendChild(track);
if (track.track.kind === 'metadata') {
track.track.mode = 'hidden';
} else {
track.track.mode = 'disabled';
}
track.onload = function () {
var tt = track.track;
if (track.readyState >= 2) {
if (tt.kind === 'metadata' && tt.mode !== 'hidden') {
tt.mode = 'hidden';
} else if (tt.kind !== 'metadata' && tt.mode !== 'disabled') {
tt.mode = 'disabled';
}
track.onload = null;
}
};
this.remoteTextTracks().addTrack_(track.track); this.remoteTextTracks().addTrack_(track.track);
return track; return track;
@ -12859,7 +12785,7 @@ module.exports = exports['default'];
// not supported // not supported
},{"../component":52,"../utils/browser.js":108,"../utils/dom.js":111,"../utils/fn.js":113,"../utils/log.js":116,"../utils/merge-options.js":117,"../utils/url.js":120,"./tech.js":100,"global/document":1,"global/window":2,"object.assign":44}],99:[function(_dereq_,module,exports){ },{"../component":52,"../utils/browser.js":108,"../utils/dom.js":111,"../utils/fn.js":113,"../utils/log.js":116,"../utils/merge-options.js":117,"../utils/url.js":121,"./tech.js":100,"global/document":1,"global/window":2,"object.assign":44}],99:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -12934,7 +12860,7 @@ _Component3['default'].registerComponent('MediaLoader', MediaLoader);
exports['default'] = MediaLoader; exports['default'] = MediaLoader;
module.exports = exports['default']; module.exports = exports['default'];
},{"../component":52,"../utils/to-title-case.js":119,"global/window":2}],100:[function(_dereq_,module,exports){ },{"../component":52,"../utils/to-title-case.js":120,"global/window":2}],100:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -13626,7 +13552,7 @@ _Component3['default'].registerComponent('MediaTechController', Tech);
exports['default'] = Tech; exports['default'] = Tech;
module.exports = exports['default']; module.exports = exports['default'];
},{"../component":52,"../tracks/text-track":107,"../tracks/text-track-list":105,"../utils/buffer.js":109,"../utils/fn.js":113,"../utils/log.js":116,"../utils/time-ranges.js":118,"global/document":1,"global/window":2}],101:[function(_dereq_,module,exports){ },{"../component":52,"../tracks/text-track":107,"../tracks/text-track-list":105,"../utils/buffer.js":109,"../utils/fn.js":113,"../utils/log.js":116,"../utils/time-ranges.js":119,"global/document":1,"global/window":2}],101:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -14922,7 +14848,7 @@ var indexOf = function indexOf(searchElement, fromIndex) {
exports['default'] = TextTrack; exports['default'] = TextTrack;
module.exports = exports['default']; module.exports = exports['default'];
},{"../event-target":83,"../utils/browser.js":108,"../utils/fn.js":113,"../utils/guid.js":115,"../utils/log.js":116,"../xhr.js":122,"./text-track-cue-list":101,"./text-track-enums":103,"global/document":1,"global/window":2}],108:[function(_dereq_,module,exports){ },{"../event-target":83,"../utils/browser.js":108,"../utils/fn.js":113,"../utils/guid.js":115,"../utils/log.js":116,"../xhr.js":123,"./text-track-cue-list":101,"./text-track-enums":103,"global/document":1,"global/window":2}],108:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -15056,7 +14982,7 @@ function bufferedPercent(buffered, duration) {
return bufferedDuration / duration; return bufferedDuration / duration;
} }
},{"./time-ranges.js":118}],110:[function(_dereq_,module,exports){ },{"./time-ranges.js":119}],110:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -16202,6 +16128,34 @@ module.exports = exports['default'];
},{"lodash-compat/object/merge":40}],118:[function(_dereq_,module,exports){ },{"lodash-compat/object/merge":40}],118:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
exports.__esModule = true;
var _document = _dereq_('global/document');
var _document2 = _interopRequireWildcard(_document);
var createStyleElement = function createStyleElement(className) {
var style = _document2['default'].createElement('style');
style.className = className;
return style;
};
exports.createStyleElement = createStyleElement;
var setTextContent = function setTextContent(el, content) {
if (el.styleSheet) {
el.styleSheet.cssText = content;
} else {
el.textContent = content;
}
};
exports.setTextContent = setTextContent;
},{"global/document":1}],119:[function(_dereq_,module,exports){
'use strict';
exports.__esModule = true; exports.__esModule = true;
/** /**
* @file time-ranges.js * @file time-ranges.js
@ -16262,7 +16216,7 @@ function createTimeRange(start, end) {
}; };
} }
},{}],119:[function(_dereq_,module,exports){ },{}],120:[function(_dereq_,module,exports){
"use strict"; "use strict";
exports.__esModule = true; exports.__esModule = true;
@ -16283,7 +16237,7 @@ function toTitleCase(string) {
exports["default"] = toTitleCase; exports["default"] = toTitleCase;
module.exports = exports["default"]; module.exports = exports["default"];
},{}],120:[function(_dereq_,module,exports){ },{}],121:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -16393,7 +16347,7 @@ var getFileExtension = function getFileExtension(path) {
}; };
exports.getFileExtension = getFileExtension; exports.getFileExtension = getFileExtension;
},{"global/document":1}],121:[function(_dereq_,module,exports){ },{"global/document":1}],122:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -16411,6 +16365,10 @@ var _import = _dereq_('./setup');
var setup = _interopRequireWildcard(_import); var setup = _interopRequireWildcard(_import);
var _import2 = _dereq_('./utils/stylesheet.js');
var stylesheet = _interopRequireWildcard(_import2);
var _Component = _dereq_('./component'); var _Component = _dereq_('./component');
var _Component2 = _interopRequireWildcard(_Component); var _Component2 = _interopRequireWildcard(_Component);
@ -16419,6 +16377,10 @@ var _EventTarget = _dereq_('./event-target');
var _EventTarget2 = _interopRequireWildcard(_EventTarget); var _EventTarget2 = _interopRequireWildcard(_EventTarget);
var _import3 = _dereq_('./utils/events.js');
var Events = _interopRequireWildcard(_import3);
var _Player = _dereq_('./player'); var _Player = _dereq_('./player');
var _Player2 = _interopRequireWildcard(_Player); var _Player2 = _interopRequireWildcard(_Player);
@ -16431,9 +16393,9 @@ var _mergeOptions = _dereq_('../../src/js/utils/merge-options.js');
var _mergeOptions2 = _interopRequireWildcard(_mergeOptions); var _mergeOptions2 = _interopRequireWildcard(_mergeOptions);
var _import2 = _dereq_('./utils/fn.js'); var _import4 = _dereq_('./utils/fn.js');
var Fn = _interopRequireWildcard(_import2); var Fn = _interopRequireWildcard(_import4);
var _assign = _dereq_('object.assign'); var _assign = _dereq_('object.assign');
@ -16453,17 +16415,17 @@ var _xhr = _dereq_('./xhr.js');
var _xhr2 = _interopRequireWildcard(_xhr); var _xhr2 = _interopRequireWildcard(_xhr);
var _import3 = _dereq_('./utils/dom.js'); var _import5 = _dereq_('./utils/dom.js');
var Dom = _interopRequireWildcard(_import3); var Dom = _interopRequireWildcard(_import5);
var _import4 = _dereq_('./utils/browser.js'); var _import6 = _dereq_('./utils/browser.js');
var browser = _interopRequireWildcard(_import4); var browser = _interopRequireWildcard(_import6);
var _import5 = _dereq_('./utils/url.js'); var _import7 = _dereq_('./utils/url.js');
var Url = _interopRequireWildcard(_import5); var Url = _interopRequireWildcard(_import7);
var _extendsFn = _dereq_('./extends.js'); var _extendsFn = _dereq_('./extends.js');
@ -16566,6 +16528,12 @@ var videojs = (function (_videojs) {
return tag.player || new _Player2['default'](tag, options, ready); return tag.player || new _Player2['default'](tag, options, ready);
}); });
// Add default styles
var style = stylesheet.createStyleElement('vjs-styles-defaults');
var head = _document2['default'].querySelector('head');
head.insertBefore(style, head.firstChild);
stylesheet.setTextContent(style, '\n .video-js {\n width: 300px;\n height: 150px;\n');
// Run Auto-load players // Run Auto-load players
// You have to wait at least once in case this script is loaded after your video in the DOM (weird behavior only with minified version) // You have to wait at least once in case this script is loaded after your video in the DOM (weird behavior only with minified version)
setup.autoSetupTimeout(1, videojs); setup.autoSetupTimeout(1, videojs);
@ -16575,7 +16543,7 @@ setup.autoSetupTimeout(1, videojs);
* *
* @type {String} * @type {String}
*/ */
videojs.VERSION = '5.0.0-rc.52'; videojs.VERSION = '5.0.0-rc.59';
/** /**
* The global options object. These are the settings that take effect * The global options object. These are the settings that take effect
@ -16902,6 +16870,50 @@ videojs.parseUrl = Url.parseUrl;
*/ */
videojs.EventTarget = _EventTarget2['default']; videojs.EventTarget = _EventTarget2['default'];
/**
* Add an event listener to element
* It stores the handler function in a separate cache object
* and adds a generic handler to the element's event,
* along with a unique id (guid) to the element.
*
* @param {Element|Object} elem Element or object to bind listeners to
* @param {String|Array} type Type of event to bind to.
* @param {Function} fn Event listener.
* @method on
*/
videojs.on = Events.on;
/**
* Trigger a listener only once for an event
*
* @param {Element|Object} elem Element or object to
* @param {String|Array} type Name/type of event
* @param {Function} fn Event handler function
* @method one
*/
videojs.one = Events.one;
/**
* Removes event listeners from an element
*
* @param {Element|Object} elem Object to remove listeners from
* @param {String|Array=} type Type of listener to remove. Don't include to remove all events from element.
* @param {Function} fn Specific listener to remove. Don't include to remove listeners for an event type.
* @method off
*/
videojs.off = Events.off;
/**
* Trigger an event for an element
*
* @param {Element|Object} elem Element to trigger an event on
* @param {Event|Object|String} event A string (the type) or an event object with a type attribute
* @param {Object} [hash] data hash to pass along with the event
* @return {Boolean=} Returned only if default was prevented
* @method trigger
*/
videojs.trigger = Events.trigger;
// REMOVING: We probably should add this to the migration plugin // REMOVING: We probably should add this to the migration plugin
// // Expose but deprecate the window[componentName] method for accessing components // // Expose but deprecate the window[componentName] method for accessing components
// Object.getOwnPropertyNames(Component.components).forEach(function(name){ // Object.getOwnPropertyNames(Component.components).forEach(function(name){
@ -16939,7 +16951,7 @@ if (typeof define === 'function' && define.amd) {
exports['default'] = videojs; exports['default'] = videojs;
module.exports = exports['default']; module.exports = exports['default'];
},{"../../src/js/utils/merge-options.js":117,"./component":52,"./event-target":83,"./extends.js":84,"./player":91,"./plugins.js":92,"./setup":94,"./tech/flash.js":97,"./tech/html5.js":98,"./utils/browser.js":108,"./utils/create-deprecation-proxy.js":110,"./utils/dom.js":111,"./utils/fn.js":113,"./utils/format-time.js":114,"./utils/log.js":116,"./utils/time-ranges.js":118,"./utils/url.js":120,"./xhr.js":122,"global/document":1,"lodash-compat/object/merge":40,"object.assign":44}],122:[function(_dereq_,module,exports){ },{"../../src/js/utils/merge-options.js":117,"./component":52,"./event-target":83,"./extends.js":84,"./player":91,"./plugins.js":92,"./setup":94,"./tech/flash.js":97,"./tech/html5.js":98,"./utils/browser.js":108,"./utils/create-deprecation-proxy.js":110,"./utils/dom.js":111,"./utils/events.js":112,"./utils/fn.js":113,"./utils/format-time.js":114,"./utils/log.js":116,"./utils/stylesheet.js":118,"./utils/time-ranges.js":119,"./utils/url.js":121,"./xhr.js":123,"global/document":1,"lodash-compat/object/merge":40,"object.assign":44}],123:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -17127,7 +17139,7 @@ var xhr = function xhr(options, callback) {
exports['default'] = xhr; exports['default'] = xhr;
module.exports = exports['default']; module.exports = exports['default'];
},{"./utils/log.js":116,"./utils/merge-options.js":117,"./utils/url.js":120,"global/window":2}]},{},[121])(121) },{"./utils/log.js":116,"./utils/merge-options.js":117,"./utils/url.js":121,"global/window":2}]},{},[122])(122)
}); });

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -164,10 +164,6 @@
/* Make video.js videos align top when next to video elements */ /* Make video.js videos align top when next to video elements */
vertical-align: top; vertical-align: top;
box-sizing: border-box; box-sizing: border-box;
/* Default to the video element width/height. This will be overridden by
* the source width height unless changed elsewhere. */
width: 300px;
height: 150px;
color: #fff; color: #fff;
background-color: #000; background-color: #000;
position: relative; position: relative;

File diff suppressed because one or more lines are too long

246
node_modules/video.js/dist/video.js generated vendored
View file

@ -1,6 +1,6 @@
/** /**
* @license * @license
* Video.js 5.0.0-rc.52 <http://videojs.com/> * Video.js 5.0.0-rc.59 <http://videojs.com/>
* Copyright Brightcove, Inc. <https://www.brightcove.com/> * Copyright Brightcove, Inc. <https://www.brightcove.com/>
* Available under Apache License Version 2.0 * Available under Apache License Version 2.0
* <https://github.com/videojs/video.js/blob/master/LICENSE> * <https://github.com/videojs/video.js/blob/master/LICENSE>
@ -3594,7 +3594,7 @@ Component.registerComponent('Component', Component);
exports['default'] = Component; exports['default'] = Component;
module.exports = exports['default']; module.exports = exports['default'];
},{"./utils/dom.js":111,"./utils/events.js":112,"./utils/fn.js":113,"./utils/guid.js":115,"./utils/log.js":116,"./utils/merge-options.js":117,"./utils/to-title-case.js":119,"global/window":2,"object.assign":44}],53:[function(_dereq_,module,exports){ },{"./utils/dom.js":111,"./utils/events.js":112,"./utils/fn.js":113,"./utils/guid.js":115,"./utils/log.js":116,"./utils/merge-options.js":117,"./utils/to-title-case.js":120,"global/window":2,"object.assign":44}],53:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -5301,7 +5301,7 @@ _Component2['default'].registerComponent('ChaptersButton', ChaptersButton);
exports['default'] = ChaptersButton; exports['default'] = ChaptersButton;
module.exports = exports['default']; module.exports = exports['default'];
},{"../../component.js":52,"../../menu/menu.js":90,"../../utils/dom.js":111,"../../utils/fn.js":113,"../../utils/to-title-case.js":119,"./chapters-track-menu-item.js":69,"./text-track-button.js":72,"./text-track-menu-item.js":73,"global/window":2}],69:[function(_dereq_,module,exports){ },{"../../component.js":52,"../../menu/menu.js":90,"../../utils/dom.js":111,"../../utils/fn.js":113,"../../utils/to-title-case.js":120,"./chapters-track-menu-item.js":69,"./text-track-button.js":72,"./text-track-menu-item.js":73,"global/window":2}],69:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -7277,7 +7277,7 @@ _Component2['default'].registerComponent('MenuButton', MenuButton);
exports['default'] = MenuButton; exports['default'] = MenuButton;
module.exports = exports['default']; module.exports = exports['default'];
},{"../button.js":51,"../component.js":52,"../utils/dom.js":111,"../utils/fn.js":113,"../utils/to-title-case.js":119,"./menu.js":90}],89:[function(_dereq_,module,exports){ },{"../button.js":51,"../component.js":52,"../utils/dom.js":111,"../utils/fn.js":113,"../utils/to-title-case.js":120,"./menu.js":90}],89:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -7539,6 +7539,10 @@ var _createTimeRange = _dereq_('./utils/time-ranges.js');
var _bufferedPercent2 = _dereq_('./utils/buffer.js'); var _bufferedPercent2 = _dereq_('./utils/buffer.js');
var _import6 = _dereq_('./utils/stylesheet.js');
var stylesheet = _interopRequireWildcard(_import6);
var _FullscreenApi = _dereq_('./fullscreen-api.js'); var _FullscreenApi = _dereq_('./fullscreen-api.js');
var _FullscreenApi2 = _interopRequireWildcard(_FullscreenApi); var _FullscreenApi2 = _interopRequireWildcard(_FullscreenApi);
@ -7799,6 +7803,10 @@ var Player = (function (_Component) {
// prevent dispose from being called twice // prevent dispose from being called twice
this.off('dispose'); this.off('dispose');
if (this.styleEl_) {
this.styleEl_.parentNode.removeChild(this.styleEl_);
}
// Kill reference to this player // Kill reference to this player
Player.players[this.id_] = null; Player.players[this.id_] = null;
if (this.tag && this.tag.player) { if (this.tag && this.tag.player) {
@ -7858,8 +7866,10 @@ var Player = (function (_Component) {
// Add a style element in the player that we'll use to set the width/height // Add a style element in the player that we'll use to set the width/height
// of the player in a way that's still overrideable by CSS, just like the // of the player in a way that's still overrideable by CSS, just like the
// video element // video element
this.styleEl_ = _document2['default'].createElement('style'); this.styleEl_ = stylesheet.createStyleElement('vjs-styles-dimensions');
el.appendChild(this.styleEl_); var defaultsStyleEl = _document2['default'].querySelector('.vjs-styles-defaults');
var head = _document2['default'].querySelector('head');
head.insertBefore(this.styleEl_, defaultsStyleEl ? defaultsStyleEl.nextSibling : head.firstChild);
// Pass in the width/height/aspectRatio options which will update the style el // Pass in the width/height/aspectRatio options which will update the style el
this.width(this.options_.width); this.width(this.options_.width);
@ -8048,17 +8058,7 @@ var Player = (function (_Component) {
// Ensure the right class is still on the player for the style element // Ensure the right class is still on the player for the style element
this.addClass(idClass); this.addClass(idClass);
// Create the width/height CSS stylesheet.setTextContent(this.styleEl_, '\n .' + idClass + ' {\n width: ' + width + 'px;\n height: ' + height + 'px;\n }\n\n .' + idClass + '.vjs-fluid {\n padding-top: ' + ratioMultiplier * 100 + '%;\n }\n ');
var css = '.' + idClass + ' { width: ' + width + 'px; height: ' + height + 'px; }';
// Add the aspect ratio CSS for when using a fluid layout
css += '.' + idClass + '.vjs-fluid { padding-top: ' + ratioMultiplier * 100 + '%; }';
// Update the style el
if (this.styleEl_.styleSheet) {
this.styleEl_.styleSheet.cssText = css;
} else {
this.styleEl_.innerHTML = css;
}
}; };
/** /**
@ -10353,7 +10353,7 @@ _Component3['default'].registerComponent('Player', Player);
exports['default'] = Player; exports['default'] = Player;
module.exports = exports['default']; module.exports = exports['default'];
},{"./big-play-button.js":50,"./component.js":52,"./control-bar/control-bar.js":53,"./error-display.js":82,"./fullscreen-api.js":85,"./loading-spinner.js":86,"./media-error.js":87,"./poster-image.js":93,"./tech/html5.js":98,"./tech/loader.js":99,"./tracks/text-track-display.js":102,"./tracks/text-track-list-converter.js":104,"./tracks/text-track-settings.js":106,"./utils/browser.js":108,"./utils/buffer.js":109,"./utils/dom.js":111,"./utils/events.js":112,"./utils/fn.js":113,"./utils/guid.js":115,"./utils/log.js":116,"./utils/merge-options.js":117,"./utils/time-ranges.js":118,"./utils/to-title-case.js":119,"global/document":1,"global/window":2,"object.assign":44,"safe-json-parse/tuple":49}],92:[function(_dereq_,module,exports){ },{"./big-play-button.js":50,"./component.js":52,"./control-bar/control-bar.js":53,"./error-display.js":82,"./fullscreen-api.js":85,"./loading-spinner.js":86,"./media-error.js":87,"./poster-image.js":93,"./tech/html5.js":98,"./tech/loader.js":99,"./tracks/text-track-display.js":102,"./tracks/text-track-list-converter.js":104,"./tracks/text-track-settings.js":106,"./utils/browser.js":108,"./utils/buffer.js":109,"./utils/dom.js":111,"./utils/events.js":112,"./utils/fn.js":113,"./utils/guid.js":115,"./utils/log.js":116,"./utils/merge-options.js":117,"./utils/stylesheet.js":118,"./utils/time-ranges.js":119,"./utils/to-title-case.js":120,"global/document":1,"global/window":2,"object.assign":44,"safe-json-parse/tuple":49}],92:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -10692,9 +10692,8 @@ var Slider = (function (_Component) {
_Component.call(this, player, options); _Component.call(this, player, options);
// Set property names to bar and handle to match with the child Slider class is looking for // Set property names to bar to match with the child Slider class is looking for
this.bar = this.getChild(this.options_.barName); this.bar = this.getChild(this.options_.barName);
this.handle = this.getChild(this.options_.handleName);
// Set a horizontal or vertical class on the slider depending on the slider type // Set a horizontal or vertical class on the slider depending on the slider type
this.vertical(!!this.options_.vertical); this.vertical(!!this.options_.vertical);
@ -10830,9 +10829,8 @@ var Slider = (function (_Component) {
var box = Dom.findElPosition(el); var box = Dom.findElPosition(el);
var boxW = el.offsetWidth; var boxW = el.offsetWidth;
var boxH = el.offsetHeight; var boxH = el.offsetHeight;
var handle = this.handle;
if (this.options_.vertical) { if (this.vertical()) {
var boxY = box.top; var boxY = box.top;
var pageY = undefined; var pageY = undefined;
@ -10842,13 +10840,6 @@ var Slider = (function (_Component) {
pageY = event.pageY; pageY = event.pageY;
} }
if (handle) {
var handleH = handle.el().offsetHeight;
// Adjusted X and Width, so handle doesn't go outside the bar
boxY = boxY + handleH / 2;
boxH = boxH - handleH;
}
// Percent that the click is through the adjusted area // Percent that the click is through the adjusted area
return Math.max(0, Math.min(1, (boxY - pageY + boxH) / boxH)); return Math.max(0, Math.min(1, (boxY - pageY + boxH) / boxH));
} else { } else {
@ -10861,14 +10852,6 @@ var Slider = (function (_Component) {
pageX = event.pageX; pageX = event.pageX;
} }
if (handle) {
var handleW = handle.el().offsetWidth;
// Adjusted X and Width, so handle doesn't go outside the bar
boxX = boxX + handleW / 2;
boxW = boxW - handleW;
}
// Percent that the click is through the adjusted area // Percent that the click is through the adjusted area
return Math.max(0, Math.min(1, (pageX - boxX) / boxW)); return Math.max(0, Math.min(1, (pageX - boxX) / boxW));
} }
@ -11654,7 +11637,7 @@ _Component2['default'].registerComponent('Flash', Flash);
exports['default'] = Flash; exports['default'] = Flash;
module.exports = exports['default']; module.exports = exports['default'];
},{"../component":52,"../utils/dom.js":111,"../utils/time-ranges.js":118,"../utils/url.js":120,"./flash-rtmp":96,"./tech":100,"global/window":2,"object.assign":44}],98:[function(_dereq_,module,exports){ },{"../component":52,"../utils/dom.js":111,"../utils/time-ranges.js":119,"../utils/url.js":121,"./flash-rtmp":96,"./tech":100,"global/window":2,"object.assign":44}],98:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -11766,8 +11749,6 @@ var Html5 = (function (_Tech) {
} }
if (this.featuresNativeTextTracks) { if (this.featuresNativeTextTracks) {
this.on('loadstart', Fn.bind(this, this.hideCaptions));
this.handleTextTrackChange_ = Fn.bind(this, this.handleTextTrackChange); this.handleTextTrackChange_ = Fn.bind(this, this.handleTextTrackChange);
this.handleTextTrackAdd_ = Fn.bind(this, this.handleTextTrackAdd); this.handleTextTrackAdd_ = Fn.bind(this, this.handleTextTrackAdd);
this.handleTextTrackRemove_ = Fn.bind(this, this.handleTextTrackRemove); this.handleTextTrackRemove_ = Fn.bind(this, this.handleTextTrackRemove);
@ -11798,7 +11779,7 @@ var Html5 = (function (_Tech) {
var emulatedTt = this.textTracks(); var emulatedTt = this.textTracks();
// remove native event listeners // remove native event listeners
if (tt) { if (tt && tt.removeEventListener) {
tt.removeEventListener('change', this.handleTextTrackChange_); tt.removeEventListener('change', this.handleTextTrackChange_);
tt.removeEventListener('addtrack', this.handleTextTrackAdd_); tt.removeEventListener('addtrack', this.handleTextTrackAdd_);
tt.removeEventListener('removetrack', this.handleTextTrackRemove_); tt.removeEventListener('removetrack', this.handleTextTrackRemove_);
@ -11832,7 +11813,7 @@ var Html5 = (function (_Tech) {
// If the original tag is still there, clone and remove it. // If the original tag is still there, clone and remove it.
if (el) { if (el) {
var clone = el.cloneNode(false); var clone = el.cloneNode(true);
el.parentNode.insertBefore(clone, el); el.parentNode.insertBefore(clone, el);
Html5.disposeMediaElement(el); Html5.disposeMediaElement(el);
el = clone; el = clone;
@ -11851,21 +11832,6 @@ var Html5 = (function (_Tech) {
'class': 'vjs-tech' 'class': 'vjs-tech'
})); }));
} }
if (this.options_.tracks) {
for (var i = 0; i < this.options_.tracks.length; i++) {
var _track = this.options_.tracks[i];
var trackEl = _document2['default'].createElement('track');
trackEl.kind = _track.kind;
trackEl.label = _track.label;
trackEl.srclang = _track.srclang;
trackEl.src = _track.src;
if ('default' in _track) {
trackEl.setAttribute('default', 'default');
}
el.appendChild(trackEl);
}
}
} }
// Update specific tag settings, in case they were overridden // Update specific tag settings, in case they were overridden
@ -11883,32 +11849,10 @@ var Html5 = (function (_Tech) {
// jenniisawesome = true; // jenniisawesome = true;
}; };
/**
* Hide captions from text track
*
* @method hideCaptions
*/
Html5.prototype.hideCaptions = function hideCaptions() {
var tracks = this.el_.querySelectorAll('track');
var i = tracks.length;
var kinds = {
captions: 1,
subtitles: 1
};
while (i--) {
var _track2 = tracks[i].track;
if (_track2 && _track2.kind in kinds && !tracks[i]['default']) {
_track2.mode = 'disabled';
}
}
};
Html5.prototype.proxyNativeTextTracks_ = function proxyNativeTextTracks_() { Html5.prototype.proxyNativeTextTracks_ = function proxyNativeTextTracks_() {
var tt = this.el().textTracks; var tt = this.el().textTracks;
if (tt) { if (tt && tt.addEventListener) {
tt.addEventListener('change', this.handleTextTrackChange_); tt.addEventListener('change', this.handleTextTrackChange_);
tt.addEventListener('addtrack', this.handleTextTrackAdd_); tt.addEventListener('addtrack', this.handleTextTrackAdd_);
tt.addEventListener('removetrack', this.handleTextTrackRemove_); tt.addEventListener('removetrack', this.handleTextTrackRemove_);
@ -12532,24 +12476,6 @@ var Html5 = (function (_Tech) {
this.el().appendChild(track); this.el().appendChild(track);
if (track.track.kind === 'metadata') {
track.track.mode = 'hidden';
} else {
track.track.mode = 'disabled';
}
track.onload = function () {
var tt = track.track;
if (track.readyState >= 2) {
if (tt.kind === 'metadata' && tt.mode !== 'hidden') {
tt.mode = 'hidden';
} else if (tt.kind !== 'metadata' && tt.mode !== 'disabled') {
tt.mode = 'disabled';
}
track.onload = null;
}
};
this.remoteTextTracks().addTrack_(track.track); this.remoteTextTracks().addTrack_(track.track);
return track; return track;
@ -12863,7 +12789,7 @@ module.exports = exports['default'];
// not supported // not supported
},{"../component":52,"../utils/browser.js":108,"../utils/dom.js":111,"../utils/fn.js":113,"../utils/log.js":116,"../utils/merge-options.js":117,"../utils/url.js":120,"./tech.js":100,"global/document":1,"global/window":2,"object.assign":44}],99:[function(_dereq_,module,exports){ },{"../component":52,"../utils/browser.js":108,"../utils/dom.js":111,"../utils/fn.js":113,"../utils/log.js":116,"../utils/merge-options.js":117,"../utils/url.js":121,"./tech.js":100,"global/document":1,"global/window":2,"object.assign":44}],99:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -12938,7 +12864,7 @@ _Component3['default'].registerComponent('MediaLoader', MediaLoader);
exports['default'] = MediaLoader; exports['default'] = MediaLoader;
module.exports = exports['default']; module.exports = exports['default'];
},{"../component":52,"../utils/to-title-case.js":119,"global/window":2}],100:[function(_dereq_,module,exports){ },{"../component":52,"../utils/to-title-case.js":120,"global/window":2}],100:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -13630,7 +13556,7 @@ _Component3['default'].registerComponent('MediaTechController', Tech);
exports['default'] = Tech; exports['default'] = Tech;
module.exports = exports['default']; module.exports = exports['default'];
},{"../component":52,"../tracks/text-track":107,"../tracks/text-track-list":105,"../utils/buffer.js":109,"../utils/fn.js":113,"../utils/log.js":116,"../utils/time-ranges.js":118,"global/document":1,"global/window":2}],101:[function(_dereq_,module,exports){ },{"../component":52,"../tracks/text-track":107,"../tracks/text-track-list":105,"../utils/buffer.js":109,"../utils/fn.js":113,"../utils/log.js":116,"../utils/time-ranges.js":119,"global/document":1,"global/window":2}],101:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -14926,7 +14852,7 @@ var indexOf = function indexOf(searchElement, fromIndex) {
exports['default'] = TextTrack; exports['default'] = TextTrack;
module.exports = exports['default']; module.exports = exports['default'];
},{"../event-target":83,"../utils/browser.js":108,"../utils/fn.js":113,"../utils/guid.js":115,"../utils/log.js":116,"../xhr.js":122,"./text-track-cue-list":101,"./text-track-enums":103,"global/document":1,"global/window":2}],108:[function(_dereq_,module,exports){ },{"../event-target":83,"../utils/browser.js":108,"../utils/fn.js":113,"../utils/guid.js":115,"../utils/log.js":116,"../xhr.js":123,"./text-track-cue-list":101,"./text-track-enums":103,"global/document":1,"global/window":2}],108:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -15060,7 +14986,7 @@ function bufferedPercent(buffered, duration) {
return bufferedDuration / duration; return bufferedDuration / duration;
} }
},{"./time-ranges.js":118}],110:[function(_dereq_,module,exports){ },{"./time-ranges.js":119}],110:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -16206,6 +16132,34 @@ module.exports = exports['default'];
},{"lodash-compat/object/merge":40}],118:[function(_dereq_,module,exports){ },{"lodash-compat/object/merge":40}],118:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
exports.__esModule = true;
var _document = _dereq_('global/document');
var _document2 = _interopRequireWildcard(_document);
var createStyleElement = function createStyleElement(className) {
var style = _document2['default'].createElement('style');
style.className = className;
return style;
};
exports.createStyleElement = createStyleElement;
var setTextContent = function setTextContent(el, content) {
if (el.styleSheet) {
el.styleSheet.cssText = content;
} else {
el.textContent = content;
}
};
exports.setTextContent = setTextContent;
},{"global/document":1}],119:[function(_dereq_,module,exports){
'use strict';
exports.__esModule = true; exports.__esModule = true;
/** /**
* @file time-ranges.js * @file time-ranges.js
@ -16266,7 +16220,7 @@ function createTimeRange(start, end) {
}; };
} }
},{}],119:[function(_dereq_,module,exports){ },{}],120:[function(_dereq_,module,exports){
"use strict"; "use strict";
exports.__esModule = true; exports.__esModule = true;
@ -16287,7 +16241,7 @@ function toTitleCase(string) {
exports["default"] = toTitleCase; exports["default"] = toTitleCase;
module.exports = exports["default"]; module.exports = exports["default"];
},{}],120:[function(_dereq_,module,exports){ },{}],121:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -16397,7 +16351,7 @@ var getFileExtension = function getFileExtension(path) {
}; };
exports.getFileExtension = getFileExtension; exports.getFileExtension = getFileExtension;
},{"global/document":1}],121:[function(_dereq_,module,exports){ },{"global/document":1}],122:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -16415,6 +16369,10 @@ var _import = _dereq_('./setup');
var setup = _interopRequireWildcard(_import); var setup = _interopRequireWildcard(_import);
var _import2 = _dereq_('./utils/stylesheet.js');
var stylesheet = _interopRequireWildcard(_import2);
var _Component = _dereq_('./component'); var _Component = _dereq_('./component');
var _Component2 = _interopRequireWildcard(_Component); var _Component2 = _interopRequireWildcard(_Component);
@ -16423,6 +16381,10 @@ var _EventTarget = _dereq_('./event-target');
var _EventTarget2 = _interopRequireWildcard(_EventTarget); var _EventTarget2 = _interopRequireWildcard(_EventTarget);
var _import3 = _dereq_('./utils/events.js');
var Events = _interopRequireWildcard(_import3);
var _Player = _dereq_('./player'); var _Player = _dereq_('./player');
var _Player2 = _interopRequireWildcard(_Player); var _Player2 = _interopRequireWildcard(_Player);
@ -16435,9 +16397,9 @@ var _mergeOptions = _dereq_('../../src/js/utils/merge-options.js');
var _mergeOptions2 = _interopRequireWildcard(_mergeOptions); var _mergeOptions2 = _interopRequireWildcard(_mergeOptions);
var _import2 = _dereq_('./utils/fn.js'); var _import4 = _dereq_('./utils/fn.js');
var Fn = _interopRequireWildcard(_import2); var Fn = _interopRequireWildcard(_import4);
var _assign = _dereq_('object.assign'); var _assign = _dereq_('object.assign');
@ -16457,17 +16419,17 @@ var _xhr = _dereq_('./xhr.js');
var _xhr2 = _interopRequireWildcard(_xhr); var _xhr2 = _interopRequireWildcard(_xhr);
var _import3 = _dereq_('./utils/dom.js'); var _import5 = _dereq_('./utils/dom.js');
var Dom = _interopRequireWildcard(_import3); var Dom = _interopRequireWildcard(_import5);
var _import4 = _dereq_('./utils/browser.js'); var _import6 = _dereq_('./utils/browser.js');
var browser = _interopRequireWildcard(_import4); var browser = _interopRequireWildcard(_import6);
var _import5 = _dereq_('./utils/url.js'); var _import7 = _dereq_('./utils/url.js');
var Url = _interopRequireWildcard(_import5); var Url = _interopRequireWildcard(_import7);
var _extendsFn = _dereq_('./extends.js'); var _extendsFn = _dereq_('./extends.js');
@ -16570,6 +16532,12 @@ var videojs = (function (_videojs) {
return tag.player || new _Player2['default'](tag, options, ready); return tag.player || new _Player2['default'](tag, options, ready);
}); });
// Add default styles
var style = stylesheet.createStyleElement('vjs-styles-defaults');
var head = _document2['default'].querySelector('head');
head.insertBefore(style, head.firstChild);
stylesheet.setTextContent(style, '\n .video-js {\n width: 300px;\n height: 150px;\n');
// Run Auto-load players // Run Auto-load players
// You have to wait at least once in case this script is loaded after your video in the DOM (weird behavior only with minified version) // You have to wait at least once in case this script is loaded after your video in the DOM (weird behavior only with minified version)
setup.autoSetupTimeout(1, videojs); setup.autoSetupTimeout(1, videojs);
@ -16579,7 +16547,7 @@ setup.autoSetupTimeout(1, videojs);
* *
* @type {String} * @type {String}
*/ */
videojs.VERSION = '5.0.0-rc.52'; videojs.VERSION = '5.0.0-rc.59';
/** /**
* The global options object. These are the settings that take effect * The global options object. These are the settings that take effect
@ -16906,6 +16874,50 @@ videojs.parseUrl = Url.parseUrl;
*/ */
videojs.EventTarget = _EventTarget2['default']; videojs.EventTarget = _EventTarget2['default'];
/**
* Add an event listener to element
* It stores the handler function in a separate cache object
* and adds a generic handler to the element's event,
* along with a unique id (guid) to the element.
*
* @param {Element|Object} elem Element or object to bind listeners to
* @param {String|Array} type Type of event to bind to.
* @param {Function} fn Event listener.
* @method on
*/
videojs.on = Events.on;
/**
* Trigger a listener only once for an event
*
* @param {Element|Object} elem Element or object to
* @param {String|Array} type Name/type of event
* @param {Function} fn Event handler function
* @method one
*/
videojs.one = Events.one;
/**
* Removes event listeners from an element
*
* @param {Element|Object} elem Object to remove listeners from
* @param {String|Array=} type Type of listener to remove. Don't include to remove all events from element.
* @param {Function} fn Specific listener to remove. Don't include to remove listeners for an event type.
* @method off
*/
videojs.off = Events.off;
/**
* Trigger an event for an element
*
* @param {Element|Object} elem Element to trigger an event on
* @param {Event|Object|String} event A string (the type) or an event object with a type attribute
* @param {Object} [hash] data hash to pass along with the event
* @return {Boolean=} Returned only if default was prevented
* @method trigger
*/
videojs.trigger = Events.trigger;
// REMOVING: We probably should add this to the migration plugin // REMOVING: We probably should add this to the migration plugin
// // Expose but deprecate the window[componentName] method for accessing components // // Expose but deprecate the window[componentName] method for accessing components
// Object.getOwnPropertyNames(Component.components).forEach(function(name){ // Object.getOwnPropertyNames(Component.components).forEach(function(name){
@ -16943,7 +16955,7 @@ if (typeof define === 'function' && define.amd) {
exports['default'] = videojs; exports['default'] = videojs;
module.exports = exports['default']; module.exports = exports['default'];
},{"../../src/js/utils/merge-options.js":117,"./component":52,"./event-target":83,"./extends.js":84,"./player":91,"./plugins.js":92,"./setup":94,"./tech/flash.js":97,"./tech/html5.js":98,"./utils/browser.js":108,"./utils/create-deprecation-proxy.js":110,"./utils/dom.js":111,"./utils/fn.js":113,"./utils/format-time.js":114,"./utils/log.js":116,"./utils/time-ranges.js":118,"./utils/url.js":120,"./xhr.js":122,"global/document":1,"lodash-compat/object/merge":40,"object.assign":44}],122:[function(_dereq_,module,exports){ },{"../../src/js/utils/merge-options.js":117,"./component":52,"./event-target":83,"./extends.js":84,"./player":91,"./plugins.js":92,"./setup":94,"./tech/flash.js":97,"./tech/html5.js":98,"./utils/browser.js":108,"./utils/create-deprecation-proxy.js":110,"./utils/dom.js":111,"./utils/events.js":112,"./utils/fn.js":113,"./utils/format-time.js":114,"./utils/log.js":116,"./utils/stylesheet.js":118,"./utils/time-ranges.js":119,"./utils/url.js":121,"./xhr.js":123,"global/document":1,"lodash-compat/object/merge":40,"object.assign":44}],123:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -17131,7 +17143,7 @@ var xhr = function xhr(options, callback) {
exports['default'] = xhr; exports['default'] = xhr;
module.exports = exports['default']; module.exports = exports['default'];
},{"./utils/log.js":116,"./utils/merge-options.js":117,"./utils/url.js":120,"global/window":2}]},{},[121])(121) },{"./utils/log.js":116,"./utils/merge-options.js":117,"./utils/url.js":121,"global/window":2}]},{},[122])(122)
}); });

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -3582,7 +3582,7 @@ Component.registerComponent('Component', Component);
exports['default'] = Component; exports['default'] = Component;
module.exports = exports['default']; module.exports = exports['default'];
},{"./utils/dom.js":111,"./utils/events.js":112,"./utils/fn.js":113,"./utils/guid.js":115,"./utils/log.js":116,"./utils/merge-options.js":117,"./utils/to-title-case.js":119,"global/window":2,"object.assign":44}],53:[function(_dereq_,module,exports){ },{"./utils/dom.js":111,"./utils/events.js":112,"./utils/fn.js":113,"./utils/guid.js":115,"./utils/log.js":116,"./utils/merge-options.js":117,"./utils/to-title-case.js":120,"global/window":2,"object.assign":44}],53:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -5289,7 +5289,7 @@ _Component2['default'].registerComponent('ChaptersButton', ChaptersButton);
exports['default'] = ChaptersButton; exports['default'] = ChaptersButton;
module.exports = exports['default']; module.exports = exports['default'];
},{"../../component.js":52,"../../menu/menu.js":90,"../../utils/dom.js":111,"../../utils/fn.js":113,"../../utils/to-title-case.js":119,"./chapters-track-menu-item.js":69,"./text-track-button.js":72,"./text-track-menu-item.js":73,"global/window":2}],69:[function(_dereq_,module,exports){ },{"../../component.js":52,"../../menu/menu.js":90,"../../utils/dom.js":111,"../../utils/fn.js":113,"../../utils/to-title-case.js":120,"./chapters-track-menu-item.js":69,"./text-track-button.js":72,"./text-track-menu-item.js":73,"global/window":2}],69:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -7265,7 +7265,7 @@ _Component2['default'].registerComponent('MenuButton', MenuButton);
exports['default'] = MenuButton; exports['default'] = MenuButton;
module.exports = exports['default']; module.exports = exports['default'];
},{"../button.js":51,"../component.js":52,"../utils/dom.js":111,"../utils/fn.js":113,"../utils/to-title-case.js":119,"./menu.js":90}],89:[function(_dereq_,module,exports){ },{"../button.js":51,"../component.js":52,"../utils/dom.js":111,"../utils/fn.js":113,"../utils/to-title-case.js":120,"./menu.js":90}],89:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -7527,6 +7527,10 @@ var _createTimeRange = _dereq_('./utils/time-ranges.js');
var _bufferedPercent2 = _dereq_('./utils/buffer.js'); var _bufferedPercent2 = _dereq_('./utils/buffer.js');
var _import6 = _dereq_('./utils/stylesheet.js');
var stylesheet = _interopRequireWildcard(_import6);
var _FullscreenApi = _dereq_('./fullscreen-api.js'); var _FullscreenApi = _dereq_('./fullscreen-api.js');
var _FullscreenApi2 = _interopRequireWildcard(_FullscreenApi); var _FullscreenApi2 = _interopRequireWildcard(_FullscreenApi);
@ -7787,6 +7791,10 @@ var Player = (function (_Component) {
// prevent dispose from being called twice // prevent dispose from being called twice
this.off('dispose'); this.off('dispose');
if (this.styleEl_) {
this.styleEl_.parentNode.removeChild(this.styleEl_);
}
// Kill reference to this player // Kill reference to this player
Player.players[this.id_] = null; Player.players[this.id_] = null;
if (this.tag && this.tag.player) { if (this.tag && this.tag.player) {
@ -7846,8 +7854,10 @@ var Player = (function (_Component) {
// Add a style element in the player that we'll use to set the width/height // Add a style element in the player that we'll use to set the width/height
// of the player in a way that's still overrideable by CSS, just like the // of the player in a way that's still overrideable by CSS, just like the
// video element // video element
this.styleEl_ = _document2['default'].createElement('style'); this.styleEl_ = stylesheet.createStyleElement('vjs-styles-dimensions');
el.appendChild(this.styleEl_); var defaultsStyleEl = _document2['default'].querySelector('.vjs-styles-defaults');
var head = _document2['default'].querySelector('head');
head.insertBefore(this.styleEl_, defaultsStyleEl ? defaultsStyleEl.nextSibling : head.firstChild);
// Pass in the width/height/aspectRatio options which will update the style el // Pass in the width/height/aspectRatio options which will update the style el
this.width(this.options_.width); this.width(this.options_.width);
@ -8036,17 +8046,7 @@ var Player = (function (_Component) {
// Ensure the right class is still on the player for the style element // Ensure the right class is still on the player for the style element
this.addClass(idClass); this.addClass(idClass);
// Create the width/height CSS stylesheet.setTextContent(this.styleEl_, '\n .' + idClass + ' {\n width: ' + width + 'px;\n height: ' + height + 'px;\n }\n\n .' + idClass + '.vjs-fluid {\n padding-top: ' + ratioMultiplier * 100 + '%;\n }\n ');
var css = '.' + idClass + ' { width: ' + width + 'px; height: ' + height + 'px; }';
// Add the aspect ratio CSS for when using a fluid layout
css += '.' + idClass + '.vjs-fluid { padding-top: ' + ratioMultiplier * 100 + '%; }';
// Update the style el
if (this.styleEl_.styleSheet) {
this.styleEl_.styleSheet.cssText = css;
} else {
this.styleEl_.innerHTML = css;
}
}; };
/** /**
@ -10341,7 +10341,7 @@ _Component3['default'].registerComponent('Player', Player);
exports['default'] = Player; exports['default'] = Player;
module.exports = exports['default']; module.exports = exports['default'];
},{"./big-play-button.js":50,"./component.js":52,"./control-bar/control-bar.js":53,"./error-display.js":82,"./fullscreen-api.js":85,"./loading-spinner.js":86,"./media-error.js":87,"./poster-image.js":93,"./tech/html5.js":98,"./tech/loader.js":99,"./tracks/text-track-display.js":102,"./tracks/text-track-list-converter.js":104,"./tracks/text-track-settings.js":106,"./utils/browser.js":108,"./utils/buffer.js":109,"./utils/dom.js":111,"./utils/events.js":112,"./utils/fn.js":113,"./utils/guid.js":115,"./utils/log.js":116,"./utils/merge-options.js":117,"./utils/time-ranges.js":118,"./utils/to-title-case.js":119,"global/document":1,"global/window":2,"object.assign":44,"safe-json-parse/tuple":49}],92:[function(_dereq_,module,exports){ },{"./big-play-button.js":50,"./component.js":52,"./control-bar/control-bar.js":53,"./error-display.js":82,"./fullscreen-api.js":85,"./loading-spinner.js":86,"./media-error.js":87,"./poster-image.js":93,"./tech/html5.js":98,"./tech/loader.js":99,"./tracks/text-track-display.js":102,"./tracks/text-track-list-converter.js":104,"./tracks/text-track-settings.js":106,"./utils/browser.js":108,"./utils/buffer.js":109,"./utils/dom.js":111,"./utils/events.js":112,"./utils/fn.js":113,"./utils/guid.js":115,"./utils/log.js":116,"./utils/merge-options.js":117,"./utils/stylesheet.js":118,"./utils/time-ranges.js":119,"./utils/to-title-case.js":120,"global/document":1,"global/window":2,"object.assign":44,"safe-json-parse/tuple":49}],92:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -10680,9 +10680,8 @@ var Slider = (function (_Component) {
_Component.call(this, player, options); _Component.call(this, player, options);
// Set property names to bar and handle to match with the child Slider class is looking for // Set property names to bar to match with the child Slider class is looking for
this.bar = this.getChild(this.options_.barName); this.bar = this.getChild(this.options_.barName);
this.handle = this.getChild(this.options_.handleName);
// Set a horizontal or vertical class on the slider depending on the slider type // Set a horizontal or vertical class on the slider depending on the slider type
this.vertical(!!this.options_.vertical); this.vertical(!!this.options_.vertical);
@ -10818,9 +10817,8 @@ var Slider = (function (_Component) {
var box = Dom.findElPosition(el); var box = Dom.findElPosition(el);
var boxW = el.offsetWidth; var boxW = el.offsetWidth;
var boxH = el.offsetHeight; var boxH = el.offsetHeight;
var handle = this.handle;
if (this.options_.vertical) { if (this.vertical()) {
var boxY = box.top; var boxY = box.top;
var pageY = undefined; var pageY = undefined;
@ -10830,13 +10828,6 @@ var Slider = (function (_Component) {
pageY = event.pageY; pageY = event.pageY;
} }
if (handle) {
var handleH = handle.el().offsetHeight;
// Adjusted X and Width, so handle doesn't go outside the bar
boxY = boxY + handleH / 2;
boxH = boxH - handleH;
}
// Percent that the click is through the adjusted area // Percent that the click is through the adjusted area
return Math.max(0, Math.min(1, (boxY - pageY + boxH) / boxH)); return Math.max(0, Math.min(1, (boxY - pageY + boxH) / boxH));
} else { } else {
@ -10849,14 +10840,6 @@ var Slider = (function (_Component) {
pageX = event.pageX; pageX = event.pageX;
} }
if (handle) {
var handleW = handle.el().offsetWidth;
// Adjusted X and Width, so handle doesn't go outside the bar
boxX = boxX + handleW / 2;
boxW = boxW - handleW;
}
// Percent that the click is through the adjusted area // Percent that the click is through the adjusted area
return Math.max(0, Math.min(1, (pageX - boxX) / boxW)); return Math.max(0, Math.min(1, (pageX - boxX) / boxW));
} }
@ -11642,7 +11625,7 @@ _Component2['default'].registerComponent('Flash', Flash);
exports['default'] = Flash; exports['default'] = Flash;
module.exports = exports['default']; module.exports = exports['default'];
},{"../component":52,"../utils/dom.js":111,"../utils/time-ranges.js":118,"../utils/url.js":120,"./flash-rtmp":96,"./tech":100,"global/window":2,"object.assign":44}],98:[function(_dereq_,module,exports){ },{"../component":52,"../utils/dom.js":111,"../utils/time-ranges.js":119,"../utils/url.js":121,"./flash-rtmp":96,"./tech":100,"global/window":2,"object.assign":44}],98:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -11754,8 +11737,6 @@ var Html5 = (function (_Tech) {
} }
if (this.featuresNativeTextTracks) { if (this.featuresNativeTextTracks) {
this.on('loadstart', Fn.bind(this, this.hideCaptions));
this.handleTextTrackChange_ = Fn.bind(this, this.handleTextTrackChange); this.handleTextTrackChange_ = Fn.bind(this, this.handleTextTrackChange);
this.handleTextTrackAdd_ = Fn.bind(this, this.handleTextTrackAdd); this.handleTextTrackAdd_ = Fn.bind(this, this.handleTextTrackAdd);
this.handleTextTrackRemove_ = Fn.bind(this, this.handleTextTrackRemove); this.handleTextTrackRemove_ = Fn.bind(this, this.handleTextTrackRemove);
@ -11786,7 +11767,7 @@ var Html5 = (function (_Tech) {
var emulatedTt = this.textTracks(); var emulatedTt = this.textTracks();
// remove native event listeners // remove native event listeners
if (tt) { if (tt && tt.removeEventListener) {
tt.removeEventListener('change', this.handleTextTrackChange_); tt.removeEventListener('change', this.handleTextTrackChange_);
tt.removeEventListener('addtrack', this.handleTextTrackAdd_); tt.removeEventListener('addtrack', this.handleTextTrackAdd_);
tt.removeEventListener('removetrack', this.handleTextTrackRemove_); tt.removeEventListener('removetrack', this.handleTextTrackRemove_);
@ -11820,7 +11801,7 @@ var Html5 = (function (_Tech) {
// If the original tag is still there, clone and remove it. // If the original tag is still there, clone and remove it.
if (el) { if (el) {
var clone = el.cloneNode(false); var clone = el.cloneNode(true);
el.parentNode.insertBefore(clone, el); el.parentNode.insertBefore(clone, el);
Html5.disposeMediaElement(el); Html5.disposeMediaElement(el);
el = clone; el = clone;
@ -11839,21 +11820,6 @@ var Html5 = (function (_Tech) {
'class': 'vjs-tech' 'class': 'vjs-tech'
})); }));
} }
if (this.options_.tracks) {
for (var i = 0; i < this.options_.tracks.length; i++) {
var _track = this.options_.tracks[i];
var trackEl = _document2['default'].createElement('track');
trackEl.kind = _track.kind;
trackEl.label = _track.label;
trackEl.srclang = _track.srclang;
trackEl.src = _track.src;
if ('default' in _track) {
trackEl.setAttribute('default', 'default');
}
el.appendChild(trackEl);
}
}
} }
// Update specific tag settings, in case they were overridden // Update specific tag settings, in case they were overridden
@ -11871,32 +11837,10 @@ var Html5 = (function (_Tech) {
// jenniisawesome = true; // jenniisawesome = true;
}; };
/**
* Hide captions from text track
*
* @method hideCaptions
*/
Html5.prototype.hideCaptions = function hideCaptions() {
var tracks = this.el_.querySelectorAll('track');
var i = tracks.length;
var kinds = {
captions: 1,
subtitles: 1
};
while (i--) {
var _track2 = tracks[i].track;
if (_track2 && _track2.kind in kinds && !tracks[i]['default']) {
_track2.mode = 'disabled';
}
}
};
Html5.prototype.proxyNativeTextTracks_ = function proxyNativeTextTracks_() { Html5.prototype.proxyNativeTextTracks_ = function proxyNativeTextTracks_() {
var tt = this.el().textTracks; var tt = this.el().textTracks;
if (tt) { if (tt && tt.addEventListener) {
tt.addEventListener('change', this.handleTextTrackChange_); tt.addEventListener('change', this.handleTextTrackChange_);
tt.addEventListener('addtrack', this.handleTextTrackAdd_); tt.addEventListener('addtrack', this.handleTextTrackAdd_);
tt.addEventListener('removetrack', this.handleTextTrackRemove_); tt.addEventListener('removetrack', this.handleTextTrackRemove_);
@ -12520,24 +12464,6 @@ var Html5 = (function (_Tech) {
this.el().appendChild(track); this.el().appendChild(track);
if (track.track.kind === 'metadata') {
track.track.mode = 'hidden';
} else {
track.track.mode = 'disabled';
}
track.onload = function () {
var tt = track.track;
if (track.readyState >= 2) {
if (tt.kind === 'metadata' && tt.mode !== 'hidden') {
tt.mode = 'hidden';
} else if (tt.kind !== 'metadata' && tt.mode !== 'disabled') {
tt.mode = 'disabled';
}
track.onload = null;
}
};
this.remoteTextTracks().addTrack_(track.track); this.remoteTextTracks().addTrack_(track.track);
return track; return track;
@ -12851,7 +12777,7 @@ module.exports = exports['default'];
// not supported // not supported
},{"../component":52,"../utils/browser.js":108,"../utils/dom.js":111,"../utils/fn.js":113,"../utils/log.js":116,"../utils/merge-options.js":117,"../utils/url.js":120,"./tech.js":100,"global/document":1,"global/window":2,"object.assign":44}],99:[function(_dereq_,module,exports){ },{"../component":52,"../utils/browser.js":108,"../utils/dom.js":111,"../utils/fn.js":113,"../utils/log.js":116,"../utils/merge-options.js":117,"../utils/url.js":121,"./tech.js":100,"global/document":1,"global/window":2,"object.assign":44}],99:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -12926,7 +12852,7 @@ _Component3['default'].registerComponent('MediaLoader', MediaLoader);
exports['default'] = MediaLoader; exports['default'] = MediaLoader;
module.exports = exports['default']; module.exports = exports['default'];
},{"../component":52,"../utils/to-title-case.js":119,"global/window":2}],100:[function(_dereq_,module,exports){ },{"../component":52,"../utils/to-title-case.js":120,"global/window":2}],100:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -13618,7 +13544,7 @@ _Component3['default'].registerComponent('MediaTechController', Tech);
exports['default'] = Tech; exports['default'] = Tech;
module.exports = exports['default']; module.exports = exports['default'];
},{"../component":52,"../tracks/text-track":107,"../tracks/text-track-list":105,"../utils/buffer.js":109,"../utils/fn.js":113,"../utils/log.js":116,"../utils/time-ranges.js":118,"global/document":1,"global/window":2}],101:[function(_dereq_,module,exports){ },{"../component":52,"../tracks/text-track":107,"../tracks/text-track-list":105,"../utils/buffer.js":109,"../utils/fn.js":113,"../utils/log.js":116,"../utils/time-ranges.js":119,"global/document":1,"global/window":2}],101:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -14914,7 +14840,7 @@ var indexOf = function indexOf(searchElement, fromIndex) {
exports['default'] = TextTrack; exports['default'] = TextTrack;
module.exports = exports['default']; module.exports = exports['default'];
},{"../event-target":83,"../utils/browser.js":108,"../utils/fn.js":113,"../utils/guid.js":115,"../utils/log.js":116,"../xhr.js":122,"./text-track-cue-list":101,"./text-track-enums":103,"global/document":1,"global/window":2}],108:[function(_dereq_,module,exports){ },{"../event-target":83,"../utils/browser.js":108,"../utils/fn.js":113,"../utils/guid.js":115,"../utils/log.js":116,"../xhr.js":123,"./text-track-cue-list":101,"./text-track-enums":103,"global/document":1,"global/window":2}],108:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -15048,7 +14974,7 @@ function bufferedPercent(buffered, duration) {
return bufferedDuration / duration; return bufferedDuration / duration;
} }
},{"./time-ranges.js":118}],110:[function(_dereq_,module,exports){ },{"./time-ranges.js":119}],110:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -16194,6 +16120,34 @@ module.exports = exports['default'];
},{"lodash-compat/object/merge":40}],118:[function(_dereq_,module,exports){ },{"lodash-compat/object/merge":40}],118:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
exports.__esModule = true;
var _document = _dereq_('global/document');
var _document2 = _interopRequireWildcard(_document);
var createStyleElement = function createStyleElement(className) {
var style = _document2['default'].createElement('style');
style.className = className;
return style;
};
exports.createStyleElement = createStyleElement;
var setTextContent = function setTextContent(el, content) {
if (el.styleSheet) {
el.styleSheet.cssText = content;
} else {
el.textContent = content;
}
};
exports.setTextContent = setTextContent;
},{"global/document":1}],119:[function(_dereq_,module,exports){
'use strict';
exports.__esModule = true; exports.__esModule = true;
/** /**
* @file time-ranges.js * @file time-ranges.js
@ -16254,7 +16208,7 @@ function createTimeRange(start, end) {
}; };
} }
},{}],119:[function(_dereq_,module,exports){ },{}],120:[function(_dereq_,module,exports){
"use strict"; "use strict";
exports.__esModule = true; exports.__esModule = true;
@ -16275,7 +16229,7 @@ function toTitleCase(string) {
exports["default"] = toTitleCase; exports["default"] = toTitleCase;
module.exports = exports["default"]; module.exports = exports["default"];
},{}],120:[function(_dereq_,module,exports){ },{}],121:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -16385,7 +16339,7 @@ var getFileExtension = function getFileExtension(path) {
}; };
exports.getFileExtension = getFileExtension; exports.getFileExtension = getFileExtension;
},{"global/document":1}],121:[function(_dereq_,module,exports){ },{"global/document":1}],122:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -16403,6 +16357,10 @@ var _import = _dereq_('./setup');
var setup = _interopRequireWildcard(_import); var setup = _interopRequireWildcard(_import);
var _import2 = _dereq_('./utils/stylesheet.js');
var stylesheet = _interopRequireWildcard(_import2);
var _Component = _dereq_('./component'); var _Component = _dereq_('./component');
var _Component2 = _interopRequireWildcard(_Component); var _Component2 = _interopRequireWildcard(_Component);
@ -16411,6 +16369,10 @@ var _EventTarget = _dereq_('./event-target');
var _EventTarget2 = _interopRequireWildcard(_EventTarget); var _EventTarget2 = _interopRequireWildcard(_EventTarget);
var _import3 = _dereq_('./utils/events.js');
var Events = _interopRequireWildcard(_import3);
var _Player = _dereq_('./player'); var _Player = _dereq_('./player');
var _Player2 = _interopRequireWildcard(_Player); var _Player2 = _interopRequireWildcard(_Player);
@ -16423,9 +16385,9 @@ var _mergeOptions = _dereq_('../../src/js/utils/merge-options.js');
var _mergeOptions2 = _interopRequireWildcard(_mergeOptions); var _mergeOptions2 = _interopRequireWildcard(_mergeOptions);
var _import2 = _dereq_('./utils/fn.js'); var _import4 = _dereq_('./utils/fn.js');
var Fn = _interopRequireWildcard(_import2); var Fn = _interopRequireWildcard(_import4);
var _assign = _dereq_('object.assign'); var _assign = _dereq_('object.assign');
@ -16445,17 +16407,17 @@ var _xhr = _dereq_('./xhr.js');
var _xhr2 = _interopRequireWildcard(_xhr); var _xhr2 = _interopRequireWildcard(_xhr);
var _import3 = _dereq_('./utils/dom.js'); var _import5 = _dereq_('./utils/dom.js');
var Dom = _interopRequireWildcard(_import3); var Dom = _interopRequireWildcard(_import5);
var _import4 = _dereq_('./utils/browser.js'); var _import6 = _dereq_('./utils/browser.js');
var browser = _interopRequireWildcard(_import4); var browser = _interopRequireWildcard(_import6);
var _import5 = _dereq_('./utils/url.js'); var _import7 = _dereq_('./utils/url.js');
var Url = _interopRequireWildcard(_import5); var Url = _interopRequireWildcard(_import7);
var _extendsFn = _dereq_('./extends.js'); var _extendsFn = _dereq_('./extends.js');
@ -16558,6 +16520,12 @@ var videojs = (function (_videojs) {
return tag.player || new _Player2['default'](tag, options, ready); return tag.player || new _Player2['default'](tag, options, ready);
}); });
// Add default styles
var style = stylesheet.createStyleElement('vjs-styles-defaults');
var head = _document2['default'].querySelector('head');
head.insertBefore(style, head.firstChild);
stylesheet.setTextContent(style, '\n .video-js {\n width: 300px;\n height: 150px;\n');
// Run Auto-load players // Run Auto-load players
// You have to wait at least once in case this script is loaded after your video in the DOM (weird behavior only with minified version) // You have to wait at least once in case this script is loaded after your video in the DOM (weird behavior only with minified version)
setup.autoSetupTimeout(1, videojs); setup.autoSetupTimeout(1, videojs);
@ -16567,7 +16535,7 @@ setup.autoSetupTimeout(1, videojs);
* *
* @type {String} * @type {String}
*/ */
videojs.VERSION = '5.0.0-rc.52'; videojs.VERSION = '5.0.0-rc.59';
/** /**
* The global options object. These are the settings that take effect * The global options object. These are the settings that take effect
@ -16894,6 +16862,50 @@ videojs.parseUrl = Url.parseUrl;
*/ */
videojs.EventTarget = _EventTarget2['default']; videojs.EventTarget = _EventTarget2['default'];
/**
* Add an event listener to element
* It stores the handler function in a separate cache object
* and adds a generic handler to the element's event,
* along with a unique id (guid) to the element.
*
* @param {Element|Object} elem Element or object to bind listeners to
* @param {String|Array} type Type of event to bind to.
* @param {Function} fn Event listener.
* @method on
*/
videojs.on = Events.on;
/**
* Trigger a listener only once for an event
*
* @param {Element|Object} elem Element or object to
* @param {String|Array} type Name/type of event
* @param {Function} fn Event handler function
* @method one
*/
videojs.one = Events.one;
/**
* Removes event listeners from an element
*
* @param {Element|Object} elem Object to remove listeners from
* @param {String|Array=} type Type of listener to remove. Don't include to remove all events from element.
* @param {Function} fn Specific listener to remove. Don't include to remove listeners for an event type.
* @method off
*/
videojs.off = Events.off;
/**
* Trigger an event for an element
*
* @param {Element|Object} elem Element to trigger an event on
* @param {Event|Object|String} event A string (the type) or an event object with a type attribute
* @param {Object} [hash] data hash to pass along with the event
* @return {Boolean=} Returned only if default was prevented
* @method trigger
*/
videojs.trigger = Events.trigger;
// REMOVING: We probably should add this to the migration plugin // REMOVING: We probably should add this to the migration plugin
// // Expose but deprecate the window[componentName] method for accessing components // // Expose but deprecate the window[componentName] method for accessing components
// Object.getOwnPropertyNames(Component.components).forEach(function(name){ // Object.getOwnPropertyNames(Component.components).forEach(function(name){
@ -16931,7 +16943,7 @@ if (typeof define === 'function' && define.amd) {
exports['default'] = videojs; exports['default'] = videojs;
module.exports = exports['default']; module.exports = exports['default'];
},{"../../src/js/utils/merge-options.js":117,"./component":52,"./event-target":83,"./extends.js":84,"./player":91,"./plugins.js":92,"./setup":94,"./tech/flash.js":97,"./tech/html5.js":98,"./utils/browser.js":108,"./utils/create-deprecation-proxy.js":110,"./utils/dom.js":111,"./utils/fn.js":113,"./utils/format-time.js":114,"./utils/log.js":116,"./utils/time-ranges.js":118,"./utils/url.js":120,"./xhr.js":122,"global/document":1,"lodash-compat/object/merge":40,"object.assign":44}],122:[function(_dereq_,module,exports){ },{"../../src/js/utils/merge-options.js":117,"./component":52,"./event-target":83,"./extends.js":84,"./player":91,"./plugins.js":92,"./setup":94,"./tech/flash.js":97,"./tech/html5.js":98,"./utils/browser.js":108,"./utils/create-deprecation-proxy.js":110,"./utils/dom.js":111,"./utils/events.js":112,"./utils/fn.js":113,"./utils/format-time.js":114,"./utils/log.js":116,"./utils/stylesheet.js":118,"./utils/time-ranges.js":119,"./utils/url.js":121,"./xhr.js":123,"global/document":1,"lodash-compat/object/merge":40,"object.assign":44}],123:[function(_dereq_,module,exports){
'use strict'; 'use strict';
var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }; var _interopRequireWildcard = function (obj) { return obj && obj.__esModule ? obj : { 'default': obj }; };
@ -17119,7 +17131,7 @@ var xhr = function xhr(options, callback) {
exports['default'] = xhr; exports['default'] = xhr;
module.exports = exports['default']; module.exports = exports['default'];
},{"./utils/log.js":116,"./utils/merge-options.js":117,"./utils/url.js":120,"global/window":2}]},{},[121])(121) },{"./utils/log.js":116,"./utils/merge-options.js":117,"./utils/url.js":121,"global/window":2}]},{},[122])(122)
}); });