CAMP/padmaEssay
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed

Browse Source
This commit is contained in:
Sanj 2011-02-21 22:06:27 +01:00
parent c1987a2cd6
commit b6fccae84a
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
padma.layers.js
View File

@ -1,8 +1,8 @@
var padmaConfig = {
'background': 'rgba(0,0,0,0.85)',
'color': '#fff',
'links_url': 'http://padma.okno.be/',
'data_url': 'http://padma.okno.be/',
'links_url': 'pad.ma/',
'data_url': 'http://pad.ma/',
// 'links_url': 'http://pad.ma/',
// 'data_url': 'http://pad.ma/',
'default_layers': ['transcript', 'description'],
@ -60,9 +60,15 @@ padmaVideo.prototype.getVideo = function(tc, size) {
return this.video.urls[size] + "?t=npt:" + tc;
}
/*
padmaVideo.prototype.getLayerVideo = function(tcIn, tcOut) {
return BASE_URL + this.id + "/download/" + tcIn + "-" + tcOut + ".ogv";
}
*/
padmaVideo.prototype.getLayerVideo = function(tcIn, tcOut) {
return this.video.urls['320'] + "?t=" + tcIn + "/" + tcOut;
}
padmaVideo.prototype.noop = function() {
// console.log("I'm done:)");

7
utils.js
View File

@ -92,9 +92,10 @@ Gives a bunch of data parsed from a pad.ma url
*/
function parsePadmaUrl(link, padma_url) {
// console.log(padma_url);
var linkStr = link.replace(padma_url, "");
// console.log(linkStr);
console.log(padma_url);
var regex = new RegExp("http://.*" + padma_url);
var linkStr = link.replace(regex, "");
console.log(linkStr);
// console.log(linkStr);
var r = { };
r.url = link;