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

Compare commits

base: 0x2620:fd294baec9adbbdb14d7a258b4d5468c4da0b0c5
Branches Tags
0x2620:master
0x2620:stable
..
compare: 0x2620:adaeb16c6924981d60942b33ae659380b213ed63
Branches Tags
0x2620:master
0x2620:stable

No commits in common. "fd294baec9adbbdb14d7a258b4d5468c4da0b0c5" and "adaeb16c6924981d60942b33ae659380b213ed63" have entirely different histories.
fd294baec9 ... adaeb16c69

2 changed files with 1 additions and 13 deletions
Show stats Expand all files Collapse all files

11
static/js/item.js
View file

@ -31,17 +31,6 @@ pandora.ui.item = function() {
// fixme: layers have value, subtitles has text?
isVideoView && Ox.extend(result.data, pandora.getVideoOptions(result.data));
if (isVideoView && result.data.duration) {
var videoPoints = pandora.user.ui.videoPoints[item], set = {};
['in', 'out', 'position'].forEach(point => {
if (videoPoints[point] > result.data.duration) {
set[point] = result.data.duration;
}
})
if (!Ox.isEmpty(set)) {
pandora.UI.set('videoPoints.' + item, Ox.extend(videoPoints[point], set[point]))
}
}
if (!result.data.rendered && [
'clips', 'timeline', 'player', 'editor', 'map', 'calendar'

3
static/js/utils.js
View file

@ -2476,7 +2476,6 @@ pandora.getVideoOptions = function(data) {
});
});
data.videoRatio = data.videoRatio || pandora.site.video.previewRatio;
return options;
};
@ -3213,7 +3212,7 @@ pandora.unloadWindow = function() {
&& pandora.user.ui.item
&& ['video', 'timeline'].indexOf(pandora.user.ui.itemView) > -1
&& pandora.UI.set(
'videoPoints.' + pandora.user.ui.item,
'videoPosition.' + pandora.user.ui.item,
pandora.$ui[
pandora.user.ui.itemView == 'video' ? 'player' : 'editor'
].options('position')