web/video.js
1
0
Fork 0
mirror of https://github.com/videojs/video.js.git synced 2024-12-31 03:11:11 +02:00
Code Releases Activity

Merge branch 'source-type' of github.com:guardian/video.js into guardian-source-type

Browse Source 
Conflicts:
	src/js/exports.js
This commit is contained in:
Steve Heffernan 2014-07-28 13:46:35 -07:00
commit 738fa73949
2 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/js/exports.js
View File

@ -75,6 +75,7 @@ goog.exportProperty(vjs.Player.prototype, 'exitFullWindow', vjs.Player.prototype
goog.exportProperty(vjs.Player.prototype, 'preload', vjs.Player.prototype.preload);
goog.exportProperty(vjs.Player.prototype, 'remainingTime', vjs.Player.prototype.remainingTime);
goog.exportProperty(vjs.Player.prototype, 'supportsFullScreen', vjs.Player.prototype.supportsFullScreen);
goog.exportProperty(vjs.Player.prototype, 'currentType', vjs.Player.prototype.currentType);
goog.exportSymbol('videojs.MediaLoader', vjs.MediaLoader);
goog.exportSymbol('videojs.TextTrackDisplay', vjs.TextTrackDisplay);

45
src/js/player.js
View File

@ -275,6 +275,7 @@ vjs.Player.prototype.loadTech = function(techName, source){
var techOptions = vjs.obj.merge({ 'source': source, 'parentEl': this.el_ }, this.options_[techName.toLowerCase()]);
if (source) {
this.currentType_ = source.type;
if (source.src == this.cache_.src && this.cache_.currentTime > 0) {
techOptions['startTime'] = this.cache_.currentTime;
}
@ -1066,6 +1067,25 @@ vjs.Player.prototype.selectSource = function(sources){
return false;
};
vjs.Player.prototype.setSource = function(source, type) {
this.cache_.src = source;
var _set = vjs.bind(this, function () {
this.currentType_ = type || '';
this.techCall('src', source);
if (this.options_['preload'] == 'auto') {
this.load();
}
if (this.options_['autoplay']) {
this.play();
}
});
this.ready(_set);
};
/**
* The source function updates the video source
*
@ -1132,30 +1152,15 @@ vjs.Player.prototype.src = function(source){
} else if (source instanceof Object) {
if (window['videojs'][this.techName]['canPlaySource'](source)) {
this.src(source.src);
this.setSource(source.src, source.type);
} else {
// Send through tech loop to check for a compatible technology.
this.src([source]);
}
// Case: URL String (http://myvideo...)
} else {
// Cache for getting last set source
this.cache_.src = source;
if (!this.isReady_) {
this.ready(function(){
this.src(source);
});
} else {
this.techCall('src', source);
if (this.options_['preload'] == 'auto') {
this.load();
}
if (this.options_['autoplay']) {
this.play();
}
}
} else if (typeof source === 'string') {
this.setSource(source);
}
return this;
@ -1173,6 +1178,10 @@ vjs.Player.prototype.currentSrc = function(){
return this.techGet('currentSrc') || this.cache_.src || '';
};
vjs.Player.prototype.currentType = function(){
return this.currentType_ || '';
};
// Attributes/Options
vjs.Player.prototype.preload = function(value){
if (value !== undefined) {