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

fix subtitle selection in player menu

Browse source
This commit is contained in:
j 2016-03-05 16:10:24 +05:30
parent 07ec93179c
commit ab21bdbe25
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
source/UI/js/Video/VideoPlayer.js
View file

@ -2110,7 +2110,7 @@ Ox.VideoPlayer = function(options, self) {
self.options.enableDownload self.options.enableDownload
? [{}, {id: 'download', title: Ox._('Download')}] ? [{}, {id: 'download', title: Ox._('Download')}]
: [] : []
) )
}) })
.addClass('OxControls OxSettings') .addClass('OxControls OxSettings')
.bindEvent({ .bindEvent({
@ -2128,6 +2128,7 @@ Ox.VideoPlayer = function(options, self) {
} else if (data.group == 'subtitlesTrack') { } else if (data.group == 'subtitlesTrack') {
self.options.subtitlesTrack = data.id == 'None' self.options.subtitlesTrack = data.id == 'None'
? '' : data.id; ? '' : data.id;
self.options.enableSubtitles = !!self.options.subtitlesTrack;
setSubtitlesTrack(); setSubtitlesTrack();
} else if (data.group == 'timeline') { } else if (data.group == 'timeline') {
type = self.options.timelineTypes[ type = self.options.timelineTypes[
@ -2343,23 +2344,20 @@ Ox.VideoPlayer = function(options, self) {
} }
function setSubtitlesTrack() { function setSubtitlesTrack() {
var enableSubtitles = self.options.enableSubtitles && !!self.options.subtitlesTrack, var enableSubtitles = self.options.enableSubtitles && !!self.options.subtitlesTrack;
toggleSubtitles = enableSubtitles != self.options.enableSubtitles;
self.options.enableSubtitles = enableSubtitles; self.options.enableSubtitles = enableSubtitles;
setSubtitle(); setSubtitle();
self.$timeline && self.$timeline.options({ self.$timeline && self.$timeline.options({
subtitles: getSubtitles() subtitles: getSubtitles()
}); });
if (toggleSubtitles) { if (enableSubtitles && !!self.options.subtitlesTrack) {
self.options.enableSubtitles = enableSubtitles;
that.triggerEvent('subtitles', {
subtitles: self.options.enableSubtitles
});
}
if (enableSubtitles) {
that.triggerEvent('subtitlestrack', { that.triggerEvent('subtitlestrack', {
track: self.options.subtitlesTrack track: self.options.subtitlesTrack
}); });
} else {
that.triggerEvent('subtitles', {
subtitles: self.options.enableSubtitles
});
} }
} }

5
source/UI/js/Video/VideoPlayerPanel.js
View file

@ -292,6 +292,11 @@ Ox.VideoPlayerPanel = function(options, self) {
that.triggerEvent('subtitles', data); that.triggerEvent('subtitles', data);
}, },
subtitlestrack: function(data) { subtitlestrack: function(data) {
var enableSubtitles = !!data.track;
if (enableSubtitles != self.options.enableSubtitles) {
self.options.enableSubtitles = enableSubtitles;
that.triggerEvent('subtitles', {subtitles: enableSubtitles});
}
self.options.subtitlesTrack = data.track; self.options.subtitlesTrack = data.track;
self.$timeline.options({subtitles: getSubtitles()}); self.$timeline.options({subtitles: getSubtitles()});
}, },