decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

use oxtimelines

Browse source
This commit is contained in:
j 2012-05-17 11:38:59 +02:00
commit 96ec35e51a
19 changed files with 393 additions and 164 deletions
Download patch file Download diff file Expand all files Collapse all files

6
static/js/pandora/editor.js
View file

@ -28,12 +28,10 @@ pandora.ui.editor = function(data) {
return '/' + pandora.user.ui.item + '/' + pandora.user.ui.videoResolution + 'p' + position + '.jpg';
},
getLargeTimelineURL: function(type, i) {
type = '';
return '/' + pandora.user.ui.item + '/timeline' + type + '64p' + i + '.png';
return '/' + pandora.user.ui.item + '/timeline' + type + '64p' + i + '.jpg';
},
getSmallTimelineURL: function(type, i) {
type = '';
return '/' + pandora.user.ui.item + '/timeline' + type + '16p' + i + '.png';
return '/' + pandora.user.ui.item + '/timeline' + type + '16p' + i + '.jpg';
},
height: pandora.$ui.contentPanel.size(1),
id: 'editor',

3
static/js/pandora/list.js
View file

@ -309,8 +309,7 @@ pandora.ui.list = function() {
duration: data.duration,
find: isClipsQuery ? clipsQuery.conditions[0].value : '',
getImageURL: function(type, i) {
type = '';
return '/' + data.id + '/timeline' + type + '16p' + i + '.png';
return '/' + data.id + '/timeline' + type + '16p' + i + '.jpg';
},
position: pandora.user.ui.videoPoints[data.id]
? pandora.user.ui.videoPoints[data.id].position : 0,

7
static/js/pandora/player.js
View file

@ -23,8 +23,7 @@ pandora.ui.player = function(data) {
enableSubtitles: pandora.user.ui.videoSubtitles,
find: pandora.user.ui.itemFind,
getLargeTimelineURL: function(type, i) {
type = '';
return '/' + pandora.user.ui.item + '/timeline' + type + '64p' + i + '.png';
return '/' + pandora.user.ui.item + '/timeline' + type + '64p' + i + '.jpg';
},
height: pandora.$ui.contentPanel.size(1),
'in': pandora.user.ui.videoPoints[pandora.user.ui.item]['in'],
@ -43,7 +42,7 @@ pandora.ui.player = function(data) {
showLayers: Ox.clone(pandora.user.ui.showLayers),
showUsers: pandora.site.annotations.showUsers,
showTimeline: pandora.user.ui.showTimeline,
smallTimelineURL: '/' + pandora.user.ui.item + '/timeline16p.png',
smallTimelineURL: '/' + pandora.user.ui.item + '/timeline16p.jpg',
subtitles: data.subtitles,
timeline: pandora.user.ui.videoTimeline,
tooltips: true,
@ -136,4 +135,4 @@ pandora.ui.player = function(data) {
}
});
};
};

7
static/js/pandora/timeline.js
View file

@ -24,8 +24,7 @@ pandora.ui.timeline = function(data) {
return '/' + ui.item + '/' + ui.videoResolution + 'p' + position + '.jpg';
},
getLargeTimelineURL: function(type, i) {
type = '';
return '/' + ui.item + '/timeline' + type + '64p' + i + '.png';
return '/' + ui.item + '/timeline' + type + '64p' + i + '.jpg';
},
height: pandora.$ui.contentPanel.size(1),
layers: data.annotations,
@ -40,7 +39,7 @@ pandora.ui.timeline = function(data) {
showAnnotationsMap: ui.showAnnotationsMap,
showLayers: Ox.clone(ui.showLayers),
showUsers: pandora.site.annotations.showUsers,
smallTimelineURL: '/' + ui.item + '/timeline16p.png',
smallTimelineURL: '/' + ui.item + '/timeline16p.jpg',
timeline: ui.videoTimeline,
timelines: pandora.site.timelines,
video: data.video,
@ -110,4 +109,4 @@ pandora.ui.timeline = function(data) {
}
});
};
};

2
static/js/pandora/tv.js
View file

@ -76,7 +76,7 @@ pandora.ui.tv = function() {
scaleToFill: pandora.user.ui.videoScale == 'fill',
subtitles: videoOptions.subtitles,
tooltips: true,
timeline: '/' + result.data.item + '/timeline16p.png',
timeline: '/' + result.data.item + '/timeline16p.jpg',
title: pandora.site.site.name + ' — ' + (
list || 'All ' + pandora.site.itemName.plural
) + ' — '

2
static/js/pandora/videoPreview.js
View file

@ -21,7 +21,7 @@ pandora.ui.videoPreview = function(data) {
height: data.height,
position: data.position,
scaleToFill: true,
timeline: '/' + data.id + '/timeline16p.png',
timeline: '/' + data.id + '/timeline16p.jpg',
width: data.width
});
return that;