web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2024-11-26 08:51:09 +02:00
Code Releases Activity

Merge branch 'guardian-html5-src-fix'

Browse Source
This commit is contained in:
Steve Heffernan 2014-08-27 13:12:46 -07:00
commit fc0d37daec
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -3,6 +3,7 @@ CHANGELOG
## HEAD (Unreleased)
* @andekande added a German translation ([view](https://github.com/videojs/video.js/pull/1426))
* @mattosborn fixed a bug where getting the video element src would overwrite it ([view](https://github.com/videojs/video.js/pull/1430))
--------------------

8
src/js/media/html5.js
View File

@ -225,7 +225,13 @@ vjs.Html5.prototype.enterFullScreen = function(){
vjs.Html5.prototype.exitFullScreen = function(){
this.el_.webkitExitFullScreen();
};
vjs.Html5.prototype.src = function(src){ this.el_.src = src; };
vjs.Html5.prototype.src = function(src) {
if (src === undefined) {
return this.el_.src;
} else {
this.el_.src = src;
}
};
vjs.Html5.prototype.load = function(){ this.el_.load(); };
vjs.Html5.prototype.currentSrc = function(){ return this.el_.currentSrc; };