From 0afef8cbb5e96975521c3381798097c442bfcc7e Mon Sep 17 00:00:00 2001
From: j <0x006A@0x2620.org>
Date: Fri, 25 Feb 2011 20:59:01 +0100
Subject: [PATCH 1/2] jump to location
---
static/js/pandora.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/static/js/pandora.js b/static/js/pandora.js
index 75c0274f..cdf7660c 100755
--- a/static/js/pandora.js
+++ b/static/js/pandora.js
@@ -823,7 +823,8 @@
flipbook: function(item) {
var that = new Ox.Flipbook({
}).bindEvent('click', function(event, data) {
- alert(data.position);
+ UI.set('videoPosition|' + item, data.position);
+ URL.set(item + '/timeline');
});
pandora.api.getItem(item, function(result) {
var duration = result.data.item.duration,
From 21b8e2fffccca339d0d66dd6db4248208d318d6e Mon Sep 17 00:00:00 2001
From: j <0x006A@0x2620.org>
Date: Fri, 25 Feb 2011 21:20:02 +0100
Subject: [PATCH 2/2] urls
---
static/js/pandora.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/static/js/pandora.js b/static/js/pandora.js
index cdf7660c..3d60a39f 100755
--- a/static/js/pandora.js
+++ b/static/js/pandora.js
@@ -882,13 +882,13 @@
{
format: function() {
return $('').attr({
- src: 'static/oxjs/build/png/ox.ui/icon16.png'
+ src: '/static/oxjs/build/png/ox.ui/icon16.png'
});
},
id: 'id',
operator: '+',
title: $('').attr({
- src: 'static/oxjs/build/png/ox.ui/icon16.png'
+ src: '/static/oxjs/build/png/ox.ui/icon16.png'
}),
unique: true,
visible: true,
@@ -1047,7 +1047,7 @@
{
format: function() {
return $('').attr({
- src: 'static/oxjs/build/png/ox.ui/icon16.png'
+ src: '/static/oxjs/build/png/ox.ui/icon16.png'
});
},
id: 'id',
@@ -1091,7 +1091,7 @@
{
format: function() {
return $('').attr({
- src: 'static/oxjs/build/png/ox.ui/icon16.png'
+ src: '/static/oxjs/build/png/ox.ui/icon16.png'
});
},
id: 'user',