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

merging changes

Browse source
This commit is contained in:
rolux 2011-03-03 22:38:04 +00:00
commit b93e09ea47
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
static/js/pandora.js
View file

@ -813,7 +813,8 @@
flipbook: function(item) { flipbook: function(item) {
var that = new Ox.Flipbook({ var that = new Ox.Flipbook({
}).bindEvent('click', function(event, data) { }).bindEvent('click', function(event, data) {
alert(data.position); UI.set('videoPosition|' + item, data.position);
URL.set(item + '/timeline');
}); });
pandora.api.getItem(item, function(result) { pandora.api.getItem(item, function(result) {
var duration = result.data.item.duration, var duration = result.data.item.duration,
@ -871,13 +872,13 @@
{ {
format: function() { format: function() {
return $('<img>').attr({ return $('<img>').attr({
src: 'static/oxjs/build/png/ox.ui/icon16.png' src: '/static/oxjs/build/png/ox.ui/icon16.png'
}); });
}, },
id: 'id', id: 'id',
operator: '+', operator: '+',
title: $('<img>').attr({ title: $('<img>').attr({
src: 'static/oxjs/build/png/ox.ui/icon16.png' src: '/static/oxjs/build/png/ox.ui/icon16.png'
}), }),
unique: true, unique: true,
visible: true, visible: true,
@ -1036,7 +1037,7 @@
{ {
format: function() { format: function() {
return $('<img>').attr({ return $('<img>').attr({
src: 'static/oxjs/build/png/ox.ui/icon16.png' src: '/static/oxjs/build/png/ox.ui/icon16.png'
}); });
}, },
id: 'id', id: 'id',
@ -1080,7 +1081,7 @@
{ {
format: function() { format: function() {
return $('<img>').attr({ return $('<img>').attr({
src: 'static/oxjs/build/png/ox.ui/icon16.png' src: '/static/oxjs/build/png/ox.ui/icon16.png'
}); });
}, },
id: 'user', id: 'user',