Skip to content

Commit

Permalink
Release 4.7.3
Browse files Browse the repository at this point in the history
  • Loading branch information
heff committed Aug 20, 2014
1 parent 03059c1 commit 760eb30
Show file tree
Hide file tree
Showing 9 changed files with 179 additions and 142 deletions.
7 changes: 5 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@ CHANGELOG
=========

## HEAD (Unreleased)
* Added function for adding new language translations, updated docs, and fixed the notSupportedMessage translation ([view](https://github.com/videojs/video.js/pull/1427))
* Exposed the player.selectSource method to allow overriding the source selection order ([view](https://github.com/videojs/video.js/pull/1424))
_(none)_

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

## 4.7.3 (2014-08-20)
* Added function for adding new language translations, updated docs, and fixed the notSupportedMessage translation ([view](https://github.com/videojs/video.js/pull/1427))
* Exposed the player.selectSource method to allow overriding the source selection order ([view](https://github.com/videojs/video.js/pull/1424))

## 4.7.2 (2014-08-14)
* Fixed a case where timeupdate events were not firing, and fixed and issue with the Flash player version ([view](https://github.com/videojs/video.js/pull/1417))

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.7.2",
"version": "4.7.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.7.2",
"version": "4.7.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.7.2
Version 4.7.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.

28 changes: 22 additions & 6 deletions dist/video-js/video.dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,25 @@ if (vjs.CDN_VERSION !== 'GENERATED'+'_CDN_VSN') {
videojs.options['flash']['swf'] = vjs.ACCESS_PROTOCOL + 'vjs.zencdn.net/'+vjs.CDN_VERSION+'/video-js.swf';
}

/**
* Utility function for adding languages to the default options. Useful for
* amending multiple language support at runtime.
*
* Example: vjs.addLanguage('es', {'Hello':'Hola'});
*
* @param {String} code The language code or dictionary property
* @param {Object} data The data values to be translated
* @return {Object} The resulting global languages dictionary object
*/
vjs.addLanguage = function(code, data){
if(vjs.options['languages'][code] !== undefined) {
vjs.options['languages'][code] = vjs.util.mergeOptions(vjs.options['languages'][code], data);
} else {
vjs.options['languages'][code] = data;
}
return vjs.options['languages'];
};

/**
* Global player list
* @type {Object}
Expand Down Expand Up @@ -1551,7 +1570,7 @@ vjs.util = {};
vjs.util.mergeOptions = function(obj1, obj2){
var key, val1, val2;

// make a copy of obj1 so we're not ovewriting original values.
// make a copy of obj1 so we're not overwriting original values.
// like prototype.options_ and all sub options objects
obj1 = vjs.obj.copy(obj1);

Expand All @@ -1569,10 +1588,7 @@ vjs.util.mergeOptions = function(obj1, obj2){
}
}
return obj1;
};


/**
};/**
* @fileoverview Player Component - Base class for all UI objects
*
*/
Expand Down Expand Up @@ -4416,7 +4432,7 @@ vjs.Player.prototype.sourceList_ = function(sources){
this.loadTech(sourceTech.tech, sourceTech.source);
}
} else {
this.error({ code: 4, message: this.options()['notSupportedMessage'] });
this.error({ code: 4, message: this.localize(this.options()['notSupportedMessage']) });
// we could not find an appropriate tech, but let's still notify the delegate that this is it
// this needs a better comment about why this is needed
this.triggerReady();
Expand Down
Loading

0 comments on commit 760eb30

Please sign in to comment.