Skip to content

Commit

Permalink
Release 4.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
heff committed May 20, 2014
1 parent 3f9a2ca commit 5edc3a5
Show file tree
Hide file tree
Showing 8 changed files with 109 additions and 106 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)
* Udpated playbackRate menu to work in minified version ([view](https://github.com/videojs/video.js/pull/1223))
_(none)_

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

## 4.6.1 (2014-05-20)
* Udpated playbackRate menu to work in minified version ([view](https://github.com/videojs/video.js/pull/1223))

## 4.6.0 (2014-05-20)
* Updated the UI to support live video ([view](https://github.com/videojs/video.js/pull/1121))
* The UI now resets after a source change ([view](https://github.com/videojs/video.js/pull/1124))
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.6.0",
"version": "4.6.1",
"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.6.0",
"version": "4.6.1",
"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.6.0
Version 4.6.1
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.

10 changes: 5 additions & 5 deletions dist/video-js/video.dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -5431,12 +5431,12 @@ vjs.PlaybackRateMenuButton.prototype.createEl = function(){
// Menu creation
vjs.PlaybackRateMenuButton.prototype.createMenu = function(){
var menu = new vjs.Menu(this.player());
var rates = this.player().options().playbackRates;
var rates = this.player().options()['playbackRates'];

if (rates) {
for (var i = rates.length - 1; i >= 0; i--) {
menu.addChild(
new vjs.PlaybackRateMenuItem(this.player(), {rate: rates[i] + 'x'})
new vjs.PlaybackRateMenuItem(this.player(), { 'rate': rates[i] + 'x'})
);
};
}
Expand All @@ -5452,7 +5452,7 @@ vjs.PlaybackRateMenuButton.prototype.updateARIAAttributes = function(){
vjs.PlaybackRateMenuButton.prototype.onClick = function(){
// select next rate option
var currentRate = this.player().playbackRate();
var rates = this.player().options().playbackRates;
var rates = this.player().options()['playbackRates'];
// this will select first one if the last one currently selected
var newRate = rates[0];
for (var i = 0; i <rates.length ; i++) {
Expand All @@ -5467,8 +5467,8 @@ vjs.PlaybackRateMenuButton.prototype.onClick = function(){
vjs.PlaybackRateMenuButton.prototype.playbackRateSupported = function(){
return this.player().tech
&& this.player().tech.features['playbackRate']
&& this.player().options().playbackRates
&& this.player().options().playbackRates.length > 0
&& this.player().options()['playbackRates']
&& this.player().options()['playbackRates'].length > 0
;
};

Expand Down
Loading

0 comments on commit 5edc3a5

Please sign in to comment.