From 4ad3f355608bf3c0207042fb8bfdb568c693eb65 Mon Sep 17 00:00:00 2001
From: j <j@pad.ma>
Date: Sun, 3 Jun 2012 12:22:09 +0200
Subject: [PATCH] support https urls and serving via https

---
 padma.layers.js | 3 ++-
 utils.js        | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/padma.layers.js b/padma.layers.js
index 434150b..219ee66 100644
--- a/padma.layers.js
+++ b/padma.layers.js
@@ -2,7 +2,8 @@ var padmaConfig = {
   'background': 'rgba(0,0,0,0.85)',
   'color': '#fff',
   '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'],
 };
 
diff --git a/utils.js b/utils.js
index 791a507..ccab246 100644
--- a/utils.js
+++ b/utils.js
@@ -92,7 +92,7 @@ Gives a bunch of data parsed from a pad.ma url
 */
 
   function parsePadmaUrl(link, padma_url) {
-    var regex = padmaConfig.data_url;  
+    var regex = padmaConfig.data_re;  
 //    var regex = new RegExp("http://.*" + padma_url);
     var linkStr = link.replace(regex, "");
 //    alert(linkStr);
@@ -109,6 +109,7 @@ Gives a bunch of data parsed from a pad.ma url
       var postIdStr = linkStr.replace(r.videoId, '');
       postIdStr = postIdStr.replace("/", ""); //FIXME
 //      console.log("postId", postIdStr);
+
       if (postIdStr == 'info' || postIdStr == '') {
         r.type = 'info';
         return r;