diff options
| -rw-r--r-- | src/java/com/juick/http/www/PageTemplates.java | 4 | ||||
| -rw-r--r-- | src/java/com/juick/http/www/UserThread.java | 9 | ||||
| -rw-r--r-- | web/scripts3.js | 13 |
3 files changed, 21 insertions, 5 deletions
diff --git a/src/java/com/juick/http/www/PageTemplates.java b/src/java/com/juick/http/www/PageTemplates.java index a07d5ed8..a76e0280 100644 --- a/src/java/com/juick/http/www/PageTemplates.java +++ b/src/java/com/juick/http/www/PageTemplates.java @@ -46,12 +46,12 @@ public class PageTemplates { out.println("<head>"); out.println(" <meta charset=\"utf-8\"/>"); out.println(" <title>" + title + "</title>"); - out.println(" <link rel=\"stylesheet\" href=\"http://static.juick.com/style3.css\"/>"); + out.println(" <link rel=\"stylesheet\" href=\"http://static.juick.com/style3.css?20120306\"/>"); out.println(" <link rel=\"icon\" type=\"image/png\" href=\"http://static.juick.com/favicon.png\"/>"); out.println(" <script type=\"text/javascript\" src=\"https://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js\"></script>"); out.println(" <script type=\"text/javascript\" src=\"https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js\"></script>"); out.println(" <script type=\"text/javascript\" src=\"https://ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js\"></script>"); - out.println(" <script type=\"text/javascript\" src=\"http://static.juick.com/scripts3.js\"></script>"); + out.println(" <script type=\"text/javascript\" src=\"http://static.juick.com/scripts3.js?20120306\"></script>"); out.println(" <script type=\"text/javascript\" src=\"http://static.juick.com/js/jquery.autoresize.js\"></script>"); if (headers != null) { out.println(headers); diff --git a/src/java/com/juick/http/www/UserThread.java b/src/java/com/juick/http/www/UserThread.java index 406698bf..e64b4437 100644 --- a/src/java/com/juick/http/www/UserThread.java +++ b/src/java/com/juick/http/www/UserThread.java @@ -71,7 +71,7 @@ public class UserThread { PageTemplates.pageNavigation(out, locale, visitor); PageTemplates.pageUserTitle(out, sql, locale, user, visitor); - + out.println("<div id=\"wrapper\">"); out.println("<div id=\"content\" style=\"margin-left: 0; width: 100%\">"); @@ -80,9 +80,14 @@ public class UserThread { printReplies(out, sql, MID, locale, listview); out.println("</div>"); - + out.println("</div>"); + out.println("<script type=\"text/javascript\">"); + out.println("$(document).ready(unfoldReply);"); + out.println("$(window).bind('hashchange',unfoldReply);"); + out.println("</script>"); + PageTemplates.pageFooter(request, out, locale, visitor); } finally { out.close(); diff --git a/web/scripts3.js b/web/scripts3.js index f6e9cdef..bf3da76f 100644 --- a/web/scripts3.js +++ b/web/scripts3.js @@ -41,7 +41,7 @@ function showCommentForm(mid,rid) { c.before('<input type="hidden" name="mid" value="'+mid+'"/><input type="hidden" name="rid" value="'+rid+'"/>'); c.append('<textarea name="body" rows="1" class="reply" placeholder="Add a comment..." onkeypress="postformListener(this.form,event)"></textarea><input type="submit" value="OK"/>'); } -// $('#replies #'+rid+' .msg-links').hide(); + // $('#replies #'+rid+' .msg-links').hide(); $('#replies #'+rid+' .msg-comment').show(); $('#replies #'+rid+' textarea')[0].focus(); $('#replies #'+rid+' textarea').autoResize({ @@ -51,6 +51,17 @@ function showCommentForm(mid,rid) { return false; } +function unfoldReply() { + if((0+window.location.hash.substring(1))>0) { + var el=$(window.location.hash); + while(el.is(":hidden")) { + el=el.prev(); + } + showMoreReplies(el.attr('id')); + window.location.replace(window.location.hash); + } +} + $(document).ready(function() { $('textarea.reply').autoResize({ extraSpace: 0, |