From 2b9c93ac6d216b67e95ccc0cfb30bc5f58c9744a Mon Sep 17 00:00:00 2001
From: Ugnich Anton
Date: Thu, 24 Jul 2014 22:20:33 +0700
Subject: Websocket replies
---
src/java/com/juick/http/www/PageTemplates.java | 5 +-
src/java/com/juick/http/www/UserThread.java | 13 ++-
web/scripts3.js | 138 ++++++++++++++++++++-----
web/style3.css | 12 +++
4 files changed, 136 insertions(+), 32 deletions(-)
diff --git a/src/java/com/juick/http/www/PageTemplates.java b/src/java/com/juick/http/www/PageTemplates.java
index dabbea99..c64f99dd 100644
--- a/src/java/com/juick/http/www/PageTemplates.java
+++ b/src/java/com/juick/http/www/PageTemplates.java
@@ -51,9 +51,9 @@ public class PageTemplates {
out.println("");
out.print("");
out.print("");
- out.print("");
+ out.print("");
out.print("");
- out.print("");
+ out.print("");
if (headers != null) {
out.print(headers);
}
@@ -247,6 +247,7 @@ public class PageTemplates {
out.println("m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)");
out.println("})(window,document,'script','//www.google-analytics.com/analytics.js','ga');");
out.println("ga('create','UA-385578-4','juick.com');");
+ out.println("ga('require','displayfeatures');");
out.println("ga('send','pageview');");
if (sapeon) {
diff --git a/src/java/com/juick/http/www/UserThread.java b/src/java/com/juick/http/www/UserThread.java
index d2b65b77..c2d7cb14 100644
--- a/src/java/com/juick/http/www/UserThread.java
+++ b/src/java/com/juick/http/www/UserThread.java
@@ -80,6 +80,15 @@ public class UserThread {
out.println("");
PageTemplates.pageFooter(request, out, visitor, false);
+
+ out.println("");
+
PageTemplates.pageEnd(out);
} finally {
out.close();
@@ -298,7 +307,7 @@ public class UserThread {
if (msg.User.Banned == false) {
out.println(" ");
} else {
- out.println(" ");
+ out.println(" ");
}
out.println(" ");
out.println(" " + PageTemplates.formatMessage(msg.Text) + "
");
@@ -344,7 +353,7 @@ public class UserThread {
if (msg.User.Banned == false) {
out.println(" ");
} else {
- out.println(" ");
+ out.println(" ");
}
out.println(" ");
out.println(" " + PageTemplates.formatMessage(msg.Text) + "
");
diff --git a/web/scripts3.js b/web/scripts3.js
index 9cb72a98..3d35b441 100644
--- a/web/scripts3.js
+++ b/web/scripts3.js
@@ -1,43 +1,123 @@
-/*
var ws=null;
+var pageTitle;
function initWS() {
- ws = new WebSocket("wss://ws.juick.com/?hash="+hash);
- ws.onopen = function() {
- $('#sidepanel').addClass('online');
- };
- ws.onclose = function() {
- $('#sidepanel').removeClass('online');
- ws=null;
- initWS();
- };
- ws.onmessage = function(msg) {
- if(msg.data==' ') {
- ws.send(' ');
+ if(typeof(pageMID)!="undefined" && pageMID>0) {
+ var url;
+ if(typeof(juickDebug)!="undefined") {
+ url="wss://ws.juick.com/_replies";
} else {
- try {
- var jsonMsg=$.parseJSON(msg.data);
- if(jsonMsg.rid>0) {
- //incomingComment(jsonMsg);
- } else if(jsonMsg.mid>0) {
- //incomingPost(jsonMsg);
- } else {
- //incomingPM(jsonMsg);
+ url="wss://ws.juick.com/"+pageMID;
+ }
+ if(typeof(hash)!="undefined" && hash) {
+ url+="?hash="+hash;
+ }
+
+ ws = new WebSocket(url);
+ ws.onopen = function() {
+ console.log('online');
+ if($('#wsthread').length==0) {
+ var d=$('');
+ d.on('click',onclickNextReply);
+ d.appendTo("body");
+ pageTitle=document.title;
+ }
+ };
+ ws.onclose = function() {
+ console.log('offline');
+ ws=null;
+ setTimeout(function() {
+ initWS();
+ },2000);
+ };
+ ws.onmessage = function(msg) {
+ if(msg.data==' ') {
+ ws.send(' ');
+ } else {
+ try {
+ var jsonMsg=$.parseJSON(msg.data);
+ console.log('data: '+msg.data);
+ wsIncomingReply(jsonMsg);
+ } catch(err) {
+ console.log(err);
}
- } catch(err) {
- console.log(err);
}
- }
- };
- setInterval(wsSendKeepAlive, 90000);
+ };
+ setInterval(wsSendKeepAlive, 90000);
+ }
}
function wsSendKeepAlive() {
- if(ws!=null) {
+ if(ws) {
ws.send(' ');
}
}
- */
+
+function wsShutdown() {
+ if(ws) {
+ ws.onclose=function(){};
+ ws.close();
+ }
+}
+
+function wsIncomingReply(msg) {
+ var p;
+ if(msg.replyto>0) {
+ p=$('#'+msg.replyto);
+ if(p.length==0) {
+ p=null;
+ }
+ }
+
+ var li=$('');
+ li.html(''+
+ ''+
+ ''+
+ ''+
+ '
'+
+ '
'+msg.body+'
'+
+ '
'+
+ ''+
+ '
