0x2620/pandora
2
1
Fork 1
Code Issues 1.2k Pull requests Releases Wiki Activity

Compare commits

base: 0x2620:e3e5e3b9e5362c968dd35151300b59d6a2f0d5a1
Branches Tags
0x2620:master
0x2620:stable
..
compare: 0x2620:af657503636edf045a687ffd8c3d1933bfc742e3
Branches Tags
0x2620:master
0x2620:stable

No commits in common. "e3e5e3b9e5362c968dd35151300b59d6a2f0d5a1" and "af657503636edf045a687ffd8c3d1933bfc742e3" have entirely different histories.
e3e5e3b9e5 ... af65750363

2 changed files with 1 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
static/js/embedPlayer.js
View file

@ -42,9 +42,7 @@ pandora.ui.embedPlayer = function() {
sizes = getSizes(); sizes = getSizes();
options.height = sizes.videoHeight; options.height = sizes.videoHeight;
if (!video.subtitles) {
video.subtitles = pandora.getSubtitles(video); video.subtitles = pandora.getSubtitles(video);
}
if (options.title) { if (options.title) {
$title = Ox.Element() $title = Ox.Element()
@ -109,10 +107,7 @@ pandora.ui.embedPlayer = function() {
scaleToFill: ui.videoScale == 'fill', scaleToFill: ui.videoScale == 'fill',
showIconOnLoad: true, showIconOnLoad: true,
subtitles: video.subtitles, subtitles: video.subtitles,
subtitlesDefaultTrack: video.subtitlesDefaultTrack || Ox.getLanguageNameByCode(pandora.site.language),
subtitlesLayer: video.subtitlesLayer,
subtitlesOffset: ui.videoSubtitlesOffset, subtitlesOffset: ui.videoSubtitlesOffset,
subtitlesTrack: video.subtitlesTrack || Ox.getLanguageNameByCode(pandora.site.language),
timeline: options.playInToOut ? function(size, i) { timeline: options.playInToOut ? function(size, i) {
return pandora.getMediaURL('/' + options.item return pandora.getMediaURL('/' + options.item
+ '/timelineantialias' + '/timelineantialias'

1
static/js/pandora.js
View file

@ -495,7 +495,6 @@ appPanel
pandora.$ui.embedPanel.options(data); pandora.$ui.embedPanel.options(data);
} }
}); });
pandora.localInit && pandora.localInit();
} else if (isPrint) { } else if (isPrint) {
pandora.$ui.printView = pandora.ui.printView().display(); pandora.$ui.printView = pandora.ui.printView().display();
} else if (isHome) { } else if (isHome) {