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

support https urls and serving via https

Browse Source
This commit is contained in:
j 2012-06-03 12:22:09 +02:00
parent 7be47e61dd
commit 4ad3f35560
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
padma.layers.js
View File

@ -2,7 +2,8 @@ var padmaConfig = {
'background': 'rgba(0,0,0,0.85)', 'background': 'rgba(0,0,0,0.85)',
'color': '#fff', 'color': '#fff',
'links_url': 'pad.ma/', 'links_url': 'pad.ma/',
'data_url': 'http://pad.ma/', 'data_url': document.location.protocol + '//pad.ma/',
'data_re': /https?:\/\/pad.ma\//,
'default_layers': ['transcripts', 'descriptions'], 'default_layers': ['transcripts', 'descriptions'],
}; };

3
utils.js
View File

@ -92,7 +92,7 @@ Gives a bunch of data parsed from a pad.ma url
*/ */
function parsePadmaUrl(link, padma_url) { function parsePadmaUrl(link, padma_url) {
var regex = padmaConfig.data_url; var regex = padmaConfig.data_re;
// var regex = new RegExp("http://.*" + padma_url); // var regex = new RegExp("http://.*" + padma_url);
var linkStr = link.replace(regex, ""); var linkStr = link.replace(regex, "");
// alert(linkStr); // alert(linkStr);
@ -109,6 +109,7 @@ Gives a bunch of data parsed from a pad.ma url
var postIdStr = linkStr.replace(r.videoId, ''); var postIdStr = linkStr.replace(r.videoId, '');
postIdStr = postIdStr.replace("/", ""); //FIXME postIdStr = postIdStr.replace("/", ""); //FIXME
// console.log("postId", postIdStr); // console.log("postId", postIdStr);
if (postIdStr == 'info' || postIdStr == '') { if (postIdStr == 'info' || postIdStr == '') {
r.type = 'info'; r.type = 'info';
return r; return r;