Refactor: JS init + HTTPS-safe URLs

1 files changed, 5 insertions, 23 deletions

diff --git a/template/imagelayering.st b/template/imagelayering.st
index 9b880cc..32318ab 100755
--- a/template/imagelayering.st
+++ b/template/imagelayering.st
@@ -20,14 +20,13 @@ $head()$
   <link rel="stylesheet" type="text/css" href="/static/css/chat_wrapper.css?v=20260129">
   <title>$roomname$ dump.fm</title>
 
-  <script type="text/javascript" src="$domain$/static/js/invalid_domains.js"></script>
-  <script type="text/javascript" src="$domain$/static/webcam/webcam.js"></script>
-  <script type="text/javascript" src="$domain$/static/js/ajaxupload.js"></script>
+  <script type="text/javascript" src="/static/js/invalid_domains.js"></script>
+  <script type="text/javascript" src="/static/webcam/webcam.js"></script>
+  <script type="text/javascript" src="/static/js/ajaxupload.js"></script>
 $if(user_nick)$
-  <script type="text/javascript" src="$domain$/json/$user_nick$/favorites"></script>
+  <script type="text/javascript" src="/json/$user_nick$/favorites"></script>
 $endif$
   <script>
-    jQuery(document).ready(initChat);
     var Nick = $json_user_nick$;
     var Room = $json_room_key$;
     var Timestamp = $timestamp$;
@@ -36,25 +35,8 @@ $if(isadmin)$
 $else$
     var IsAdmin = false;
 $endif$
-    if (Nick) {
-      jQuery(document).ready(function() { setupUpload('upload', Room); });
-    }
-    function showAlert() { alert('MUST LOGIN'); }
-    var newwindow;
-    function pop(url) {
-      newwindow=window.open(url,'name','height=50,width=400,left=20,top=20,location=0,status=0,scrollbar=0,resizable=0');
-      if (window.focus) {newwindow.focus()}
-    }
-    jQuery(Away.startTitleUpdater);
-    jQuery(initChatMsgs);
-    $if(user_nick)$ //
-    $else$
-    function showAlert() {
-	alert('Join dump.fm @ /register');
-	}
-
-$endif$
   </script>
+  <script type="text/javascript" src="/static/js/pages/chat_init.js?v=20260130"></script>
   <!--
   <style>
     #chat-wrapper {