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

clip timeline

Browse source
This commit is contained in:
j 2011-01-01 17:19:14 +05:30
commit a00b88acd9
6 changed files with 244 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
static/js/pandora.js
View file

@ -738,6 +738,7 @@ var pandora = new Ox.App({
}), callback);
}
});
Ox.print('ZZZ')
$.each(app.ui.groups, function(i_, group_) {
if (i_ != i) {
Ox.print('setting groups request', i, i_)
@ -838,7 +839,7 @@ var pandora = new Ox.App({
duration: video.duration,
find: '',
frameURL: function(position) {
return '/' + id + '/frame/' + video.width.toString() + '/' + position.toString() + '.jpg'
return '/' + app.user.ui.item + '/frame/' + video.width.toString() + '/' + position.toString() + '.jpg'
},
height: app.$ui.contentPanel.size(1),
id: 'editor',
@ -865,6 +866,7 @@ var pandora = new Ox.App({
{
collapsible: true,
element: app.$ui.annotations = ui.annotations(),
//.bindEvent('resize', function(event, data) { Ox.print('resize annotations', data); }),
resizable: true,
resize: [256, 384],
size: 256