summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorczaks <marcin@6irc.net>2013-06-21 16:41:39 -0400
committerczaks <marcin@6irc.net>2013-06-21 16:41:39 -0400
commit24a520485df30a85a68d02938256c4a8ac7af8e8 (patch)
tree8a93e590b715624cfa7e3812a413061fc252c1ab /js
parentc073967600124568609d10a400039f017ad9dcf8 (diff)
parent9b0c31daa68c7ab96bc25e09b70ffea77ba23590 (diff)
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts: templates/page.html
Diffstat (limited to 'js')
-rw-r--r--js/auto-reload.js3
-rw-r--r--js/post-hover.js2
2 files changed, 5 insertions, 0 deletions
diff --git a/js/auto-reload.js b/js/auto-reload.js
index c0c63056..5d96146a 100644
--- a/js/auto-reload.js
+++ b/js/auto-reload.js
@@ -16,6 +16,9 @@
$(document).ready(function(){
if($('div.banner').length == 0)
return; // not index
+
+ if($(".post.op").size() != 1)
+ return; //not thread page
var poll_interval;
diff --git a/js/post-hover.js b/js/post-hover.js
index 2f25540b..48f0ed96 100644
--- a/js/post-hover.js
+++ b/js/post-hover.js
@@ -20,6 +20,8 @@ onready(function(){
if(id = $link.text().match(/^>>(\d+)$/)) {
id = id[1];
+ } else {
+ return;
}
var $post = false;