recommit changes lost in revision/514
This commit is contained in:
parent
7c3626b0f4
commit
068fab1096
1 changed files with 6 additions and 5 deletions
|
@ -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',
|
||||||
|
|
Loading…
Reference in a new issue