Skip to content

Commit

Permalink
Release v4.12.3
Browse files Browse the repository at this point in the history
  • Loading branch information
mmcc committed Feb 28, 2015
1 parent 52e85e6 commit ab84de6
Show file tree
Hide file tree
Showing 10 changed files with 112 additions and 87 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@ CHANGELOG
=========

## HEAD (Unreleased)
* @heff fixed setting the source to an empty string ([view](https://github.com/videojs/video.js/pull/1905))
_(none)_

--------------------

## 4.12.3 (2015-02-28)
* @heff fixed setting the source to an empty string ([view](https://github.com/videojs/video.js/pull/1905))

## 4.12.2 (2015-02-27)
* @gkatsev fixed disabling of default text tracks ([view](https://github.com/videojs/video.js/pull/1892))

Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "video.js",
"description": "An HTML5 and Flash video player with a common API and skin for both.",
"version": "4.12.2",
"version": "4.12.3",
"main": [
"dist/video-js/video.js",
"dist/video-js/video-js.css",
Expand Down
2 changes: 1 addition & 1 deletion component.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "video.js",
"description": "An HTML5 and Flash video player with a common API and skin for both.",
"version": "4.12.2",
"version": "4.12.3",
"keywords": [
"videojs",
"html5",
Expand Down
2 changes: 1 addition & 1 deletion dist/video-js/video-js.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
Video.js Default Styles (http://videojs.com)
Version 4.12.2
Version 4.12.3
Create your own skin at http://designer.videojs.com
*/
/* SKIN
Expand Down
2 changes: 1 addition & 1 deletion dist/video-js/video-js.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 11 additions & 1 deletion dist/video-js/video.dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ vjs.ACCESS_PROTOCOL = ('https:' == document.location.protocol ? 'https://' : 'ht
* Full player version
* @type {string}
*/
vjs['VERSION'] = '4.12.2';
vjs['VERSION'] = '4.12.3';

/**
* Global Player instance options, surfaced from vjs.Player.prototype.options_
Expand Down Expand Up @@ -7029,6 +7029,16 @@ vjs.MediaTechController.withSourceHandlers = function(Tech){
Tech.prototype.setSource = function(source){
var sh = Tech.selectSourceHandler(source);

if (!sh) {
// Fall back to a native source hander when unsupported sources are
// deliberately set
if (Tech.nativeSourceHandler) {
sh = Tech.nativeSourceHandler;
} else {
vjs.log.error('No source hander found for the current source.');
}
}

// Dispose any existing source handler
this.disposeSourceHandler();
this.off('dispose', this.disposeSourceHandler);
Expand Down
Loading

0 comments on commit ab84de6

Please sign in to comment.