Skip to content

Commit

Permalink
Release v4.12.7
Browse files Browse the repository at this point in the history
  • Loading branch information
dmlap committed May 19, 2015
1 parent fbdf7ef commit 69a4884
Show file tree
Hide file tree
Showing 14 changed files with 94 additions and 87 deletions.
7 changes: 5 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,16 @@ CHANGELOG
=========

## HEAD (Unreleased)
_(none)_

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

## 4.12.7 (2015-05-19)
* @tjenkinson Added background-color to vjs-poster to remove transparent borders around scaled poster image ([view](https://github.com/videojs/video.js/pull/2138))
* @bc-bbay fixed a bug where the player would try to autoplay when there was no source ([view](https://github.com/videojs/video.js/pull/2127))
* @bc-bbay update time display on loadedmetadata ([view](https://github.com/videojs/video.js/pull/2151))
* @dmlap update swf to 4.7 to pick up preload fix ([view](https://github.com/videojs/video.js/pull/2170))

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

## 4.12.6 (2015-05-07)
* @saxena-gaurav fixed a bug from disposing after changing techs ([view](https://github.com/videojs/video.js/pull/2125))

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.6",
"version": "4.12.7",
"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.6",
"version": "4.12.7",
"keywords": [
"videojs",
"html5",
Expand Down
3 changes: 2 additions & 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.6
Version 4.12.7
Create your own skin at http://designer.videojs.com
*/
/* SKIN
Expand Down Expand Up @@ -868,6 +868,7 @@ body.vjs-full-window {
background-repeat: no-repeat;
background-position: 50% 50%;
background-size: contain;
background-color: #000000;
cursor: pointer;
margin: 0;
padding: 0;
Expand Down
1 change: 1 addition & 0 deletions dist/video-js/video-js.less
Original file line number Diff line number Diff line change
Expand Up @@ -924,6 +924,7 @@ body.vjs-full-window {
background-repeat: no-repeat;
background-position: 50% 50%;
background-size: contain;
background-color: #000000;
cursor: pointer;
margin: 0;
padding: 0;
Expand Down
4 changes: 2 additions & 2 deletions dist/video-js/video-js.min.css

Large diffs are not rendered by default.

Binary file modified dist/video-js/video-js.swf
Binary file not shown.
5 changes: 3 additions & 2 deletions 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.6';
vjs['VERSION'] = '4.12.7';

/**
* Global Player instance options, surfaced from vjs.Player.prototype.options_
Expand Down Expand Up @@ -5601,6 +5601,7 @@ vjs.DurationDisplay = vjs.Component.extend({
// Once the order of durationchange and this.player_.duration() being set is figured out,
// this can be updated.
this.on(player, 'timeupdate', this.updateContent);
this.on(player, 'loadedmetadata', this.updateContent);
}
});

Expand Down Expand Up @@ -7142,7 +7143,7 @@ vjs.Html5 = vjs.MediaTechController.extend({
// In Chrome (15), if you have autoplay + a poster + no controls, the video gets hidden (but audio plays)
// This fixes both issues. Need to wait for API, so it updates displays correctly
player.ready(function(){
if (this.tag && this.options_['autoplay'] && this.paused()) {
if (this.src() && this.tag && this.options_['autoplay'] && this.paused()) {
delete this.tag['poster']; // Chrome Fix. Fixed in Chrome v16.
this.play();
}
Expand Down
72 changes: 36 additions & 36 deletions dist/video-js/video.js

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions dist/video-js/video.novtt.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.6';
vjs['VERSION'] = '4.12.7';

/**
* Global Player instance options, surfaced from vjs.Player.prototype.options_
Expand Down Expand Up @@ -5601,6 +5601,7 @@ vjs.DurationDisplay = vjs.Component.extend({
// Once the order of durationchange and this.player_.duration() being set is figured out,
// this can be updated.
this.on(player, 'timeupdate', this.updateContent);
this.on(player, 'loadedmetadata', this.updateContent);
}
});

Expand Down Expand Up @@ -7142,7 +7143,7 @@ vjs.Html5 = vjs.MediaTechController.extend({
// In Chrome (15), if you have autoplay + a poster + no controls, the video gets hidden (but audio plays)
// This fixes both issues. Need to wait for API, so it updates displays correctly
player.ready(function(){
if (this.tag && this.options_['autoplay'] && this.paused()) {
if (this.src() && this.tag && this.options_['autoplay'] && this.paused()) {
delete this.tag['poster']; // Chrome Fix. Fixed in Chrome v16.
this.play();
}
Expand Down
70 changes: 35 additions & 35 deletions dist/video-js/video.novtt.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/api/vjs.RemainingTimeDisplay.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# vjs.RemainingTimeDisplay

__EXTENDS__: [vjs.Component](vjs.Component.md)
__DEFINED IN__: [src/js/control-bar/time-display.js#L108](https://github.com/videojs/video.js/blob/master/src/js/control-bar/time-display.js#L108)
__DEFINED IN__: [src/js/control-bar/time-display.js#L109](https://github.com/videojs/video.js/blob/master/src/js/control-bar/time-display.js#L109)

Displays the time left in the video

Expand Down Expand Up @@ -322,7 +322,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
* __player__
* __options__

_defined in_: [src/js/control-bar/time-display.js#L110](https://github.com/videojs/video.js/blob/master/src/js/control-bar/time-display.js#L110)
_defined in_: [src/js/control-bar/time-display.js#L111](https://github.com/videojs/video.js/blob/master/src/js/control-bar/time-display.js#L111)

---

Expand Down
4 changes: 2 additions & 2 deletions docs/api/vjs.TimeDivider.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# vjs.TimeDivider

__EXTENDS__: [vjs.Component](vjs.Component.md)
__DEFINED IN__: [src/js/control-bar/time-display.js#L88](https://github.com/videojs/video.js/blob/master/src/js/control-bar/time-display.js#L88)
__DEFINED IN__: [src/js/control-bar/time-display.js#L89](https://github.com/videojs/video.js/blob/master/src/js/control-bar/time-display.js#L89)

The separator between the current time and duration

Expand Down Expand Up @@ -324,7 +324,7 @@ _inherited from_: [src/js/component.js#L258](https://github.com/videojs/video.js
* __player__
* __options__

_defined in_: [src/js/control-bar/time-display.js#L90](https://github.com/videojs/video.js/blob/master/src/js/control-bar/time-display.js#L90)
_defined in_: [src/js/control-bar/time-display.js#L91](https://github.com/videojs/video.js/blob/master/src/js/control-bar/time-display.js#L91)

---

Expand Down
2 changes: 1 addition & 1 deletion package.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.6",
"version": "4.12.7",
"copyright": "Copyright 2014 Brightcove, Inc. https://github.com/videojs/video.js/blob/master/LICENSE",
"keywords": [
"videojs",
Expand Down

0 comments on commit 69a4884

Please sign in to comment.