make js more modular

build-js.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+set -e
+root=$(readlink -e $(dirname $0))
+
+cd $root
+if [ -z "$GOPATH" ]; then
+	export GOPATH=$PWD/go
+	mkdir -p $GOPATH
+fi
+
+if [ ! -f $GOPATH/bin/minify ]; then
+	go get github.com/tdewolff/minify/cmd/minify
+fi
+
+echo -e "//For source code and license information please check https://github.com/majestrate/nntpchan \n" > ./contrib/static/nntpchan.js
+
+for f in ./contrib/js/*.js ; do
+	cat $f | $GOPATH/bin/minify --mime=text/javascript >> ./contrib/static/nntpchan.js
+done

contrib/js/api.js

@@ -0,0 +1,41 @@
+// call an api method
+// handler(json_object) on success
+// handler(null) on fail
+function nntpchan_apicall(url, handler, err_handler) {
+  var ajax = new XMLHttpRequest();
+  ajax.onreadystatechange = function() {
+    if (ajax.readyState == XMLHttpRequest.DONE ) {
+      var status = ajax.status;
+      var j = null;
+      if (status == 200) {
+        // found
+        try {
+          j = JSON.parse(ajax.responseText);
+        } catch (e) {} // ignore parse error
+      } else if (status == 410) {
+        if (err_handler) {err_handler("cannot fetch post: api disabled");}
+        return;
+      }
+      handler(j);
+    }
+  };
+  ajax.open("GET", url);
+  ajax.send();
+}
+
+// build post from json
+// inject into parent
+// if j is null then inject "not found" post
+function nntpchan_buildpost(parent, j) {
+  var post = document.createElement("div");
+  if (j) {
+    // huehuehue
+    post.innerHTML = j.PostMarkup;
+    inject_hover_for_element(post);
+  } else {
+    post.setAttribute("class", "notfound post");
+    post.appendChild(document.createTextNode("post not found"));
+  }
+  parent.appendChild(post);
+}
+

contrib/js/backlink.js

@@ -0,0 +1,78 @@
+// insert a backlink for a post given its short hash
+function nntpchan_backlink(shorthash) {
+  var elem = document.getElementById("postform_message");
+  if ( elem )
+  {
+    elem.value += ">>" + shorthash.substr(0,10) + "\n";
+  }
+}
+
+// inject post hover behavior
+function inject_hover(prefix, el, parent) {
+  if (!prefix) { throw "prefix is not defined"; }
+  var linkhash = el.getAttribute("backlinkhash");
+  if (!linkhash) { throw "linkhash undefined"; }
+  console.log("rewrite linkhash "+linkhash);
+
+  var elem = document.createElement("span");
+  elem.setAttribute("class", "backlink_rewritten");
+  elem.appendChild(document.createTextNode(">>"+linkhash.substr(0,10)));
+  if (!parent) {
+    parent = el.parentNode;
+  }
+  parent.removeChild(el);
+  parent.appendChild(elem);
+  
+  elem.onclick = function(ev) {
+    if(parent.backlink) {
+      nntpchan_apicall(prefix+"api/find?hash="+linkhash, function(j) {
+        var wrapper = document.createElement("div");
+        wrapper.setAttribute("class", "hover "+linkhash);
+        if (j == null) {
+          // not found?
+          wrapper.setAttribute("class", "hover notfound-hover "+linkhash);
+          wrapper.appendChild(document.createTextNode("not found"));
+        } else {
+          // wrap backlink
+          nntpchan_buildpost(wrapper, j);
+        }
+        parent.appendChild(wrapper);
+        parent.backlink = false;
+      }, function(msg) {
+        var wrapper = document.createElement("div");
+        wrapper.setAttribute("class", "hover "+linkhash);
+        wrapper.appendChild(document.createTextNode(msg));
+        parent.appendChild(wrapper);
+        parent.backlink = false;
+      });
+    } else {
+      var elems = document.getElementsByClassName(linkhash);
+      if (!elems) throw "bad state, no backlinks open?";
+      for (var idx = 0 ; idx < elems.length; idx ++ ) {
+        elems[idx].parentNode.removeChild(elems[idx]);
+      }
+      parent.backlink = true;
+    }
+  };
+  parent.backlink = true;
+}
+
+// inject post hover for all backlinks in an element
+function inject_hover_for_element(elem) {  
+  var elems = elem.getElementsByClassName("backlink");
+  var ls = [];
+  var l = elems.length;
+  for ( var idx = 0 ; idx < l ; idx ++ ) {
+    var e = elems[idx];
+    ls.push(e);
+  }
+  for( var elem in ls ) {
+      inject_hover(prefix, ls[elem]);
+  }
+}
+
+function init(prefix) {
+  // inject posthover ...
+  inject_hover_for_element(document);
+}
+

contrib/js/banner.js

@@ -0,0 +1,13 @@
+var banner_count = 3;
+
+// inject a banner into an element
+function nntpchan_inject_banners(elem, prefix) {
+  var n = Math.floor(Math.random() * banner_count);
+  var banner = prefix + "static/banner_"+n+".jpg";
+  var e = document.createElement("img");
+  e.src = banner;
+  e.id = "nntpchan_banner";
+  elem.appendChild(e);
+}
+
+

contrib/js/livechan.js

@@ -0,0 +1,66 @@
+function livechan_got_post(widget, j) {
+  // do scroll
+  while (widget.children.length > 5) {
+    // remove top element
+    widget.removeChild(widget.children[0]);
+  }
+  nntpchan_buildpost(widget, j);
+  // scroll to bottom
+  widget.scrollTop = widget.scrollHeight;
+}
+
+// inject post form into an element
+function inject_postform(prefix, parent) {
+  
+}
+
+// inject livechan widget into parent
+function inject_livechan_widget(prefix, parent) {
+  if ( "WebSocket" in window ) {
+    var url = "ws://"+document.location.host+prefix+"live";
+    if ( document.location.protocol == "https:" ) {
+      url = "wss://"+document.location.host+prefix+"live";
+    }
+    var socket = new WebSocket(url);
+    var progress = function(str) {
+      parent.innerHTML = "<pre>livechan: "+str+"</pre>";
+    };
+    progress("initialize");
+    socket.onopen = function () {
+      progress("streaming (read only)");
+    }
+    socket.onmessage = function(ev) {
+      var j = null;
+      try {
+        j = JSON.parse(ev.data);
+      } catch(e) {
+        // ignore
+      }
+      if (j) {
+        console.log(j);
+        livechan_got_post(parent, j);
+      }
+    }
+    socket.onclose = function(ev) {
+      progress("connection closed");
+      setTimeout(function() {
+        inject_livechan_widget(prefix, parent);
+      }, 1000);
+    }
+  } else {
+    parent.innerHTML = "<pre>livechan mode requires websocket support</pre>";
+    setTimeout(function() {
+      parent.innerHTML = "";
+    }, 5000);
+  }
+}
+
+function ukko_livechan(prefix) {
+  var ukko = document.getElementById("ukko_threads");
+  if (ukko) {
+    // remove children
+    ukko.innerHTML = "";
+    inject_livechan_widget(prefix, ukko);
+  }
+}
+

contrib/js/local_storage.js

@@ -0,0 +1,10 @@
+function get_storage() {
+  var st = null;
+  if (window.localStorage) {
+    st = window.localStorage;
+  } else if (localStorage) {
+    st = localStorage;
+  }
+  return st;
+}
+

contrib/js/theme.js

@@ -0,0 +1,15 @@
+function enable_theme(prefix, name) {
+  if (prefix && name) {
+    var theme = document.getElementById("current_theme");
+    if (theme) {
+      theme.href = prefix + "static/"+ name + ".css";
+      var st = get_storage();
+      st.nntpchan_prefix = prefix;
+      st.nntpchan_theme = name;
+    }
+  }
+}
+
+// apply themes
+var st = get_storage();
+enable_theme(st.nntpchan_prefix, st.nntpchan_theme);

contrib/static/nntpchan.js

@@ -1,228 +1,27 @@
-//
+//For source code and license information please check https://github.com/majestrate/nntpchan 
-// nntpchan.js -- frontend ui niceness
-//
 
-
+function nntpchan_apicall(url,handler,err_handler){var ajax=new XMLHttpRequest();ajax.onreadystatechange=function(){if(ajax.readyState==XMLHttpRequest.DONE){var status=ajax.status;var j=null;if(status==200){try{j=JSON.parse(ajax.responseText);}catch(e){}}else if(status==410){if(err_handler){err_handler("cannot fetch post: api disabled");}
-// insert a backlink for a post given its short hash
+return;}
-function nntpchan_backlink(shorthash) {
+handler(j);}};ajax.open("GET",url);ajax.send();}
-  var elem = document.getElementById("postform_message");
+function nntpchan_buildpost(parent,j){var post=document.createElement("div");if(j){post.innerHTML=j.PostMarkup;inject_hover_for_element(post);}else{post.setAttribute("class","notfound post");post.appendChild(document.createTextNode("post not found"));}
-  if ( elem )
+parent.appendChild(post);}function nntpchan_backlink(shorthash){var elem=document.getElementById("postform_message");if(elem)
-  {
+{elem.value+=">>"+shorthash.substr(0,10)+"\n";}}
-    elem.value += ">>" + shorthash.substr(0,10) + "\n";
+function inject_hover(prefix,el,parent){if(!prefix){throw"prefix is not defined";}
-  }
+var linkhash=el.getAttribute("backlinkhash");if(!linkhash){throw"linkhash undefined";}
-}
+console.log("rewrite linkhash "+linkhash);var elem=document.createElement("span");elem.setAttribute("class","backlink_rewritten");elem.appendChild(document.createTextNode(">>"+linkhash.substr(0,10)));if(!parent){parent=el.parentNode;}
-
+parent.removeChild(el);parent.appendChild(elem);elem.onclick=function(ev){if(parent.backlink){nntpchan_apicall(prefix+"api/find?hash="+linkhash,function(j){var wrapper=document.createElement("div");wrapper.setAttribute("class","hover "+linkhash);if(j==null){wrapper.setAttribute("class","hover notfound-hover "+linkhash);wrapper.appendChild(document.createTextNode("not found"));}else{nntpchan_buildpost(wrapper,j);}
-function get_storage() {
+parent.appendChild(wrapper);parent.backlink=false;},function(msg){var wrapper=document.createElement("div");wrapper.setAttribute("class","hover "+linkhash);wrapper.appendChild(document.createTextNode(msg));parent.appendChild(wrapper);parent.backlink=false;});}else{var elems=document.getElementsByClassName(linkhash);if(!elems)throw"bad state, no backlinks open?";for(var idx=0;idx<elems.length;idx++){elems[idx].parentNode.removeChild(elems[idx]);}
-  var st = null;
+parent.backlink=true;}};parent.backlink=true;}
-  if (window.localStorage) {
+function inject_hover_for_element(elem){var elems=elem.getElementsByClassName("backlink");var ls=[];var l=elems.length;for(var idx=0;idx<l;idx++){var e=elems[idx];ls.push(e);}
-    st = window.localStorage;
+for(var elem in ls){inject_hover(prefix,ls[elem]);}}
-  } else if (localStorage) {
+function init(prefix){inject_hover_for_element(document);}var banner_count=3;function nntpchan_inject_banners(elem,prefix){var n=Math.floor(Math.random()*banner_count);var banner=prefix+"static/banner_"+n+".jpg";var e=document.createElement("img");e.src=banner;e.id="nntpchan_banner";elem.appendChild(e);}function livechan_got_post(widget,j){while(widget.children.length>5){widget.removeChild(widget.children[0]);}
-    st = localStorage;
+nntpchan_buildpost(widget,j);widget.scrollTop=widget.scrollHeight;}
-  }
+function inject_postform(prefix,parent){}
-  return st;
+function inject_livechan_widget(prefix,parent){if("WebSocket"in window){var url="ws://"+document.location.host+prefix+"live";if(document.location.protocol=="https:"){url="wss://"+document.location.host+prefix+"live";}
-}
+var socket=new WebSocket(url);var progress=function(str){parent.innerHTML="<pre>livechan: "+str+"</pre>";};progress("initialize");socket.onopen=function(){progress("streaming (read only)");}
-
+socket.onmessage=function(ev){var j=null;try{j=JSON.parse(ev.data);}catch(e){}
-function enable_theme(prefix, name) {
+if(j){console.log(j);livechan_got_post(parent,j);}}
-  if (prefix && name) {
+socket.onclose=function(ev){progress("connection closed");setTimeout(function(){inject_livechan_widget(prefix,parent);},1000);}}else{parent.innerHTML="<pre>livechan mode requires websocket support</pre>";setTimeout(function(){parent.innerHTML="";},5000);}}
-    var theme = document.getElementById("current_theme");
+function ukko_livechan(prefix){var ukko=document.getElementById("ukko_threads");if(ukko){ukko.innerHTML="";inject_livechan_widget(prefix,ukko);}}function get_storage(){var st=null;if(window.localStorage){st=window.localStorage;}else if(localStorage){st=localStorage;}
-    if (theme) {
+return st;}function enable_theme(prefix,name){if(prefix&&name){var theme=document.getElementById("current_theme");if(theme){theme.href=prefix+"static/"+name+".css";var st=get_storage();st.nntpchan_prefix=prefix;st.nntpchan_theme=name;}}}
-      theme.href = prefix + "static/"+ name + ".css";
+var st=get_storage();enable_theme(st.nntpchan_prefix,st.nntpchan_theme);
-      var st = get_storage();
-      st.nntpchan_prefix = prefix;
-      st.nntpchan_theme = name;
-    }
-  }
-}
-
-
-// call an api method
-// handler(json_object) on success
-// handler(null) on fail
-function nntpchan_apicall(url, handler, err_handler) {
-  var ajax = new XMLHttpRequest();
-  ajax.onreadystatechange = function() {
-    if (ajax.readyState == XMLHttpRequest.DONE ) {
-      var status = ajax.status;
-      var j = null;
-      if (status == 200) {
-        // found
-        try {
-          j = JSON.parse(ajax.responseText);
-        } catch (e) {} // ignore parse error
-      } else if (status == 410) {
-        if (err_handler) {err_handler("cannot fetch post: api disabled");}
-        return;
-      }
-      handler(j);
-    }
-  };
-  ajax.open("GET", url);
-  ajax.send();
-}
-
-// build post from json
-// inject into parent
-// if j is null then inject "not found" post
-function nntpchan_buildpost(parent, j) {
-  var post = document.createElement("div");
-  if (j) {
-    // huehuehue
-    post.innerHTML = j.PostMarkup;
-    inject_hover_for_element(post);
-  } else {
-    post.setAttribute("class", "notfound post");
-    post.appendChild(document.createTextNode("post not found"));
-  }
-  parent.appendChild(post);
-}
-
-// inject post hover behavior
-function inject_hover(prefix, el, parent) {
-  if (!prefix) { throw "prefix is not defined"; }
-  var linkhash = el.getAttribute("backlinkhash");
-  if (!linkhash) { throw "linkhash undefined"; }
-  console.log("rewrite linkhash "+linkhash);
-
-  var elem = document.createElement("span");
-  elem.setAttribute("class", "backlink_rewritten");
-  elem.appendChild(document.createTextNode(">>"+linkhash.substr(0,10)));
-  if (!parent) {
-    parent = el.parentNode;
-  }
-  parent.removeChild(el);
-  parent.appendChild(elem);
-  
-  elem.onclick = function(ev) {
-    if(parent.backlink) {
-      nntpchan_apicall(prefix+"api/find?hash="+linkhash, function(j) {
-        var wrapper = document.createElement("div");
-        wrapper.setAttribute("class", "hover "+linkhash);
-        if (j == null) {
-          // not found?
-          wrapper.setAttribute("class", "hover notfound-hover "+linkhash);
-          wrapper.appendChild(document.createTextNode("not found"));
-        } else {
-          // wrap backlink
-          nntpchan_buildpost(wrapper, j);
-        }
-        parent.appendChild(wrapper);
-        parent.backlink = false;
-      }, function(msg) {
-        var wrapper = document.createElement("div");
-        wrapper.setAttribute("class", "hover "+linkhash);
-        wrapper.appendChild(document.createTextNode(msg));
-        parent.appendChild(wrapper);
-        parent.backlink = false;
-      });
-    } else {
-      var elems = document.getElementsByClassName(linkhash);
-      if (!elems) throw "bad state, no backlinks open?";
-      for (var idx = 0 ; idx < elems.length; idx ++ ) {
-        elems[idx].parentNode.removeChild(elems[idx]);
-      }
-      parent.backlink = true;
-    }
-  };
-  parent.backlink = true;
-}
-
-function livechan_got_post(widget, j) {
-  // do scroll
-  while (widget.children.length > 5) {
-    // remove top element
-    widget.removeChild(widget.children[0]);
-  }
-  nntpchan_buildpost(widget, j);
-  // scroll to bottom
-  widget.scrollTop = widget.scrollHeight;
-}
-
-// inject post form into an element
-function inject_postform(prefix, parent) {
-  
-}
-
-// inject livechan widget into parent
-function inject_livechan_widget(prefix, parent) {
-  if ( "WebSocket" in window ) {
-    var url = "ws://"+document.location.host+prefix+"live";
-    if ( document.location.protocol == "https:" ) {
-      url = "wss://"+document.location.host+prefix+"live";
-    }
-    var socket = new WebSocket(url);
-    var progress = function(str) {
-      parent.innerHTML = "<pre>livechan: "+str+"</pre>";
-    };
-    progress("initialize");
-    socket.onopen = function () {
-      progress("streaming (read only)");
-    }
-    socket.onmessage = function(ev) {
-      var j = null;
-      try {
-        j = JSON.parse(ev.data);
-      } catch(e) {
-        // ignore
-      }
-      if (j) {
-        console.log(j);
-        livechan_got_post(parent, j);
-      }
-    }
-    socket.onclose = function(ev) {
-      progress("connection closed");
-      setTimeout(function() {
-        inject_livechan_widget(prefix, parent);
-      }, 1000);
-    }
-  } else {
-    parent.innerHTML = "<pre>livechan mode requires websocket support</pre>";
-    setTimeout(function() {
-      parent.innerHTML = "";
-    }, 5000);
-  }
-}
-
-function ukko_livechan(prefix) {
-  var ukko = document.getElementById("ukko_threads");
-  if (ukko) {
-    // remove children
-    ukko.innerHTML = "";
-    inject_livechan_widget(prefix, ukko);
-  }
-}
-
-var banner_count = 3;
-
-// inject a banner into an element
-function nntpchan_inject_banners(elem, prefix) {
-  var n = Math.floor(Math.random() * banner_count);
-  var banner = prefix + "static/banner_"+n+".jpg";
-  var e = document.createElement("img");
-  e.src = banner;
-  e.id = "nntpchan_banner";
-  elem.appendChild(e);
-}
-
-// inject post hover for all backlinks in an element
-function inject_hover_for_element(elem) {  
-  var elems = elem.getElementsByClassName("backlink");
-  var ls = [];
-  var l = elems.length;
-  for ( var idx = 0 ; idx < l ; idx ++ ) {
-    var e = elems[idx];
-    ls.push(e);
-  }
-  for( var elem in ls ) {
-      inject_hover(prefix, ls[elem]);
-  }
-}
-
-function init(prefix) {
-  // inject posthover ...
-  inject_hover_for_element(document);
-}
-  
-// apply themes
-var st = get_storage();
-enable_theme(st.nntpchan_prefix, st.nntpchan_theme);