recommit changes lost in revision/514

This commit is contained in:
j 2011-03-08 00:18:14 +01:00
parent c53a1009e5
commit 67b1dd5b82

View file

@ -822,7 +822,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,
@ -881,14 +882,14 @@
format: function() { format: function() {
return $('<img>') return $('<img>')
.attr({ .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>') title: $('<img>')
.attr({ .attr({
src: 'static/oxjs/build/png/ox.ui/icon16.png' src: '/static/oxjs/build/png/ox.ui/icon16.png'
}) })
.css({ .css({
width: '10px', width: '10px',
@ -1071,7 +1072,7 @@
format: function() { format: function() {
return $('<img>') return $('<img>')
.attr({ .attr({
src: 'static/oxjs/build/png/ox.ui/icon16.png' src: '/static/oxjs/build/png/ox.ui/icon16.png'
}) })
}, },
id: 'id', id: 'id',
@ -1115,7 +1116,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',