0x2620/cablegates
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

cleanup file locations

Browse source
This commit is contained in:
j 2010-09-08 19:14:01 +02:00
commit 8aa1f119ea
9 changed files with 254 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pandora/static/js/pandora.js
View file

@ -59,7 +59,7 @@ var app = new Ox.App({
Ox.print('requestStop')
app.$ui.loadingIcon.stop();
});
$.each(app.afterLaunch, function(i, f) { f() });
});

85
pandora/static/js/pandora.local.js
View file

@ -1,4 +1,6 @@
$(function() {
if(typeof(app.afterLaunch) == "undefined")
app.afterLaunch = [];
app.afterLaunch.push(function() {
if (typeof(OxFF) == 'undefined')
return;
app.local = {
@ -53,6 +55,7 @@ $(function() {
if(!cb)
return null;
return function(result) {
Ox.print("you called upload", result);
var data = JSON.parse(result);
cb(data)
}
@ -211,41 +214,58 @@ $(function() {
});
} else {
app.local.files(name, function(result) {
var fileInfo = result.info;
app.request('update', {
'volume': name, 'files': result.files
}, function(result) {
var videos = {};
$.each(result.data.data, function(i, oshash) {
$.each(folder_ids, function(i, ids) {
if($.inArray(oshash, ids) > -1) {
if(!videos[i]) {
videos[i] = [];
var button = new Ox.Button({
id: 'upload_' + oshash,
title: 'Upload',
width: 48
}).bindEvent('click', function(fid) { return function(event, data) {
Ox.print(videos[fid]);
//$($('#'+fid).find('.OxCell')[2]).html('extracting data...');
app.local.uploadVideos(
videos[fid],
function(data) {
$($('#'+fid).find('.OxCell')[2]).html('done');
},
function(data) {
$($('#'+fid).find('.OxCell')[2]).html(data.status +': '+ data.progress);
}
);
}}(i));
$($('#'+i).find('.OxCell')[2]).html(button.$element);
$('#'+i).css({'font-weight': 'bold'});
function parseResult(result) {
$.each(result.data.data, function(i, oshash) {
$.each(folder_ids, function(i, ids) {
if($.inArray(oshash, ids) > -1) {
if(!videos[i]) {
videos[i] = [];
var button = new Ox.Button({
id: 'upload_' + oshash,
title: 'Upload',
width: 48
}).bindEvent('click', function(fid) { return function(event, data) {
Ox.print(videos[fid]);
//$($('#'+fid).find('.OxCell')[2]).html('extracting data...');
app.local.uploadVideos(
videos[fid],
function(data) {
$($('#'+fid).find('.OxCell')[2]).html('done');
},
function(data) {
$($('#'+fid).find('.OxCell')[2]).html(data.status +': '+ data.progress);
}
);
}}(i));
$($('#'+i).find('.OxCell')[2]).html(button.$element);
$('#'+i).css({'font-weight': 'bold'});
}
videos[i].push(oshash);
//add some double click callback here to trigger video upload
return false;
}
videos[i].push(oshash);
//add some double click callback here to trigger video upload
return false;
});
});
};
if (result.data.info.length>0) {
var post = {'info': {}};
$.each(result.data.info, function(i, oshash) {
if(fileInfo[oshash]) {
post.info[oshash] = fileInfo[oshash];
}
});
});
app.request('update', post, function(result) {
parseResult(result);
});
} else {
parseResult(result);
}
});
var data = {
items: []
@ -303,10 +323,5 @@ $(function() {
return url;
},
};
if(typeof(app.afterLaunch) == "undefined")
app.afterLaunch = [];
app.afterLaunch.push(function() {
app.local.loadVolumes();
});
app.local.loadVolumes();
});

2
pandora/static/js/timeline.js
View file

@ -23,7 +23,7 @@ $(function() {
posterFrame = 1515,
points = [2059, 2748],
videoId = document.location.hash.substring(1),
videoUrl = "/" + videoId + "/96p." + ($.support.video.webm ? "webm": "mp4").
videoUrl = "/" + videoId + "/96p." + ($.support.video.webm ? "webm": "mp4"),
stripTimeline = false;
$.getJSON("/" + videoId + "/data/video.json", function(video) {