in manage places, resurrect place name (top right), fixes #670
This commit is contained in:
parent
53f57939ec
commit
d886ffdde2
3 changed files with 15 additions and 8 deletions
|
@ -33,21 +33,27 @@ Ox.load('UI', function() {
|
||||||
|
|
||||||
Ox.get('srt/0097514.srt', function(srt) {
|
Ox.get('srt/0097514.srt', function(srt) {
|
||||||
|
|
||||||
var $videoTimelinePlayer = Ox.VideoTimelinePlayer({
|
var id = '0097514',
|
||||||
|
// var id = '0318034',
|
||||||
|
|
||||||
|
$videoTimelinePlayer = Ox.VideoTimelinePlayer({
|
||||||
duration: 3029.96,
|
duration: 3029.96,
|
||||||
|
//duration: 5956.24,
|
||||||
getFrameURL: function(position) {
|
getFrameURL: function(position) {
|
||||||
return 'http://0xdb.org/0097514/64p' + position + '.jpg'
|
return 'http://0xdb.org/' + id + '/64p' + position + '.jpg'
|
||||||
},
|
},
|
||||||
getImageURL: function(i) {
|
getImageURL: function(i) {
|
||||||
return 'http://0xdb.org/0097514/timeline64p' + i + '.png'
|
return 'http://0xdb.org/' + id + '/timeline64p' + i + '.png'
|
||||||
|
//return 'png/timelinecenter64p' + i + '.png'
|
||||||
},
|
},
|
||||||
height: window.innerHeight - 65,
|
height: window.innerHeight - 65,
|
||||||
paused: true,
|
paused: true,
|
||||||
position: 1000,
|
position: 1000,
|
||||||
subtitles: Ox.parseSRT(srt),
|
subtitles: Ox.parseSRT(srt),
|
||||||
timelineURL: 'http://0xdb.org/0097514/timeline16p.png',
|
timelineURL: 'http://0xdb.org/' + id + '/timeline16p.png',
|
||||||
videoRatio: 1.291667,
|
videoRatio: 1.291667,
|
||||||
videoURL: 'http://0xdb.org/0097514/96p.webm',
|
//videoRatio: 1.833333,
|
||||||
|
videoURL: 'http://0xdb.org/' + id + '/96p.webm',
|
||||||
width: window.innerWidth - 129
|
width: window.innerWidth - 129
|
||||||
})
|
})
|
||||||
.bindEvent({
|
.bindEvent({
|
||||||
|
|
|
@ -297,7 +297,6 @@ Ox.ListCalendar = function(options, self) {
|
||||||
width: 228
|
width: 228
|
||||||
})
|
})
|
||||||
.css({float: 'left', margin: '4px'})
|
.css({float: 'left', margin: '4px'})
|
||||||
.appendTo(self.$eventTitle)
|
|
||||||
.bindEvent({
|
.bindEvent({
|
||||||
singleclick: function() {
|
singleclick: function() {
|
||||||
self.$calendar.panToEvent();
|
self.$calendar.panToEvent();
|
||||||
|
@ -305,7 +304,8 @@ Ox.ListCalendar = function(options, self) {
|
||||||
doubleclick: function() {
|
doubleclick: function() {
|
||||||
self.$calendar.zoomToEvent();
|
self.$calendar.zoomToEvent();
|
||||||
}
|
}
|
||||||
});
|
})
|
||||||
|
.appendTo(self.$eventTitle);
|
||||||
self.$deselectEventButton = Ox.Button({
|
self.$deselectEventButton = Ox.Button({
|
||||||
title: 'close',
|
title: 'close',
|
||||||
tooltip: 'Done',
|
tooltip: 'Done',
|
||||||
|
|
|
@ -455,7 +455,8 @@ Ox.ListMap = function(options, self) {
|
||||||
doubleclick: function() {
|
doubleclick: function() {
|
||||||
self.$map.zoomToPlace();
|
self.$map.zoomToPlace();
|
||||||
}
|
}
|
||||||
});
|
})
|
||||||
|
.appendTo(self.$placeTitle);
|
||||||
self.$deselectPlaceButton = Ox.Button({
|
self.$deselectPlaceButton = Ox.Button({
|
||||||
title: 'close',
|
title: 'close',
|
||||||
tooltip: 'Done',
|
tooltip: 'Done',
|
||||||
|
|
Loading…
Reference in a new issue