0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

video player: support subtitles options update

Browse source
This commit is contained in:
rolux 2013-10-22 17:37:58 +02:00
parent c7b03030bd
commit e533af5cff
1 changed files with 27 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
source/Ox.UI/js/Video/VideoPlayer.js
View file

@ -219,6 +219,9 @@ Ox.VideoPlayer = function(options, self) {
sizeIsLarge: function() { sizeIsLarge: function() {
self.$sizeButton.toggle(); self.$sizeButton.toggle();
}, },
subtitles: function() {
loadSubtitles();
},
timeline: function() { timeline: function() {
self.$timeline.options({imageURL: self.options.timeline}); self.$timeline.options({imageURL: self.options.timeline});
}, },
@ -1203,22 +1206,8 @@ Ox.VideoPlayer = function(options, self) {
self.options.type != 'play' && setPosition(self.options.position); self.options.type != 'play' && setPosition(self.options.position);
self.results = []; self.results = [];
if (self.options.subtitles) {
if (Ox.isArray(self.options.subtitles)) { loadSubtitles();
loadedsubtitles();
} else {
if (self.options.subtitles.indexOf('\n') > -1) {
self.options.subtitles = Ox.parseSRT(self.options.subtitles);
loadedsubtitles();
} else {
Ox.get(self.options.subtitles, function(data) {
self.options.subtitles = Ox.parseSRT(data);
loadedsubtitles();
});
self.options.subtitles = [];
}
}
}
setSizes(false, function() { setSizes(false, function() {
self.options.fullscreen && enterFullscreen(); self.options.fullscreen && enterFullscreen();
@ -1884,6 +1873,28 @@ Ox.VideoPlayer = function(options, self) {
subtitles: self.options.subtitles subtitles: self.options.subtitles
}); });
} }
} else {
// needed on options change
self.options.enableSubtitles && self.$subtitle && setSubtitle();
}
}
function loadSubtitles() {
if (self.options.subtitles) {
if (Ox.isArray(self.options.subtitles)) {
loadedsubtitles();
} else {
if (self.options.subtitles.indexOf('\n') > -1) {
self.options.subtitles = Ox.parseSRT(self.options.subtitles);
loadedsubtitles();
} else {
Ox.get(self.options.subtitles, function(data) {
self.options.subtitles = Ox.parseSRT(data);
loadedsubtitles();
});
self.options.subtitles = [];
}
}
} }
} }