From 97a22e57c1ef3c3e41ed5666255c1e941df21f3e Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sat, 20 Jul 2013 22:47:26 -0400
Subject: Remove imgcaptcha, this code is unused in any of our forks and needs
 work to get here back.

Revert "Merge branch 'imgcaptcha' of https://github.com/asiekierka/Tinyboard"

This reverts commit 49afb685c8e658c0f36b8171e176363538eb9419, reversing
changes made to 2451a0f29c08e23ff36ef113082c112224f7e576.

Conflicts:

	js/imgcaptcha.js
---
 js/imgcaptcha.js | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 js/imgcaptcha.js

(limited to 'js')

diff --git a/js/imgcaptcha.js b/js/imgcaptcha.js
deleted file mode 100644
index 99aad414..00000000
--- a/js/imgcaptcha.js
+++ /dev/null
@@ -1,12 +0,0 @@
-function ic_odswiezKapcze() {
- $.get(configRoot + "imgcaptcha_p.php", function(data) {
-  $("#imgcaptcha_hash").val(data);
-  $("#imgcaptcha_img").prop("src",configRoot + "imgcaptcha_im.php?cr=" + data);
- });
-}
-//function resetujKapcze() {
-// $("#imgcaptcha_img").prop("src",configRoot + "zakrytek.png");
-//}
-//$(document).ready(function(){
-// //resetujKapcze(); - to nie powinno byc na razie potrzebne
-//});
-- 
cgit v1.3


From 9123161870f0bf935624f7668d28fd62d2a60f8e Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Sun, 21 Jul 2013 21:12:30 -0400
Subject: js/hide-threads.js: Simple thread-minimizing script

---
 js/hide-threads.js | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 js/hide-threads.js

(limited to 'js')

diff --git a/js/hide-threads.js b/js/hide-threads.js
new file mode 100644
index 00000000..42475d2a
--- /dev/null
+++ b/js/hide-threads.js
@@ -0,0 +1,74 @@
+/*
+ * hide-threads.js
+ * https://github.com/savetheinternet/Tinyboard/blob/master/js/hide-threads.js
+ *
+ * Released under the MIT license
+ * Copyright (c) 2013 Michael Save <savetheinternet@tinyboard.org>
+ *
+ * Usage:
+ *   $config['additional_javascript'][] = 'js/jquery.min.js';
+ *   $config['additional_javascript'][] = 'js/hide-threads.js';
+ *
+ */
+
+$(document).ready(function(){
+	if($('div.banner').length != 0)
+		return; // not index
+	
+	var board = $('form input[name="board"]').val().toString();
+	
+	if (!localStorage.hiddenthreads)
+		localStorage.hiddenthreads = '{}';
+	
+	// Load data from HTML5 localStorage
+	var hidden_data = JSON.parse(localStorage.hiddenthreads);
+	
+	var store_data = function() {
+		localStorage.hiddenthreads = JSON.stringify(hidden_data);
+	};
+	
+	// Delete old hidden threads (7+ days old)
+	for (var key in hidden_data) {
+		for (var id in hidden_data[key]) {
+			if (hidden_data[key][id] < Math.round(Date.now() / 1000) - 60 * 60 * 24 * 7) {
+				delete hidden_data[key][id];
+				store_data();
+			}
+		}
+	}
+	
+	if (!hidden_data[board]) {
+		hidden_data[board] = {}; // id : timestamp
+	}
+	
+	$('div.post.op').each(function() {
+		var id = $(this).children('p.intro').children('a.post_no:eq(1)').text();
+		var thread_container = $(this).parent();
+		$('<a class="hide-thread-link" style="float:left;margin-right:5px" href="javascript:void(0)">[-]</a><span> </span>')
+			.insertBefore(thread_container.find('p.fileinfo'))
+			.click(function() {
+				hidden_data[board][id] = Math.round(Date.now() / 1000);
+				store_data();
+				
+				thread_container.find('div.post,img,p.fileinfo,a.hide-thread-link,br').hide();
+				
+				var hidden_div = thread_container.find('div.post.op > p.intro').clone();
+				hidden_div.addClass('thread-hidden');
+				hidden_div.find('a[href],input').remove();
+				
+				$('<a class="unhide-thread-link" style="float:left;margin-right:5px" href="javascript:void(0)">[+]</a><span> </span>')
+					.insertAfter(thread_container.find('a.hide-thread-link'))
+					.click(function() {
+						delete hidden_data[board][id];
+						store_data();
+						thread_container.find('div.post,img,p.fileinfo,a.hide-thread-link,br').show();
+						$(this).remove();
+						hidden_div.remove();
+					});
+				
+				hidden_div.insertAfter(thread_container.find('p.fileinfo'));
+			});
+		if (hidden_data[board][id])
+			thread_container.find('.hide-thread-link').click();
+	});
+});
-- 
cgit v1.3


From 51361d02fb4b66a198dcdb5cd6350e6dada0aac9 Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Sun, 21 Jul 2013 21:18:57 -0400
Subject: Strange bug in last commit

---
 js/hide-threads.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'js')

diff --git a/js/hide-threads.js b/js/hide-threads.js
index 42475d2a..135fbf51 100644
--- a/js/hide-threads.js
+++ b/js/hide-threads.js
@@ -45,7 +45,7 @@ $(document).ready(function(){
 		var id = $(this).children('p.intro').children('a.post_no:eq(1)').text();
 		var thread_container = $(this).parent();
 		$('<a class="hide-thread-link" style="float:left;margin-right:5px" href="javascript:void(0)">[-]</a><span> </span>')
-			.insertBefore(thread_container.find('p.fileinfo'))
+			.insertBefore(thread_container.find('p.fileinfo:first'))
 			.click(function() {
 				hidden_data[board][id] = Math.round(Date.now() / 1000);
 				store_data();
@@ -66,7 +66,7 @@ $(document).ready(function(){
 						hidden_div.remove();
 					});
 				
-				hidden_div.insertAfter(thread_container.find('p.fileinfo'));
+				hidden_div.insertAfter(thread_container.find('p.fileinfo:first'));
 			});
 		if (hidden_data[board][id])
 			thread_container.find('.hide-thread-link').click();
-- 
cgit v1.3


From e5663953b534f8098acff8f2942fdb81c2942acf Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Mon, 22 Jul 2013 10:14:08 -0400
Subject: Remove our post-hider script in favour of STI's one, leave symlink
 for compatibility

---
 js/post-hider.js | 54 +-----------------------------------------------------
 1 file changed, 1 insertion(+), 53 deletions(-)
 mode change 100644 => 120000 js/post-hider.js

(limited to 'js')

diff --git a/js/post-hider.js b/js/post-hider.js
deleted file mode 100644
index f4cde66a..00000000
--- a/js/post-hider.js
+++ /dev/null
@@ -1,53 +0,0 @@
-function phGetCookieName(board, id) {
-  return "ph_hide_" + board + "_" + id;
-}
-function phPostHidden(board, id) {
-  return (localStorage.getItem(phGetCookieName(board, id)) != null);
-}
-function phPostToggle(board, id) {
- if(phPostHidden(board, id)) { localStorage.removeItem(phGetCookieName(board, id)); }
- else { localStorage.setItem(phGetCookieName(board, id),"yes"); }
-}
-function phGetInnerText(board, id) {
- if(phPostHidden(board, id)) { return "[+]"; }
- else { return "[–]"; }
-}
-function phGetOpID(element) {
- return Number(element.children("div.post.op").children("p.intro").children("a.post_no:eq(1)").text());
-}
-function phGetOpBoard(element) {
- return element.data("board");
-}
-function phPostHandle(element) {
- var id = phGetOpID(element);
- var board = phGetOpBoard(element);
- var preplies = element.children("div.post.reply");
- var pbody = element.children("div.post.op").children("div.body");
- var pimage = element.children("a:first").children("img");
- var pbutton = element.children("div.post.op").children("p.intro").children("a.posthider");
- var pomitted = element.children("div.post.op").children("span.omitted");
- if(phPostHidden(board, id)) { element.addClass("thread-hidden"); pomitted.hide(); preplies.hide(); pbody.hide(); pimage.hide(); pbutton.text("[+]"); }
- else { element.removeClass("thread-hidden"); pomitted.show(); preplies.show(); pbody.show(); pimage.show(); pbutton.text("[–]"); }
-}
-
-function phHandleThread(index, element) {
-  // Get thread ID.
-  var pin = $(this).children("div.post.op").children("p.intro");
-  var tid = phGetOpID($(this));
-  if(tid != NaN) {
-    $("<a href='javascript:;' class='posthider'>[?]</a>").insertAfter(pin.children('a:last')).click(function(e) {
-      var eO = $(e.target);
-      var par = eO.parent().parent().parent();
-      phPostToggle(phGetOpBoard(par), phGetOpID(par));
-      phPostHandle(par);
-      return false;
-    });
-    phPostHandle($(this));
-  }
-}
-
-$(document).ready(function(){
-  if (active_page != "thread") {
-    $('form[name="postcontrols"] > div[id^="thread"]').each(phHandleThread);
-  }
-});
diff --git a/js/post-hider.js b/js/post-hider.js
new file mode 120000
index 00000000..693c14d6
--- /dev/null
+++ b/js/post-hider.js
@@ -0,0 +1 @@
+hide-threads.js
\ No newline at end of file
-- 
cgit v1.3


From d111c6ab8c9ef12440c52974fc12ea61aa5c6ca1 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Mon, 22 Jul 2013 10:26:14 -0400
Subject: hide-threads.js: a bigger minus character

---
 js/hide-threads.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/hide-threads.js b/js/hide-threads.js
index 135fbf51..5a9908f1 100644
--- a/js/hide-threads.js
+++ b/js/hide-threads.js
@@ -44,7 +44,7 @@ $(document).ready(function(){
 	$('div.post.op').each(function() {
 		var id = $(this).children('p.intro').children('a.post_no:eq(1)').text();
 		var thread_container = $(this).parent();
-		$('<a class="hide-thread-link" style="float:left;margin-right:5px" href="javascript:void(0)">[-]</a><span> </span>')
+		$('<a class="hide-thread-link" style="float:left;margin-right:5px" href="javascript:void(0)">[–]</a><span> </span>')
 			.insertBefore(thread_container.find('p.fileinfo:first'))
 			.click(function() {
 				hidden_data[board][id] = Math.round(Date.now() / 1000);
-- 
cgit v1.3


From 163df14b50eea0fd4b84342055130459c3b8035d Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Mon, 22 Jul 2013 10:26:14 -0400
Subject: hide-threads.js: a bigger minus character

---
 js/hide-threads.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/hide-threads.js b/js/hide-threads.js
index 135fbf51..5a9908f1 100644
--- a/js/hide-threads.js
+++ b/js/hide-threads.js
@@ -44,7 +44,7 @@ $(document).ready(function(){
 	$('div.post.op').each(function() {
 		var id = $(this).children('p.intro').children('a.post_no:eq(1)').text();
 		var thread_container = $(this).parent();
-		$('<a class="hide-thread-link" style="float:left;margin-right:5px" href="javascript:void(0)">[-]</a><span> </span>')
+		$('<a class="hide-thread-link" style="float:left;margin-right:5px" href="javascript:void(0)">[–]</a><span> </span>')
 			.insertBefore(thread_container.find('p.fileinfo:first'))
 			.click(function() {
 				hidden_data[board][id] = Math.round(Date.now() / 1000);
-- 
cgit v1.3


From 51bd267764f7820c239b6c2a5e93be089c3e064d Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sat, 20 Jul 2013 17:50:52 -0400
Subject: youtube.js: prevent default action of opening new window

---
 js/youtube.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'js')

diff --git a/js/youtube.js b/js/youtube.js
index 482a9bc8..035796d8 100644
--- a/js/youtube.js
+++ b/js/youtube.js
@@ -29,6 +29,8 @@ onready(function(){
 		var videoID = $(this).data('video');
 		
 		$(this).html('<iframe style="float:left;margin: 10px 20px" type="text/html" width="360" height="270" src="http://www.youtube.com/embed/' + videoID + '?autoplay=1" frameborder="0"/>');
+
+		return false;
 	});
 });
 
-- 
cgit v1.3


From e2806cfcaf78973281a7ca423187dba1ca5123d5 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sat, 20 Jul 2013 18:01:46 -0400
Subject: youtube.js: fix previous commit

---
 js/youtube.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'js')

diff --git a/js/youtube.js b/js/youtube.js
index 035796d8..0bb8d86a 100644
--- a/js/youtube.js
+++ b/js/youtube.js
@@ -24,9 +24,8 @@
 
 
 onready(function(){
-	$('div.video-container a').attr('href', 'javascript:void(0)');
-	$('div.video-container').click(function() {
-		var videoID = $(this).data('video');
+	$('div.video-container a').click(function() {
+		var videoID = $(this).parentNode.data('video');
 		
 		$(this).html('<iframe style="float:left;margin: 10px 20px" type="text/html" width="360" height="270" src="http://www.youtube.com/embed/' + videoID + '?autoplay=1" frameborder="0"/>');
 
-- 
cgit v1.3


From bdffdcb1c319cab6f3fec638a17c933d9f4a42ad Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sat, 20 Jul 2013 18:11:25 -0400
Subject: youtube.js: made it actually work, also a fix in usage

---
 js/youtube.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'js')

diff --git a/js/youtube.js b/js/youtube.js
index 0bb8d86a..745093dd 100644
--- a/js/youtube.js
+++ b/js/youtube.js
@@ -13,8 +13,8 @@
 *
 * Usage:
 *	$config['embedding'] = array();
-*	$config['embedding'][] = array(
-*		'/^https?:\/\/(\w+\.)?youtube\.com\/watch\?v=([a-zA-Z0-9\-_]{10,11})(&.+)?$/i',
+*	$config['embedding'][0] = array(
+*		'/^https?:\/\/(\w+\.)?(?:youtube\.com\/watch\?v=|youtu\.be\/)([a-zA-Z0-9\-_]{10,11})(&.+)?$/i',
 *		'<div class="video-container" data-video="$2"><a href="$0" target="_blank" class="file"><img style="width:360px;height:270px;" src="http://img.youtube.com/vi/$2/0.jpg"/></a></div>'
 );
 *   $config['additional_javascript'][] = 'js/jquery.min.js';
@@ -25,9 +25,9 @@
 
 onready(function(){
 	$('div.video-container a').click(function() {
-		var videoID = $(this).parentNode.data('video');
+		var videoID = $(this.parentNode).data('video');
 		
-		$(this).html('<iframe style="float:left;margin: 10px 20px" type="text/html" width="360" height="270" src="http://www.youtube.com/embed/' + videoID + '?autoplay=1" frameborder="0"/>');
+		$(this.parentNode).html('<iframe style="float:left;margin: 10px 20px" type="text/html" width="360" height="270" src="http://www.youtube.com/embed/' + videoID + '?autoplay=1" frameborder="0"/>');
 
 		return false;
 	});
-- 
cgit v1.3


From 96f3363a8bd0c001c443b34bb9765c6a4895e48b Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sat, 20 Jul 2013 18:12:45 -0400
Subject: youtube.js: better working in https environments

---
 js/youtube.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'js')

diff --git a/js/youtube.js b/js/youtube.js
index 745093dd..ec8c501a 100644
--- a/js/youtube.js
+++ b/js/youtube.js
@@ -15,7 +15,7 @@
 *	$config['embedding'] = array();
 *	$config['embedding'][0] = array(
 *		'/^https?:\/\/(\w+\.)?(?:youtube\.com\/watch\?v=|youtu\.be\/)([a-zA-Z0-9\-_]{10,11})(&.+)?$/i',
-*		'<div class="video-container" data-video="$2"><a href="$0" target="_blank" class="file"><img style="width:360px;height:270px;" src="http://img.youtube.com/vi/$2/0.jpg"/></a></div>'
+*		'<div class="video-container" data-video="$2"><a href="$0" target="_blank" class="file"><img style="width:360px;height:270px;" src="//img.youtube.com/vi/$2/0.jpg"/></a></div>'
 );
 *   $config['additional_javascript'][] = 'js/jquery.min.js';
 *   $config['additional_javascript'][] = 'js/youtube.js';
@@ -27,7 +27,7 @@ onready(function(){
 	$('div.video-container a').click(function() {
 		var videoID = $(this.parentNode).data('video');
 		
-		$(this.parentNode).html('<iframe style="float:left;margin: 10px 20px" type="text/html" width="360" height="270" src="http://www.youtube.com/embed/' + videoID + '?autoplay=1" frameborder="0"/>');
+		$(this.parentNode).html('<iframe style="float:left;margin: 10px 20px" type="text/html" width="360" height="270" src="//www.youtube.com/embed/' + videoID + '?autoplay=1" frameborder="0"/>');
 
 		return false;
 	});
-- 
cgit v1.3


From acea5a3cccbc6ffd3fd4fae7f4e9255ded02bee6 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sat, 20 Jul 2013 18:25:58 -0400
Subject: youtube.js: make it work with thread expand etc.

---
 js/youtube.js | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'js')

diff --git a/js/youtube.js b/js/youtube.js
index ec8c501a..f64d4874 100644
--- a/js/youtube.js
+++ b/js/youtube.js
@@ -24,12 +24,20 @@
 
 
 onready(function(){
-	$('div.video-container a').click(function() {
-		var videoID = $(this.parentNode).data('video');
+	var do_embed_yt = function(tag) {
+		$('div.video-container a', tag).click(function() {
+			var videoID = $(this.parentNode).data('video');
 		
-		$(this.parentNode).html('<iframe style="float:left;margin: 10px 20px" type="text/html" width="360" height="270" src="//www.youtube.com/embed/' + videoID + '?autoplay=1" frameborder="0"/>');
+			$(this.parentNode).html('<iframe style="float:left;margin: 10px 20px" type="text/html" width="360" height="270" src="//www.youtube.com/embed/' + videoID + '?autoplay=1" frameborder="0"/>');
 
-		return false;
-	});
+			return false;
+		});
+	};
+	do_embed_yt(document);
+
+        // allow to work with auto-reload.js, etc.
+        $(document).bind('new_post', function(e, post) {
+                do_embed_yt(post);
+        });
 });
 
-- 
cgit v1.3


From 6bc309697edfa5ab1c2cf22d945361bb8a210baa Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Mon, 22 Jul 2013 23:29:24 -0400
Subject: hide-threads.js: fix working with ukko

---
 js/hide-threads.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'js')

diff --git a/js/hide-threads.js b/js/hide-threads.js
index 5a9908f1..c9ace8a5 100644
--- a/js/hide-threads.js
+++ b/js/hide-threads.js
@@ -12,11 +12,9 @@
  */
 
 $(document).ready(function(){
-	if($('div.banner').length != 0)
+	if (active_page != "index" && active_page != "ukko")
 		return; // not index
-	
-	var board = $('form input[name="board"]').val().toString();
-	
+		
 	if (!localStorage.hiddenthreads)
 		localStorage.hiddenthreads = '{}';
 	
@@ -37,13 +35,15 @@ $(document).ready(function(){
 		}
 	}
 	
-	if (!hidden_data[board]) {
-		hidden_data[board] = {}; // id : timestamp
-	}
-	
 	$('div.post.op').each(function() {
 		var id = $(this).children('p.intro').children('a.post_no:eq(1)').text();
 		var thread_container = $(this).parent();
+		var board = thread_container.data("board");
+
+		if (!hidden_data[board]) {
+			hidden_data[board] = {}; // id : timestamp
+		}
+	
 		$('<a class="hide-thread-link" style="float:left;margin-right:5px" href="javascript:void(0)">[–]</a><span> </span>')
 			.insertBefore(thread_container.find('p.fileinfo:first'))
 			.click(function() {
-- 
cgit v1.3


From c562149458dc4ac917858a66dbea705297200b93 Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Tue, 23 Jul 2013 09:20:37 -0400
Subject: Bugfix: "[]" showing for mods when hiding threads

---
 js/hide-threads.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'js')

diff --git a/js/hide-threads.js b/js/hide-threads.js
index 5a9908f1..734dfe78 100644
--- a/js/hide-threads.js
+++ b/js/hide-threads.js
@@ -55,6 +55,7 @@ $(document).ready(function(){
 				var hidden_div = thread_container.find('div.post.op > p.intro').clone();
 				hidden_div.addClass('thread-hidden');
 				hidden_div.find('a[href],input').remove();
+				hidden_div.html(hidden_div.html().replace(' [] ', ' '));
 				
 				$('<a class="unhide-thread-link" style="float:left;margin-right:5px" href="javascript:void(0)">[+]</a><span> </span>')
 					.insertAfter(thread_container.find('a.hide-thread-link'))
-- 
cgit v1.3


From c217069f2bc7f9b38a4ddbe3d1043fe3b06ecf17 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 26 Jul 2013 14:27:38 -0400
Subject: hide-threads.js: show post hider even in posts without an image

---
 js/hide-threads.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/hide-threads.js b/js/hide-threads.js
index 75339455..cc06ad0b 100644
--- a/js/hide-threads.js
+++ b/js/hide-threads.js
@@ -46,7 +46,7 @@ $(document).ready(function(){
 		}
 	
 		$('<a class="hide-thread-link" style="float:left;margin-right:5px" href="javascript:void(0)">[–]</a><span> </span>')
-			.insertBefore(thread_container.find('p.fileinfo:first'))
+			.insertBefore(thread_container.find(':first'))
 			.click(function() {
 				hidden_data[board][id] = Math.round(Date.now() / 1000);
 				store_data();
-- 
cgit v1.3


From 95c50ae778d4e47b2076a6af0df61a05180c3dd1 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 26 Jul 2013 14:57:08 -0400
Subject: hide-threads.js: fix previous commit

---
 js/hide-threads.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/hide-threads.js b/js/hide-threads.js
index cc06ad0b..00ddbc48 100644
--- a/js/hide-threads.js
+++ b/js/hide-threads.js
@@ -68,7 +68,7 @@ $(document).ready(function(){
 						hidden_div.remove();
 					});
 				
-				hidden_div.insertAfter(thread_container.find('p.fileinfo:first'));
+				hidden_div.insertAfter(thread_container.find(':first'));
 			});
 		if (hidden_data[board][id])
 			thread_container.find('.hide-thread-link').click();
-- 
cgit v1.3


From 1a43b8731525e7268b1c4e167b8116fdf97b28c4 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 26 Jul 2013 15:31:20 -0400
Subject: hide-threads.js: further fixes and customisations, mainly due to
 unexpanding previously not working here, but working on another boards
 (4chon, etc.)

---
 js/hide-threads.js    | 7 ++++---
 stylesheets/style.css | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'js')

diff --git a/js/hide-threads.js b/js/hide-threads.js
index 00ddbc48..abaa700f 100644
--- a/js/hide-threads.js
+++ b/js/hide-threads.js
@@ -55,11 +55,12 @@ $(document).ready(function(){
 				
 				var hidden_div = thread_container.find('div.post.op > p.intro').clone();
 				hidden_div.addClass('thread-hidden');
-				hidden_div.find('a[href],input').remove();
+				hidden_div.find('a[href]:not([href$=".html"]),input').remove();
+				hidden_div.html(hidden_div.html().replace(' [] ', ' '));
 				hidden_div.html(hidden_div.html().replace(' [] ', ' '));
 				
-				$('<a class="unhide-thread-link" style="float:left;margin-right:5px" href="javascript:void(0)">[+]</a><span> </span>')
-					.insertAfter(thread_container.find('a.hide-thread-link'))
+				$('<a class="unhide-thread-link" style="float:left;margin-right:5px;margin-left:0px;" href="javascript:void(0)">[+]</a><span> </span>')
+					.insertBefore(hidden_div.find(':first'))
 					.click(function() {
 						delete hidden_data[board][id];
 						store_data();
diff --git a/stylesheets/style.css b/stylesheets/style.css
index 0339864b..393f9faa 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -458,6 +458,7 @@ table.mod.config-editor input[type="text"] {
   background-color: #fff;
   opacity: 0.8;
 }
-.thread-hidden {
-  opacity: 0.5;
+p.intro.thread-hidden {
+  margin: 0px;
+  padding: 0px;
 }
-- 
cgit v1.3


From baa6793516242890222d3b4c94cac3f31649bd3b Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Fri, 26 Jul 2013 19:39:11 -0400
Subject: toggle-images.js (this was written last year, but I never pushed it
 to git)

---
 js/toggle-images.js | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 js/toggle-images.js

(limited to 'js')

diff --git a/js/toggle-images.js b/js/toggle-images.js
new file mode 100644
index 00000000..006b3622
--- /dev/null
+++ b/js/toggle-images.js
@@ -0,0 +1,50 @@
+/*
+ * toggle-images.js
+ *
+ * Released under the MIT license
+ * Copyright (c) 2012 Michael Save <savetheinternet@tinyboard.org>
+ *
+ * Usage:
+ *   $config['additional_javascript'][] = 'js/jquery.min.js';
+ *   $config['additional_javascript'][] = 'js/toggle-images.js';
+ *
+ */
+
+$(document).ready(function(){
+	var hide_images = localStorage['hideimages'] ? true : false;
+
+	$('<style type="text/css"> img.hidden{ opacity: 0.1; background: grey; border: 1px solid #000; } </style>').appendTo($('head'));
+
+	var hideImage = function() {
+		$(this)
+			.attr('data-orig', this.src)
+			.attr('src', 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==')
+			.addClass('hidden');
+	};
+
+	var restoreImage = function() {
+		$(this)
+			.attr('src', $(this).attr('data-orig'))
+			.removeClass('hidden');
+	};
+
+	$('hr:first').before('<div id="toggle-images" style="text-align:right"><a class="unimportant" href="javascript:void(0)">-</a></div>');
+	$('div#toggle-images a')
+		.text((hide_images ? 'Show' : 'Hide') + ' images')
+		.click(function() {
+			hide_images = !hide_images;
+			if (hide_images) {
+				$('div > a > img').each(hideImage);
+				localStorage.hideimages = true;
+			} else {
+				$('div > a > img').each(restoreImage);
+				delete localStorage.hideimages;
+			}
+
+			$(this).text((hide_images ? 'Show' : 'Hide') + ' images')
+		});
+
+	if (hide_images) {
+		$('div > a > img').each(hideImage);
+	}
+});
-- 
cgit v1.3


From a11c8981fe87f58d7205fc478c8ba68dca9aa3c2 Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Fri, 26 Jul 2013 19:55:28 -0400
Subject: js/hide-images.js: Hide individual images

---
 js/hide-images.js | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100644 js/hide-images.js

(limited to 'js')

diff --git a/js/hide-images.js b/js/hide-images.js
new file mode 100644
index 00000000..75dc07c2
--- /dev/null
+++ b/js/hide-images.js
@@ -0,0 +1,81 @@
+/*
+ * hide-images.js
+ * https://github.com/savetheinternet/Tinyboard/blob/master/js/hide-images.js
+ *
+ * Hide individual images.
+ *
+ * Released under the MIT license
+ * Copyright (c) 2013 Michael Save <savetheinternet@tinyboard.org>
+ *
+ * Usage:
+ *   $config['additional_javascript'][] = 'js/jquery.min.js';
+ *   $config['additional_javascript'][] = 'js/hide-images.js';
+ *
+ */
+
+$(document).ready(function(){
+	$('<style type="text/css"> img.hidden{ opacity: 0.1; background: grey; border: 1px solid #000; } </style>').appendTo($('head'));
+	
+	var board = $('form input[name="board"]').val().toString();
+
+	if (!localStorage.hiddenimages)
+		localStorage.hiddenimages = '{}';
+
+	// Load data from HTML5 localStorage
+	var hidden_data = JSON.parse(localStorage.hiddenimages);
+
+	var store_data = function() {
+		localStorage.hiddenimages = JSON.stringify(hidden_data);
+	};
+
+	// Delete old hidden images (30+ days old)
+	for (var key in hidden_data) {
+		for (var id in hidden_data[key]) {
+			if (hidden_data[key][id] < Math.round(Date.now() / 1000) - 60 * 60 * 24 * 30) {
+				delete hidden_data[key][id];
+				store_data();
+			}
+		}
+	}
+
+	if (!hidden_data[board]) {
+		hidden_data[board] = {}; // id : timestamp
+	}
+
+	$('div.post > a > img, div > a > img').each(function() {
+		var img = this;
+		var fileinfo = $(this).parent().prev();
+		var id = $(this).parent().parent().find('>p.intro>a.post_no:eq(1),>div.post.op>p.intro>a.post_no:eq(1)').text();
+		
+		var replacement = $('<span>File <small>(<a class="hide-image-link" href="javascript:void(0)">hide</a>)</small>: </span>');
+				
+		replacement.find('a').click(function() {
+			hidden_data[board][id] = Math.round(Date.now() / 1000);
+			store_data();
+			
+			var show_link = $('<a href="javascript:void(0)">show</a>').click(function() {
+				delete hidden_data[board][id];
+				store_data();
+				
+				$(img)
+					.removeClass('hidden')
+					.attr('src', $(img).data('orig'));
+				$(this).prev().show();
+				$(this).remove();
+			});
+			
+			$(this).hide().after(show_link);
+			
+			$(img)
+				.data('orig', img.src)
+				.attr('src', 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==')
+				.addClass('hidden');
+		});
+		
+		$(this).parent().prev().contents().first().replaceWith(replacement);
+		
+		if (hidden_data[board][id])
+			$(this).parent().prev().find('.hide-image-link').click();
+		
+	});
+});
-- 
cgit v1.3


From a28b5fc3a1975af863d348d3851b90b3c398baaf Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 26 Jul 2013 22:34:06 -0400
Subject: expand.js: fix a weird bug - thread expand not always worked due to
 post being loaded in DOM, but not put in a right place in a thread, or so, so
 check if it has been loaded in a thread instead of if it exists in DOM

---
 js/expand.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/expand.js b/js/expand.js
index 0e3537a8..1a719fad 100644
--- a/js/expand.js
+++ b/js/expand.js
@@ -27,7 +27,7 @@ $(document).ready(function(){
 					success: function(data) {
 						var last_expanded = false;
 						$(data).find('div.post.reply').each(function() {
-							if($('#' + $(this).attr('id')).length == 0) {
+							if(thread.find('#' + $(this).attr('id')).length == 0) {
 								if(last_expanded) {
 									$(this).addClass('expanded').insertAfter(last_expanded).before('<br class="expanded">');
 								} else {
-- 
cgit v1.3


From e5bdf63692487e07833bbc4197ae7cd98e5af7e4 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 26 Jul 2013 22:39:00 -0400
Subject: expand.js: fix post order when new posts appear between loading index
 and expanding

---
 js/expand.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/expand.js b/js/expand.js
index 1a719fad..a737ee7f 100644
--- a/js/expand.js
+++ b/js/expand.js
@@ -27,7 +27,8 @@ $(document).ready(function(){
 					success: function(data) {
 						var last_expanded = false;
 						$(data).find('div.post.reply').each(function() {
-							if(thread.find('#' + $(this).attr('id')).length == 0) {
+							var post_in_doc = thread.find('#' + $(this).attr('id'));
+							if(post_in_doc.length == 0) {
 								if(last_expanded) {
 									$(this).addClass('expanded').insertAfter(last_expanded).before('<br class="expanded">');
 								} else {
@@ -37,6 +38,9 @@ $(document).ready(function(){
 								
 								$(document).trigger('new_post', this);
 							}
+							else {
+								last_expanded = post_in_doc;
+							}
 						});
 						$('<span class="omitted"><a href="javascript:void(0)">' + _('Hide expanded replies') + '</a>.</span>')
 							.insertAfter(thread.find('span.omitted').css('display', 'none'))
-- 
cgit v1.3


From c0a45ba1237fd54c0d5050d3a70abdea022ff6c3 Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Sat, 27 Jul 2013 00:14:43 -0400
Subject: Allow hide-images.js, toggle-images.js and inline-expanding.js to
 work together

---
 js/hide-images.js      |  5 ++++-
 js/inline-expanding.js | 33 ++++++++++++++++++++-------------
 js/toggle-images.js    | 29 ++++++++++++++++++++++++++++-
 3 files changed, 52 insertions(+), 15 deletions(-)

(limited to 'js')

diff --git a/js/hide-images.js b/js/hide-images.js
index 75dc07c2..7344cd8f 100644
--- a/js/hide-images.js
+++ b/js/hide-images.js
@@ -53,7 +53,7 @@ $(document).ready(function(){
 			hidden_data[board][id] = Math.round(Date.now() / 1000);
 			store_data();
 			
-			var show_link = $('<a href="javascript:void(0)">show</a>').click(function() {
+			var show_link = $('<a class="show-image-link" href="javascript:void(0)">show</a>').click(function() {
 				delete hidden_data[board][id];
 				store_data();
 				
@@ -66,6 +66,9 @@ $(document).ready(function(){
 			
 			$(this).hide().after(show_link);
 			
+			if ($(img).parent()[0].dataset.expanded == 'true') {
+				$(img).parent().click();
+			}
 			$(img)
 				.data('orig', img.src)
 				.attr('src', 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==')
diff --git a/js/inline-expanding.js b/js/inline-expanding.js
index f6714d7f..2e924f05 100644
--- a/js/inline-expanding.js
+++ b/js/inline-expanding.js
@@ -3,7 +3,7 @@
  * https://github.com/savetheinternet/Tinyboard/blob/master/js/inline-expanding.js
  *
  * Released under the MIT license
- * Copyright (c) 2012 Michael Save <savetheinternet@tinyboard.org>
+ * Copyright (c) 2012-2013 Michael Save <savetheinternet@tinyboard.org>
  *
  * Usage:
  *   $config['additional_javascript'][] = 'js/inline-expanding.js';
@@ -13,30 +13,37 @@
 onready(function(){
 	var link = document.getElementsByTagName('a');
 	
-	for(var i = 0; i < link.length; i++) {
-		if(typeof link[i] == "object" && link[i].childNodes[0].src && link[i].className != 'file') {
+	for (var i = 0; i < link.length; i++) {
+		if (typeof link[i] == "object" && link[i].childNodes && link[i].childNodes[0].src && link[i].className != 'file') {
 			link[i].childNodes[0].style.maxWidth = '95%';
 			link[i].childNodes[0].style.maxHeight = '95%';
 			link[i].onclick = function(e) {
-				if(e.which == 2) {
+				if (this.childNodes[0].className == 'hidden')
+					return false;
+				if (e.which == 2)
 					return true;
-				}
-				if(!this.tag) {
-					this.tag = this.childNodes[0].src;
+				if (!this.dataset.src) {
+					this.dataset.expanded = 'true';
+					this.dataset.src= this.childNodes[0].src;
+					this.dataset.width = this.childNodes[0].style.width;
+					this.dataset.height = this.childNodes[0].style.height;
 					this.childNodes[0].src = this.href;
 					this.childNodes[0].style.width = 'auto';
 					this.childNodes[0].style.height = 'auto';
 					this.childNodes[0].style.opacity = '0.4';
 					this.childNodes[0].style.filter = 'alpha(opacity=40)';
 					this.childNodes[0].onload = function() {
-						this.style.opacity = '1';
-						this.style.filter = '';
+						this.style.opacity = '';
+						delete this.style.filter;
 					}
 				} else {
-					this.childNodes[0].src = this.tag;
-					this.childNodes[0].style.width = 'auto';
-					this.childNodes[0].style.height = 'auto';
-					this.tag = '';
+					this.childNodes[0].src = this.dataset.src;
+					this.childNodes[0].style.width = this.dataset.width;
+					this.childNodes[0].style.height = this.dataset.height;
+					delete this.dataset.expanded;
+					delete this.dataset.src;
+					delete this.childNodes[0].style.opacity;
+					delete this.childNodes[0].style.filter;
 				}
 				return false;
 			}
diff --git a/js/toggle-images.js b/js/toggle-images.js
index 006b3622..74f2fab4 100644
--- a/js/toggle-images.js
+++ b/js/toggle-images.js
@@ -16,6 +16,9 @@ $(document).ready(function(){
 	$('<style type="text/css"> img.hidden{ opacity: 0.1; background: grey; border: 1px solid #000; } </style>').appendTo($('head'));
 
 	var hideImage = function() {
+		if ($(this).parent()[0].dataset.expanded == 'true') {
+			$(this).parent().click();
+		}
 		$(this)
 			.attr('data-orig', this.src)
 			.attr('src', 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==')
@@ -28,6 +31,27 @@ $(document).ready(function(){
 			.removeClass('hidden');
 	};
 
+	// Fix for hide-images.js
+	var show_hide_hide_images_buttons = function() {
+		if (hide_images) {
+			$('a.hide-image-link').each(function() {
+				if ($(this).next().hasClass('show-image-link')) {
+					$(this).next().hide();
+				}
+				$(this).hide().after('<span class="toggle-images-placeholder">hidden</span>');
+			});
+		} else {
+			$('span.toggle-images-placeholder').remove();
+			$('a.hide-image-link').each(function() {
+				if ($(this).next().hasClass('show-image-link')) {
+					$(this).next().show();
+				} else {
+					$(this).show();
+				}
+			});
+		}
+	};
+
 	$('hr:first').before('<div id="toggle-images" style="text-align:right"><a class="unimportant" href="javascript:void(0)">-</a></div>');
 	$('div#toggle-images a')
 		.text((hide_images ? 'Show' : 'Hide') + ' images')
@@ -40,11 +64,14 @@ $(document).ready(function(){
 				$('div > a > img').each(restoreImage);
 				delete localStorage.hideimages;
 			}
-
+			
+			show_hide_hide_images_buttons();
+			
 			$(this).text((hide_images ? 'Show' : 'Hide') + ' images')
 		});
 
 	if (hide_images) {
 		$('div > a > img').each(hideImage);
+		show_hide_hide_images_buttons();
 	}
 });
-- 
cgit v1.3


From 6bf217941a3342cdcf7768ab5269f7d35b050984 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 26 Jul 2013 22:34:06 -0400
Subject: expand.js: fix a weird bug - thread expand not always worked due to
 post being loaded in DOM, but not put in a right place in a thread, or so, so
 check if it has been loaded in a thread instead of if it exists in DOM

---
 js/expand.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/expand.js b/js/expand.js
index 05aece95..d0b4583c 100644
--- a/js/expand.js
+++ b/js/expand.js
@@ -27,7 +27,7 @@ $(document).ready(function(){
 					success: function(data) {
 						var last_expanded = false;
 						$(data).find('div.post.reply').each(function() {
-							if($('#' + $(this).attr('id')).length == 0) {
+							if(thread.find('#' + $(this).attr('id')).length == 0) {
 								if(last_expanded) {
 									$(this).addClass('expanded').insertAfter(last_expanded).before('<br class="expanded">');
 								} else {
-- 
cgit v1.3


From d82cd9b7bd03708f4940b4508acd0394713b8869 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 26 Jul 2013 22:39:00 -0400
Subject: expand.js: fix post order when new posts appear between loading index
 and expanding

---
 js/expand.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/expand.js b/js/expand.js
index d0b4583c..16a0efb2 100644
--- a/js/expand.js
+++ b/js/expand.js
@@ -27,7 +27,8 @@ $(document).ready(function(){
 					success: function(data) {
 						var last_expanded = false;
 						$(data).find('div.post.reply').each(function() {
-							if(thread.find('#' + $(this).attr('id')).length == 0) {
+							var post_in_doc = thread.find('#' + $(this).attr('id'));
+							if(post_in_doc.length == 0) {
 								if(last_expanded) {
 									$(this).addClass('expanded').insertAfter(last_expanded).before('<br class="expanded">');
 								} else {
@@ -36,6 +37,9 @@ $(document).ready(function(){
 								last_expanded = $(this);
 								
 							}
+							else {
+								last_expanded = post_in_doc;
+							}
 						});
 						$('<span class="omitted"><a href="javascript:void(0)">Hide expanded replies</a>.</span>')
 							.insertAfter(thread.find('span.omitted').css('display', 'none'))
-- 
cgit v1.3


From c51dc146e2248a09d97941a73ac5ef65ee4e1085 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 26 Jul 2013 14:27:38 -0400
Subject: hide-threads.js: show post hider even in posts without an image

---
 js/hide-threads.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/hide-threads.js b/js/hide-threads.js
index 734dfe78..03c33a3f 100644
--- a/js/hide-threads.js
+++ b/js/hide-threads.js
@@ -45,7 +45,7 @@ $(document).ready(function(){
 		var id = $(this).children('p.intro').children('a.post_no:eq(1)').text();
 		var thread_container = $(this).parent();
 		$('<a class="hide-thread-link" style="float:left;margin-right:5px" href="javascript:void(0)">[–]</a><span> </span>')
-			.insertBefore(thread_container.find('p.fileinfo:first'))
+			.insertBefore(thread_container.find(':first'))
 			.click(function() {
 				hidden_data[board][id] = Math.round(Date.now() / 1000);
 				store_data();
-- 
cgit v1.3


From 4b50f1475e5cdf6afa2db0aef0345ad00a9d6a7f Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 26 Jul 2013 14:57:08 -0400
Subject: hide-threads.js: fix previous commit

---
 js/hide-threads.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/hide-threads.js b/js/hide-threads.js
index 03c33a3f..14893e05 100644
--- a/js/hide-threads.js
+++ b/js/hide-threads.js
@@ -67,7 +67,7 @@ $(document).ready(function(){
 						hidden_div.remove();
 					});
 				
-				hidden_div.insertAfter(thread_container.find('p.fileinfo:first'));
+				hidden_div.insertAfter(thread_container.find(':first'));
 			});
 		if (hidden_data[board][id])
 			thread_container.find('.hide-thread-link').click();
-- 
cgit v1.3


From 1c33285c81efe174f09e99b15be81f527c0f8ae0 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 26 Jul 2013 15:31:20 -0400
Subject: hide-threads.js: further fixes and customisations, mainly due to
 unexpanding previously not working here, but working on another boards
 (4chon, etc.)

Conflicts:
	stylesheets/style.css
---
 js/hide-threads.js    | 7 ++++---
 stylesheets/style.css | 5 +++++
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'js')

diff --git a/js/hide-threads.js b/js/hide-threads.js
index 14893e05..faa1289c 100644
--- a/js/hide-threads.js
+++ b/js/hide-threads.js
@@ -54,11 +54,12 @@ $(document).ready(function(){
 				
 				var hidden_div = thread_container.find('div.post.op > p.intro').clone();
 				hidden_div.addClass('thread-hidden');
-				hidden_div.find('a[href],input').remove();
+				hidden_div.find('a[href]:not([href$=".html"]),input').remove();
+				hidden_div.html(hidden_div.html().replace(' [] ', ' '));
 				hidden_div.html(hidden_div.html().replace(' [] ', ' '));
 				
-				$('<a class="unhide-thread-link" style="float:left;margin-right:5px" href="javascript:void(0)">[+]</a><span> </span>')
-					.insertAfter(thread_container.find('a.hide-thread-link'))
+				$('<a class="unhide-thread-link" style="float:left;margin-right:5px;margin-left:0px;" href="javascript:void(0)">[+]</a><span> </span>')
+					.insertBefore(hidden_div.find(':first'))
 					.click(function() {
 						delete hidden_data[board][id];
 						store_data();
diff --git a/stylesheets/style.css b/stylesheets/style.css
index 12cc54d5..c0430b7c 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -404,3 +404,8 @@ table.mod.config-editor td {
 table.mod.config-editor input[type="text"] {
 	width: 98%;
 }
+p.intro.thread-hidden {
+	margin: 0px;
+	padding: 0px;
+}
+
-- 
cgit v1.3


From e3cb427feefbbb4fd6a5e76ce77ef80a240941f1 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sat, 27 Jul 2013 00:57:12 -0400
Subject: ukko: fix javascript interoperation

---
 js/expand.js                  | 10 +++++++++-
 js/hide-threads.js            | 12 +++++++++---
 js/show-backlinks.js          |  7 ++++++-
 templates/themes/ukko/ukko.js |  3 ++-
 4 files changed, 26 insertions(+), 6 deletions(-)

(limited to 'js')

diff --git a/js/expand.js b/js/expand.js
index a737ee7f..06151627 100644
--- a/js/expand.js
+++ b/js/expand.js
@@ -15,7 +15,7 @@ $(document).ready(function(){
 	if($('div.banner').length != 0)
 		return; // not index
 	
-	$('div.post.op span.omitted').each(function() {
+	var do_expand = function() {
 		$(this)
 			.html($(this).text().replace(_("Click reply to view."), '<a href="javascript:void(0)">'+_("Click to expand")+'</a>.'))
 			.find('a').click(function() {
@@ -52,5 +52,13 @@ $(document).ready(function(){
 					}
 				});
 			});
+	}
+
+	$('div.post.op span.omitted').each(do_expand);
+
+	$(document).bind("new_post", function(e, post) {
+		if (!$(post).hasClass("reply")) {
+			$(post).find('div.post.op span.omitted').each(do_expand);
+		}
 	});
 });
diff --git a/js/hide-threads.js b/js/hide-threads.js
index abaa700f..44bd829b 100644
--- a/js/hide-threads.js
+++ b/js/hide-threads.js
@@ -35,7 +35,7 @@ $(document).ready(function(){
 		}
 	}
 	
-	$('div.post.op').each(function() {
+	var do_hide_threads = function() {
 		var id = $(this).children('p.intro').children('a.post_no:eq(1)').text();
 		var thread_container = $(this).parent();
 
@@ -46,7 +46,7 @@ $(document).ready(function(){
 		}
 	
 		$('<a class="hide-thread-link" style="float:left;margin-right:5px" href="javascript:void(0)">[–]</a><span> </span>')
-			.insertBefore(thread_container.find(':first'))
+			.insertBefore(thread_container.find(':not(h2,h2 *):first'))
 			.click(function() {
 				hidden_data[board][id] = Math.round(Date.now() / 1000);
 				store_data();
@@ -69,9 +69,15 @@ $(document).ready(function(){
 						hidden_div.remove();
 					});
 				
-				hidden_div.insertAfter(thread_container.find(':first'));
+				hidden_div.insertAfter(thread_container.find(':not(h2,h2 *):first'));
 			});
 		if (hidden_data[board][id])
 			thread_container.find('.hide-thread-link').click();
+	}
+
+	$('div.post.op').each(do_hide_threads);
+
+	$(document).bind('new_post', function(e, post) {
+		do_hide_threads.call($(post).find('div.post.op')[0]);
 	});
 });
diff --git a/js/show-backlinks.js b/js/show-backlinks.js
index 4ead494b..f23cfc38 100644
--- a/js/show-backlinks.js
+++ b/js/show-backlinks.js
@@ -48,7 +48,12 @@ onready(function(){
 	$('div.post.reply').each(showBackLinks);
 
         $(document).bind('new_post', function(e, post) {
-		showBackLinks.call(post);
+		if ($(post).hasClass("reply")) {
+			showBackLinks.call(post);
+		}
+		else {
+			$(post).find('div.post.reply').each(showBackLinks);
+		}
 	});
 });
 
diff --git a/templates/themes/ukko/ukko.js b/templates/themes/ukko/ukko.js
index dc8ed382..6566335e 100644
--- a/templates/themes/ukko/ukko.js
+++ b/templates/themes/ukko/ukko.js
@@ -10,6 +10,7 @@ $(document).ready(function() {
 				if(thread.length > 0) {
 					thread.prepend('<h2><a href="/' + overflow[0].board + '/">/' + overflow[0].board + '/</a></h2>');
 					$('div[id*="thread_"]').last().after(thread.attr('data-board', overflow[0].board).css('display', 'block'));
+					$(document).trigger('new_post', thread);
 					overflow.shift();
 				}
 			} else {
@@ -25,6 +26,7 @@ $(document).ready(function() {
 					if(thread.length > 0) {
 						thread.prepend('<h2><a href="/' + overflow[0].board + '/">/' + overflow[0].board + '/</a></h2>');
 						$('div[id*="thread_"]').last().after(thread.attr('data-board', overflow[0].board).css('display', 'block'));
+						$(document).trigger('new_post', thread);
 						overflow.shift();
 					}
 
@@ -33,5 +35,4 @@ $(document).ready(function() {
 			}
 		}
 	});
-
 });
-- 
cgit v1.3


From 880cf25366797affa6279508f3ba8779e3b6da46 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sat, 27 Jul 2013 01:08:26 -0400
Subject: fix merge

---
 js/expand.js           | 3 ---
 js/inline-expanding.js | 3 +--
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'js')

diff --git a/js/expand.js b/js/expand.js
index 6b8657bd..06151627 100644
--- a/js/expand.js
+++ b/js/expand.js
@@ -41,9 +41,6 @@ $(document).ready(function(){
 							else {
 								last_expanded = post_in_doc;
 							}
-							else {
-								last_expanded = post_in_doc;
-							}
 						});
 						$('<span class="omitted"><a href="javascript:void(0)">' + _('Hide expanded replies') + '</a>.</span>')
 							.insertAfter(thread.find('span.omitted').css('display', 'none'))
diff --git a/js/inline-expanding.js b/js/inline-expanding.js
index fb78c222..1849b078 100644
--- a/js/inline-expanding.js
+++ b/js/inline-expanding.js
@@ -16,9 +16,8 @@ onready(function(){
 		var link = this.getElementsByTagName('a');
 	
 		for (var i = 0; i < link.length; i++) {
-			if (typeof link[i] == "object" && link[i].childNodes && link[i].childNodes[0].src && link[i].className != 'file') {
+			if (typeof link[i] == "object" && link[i].childNodes && typeof link[i].childNodes[0] !== 'undefined' && link[i].childNodes[0].src && link[i].className != 'file') {
 				link[i].childNodes[0].style.maxWidth = '95%';
-				link[i].childNodes[0].style.maxHeight = '95%';
 				link[i].onclick = function(e) {
 					if (this.childNodes[0].className == 'hidden')
 						return false;
-- 
cgit v1.3


From d09ef2215433892dbd6e79fe41084dedd0e47931 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sat, 27 Jul 2013 01:12:22 -0400
Subject: hide-images.js: javascript i18n

---
 js/hide-images.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'js')

diff --git a/js/hide-images.js b/js/hide-images.js
index 7344cd8f..365ebac6 100644
--- a/js/hide-images.js
+++ b/js/hide-images.js
@@ -47,13 +47,13 @@ $(document).ready(function(){
 		var fileinfo = $(this).parent().prev();
 		var id = $(this).parent().parent().find('>p.intro>a.post_no:eq(1),>div.post.op>p.intro>a.post_no:eq(1)').text();
 		
-		var replacement = $('<span>File <small>(<a class="hide-image-link" href="javascript:void(0)">hide</a>)</small>: </span>');
+		var replacement = $('<span>'+_('File')+' <small>(<a class="hide-image-link" href="javascript:void(0)">'+_('hide')+'</a>)</small>: </span>');
 				
 		replacement.find('a').click(function() {
 			hidden_data[board][id] = Math.round(Date.now() / 1000);
 			store_data();
 			
-			var show_link = $('<a class="show-image-link" href="javascript:void(0)">show</a>').click(function() {
+			var show_link = $('<a class="show-image-link" href="javascript:void(0)">'+_('show')+'</a>').click(function() {
 				delete hidden_data[board][id];
 				store_data();
 				
-- 
cgit v1.3


From 3e5234e54e3052cbdc6e17691182766e17824fe7 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sat, 27 Jul 2013 01:16:12 -0400
Subject: toggle-images.js: javascript i18n

---
 js/toggle-images.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'js')

diff --git a/js/toggle-images.js b/js/toggle-images.js
index 74f2fab4..de1d47b3 100644
--- a/js/toggle-images.js
+++ b/js/toggle-images.js
@@ -38,7 +38,7 @@ $(document).ready(function(){
 				if ($(this).next().hasClass('show-image-link')) {
 					$(this).next().hide();
 				}
-				$(this).hide().after('<span class="toggle-images-placeholder">hidden</span>');
+				$(this).hide().after('<span class="toggle-images-placeholder">'+_('hidden')+'</span>');
 			});
 		} else {
 			$('span.toggle-images-placeholder').remove();
@@ -54,7 +54,7 @@ $(document).ready(function(){
 
 	$('hr:first').before('<div id="toggle-images" style="text-align:right"><a class="unimportant" href="javascript:void(0)">-</a></div>');
 	$('div#toggle-images a')
-		.text((hide_images ? 'Show' : 'Hide') + ' images')
+		.text(hide_images ? _('Show images') : _('Hide images'))
 		.click(function() {
 			hide_images = !hide_images;
 			if (hide_images) {
@@ -67,7 +67,7 @@ $(document).ready(function(){
 			
 			show_hide_hide_images_buttons();
 			
-			$(this).text((hide_images ? 'Show' : 'Hide') + ' images')
+			$(this).text(hide_images ? _('Show images') : _('Hide images'))
 		});
 
 	if (hide_images) {
-- 
cgit v1.3


From 07ea457aa53729212e345eb0907b932f3939a3d9 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sat, 27 Jul 2013 02:19:58 -0400
Subject: inline-expanding.js: missed preventing default action; shouldn't open
 new window when unwanted anymore

---
 js/inline-expanding.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'js')

diff --git a/js/inline-expanding.js b/js/inline-expanding.js
index 1849b078..0f7b7229 100644
--- a/js/inline-expanding.js
+++ b/js/inline-expanding.js
@@ -46,6 +46,7 @@ onready(function(){
 						delete this.childNodes[0].style.opacity;
 						delete this.childNodes[0].style.filter;
 					}
+					return false;
 				}
 			}
 		}
-- 
cgit v1.3


From 54714595f7ce2cdbd88de1c536e0ddc97ca71529 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sat, 27 Jul 2013 02:19:58 -0400
Subject: js/inline-expanding.js: Allow to work with auto-reload.js, etc.
 (jQuery is still optional)

Conflicts:
	js/inline-expanding.js
---
 js/inline-expanding.js | 79 +++++++++++++++++++++++++++++---------------------
 1 file changed, 46 insertions(+), 33 deletions(-)

(limited to 'js')

diff --git a/js/inline-expanding.js b/js/inline-expanding.js
index 2e924f05..06d3f76f 100644
--- a/js/inline-expanding.js
+++ b/js/inline-expanding.js
@@ -6,49 +6,62 @@
  * Copyright (c) 2012-2013 Michael Save <savetheinternet@tinyboard.org>
  *
  * Usage:
+ *   // $config['additional_javascript'][] = 'js/jquery.min.js';
  *   $config['additional_javascript'][] = 'js/inline-expanding.js';
  *
  */
 
 onready(function(){
-	var link = document.getElementsByTagName('a');
+	var inline_expand_post = function() {
+		var link = this.getElementsByTagName('a');
 	
-	for (var i = 0; i < link.length; i++) {
-		if (typeof link[i] == "object" && link[i].childNodes && link[i].childNodes[0].src && link[i].className != 'file') {
-			link[i].childNodes[0].style.maxWidth = '95%';
-			link[i].childNodes[0].style.maxHeight = '95%';
-			link[i].onclick = function(e) {
-				if (this.childNodes[0].className == 'hidden')
-					return false;
-				if (e.which == 2)
-					return true;
-				if (!this.dataset.src) {
-					this.dataset.expanded = 'true';
-					this.dataset.src= this.childNodes[0].src;
-					this.dataset.width = this.childNodes[0].style.width;
-					this.dataset.height = this.childNodes[0].style.height;
-					this.childNodes[0].src = this.href;
-					this.childNodes[0].style.width = 'auto';
-					this.childNodes[0].style.height = 'auto';
-					this.childNodes[0].style.opacity = '0.4';
-					this.childNodes[0].style.filter = 'alpha(opacity=40)';
-					this.childNodes[0].onload = function() {
-						this.style.opacity = '';
-						delete this.style.filter;
+		for (var i = 0; i < link.length; i++) {
+			if (typeof link[i] == "object" && link[i].childNodes && typeof link[i].childNodes[0] !== 'undefined' && link[i].childNodes[0].src && link[i].className != 'file') {
+				link[i].childNodes[0].style.maxWidth = '95%';
+				link[i].onclick = function(e) {
+					if (this.childNodes[0].className == 'hidden')
+						return false;
+					if (e.which == 2)
+						return true;
+					if (!this.dataset.src) {
+						this.dataset.expanded = 'true';
+						this.dataset.src= this.childNodes[0].src;
+						this.dataset.width = this.childNodes[0].style.width;
+						this.dataset.height = this.childNodes[0].style.height;
+						this.childNodes[0].src = this.href;
+						this.childNodes[0].style.width = 'auto';
+						this.childNodes[0].style.height = 'auto';
+						this.childNodes[0].style.opacity = '0.4';
+						this.childNodes[0].style.filter = 'alpha(opacity=40)';
+						this.childNodes[0].onload = function() {
+							this.style.opacity = '';
+							delete this.style.filter;
+						}
+					} else {
+						this.childNodes[0].src = this.dataset.src;
+						this.childNodes[0].style.width = this.dataset.width;
+						this.childNodes[0].style.height = this.dataset.height;
+						delete this.dataset.expanded;
+						delete this.dataset.src;
+						delete this.childNodes[0].style.opacity;
+						delete this.childNodes[0].style.filter;
 					}
-				} else {
-					this.childNodes[0].src = this.dataset.src;
-					this.childNodes[0].style.width = this.dataset.width;
-					this.childNodes[0].style.height = this.dataset.height;
-					delete this.dataset.expanded;
-					delete this.dataset.src;
-					delete this.childNodes[0].style.opacity;
-					delete this.childNodes[0].style.filter;
+					return false;
 				}
-				return false;
 			}
-			
 		}
 	}
+
+	if (window.jQuery) {
+		$('div[id^="thread_"]').each(inline_expand_post);
+		               
+		// allow to work with auto-reload.js, etc.
+		$(document).bind('new_post', function(e, post) {
+			inline_expand_post.call(post);
+		});
+	} else {
+		inline_expand_post.call(document);
+	}
+
 });
 
-- 
cgit v1.3


From 91bb3182da63e64d45ab8ac26735e090db928f15 Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Tue, 30 Jul 2013 19:07:28 -0400
Subject: ⌘+click should open image in new tab
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/inline-expanding.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/inline-expanding.js b/js/inline-expanding.js
index 06d3f76f..20383f04 100644
--- a/js/inline-expanding.js
+++ b/js/inline-expanding.js
@@ -21,7 +21,7 @@ onready(function(){
 				link[i].onclick = function(e) {
 					if (this.childNodes[0].className == 'hidden')
 						return false;
-					if (e.which == 2)
+					if (e.which == 2 || e.metaKey)
 						return true;
 					if (!this.dataset.src) {
 						this.dataset.expanded = 'true';
-- 
cgit v1.3


From 3bee1ba4fd16263ac4eefdf0bc8c7a3d11d8cccb Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Wed, 31 Jul 2013 00:39:00 -0400
Subject: Issue #61

---
 js/expand.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'js')

diff --git a/js/expand.js b/js/expand.js
index 16a0efb2..6e5fa659 100644
--- a/js/expand.js
+++ b/js/expand.js
@@ -1,9 +1,9 @@
 /*
- *expand.js
+ * expand.js
  * https://github.com/savetheinternet/Tinyboard/blob/master/js/expand.js
  *
  * Released under the MIT license
- * Copyright (c) 2012 Michael Save <savetheinternet@tinyboard.org>
+ * Copyright (c) 2012-2013 Michael Save <savetheinternet@tinyboard.org>
  *
  * Usage:
  *   $config['additional_javascript'][] = 'js/jquery.min.js';
@@ -35,9 +35,8 @@ $(document).ready(function(){
 									$(this).addClass('expanded').insertAfter(thread.find('div.post:first')).after('<br class="expanded">');
 								}
 								last_expanded = $(this);
-								
-							}
-							else {
+								$(document).trigger('new_post', this);
+							} else {
 								last_expanded = post_in_doc;
 							}
 						});
-- 
cgit v1.3


From 61a305a1a27d414072b0de24441c07b1630c3075 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Wed, 3 Jul 2013 01:04:08 -0400
Subject: js i18n: misc fixes; quick-reply.js i18n

Conflicts:
	tools/i18n_compile.php
---
 js/quick-reply.js | 6 +++---
 templates/main.js | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'js')

diff --git a/js/quick-reply.js b/js/quick-reply.js
index bc36ca48..ea504b48 100644
--- a/js/quick-reply.js
+++ b/js/quick-reply.js
@@ -17,7 +17,7 @@ $(document).ready(function(){
 		return; // not index
 	
 	txt_new_topic = $('form[name=post] input[type=submit]').val();
-	txt_new_reply = txt_new_topic == 'Submit' ? txt_new_topic : new_reply_string;
+	txt_new_reply = txt_new_topic == _('Submit') ? txt_new_topic : new_reply_string;
 	
 	undo_quick_reply = function() {
 		$('div.banner').remove();
@@ -27,9 +27,9 @@ $(document).ready(function(){
 	
 	$('div.post.op').each(function() {
 		var id = $(this).children('p.intro').children('a.post_no:eq(1)').text();
-		$('<a href="?/b/res/69.html">[Quick reply]</a>').insertAfter($(this).children('p.intro').children('a:last')).click(function() {
+		$('<a href="#">['+_("Quick reply")+']</a>').insertAfter($(this).children('p.intro').children('a:last')).click(function() {
 			$('div.banner').remove();
-			$('<div class="banner">Posting mode: Replying to <small>&gt;&gt;' + id + '</small> <a class="unimportant" onclick="undo_quick_reply()" href="javascript:void(0)">[Return]</a></div>')
+			$('<div class="banner">'+fmt(_("Posting mode: Replying to <small>&gt;&gt;{0}</small>"), [id])+' <a class="unimportant" onclick="undo_quick_reply()" href="javascript:void(0)">['+_("Return")+']</a></div>')
 				.insertBefore('form[name=post]');
 			$('form[name=post] input[type=submit]').val(txt_new_reply);
 			
diff --git a/templates/main.js b/templates/main.js
index 78e7cbf1..401d3504 100644
--- a/templates/main.js
+++ b/templates/main.js
@@ -2,12 +2,12 @@
 
 /* gettext-compatible _ function, example of usage:
  *
- * > // Loading pl_PL.json here (containing polish translation strings generated by tools/locale_compile.php)
+ * > // Loading pl_PL.json here (containing polish translation strings generated by tools/i18n_compile.php)
  * > alert(_("Hello!"));
  * Witaj!
  */
 function _(s) {
-	return (typeof tb_l10n != 'undefined' && typeof tb_l10n[s] != 'undefined') ? tb_l10n[s] : s;
+	return (typeof l10n != 'undefined' && typeof l10n[s] != 'undefined') ? l10n[s] : s;
 }
 
 /* printf-like formatting function, example of usage:
-- 
cgit v1.3


From f98d5bdd180d7452e82d7e35dcd7e3372ccd2aab Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Tue, 2 Jul 2013 20:58:16 -0400
Subject: local-time.js: make it work in localised environments

---
 js/local-time.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'js')

diff --git a/js/local-time.js b/js/local-time.js
index b92cc5be..bb81c83a 100644
--- a/js/local-time.js
+++ b/js/local-time.js
@@ -25,13 +25,13 @@ onready(function(){
 	var times = document.getElementsByTagName('time');
 	
 	for(var i = 0; i < times.length; i++) {
-		if(!times[i].innerHTML.match(/^\d+\/\d+\/\d+ \(\w+\) \d+:\d+:\d+$/))
+		if(typeof times[i].getAttribute('data-local') == 'undefined')
 			continue;
 		
 		var t = iso8601(times[i].getAttribute('datetime'));
 		
 		
-		
+		times[i].setAttribute('data-local', 'true');
 		times[i].innerHTML =
 			// date
 			zeropad(t.getMonth() + 1, 2) + "/" + zeropad(t.getDate(), 2) + "/" + t.getFullYear().toString().substring(2) +
-- 
cgit v1.3


From 46ebcbf51d99cd439906cf63a5bf4cefe5ddce45 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Tue, 2 Jul 2013 21:09:05 -0400
Subject: local-time.js: make it work with thread expand etc; BEWARE IT NOW
 NEEDS JQUERY TO BE LOADED BEFORE

---
 js/local-time.js | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

(limited to 'js')

diff --git a/js/local-time.js b/js/local-time.js
index bb81c83a..aee26ed2 100644
--- a/js/local-time.js
+++ b/js/local-time.js
@@ -6,6 +6,7 @@
  * Copyright (c) 2012 Michael Save <savetheinternet@tinyboard.org>
  *
  * Usage:
+ *   $config['additional_javascript'][] = 'js/jquery.min.js';
  *   $config['additional_javascript'][] = 'js/local-time.js';
  *
  */
@@ -21,23 +22,32 @@ onready(function(){
 	var zeropad = function(num, count) {
 		return [Math.pow(10, count - num.toString().length), num].join('').substr(1);
 	};
+
+	var do_localtime = function(elem) {	
+		var times = elem.getElementsByTagName('time');
 	
-	var times = document.getElementsByTagName('time');
-	
-	for(var i = 0; i < times.length; i++) {
-		if(typeof times[i].getAttribute('data-local') == 'undefined')
-			continue;
+		for(var i = 0; i < times.length; i++) {
+			if(typeof times[i].getAttribute('data-local') == 'undefined')
+				continue;
 		
-		var t = iso8601(times[i].getAttribute('datetime'));
+			var t = iso8601(times[i].getAttribute('datetime'));
 		
 		
-		times[i].setAttribute('data-local', 'true');
-		times[i].innerHTML =
-			// date
-			zeropad(t.getMonth() + 1, 2) + "/" + zeropad(t.getDate(), 2) + "/" + t.getFullYear().toString().substring(2) +
-			" (" + ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"][t.getDay()]  + ") " +
-			// time
-			zeropad(t.getHours(), 2) + ":" + zeropad(t.getMinutes(), 2) + ":" + zeropad(t.getSeconds(), 2);
+			times[i].setAttribute('data-local', 'true');
+			times[i].innerHTML =
+				// date
+				zeropad(t.getMonth() + 1, 2) + "/" + zeropad(t.getDate(), 2) + "/" + t.getFullYear().toString().substring(2) +
+				" (" + ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"][t.getDay()]  + ") " +
+				// time
+				zeropad(t.getHours(), 2) + ":" + zeropad(t.getMinutes(), 2) + ":" + zeropad(t.getSeconds(), 2);
+		};
 	};
+
+	do_localtime(document);
+
+        // allow to work with auto-reload.js, etc.
+        $(document).bind('new_post', function(e, post) {
+		do_localtime(post);
+	});
 });
 
-- 
cgit v1.3


From 0a97cf721584e352806354e2c5c6392175d89d7c Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Wed, 31 Jul 2013 04:37:07 -0400
Subject: js/local-time.js: Make jQuery optional

---
 js/local-time.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'js')

diff --git a/js/local-time.js b/js/local-time.js
index aee26ed2..40869c3a 100644
--- a/js/local-time.js
+++ b/js/local-time.js
@@ -6,7 +6,7 @@
  * Copyright (c) 2012 Michael Save <savetheinternet@tinyboard.org>
  *
  * Usage:
- *   $config['additional_javascript'][] = 'js/jquery.min.js';
+ *   // $config['additional_javascript'][] = 'js/jquery.min.js';
  *   $config['additional_javascript'][] = 'js/local-time.js';
  *
  */
@@ -44,10 +44,12 @@ onready(function(){
 	};
 
 	do_localtime(document);
-
-        // allow to work with auto-reload.js, etc.
-        $(document).bind('new_post', function(e, post) {
-		do_localtime(post);
-	});
+	
+	if (window.jQuery) {
+		// allow to work with auto-reload.js, etc.
+		$(document).bind('new_post', function(e, post) {
+			do_localtime(post);
+		});
+	}
 });
 
-- 
cgit v1.3


From 4922828e35eca8b28135a681a6f5d0e9a93641fd Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Wed, 3 Jul 2013 01:17:56 -0400
Subject: js i18n: expand.js

---
 js/expand.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'js')

diff --git a/js/expand.js b/js/expand.js
index 6e5fa659..d5706643 100644
--- a/js/expand.js
+++ b/js/expand.js
@@ -17,7 +17,7 @@ $(document).ready(function(){
 	
 	$('div.post.op span.omitted').each(function() {
 		$(this)
-			.html($(this).text().replace(/Click reply to view\./, '<a href="javascript:void(0)">Click to expand</a>.'))
+			.html($(this).text().replace(_("Click reply to view."), '<a href="javascript:void(0)">'+_("Click to expand")+'</a>.'))
 			.find('a').click(function() {
 				var thread = $(this).parent().parent().parent();
 				var id = thread.attr('id').replace(/^thread_/, '');
@@ -40,7 +40,7 @@ $(document).ready(function(){
 								last_expanded = post_in_doc;
 							}
 						});
-						$('<span class="omitted"><a href="javascript:void(0)">Hide expanded replies</a>.</span>')
+						$('<span class="omitted"><a href="javascript:void(0)">' + _('Hide expanded replies') + '</a>.</span>')
 							.insertAfter(thread.find('span.omitted').css('display', 'none'))
 							.click(function() {
 								thread.find('.expanded').remove();
-- 
cgit v1.3


From 2779db56cb080d1837d216d3c1f9b8c6aa013f08 Mon Sep 17 00:00:00 2001
From: Marcin Łabanowski <marcin@6irc.net>
Date: Sat, 29 Dec 2012 16:30:46 +0100
Subject: smartphone-spoiler.js: add windows phone/tablet user agents

---
 js/smartphone-spoiler.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/smartphone-spoiler.js b/js/smartphone-spoiler.js
index ede273e4..54c7a9a1 100644
--- a/js/smartphone-spoiler.js
+++ b/js/smartphone-spoiler.js
@@ -11,7 +11,7 @@
  */
 
 onready(function(){
-	if(navigator.userAgent.match(/iPhone|iPod|iPad|Android|Opera Mini|Blackberry|PlayBook/i)) {
+	if(navigator.userAgent.match(/iPhone|iPod|iPad|Android|Opera Mini|Blackberry|PlayBook|Windows Phone|Tablet PC|Windows CE|IEMobile/i)) {
 		var spoilers = document.getElementsByClassName('spoiler');
 		for(var i = 0; i < spoilers.length; i++) {
 			spoilers[i].onmousedown = function() {
-- 
cgit v1.3


From fee73c2087dcac126c430bae905ed4ff24784c35 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Wed, 3 Jul 2013 01:27:09 -0400
Subject: js i18n: local-time.js

---
 js/local-time.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/local-time.js b/js/local-time.js
index 40869c3a..d581e304 100644
--- a/js/local-time.js
+++ b/js/local-time.js
@@ -37,7 +37,7 @@ onready(function(){
 			times[i].innerHTML =
 				// date
 				zeropad(t.getMonth() + 1, 2) + "/" + zeropad(t.getDate(), 2) + "/" + t.getFullYear().toString().substring(2) +
-				" (" + ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"][t.getDay()]  + ") " +
+				" (" + [_("Sun"), _("Mon"), _("Tue"), _("Wed"), _("Thu"), _("Fri"), _("Sat"), _("Sun")][t.getDay()]  + ") " +
 				// time
 				zeropad(t.getHours(), 2) + ":" + zeropad(t.getMinutes(), 2) + ":" + zeropad(t.getSeconds(), 2);
 		};
-- 
cgit v1.3


From bf4eca82b60f8ecd30f529164eb9f65872746608 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Wed, 3 Jul 2013 01:40:23 -0400
Subject: js i18n: hide-locked-threads.js i18n

---
 js/toggle-locked-threads.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'js')

diff --git a/js/toggle-locked-threads.js b/js/toggle-locked-threads.js
index 50c44eda..1d517a4d 100644
--- a/js/toggle-locked-threads.js
+++ b/js/toggle-locked-threads.js
@@ -36,7 +36,7 @@ $(document).ready(function(){
 	
 	$('hr:first').before('<div id="toggle-locked-threads" style="text-align:right"><a class="unimportant" href="javascript:void(0)">-</a></div>');
 	$('div#toggle-locked-threads a')
-		.text((hide_locked_threads ? 'Show' : 'Hide') + ' locked threads')
+		.text(hide_locked_threads ? _('Show locked threads') : _('Hide locked threads'))
 		.click(function() {
 			hide_locked_threads = !hide_locked_threads;
 			if (hide_locked_threads) {
@@ -51,7 +51,7 @@ $(document).ready(function(){
 				delete localStorage.hidelockedthreads;
 			}
 			
-			$(this).text((hide_locked_threads ? 'Show' : 'Hide') + ' locked threads')
+			$(this).text(hide_locked_threads ? _('Show locked threads') : _('Hide locked threads'))
 		});
 	
 	if (hide_locked_threads) {
-- 
cgit v1.3


From 223624892a8cf9cb6f41f6b83927f2d12f00246c Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Wed, 3 Jul 2013 01:48:24 -0400
Subject: js i18n: forced-anon.js

---
 js/forced-anon.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'js')

diff --git a/js/forced-anon.js b/js/forced-anon.js
index 3dbf0dfc..6ae43882 100644
--- a/js/forced-anon.js
+++ b/js/forced-anon.js
@@ -56,17 +56,17 @@ $(document).ready(function() {
 	forced_anon = localStorage['forcedanon'] ? true : false;
 	
 	$('hr:first').before('<div id="forced-anon" style="text-align:right"><a class="unimportant" href="javascript:void(0)">-</a></div>');
-	$('div#forced-anon a').text('Forced anonymity (' + (forced_anon ? 'enabled' : 'disabled') + ')');
+	$('div#forced-anon a').text(_('Forced anonymity')+' (' + (forced_anon ? _('enabled') : _('disabled')) + ')');
 	
 	$('div#forced-anon a').click(function() {
 		forced_anon = !forced_anon;
 		
 		if(forced_anon) {
-			$('div#forced-anon a').text('Forced anonymity (enabled)');
+			$('div#forced-anon a').text(_('Forced anonymity')+' ('+_('enabled')+')');
 			localStorage.forcedanon = true;
 			enable_fa();
 		} else {
-			$('div#forced-anon a').text('Forced anonymity (disabled)');
+			$('div#forced-anon a').text(_('Forced anonymity')+' ('+_('disabled')+')');
 			delete localStorage.forcedanon;
 			disable_fa();
 		}
-- 
cgit v1.3


From a1b739b818eef2aa17846cd171f04e21dc7d34e4 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Wed, 3 Jul 2013 01:55:43 -0400
Subject: js i18n: quick-post-controls.js

---
 js/quick-post-controls.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'js')

diff --git a/js/quick-post-controls.js b/js/quick-post-controls.js
index 0c164bbb..c28f874f 100644
--- a/js/quick-post-controls.js
+++ b/js/quick-post-controls.js
@@ -24,17 +24,17 @@ $(document).ready(function(){
 					
 					'<input type="hidden" name="delete_' + id + '">' +
 					
-					'<label for="password_' + id + '">Password</label>: ' +
+					'<label for="password_' + id + '">'+_("Password")+'</label>: ' +
 					'<input id="password_' + id + '" type="password" name="password" size="11" maxlength="18">' +
-					'<input title="Delete file only" type="checkbox" name="file" id="delete_file_' + id + '">' +
-						'<label for="delete_file_' + id + '">File</label>' +
-					' <input type="submit" name="delete" value="Delete">' +
+					'<input title="'+_('Delete file only')+'" type="checkbox" name="file" id="delete_file_' + id + '">' +
+						'<label for="delete_file_' + id + '">'+_('File')+'</label>' +
+					' <input type="submit" name="delete" value="'+_('Delete')+'">' +
 				
 					'<br>' +
 				
-					'<label for="reason_' + id + '">Reason</label>: ' +
+					'<label for="reason_' + id + '">'+_('Reason')+'</label>: ' +
 					'<input id="reason_' + id + '" type="text" name="reason" size="20" maxlength="100">' +
-					' <input type="submit" name="report" value="Report">' +
+					' <input type="submit" name="report" value="'+_('Report')+'">' +
 				'</div>' +
 			'</form>');
 			post_form
-- 
cgit v1.3


From e648121e4ad07aadec7579d62a56190ca19d3fe5 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sat, 27 Jul 2013 01:12:22 -0400
Subject: hide-images.js: javascript i18n

---
 js/hide-images.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'js')

diff --git a/js/hide-images.js b/js/hide-images.js
index 7344cd8f..365ebac6 100644
--- a/js/hide-images.js
+++ b/js/hide-images.js
@@ -47,13 +47,13 @@ $(document).ready(function(){
 		var fileinfo = $(this).parent().prev();
 		var id = $(this).parent().parent().find('>p.intro>a.post_no:eq(1),>div.post.op>p.intro>a.post_no:eq(1)').text();
 		
-		var replacement = $('<span>File <small>(<a class="hide-image-link" href="javascript:void(0)">hide</a>)</small>: </span>');
+		var replacement = $('<span>'+_('File')+' <small>(<a class="hide-image-link" href="javascript:void(0)">'+_('hide')+'</a>)</small>: </span>');
 				
 		replacement.find('a').click(function() {
 			hidden_data[board][id] = Math.round(Date.now() / 1000);
 			store_data();
 			
-			var show_link = $('<a class="show-image-link" href="javascript:void(0)">show</a>').click(function() {
+			var show_link = $('<a class="show-image-link" href="javascript:void(0)">'+_('show')+'</a>').click(function() {
 				delete hidden_data[board][id];
 				store_data();
 				
-- 
cgit v1.3


From 2868dd7886082cfb11fcbe8f8bee1108a48c81a3 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sat, 15 Jun 2013 01:39:39 -0400
Subject: javascripts: fixed interactions (BEWARE, inline-expanding.js now
 requires jquery! fix your configs)

Conflicts:
	js/expand.js
	js/inline-expanding.js
---
 js/expand.js           | 4 ++--
 js/inline-expanding.js | 5 ++---
 js/show-backlinks.js   | 4 ++++
 3 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'js')

diff --git a/js/expand.js b/js/expand.js
index d5706643..f2cfdc5e 100644
--- a/js/expand.js
+++ b/js/expand.js
@@ -14,7 +14,7 @@
 $(document).ready(function(){
 	if($('div.banner').length != 0)
 		return; // not index
-	
+
 	$('div.post.op span.omitted').each(function() {
 		$(this)
 			.html($(this).text().replace(_("Click reply to view."), '<a href="javascript:void(0)">'+_("Click to expand")+'</a>.'))
@@ -51,4 +51,4 @@ $(document).ready(function(){
 				});
 			});
 	});
-});
+});
\ No newline at end of file
diff --git a/js/inline-expanding.js b/js/inline-expanding.js
index 20383f04..e529a395 100644
--- a/js/inline-expanding.js
+++ b/js/inline-expanding.js
@@ -14,7 +14,7 @@
 onready(function(){
 	var inline_expand_post = function() {
 		var link = this.getElementsByTagName('a');
-	
+
 		for (var i = 0; i < link.length; i++) {
 			if (typeof link[i] == "object" && link[i].childNodes && typeof link[i].childNodes[0] !== 'undefined' && link[i].childNodes[0].src && link[i].className != 'file') {
 				link[i].childNodes[0].style.maxWidth = '95%';
@@ -54,7 +54,7 @@ onready(function(){
 
 	if (window.jQuery) {
 		$('div[id^="thread_"]').each(inline_expand_post);
-		               
+
 		// allow to work with auto-reload.js, etc.
 		$(document).bind('new_post', function(e, post) {
 			inline_expand_post.call(post);
@@ -64,4 +64,3 @@ onready(function(){
 	}
 
 });
-
diff --git a/js/show-backlinks.js b/js/show-backlinks.js
index e6e17e4f..4ead494b 100644
--- a/js/show-backlinks.js
+++ b/js/show-backlinks.js
@@ -46,5 +46,9 @@ onready(function(){
 	};
 	
 	$('div.post.reply').each(showBackLinks);
+
+        $(document).bind('new_post', function(e, post) {
+		showBackLinks.call(post);
+	});
 });
 
-- 
cgit v1.3


From 45ead9803f01c2cb84b11b3747e432737af27595 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sat, 27 Jul 2013 00:57:12 -0400
Subject: ukko: fix javascript interoperation

Conflicts:
	js/expand.js
	js/hide-threads.js
	templates/themes/ukko/ukko.js
---
 js/expand.js         | 13 +++++++++++--
 js/hide-threads.js   | 12 +++++++++---
 js/show-backlinks.js |  7 ++++++-
 3 files changed, 26 insertions(+), 6 deletions(-)

(limited to 'js')

diff --git a/js/expand.js b/js/expand.js
index f2cfdc5e..07ce9e43 100644
--- a/js/expand.js
+++ b/js/expand.js
@@ -14,8 +14,9 @@
 $(document).ready(function(){
 	if($('div.banner').length != 0)
 		return; // not index
-
 	$('div.post.op span.omitted').each(function() {
+	
+	var do_expand = function() {
 		$(this)
 			.html($(this).text().replace(_("Click reply to view."), '<a href="javascript:void(0)">'+_("Click to expand")+'</a>.'))
 			.find('a').click(function() {
@@ -50,5 +51,13 @@ $(document).ready(function(){
 					}
 				});
 			});
+	}
+
+	$('div.post.op span.omitted').each(do_expand);
+
+	$(document).bind("new_post", function(e, post) {
+		if (!$(post).hasClass("reply")) {
+			$(post).find('div.post.op span.omitted').each(do_expand);
+		}
 	});
-});
\ No newline at end of file
+});
diff --git a/js/hide-threads.js b/js/hide-threads.js
index faa1289c..575804b6 100644
--- a/js/hide-threads.js
+++ b/js/hide-threads.js
@@ -41,11 +41,11 @@ $(document).ready(function(){
 		hidden_data[board] = {}; // id : timestamp
 	}
 	
-	$('div.post.op').each(function() {
+	var do_hide_threads = function() {
 		var id = $(this).children('p.intro').children('a.post_no:eq(1)').text();
 		var thread_container = $(this).parent();
 		$('<a class="hide-thread-link" style="float:left;margin-right:5px" href="javascript:void(0)">[–]</a><span> </span>')
-			.insertBefore(thread_container.find(':first'))
+			.insertBefore(thread_container.find(':not(h2,h2 *):first'))
 			.click(function() {
 				hidden_data[board][id] = Math.round(Date.now() / 1000);
 				store_data();
@@ -68,9 +68,15 @@ $(document).ready(function(){
 						hidden_div.remove();
 					});
 				
-				hidden_div.insertAfter(thread_container.find(':first'));
+				hidden_div.insertAfter(thread_container.find(':not(h2,h2 *):first'));
 			});
 		if (hidden_data[board][id])
 			thread_container.find('.hide-thread-link').click();
+	}
+
+	$('div.post.op').each(do_hide_threads);
+
+	$(document).bind('new_post', function(e, post) {
+		do_hide_threads.call($(post).find('div.post.op')[0]);
 	});
 });
diff --git a/js/show-backlinks.js b/js/show-backlinks.js
index 4ead494b..f23cfc38 100644
--- a/js/show-backlinks.js
+++ b/js/show-backlinks.js
@@ -48,7 +48,12 @@ onready(function(){
 	$('div.post.reply').each(showBackLinks);
 
         $(document).bind('new_post', function(e, post) {
-		showBackLinks.call(post);
+		if ($(post).hasClass("reply")) {
+			showBackLinks.call(post);
+		}
+		else {
+			$(post).find('div.post.reply').each(showBackLinks);
+		}
 	});
 });
 
-- 
cgit v1.3


From 5bf0e7f7e76cd3610e0aa692e0c433aca594ee51 Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Thu, 1 Aug 2013 00:27:54 -0400
Subject: Better/fixed jQuery styling and slightly improved
 js/inline-expanding.js accuracy (when jQuery is enabled)

---
 js/inline-expanding.js |  3 +++
 templates/header.html  | 30 ++++++++++++++++++++++--------
 2 files changed, 25 insertions(+), 8 deletions(-)

(limited to 'js')

diff --git a/js/inline-expanding.js b/js/inline-expanding.js
index e529a395..61085b0d 100644
--- a/js/inline-expanding.js
+++ b/js/inline-expanding.js
@@ -17,6 +17,9 @@ onready(function(){
 
 		for (var i = 0; i < link.length; i++) {
 			if (typeof link[i] == "object" && link[i].childNodes && typeof link[i].childNodes[0] !== 'undefined' && link[i].childNodes[0].src && link[i].className != 'file') {
+				if (window.jQuery && !$(link).prev().hasClass('fileinfo')) {
+					continue;	
+				}
 				link[i].childNodes[0].style.maxWidth = '95%';
 				link[i].onclick = function(e) {
 					if (this.childNodes[0].className == 'hidden')
diff --git a/templates/header.html b/templates/header.html
index 3791296f..c1230f0e 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -13,17 +13,31 @@
 			{% endif %}
 		{% endif %}
 		{% if config.recaptcha %}<style type="text/css">{% raw %}
-			.recaptcha_image_cell {
-				background: none !important;
+			#recaptcha_area {
+				float: none !important;
+				padding: 0 !important;
 			}
-			table.recaptchatable {
+			#recaptcha_logo, #recaptcha_privacy {
+				display: none;
+			}
+			#recaptcha_table {
 				border: none !important;
 			}
-			#recaptcha_logo, #recaptcha_tagline {
-				display: none;
-				float: right;
+			#recaptcha_table tr:first-child {
+				height: auto;
+			}
+			.recaptchatable img {
+				float: none !important;
+			}
+			#recaptcha_response_field {
+				font-size: 10pt !important;
+				border: 1px solid #a9a9a9 !important;
+				padding: 1px !important;
+			}
+			td.recaptcha_image_cell {
+				background: transparent !important;
 			}
-			.recaptchatable a {
-				display: block;
+			.recaptchatable, #recaptcha_area tr, #recaptcha_area td, #recaptcha_area th {
+				padding: 0 !important;
 			}
 		{% endraw %}</style>{% endif %}
\ No newline at end of file
-- 
cgit v1.3


From 38cc2d77f8cb68973ca52a1ce7d619ded64e83c5 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sat, 27 Jul 2013 01:16:12 -0400
Subject: toggle-images.js: javascript i18n

---
 js/toggle-images.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'js')

diff --git a/js/toggle-images.js b/js/toggle-images.js
index 74f2fab4..de1d47b3 100644
--- a/js/toggle-images.js
+++ b/js/toggle-images.js
@@ -38,7 +38,7 @@ $(document).ready(function(){
 				if ($(this).next().hasClass('show-image-link')) {
 					$(this).next().hide();
 				}
-				$(this).hide().after('<span class="toggle-images-placeholder">hidden</span>');
+				$(this).hide().after('<span class="toggle-images-placeholder">'+_('hidden')+'</span>');
 			});
 		} else {
 			$('span.toggle-images-placeholder').remove();
@@ -54,7 +54,7 @@ $(document).ready(function(){
 
 	$('hr:first').before('<div id="toggle-images" style="text-align:right"><a class="unimportant" href="javascript:void(0)">-</a></div>');
 	$('div#toggle-images a')
-		.text((hide_images ? 'Show' : 'Hide') + ' images')
+		.text(hide_images ? _('Show images') : _('Hide images'))
 		.click(function() {
 			hide_images = !hide_images;
 			if (hide_images) {
@@ -67,7 +67,7 @@ $(document).ready(function(){
 			
 			show_hide_hide_images_buttons();
 			
-			$(this).text((hide_images ? 'Show' : 'Hide') + ' images')
+			$(this).text(hide_images ? _('Show images') : _('Hide images'))
 		});
 
 	if (hide_images) {
-- 
cgit v1.3


From cf0a20a5645e1e82a48ad00f9381813af3b4e658 Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Thu, 1 Aug 2013 19:21:15 -0400
Subject: js/style-select.js: Changes the stylesheet chooser links to a
 <select>

---
 js/style-select.js | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 js/style-select.js

(limited to 'js')

diff --git a/js/style-select.js b/js/style-select.js
new file mode 100644
index 00000000..ac17c7ce
--- /dev/null
+++ b/js/style-select.js
@@ -0,0 +1,43 @@
+/*
+ * style-select.js
+ * https://github.com/savetheinternet/Tinyboard/blob/master/js/style-select.js
+ *
+ * Changes the stylesheet chooser links to a <select>
+ *
+ * Released under the MIT license
+ * Copyright (c) 2013 Michael Save <savetheinternet@tinyboard.org>
+ *
+ * Usage:
+ *   $config['additional_javascript'][] = 'js/jquery.min.js';
+ *   $config['additional_javascript'][] = 'js/style-select.js';
+ *
+ */
+
+onready(function(){
+	var stylesDiv = $('div.styles');
+	var stylesSelect = $('<select></select>');
+	
+	var i = 1;
+	stylesDiv.children().each(function() {
+		stylesSelect.append(
+			$('<option></option>')
+				.text(this.innerText.replace(/(^\[|\]$)/g, ''))
+				.val(i)
+		);
+		$(this).attr('id', 'style-select-' + i);
+		i++;
+	});
+	
+	stylesSelect.change(function() {
+		$('#style-select-' + $(this).val()).click();
+	});
+	
+	stylesDiv.hide();
+	
+	stylesDiv.after(
+		$('<div style="float:right;margin-bottom:10px"></div>')
+			.text(_('Style: '))
+			.append(stylesSelect)
+	);
+});
+
-- 
cgit v1.3


From 2fd60c6d2599d991c8d05ad101844ea840bc1528 Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Thu, 1 Aug 2013 19:26:09 -0400
Subject: Select chosen stylesheet on load

---
 js/style-select.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'js')

diff --git a/js/style-select.js b/js/style-select.js
index ac17c7ce..33c1308b 100644
--- a/js/style-select.js
+++ b/js/style-select.js
@@ -19,11 +19,12 @@ onready(function(){
 	
 	var i = 1;
 	stylesDiv.children().each(function() {
-		stylesSelect.append(
-			$('<option></option>')
-				.text(this.innerText.replace(/(^\[|\]$)/g, ''))
-				.val(i)
-		);
+		var opt = $('<option></option>')
+			.text(this.innerText.replace(/(^\[|\]$)/g, ''))
+			.val(i);
+		if ($(this).hasClass('selected'))
+			opt.attr('selected', true);
+		stylesSelect.append(opt);
 		$(this).attr('id', 'style-select-' + i);
 		i++;
 	});
-- 
cgit v1.3


From 0d64ae0472d65d33f6f6de3b3ea1476f1cefc25b Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 2 Aug 2013 00:18:02 -0400
Subject: style-select.js: fix on firefox

---
 js/style-select.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/style-select.js b/js/style-select.js
index 33c1308b..c0272d98 100644
--- a/js/style-select.js
+++ b/js/style-select.js
@@ -20,7 +20,7 @@ onready(function(){
 	var i = 1;
 	stylesDiv.children().each(function() {
 		var opt = $('<option></option>')
-			.text(this.innerText.replace(/(^\[|\]$)/g, ''))
+			.html(this.innerHTML.replace(/(^\[|\]$)/g, ''))
 			.val(i);
 		if ($(this).hasClass('selected'))
 			opt.attr('selected', true);
-- 
cgit v1.3


From 22cecf9de789d600b68af2796dba026628196e31 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 2 Aug 2013 00:21:41 -0400
Subject: style-select.js: add id for a styling ability

---
 js/style-select.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/style-select.js b/js/style-select.js
index c0272d98..6dcb11e4 100644
--- a/js/style-select.js
+++ b/js/style-select.js
@@ -36,7 +36,7 @@ onready(function(){
 	stylesDiv.hide();
 	
 	stylesDiv.after(
-		$('<div style="float:right;margin-bottom:10px"></div>')
+		$('<div id="style-select" style="float:right;margin-bottom:10px"></div>')
 			.text(_('Style: '))
 			.append(stylesSelect)
 	);
-- 
cgit v1.3


From 49993a355966129768069daa128984cdd66e1214 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Fri, 2 Aug 2013 01:05:29 -0400
Subject: inline-expanding-filename.js: expand images also by clicking a link
 and not image

---
 js/inline-expanding-filename.js | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 js/inline-expanding-filename.js

(limited to 'js')

diff --git a/js/inline-expanding-filename.js b/js/inline-expanding-filename.js
new file mode 100644
index 00000000..048a0e1a
--- /dev/null
+++ b/js/inline-expanding-filename.js
@@ -0,0 +1,33 @@
+/*
+ * inline-expanding-filename.js
+ * Binds image filename link to expanding, to make kusaba x users somewhat more accustomed.
+ * https://github.com/vichan-devel/Tinyboard/blob/master/js/inline-expanding.js
+ *
+ * Released under the MIT license
+ * Copyright (c) 2012-2013 Marcin Łabanowski <marcin@6irc.net>
+ *
+ * Usage:
+ *   $config['additional_javascript'][] = 'js/jquery.min.js';
+ *   $config['additional_javascript'][] = 'js/inline-expanding.js';
+ *   $config['additional_javascript'][] = 'js/inline-expanding-filename.js';
+ *
+ */
+
+onready(function(){
+	var inline_expanding_filename = function() {
+		$(this).find(".fileinfo > a").click(function(){
+			var imagelink = $(this).parent().parent().find('a[target="_blank"]:first');
+			if(imagelink.length > 0) {
+				imagelink.click();
+				return false;
+			}
+		});
+	};
+
+        $('div[id^="thread_"]').each(inline_expanding_filename);
+                                        
+        // allow to work with auto-reload.js, etc.
+        $(document).bind('new_post', function(e, post) {
+                inline_expanding_filename.call(post);
+        });
+});
-- 
cgit v1.3


From 8a89893b0210217264e1041408e50d8caffa846a Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sun, 4 Aug 2013 01:53:37 -0400
Subject: quick-post-controls.js: fix javascript interactions

---
 js/quick-post-controls.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/quick-post-controls.js b/js/quick-post-controls.js
index c28f874f..1cbc0711 100644
--- a/js/quick-post-controls.js
+++ b/js/quick-post-controls.js
@@ -71,10 +71,16 @@ $(document).ready(function(){
 		}
 	};
 	
-	$('div.post input[type=checkbox].delete').each(function() {
+	var init_qpc = function() {
 		$(this).change(open_form);
 		if(this.checked)
 			$(this).trigger('change');
+	};
+
+	$('div.post input[type=checkbox].delete').each(init_qpc);
+
+	$(document).bind('new_post', function(e, post) {
+		$(post).find('input[type=checkbox].delete').each(init_qpc);
 	});
 });
 
-- 
cgit v1.3


From 71db41720629a25110f69097bf149f96c71c29ef Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sun, 4 Aug 2013 06:08:10 -0400
Subject: post-hover.js: ukko fix

---
 js/post-hover.js | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'js')

diff --git a/js/post-hover.js b/js/post-hover.js
index 48f0ed96..1d0c2902 100644
--- a/js/post-hover.js
+++ b/js/post-hover.js
@@ -23,7 +23,14 @@ onready(function(){
 		} else {
 			return;
 		}
-		
+
+		var board = $(this);
+		while (board.data('board') === undefined) {
+			board = board.parent();
+		}
+		var threadid = board.attr('id');
+		board = board.data('board');
+
 		var $post = false;
 		var hovering = false;
 		var hovered_at;
@@ -43,6 +50,7 @@ onready(function(){
 					$newPost.find('span.mentioned').remove();
 					$newPost
 						.attr('id', 'post-hover-' + id)
+						.attr('data-board', board)
 						.addClass('post-hover')
 						.css('position', 'absolute')
 						.css('border-style', 'solid')
@@ -53,7 +61,7 @@ onready(function(){
 				}
 			};
 			
-			$post = $('div.post#reply_' + id);
+			$post = $('[data-board="' + board + '"] div.post#reply_' + id);
 			if($post.length > 0) {
 				start_hover($(this));
 			} else {
@@ -69,12 +77,12 @@ onready(function(){
 					context: document.body,
 					success: function(data) {
 						$(data).find('div.post.reply').each(function() {
-							if($('#' + $(this).attr('id')).length == 0)
-								$('div.post:first').prepend($(this).css('display', 'none').addClass('hidden'));
+							if($('[data-board="' + board + '"] #' + $(this).attr('id')).length == 0)
+								$('[data-board="' + board + '"]#' + threadid + " .post.reply:first").before($(this).css('display', 'none').addClass('hidden'));
 
 						});
 						
-						$post = $('div.post#reply_' + id);
+						$post = $('[data-board="' + board + '"] div.post#reply_' + id);
 						if(hovering && $post.length > 0) {
 							start_hover($link);
 						}
@@ -94,7 +102,7 @@ onready(function(){
 			if(!$post)
 				return;
 			
-			var $hover = $('#post-hover-' + id);
+			var $hover = $('#post-hover-' + id + '[data-board="' + board + '"]');
 			if($hover.length == 0)
 				return;
 			
-- 
cgit v1.3


From 185e68de47210b9886d87196832d166ff85dc72c Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Mon, 5 Aug 2013 00:18:25 -0400
Subject: post-hover.js: allow working between threads and boards (ukko
 patchset required!)

---
 js/post-hover.js | 40 +++++++++++++++++++++++++++++++---------
 1 file changed, 31 insertions(+), 9 deletions(-)

(limited to 'js')

diff --git a/js/post-hover.js b/js/post-hover.js
index 1d0c2902..8d726003 100644
--- a/js/post-hover.js
+++ b/js/post-hover.js
@@ -17,20 +17,28 @@ onready(function(){
 		var $link = $(this);
 		
 		var id;
-		
-		if(id = $link.text().match(/^>>(\d+)$/)) {
-			id = id[1];
+		var matches;
+
+		if(matches = $link.text().match(/^>>(?:>\/([^\/]+)\/)?(\d+)$/)) {
+			id = matches[2];
 		} else {
 			return;
 		}
-
+		
 		var board = $(this);
 		while (board.data('board') === undefined) {
 			board = board.parent();
 		}
-		var threadid = board.attr('id');
+		var threadid = board.attr('id').replace("thread_", "");
 		board = board.data('board');
 
+		var parentboard = board;
+
+		if (matches[1] !== undefined) {
+			board = matches[1];
+		}
+
+
 		var $post = false;
 		var hovering = false;
 		var hovered_at;
@@ -76,11 +84,25 @@ onready(function(){
 					url: url,
 					context: document.body,
 					success: function(data) {
-						$(data).find('div.post.reply').each(function() {
-							if($('[data-board="' + board + '"] #' + $(this).attr('id')).length == 0)
-								$('[data-board="' + board + '"]#' + threadid + " .post.reply:first").before($(this).css('display', 'none').addClass('hidden'));
+						var mythreadid = $(data).find('div[id^="thread_"]').attr('id').replace("thread_", "");
 
-						});
+						if (mythreadid == threadid && parentboard == board) {
+							$(data).find('div.post.reply').each(function() {
+								if($('[data-board="' + board + '"] #' + $(this).attr('id')).length == 0) {
+									$('[data-board="' + board + '"]#thread_' + threadid + " .post.reply:first").before($(this).hide().addClass('hidden'));
+								}
+							});
+						}
+						else if ($('[data-board="' + board + '"]#thread_'+mythreadid).length > 0) {
+							$(data).find('div.post.reply').each(function() {
+								if($('[data-board="' + board + '"] #' + $(this).attr('id')).length == 0) {
+									$('[data-board="' + board + '"]#thread_' + mythreadid + " .post.reply:first").before($(this).hide().addClass('hidden'));
+								}
+							});
+						}
+						else {
+							$(data).find('div[id^="thread_"]').hide().attr('data-cached', 'yes').prependTo('form[name="postcontrols"]');
+						}
 						
 						$post = $('[data-board="' + board + '"] div.post#reply_' + id);
 						if(hovering && $post.length > 0) {
-- 
cgit v1.3


From b438fb294ba15881dd5bb4bc4d2e6432e74ec47d Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Mon, 5 Aug 2013 01:00:25 -0400
Subject: post-hover.js: support linking to OPs (requires ukko patchset!)

---
 js/post-hover.js | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'js')

diff --git a/js/post-hover.js b/js/post-hover.js
index 8d726003..040b6a73 100644
--- a/js/post-hover.js
+++ b/js/post-hover.js
@@ -47,15 +47,19 @@ onready(function(){
 			hovered_at = {'x': e.pageX, 'y': e.pageY};
 			
 			var start_hover = function($link) {
-				if($post.is(':visible') &&
+				if($.contains($post[0], $link[0])) {
+					// link links to itself or to op; ignore
+				}
+				else if($post.is(':visible') &&
 						$post.offset().top + $post.height() >= $(window).scrollTop() &&
-						$post.offset().top <= $(window).scrollTop() + $(window).height()
-						) {
+						$post.offset().top <= $(window).scrollTop() + $(window).height()) {
 					// post is in view
 					$post.attr('style', 'border-style: none dashed dashed none; background: ' + $post.css('border-right-color'));
 				} else {
 					var $newPost = $post.clone();
+					$newPost.find('>.reply, >br').remove();
 					$newPost.find('span.mentioned').remove();
+
 					$newPost
 						.attr('id', 'post-hover-' + id)
 						.attr('data-board', board)
@@ -64,12 +68,13 @@ onready(function(){
 						.css('border-style', 'solid')
 						.css('box-shadow', '1px 1px 1px #999')
 						.css('display', 'block')
-						.insertAfter($link.parent());
+						.addClass('reply').addClass('post')
+						.insertAfter($link.parent())
 					$link.trigger('mousemove');
 				}
 			};
 			
-			$post = $('[data-board="' + board + '"] div.post#reply_' + id);
+			$post = $('[data-board="' + board + '"] div.post#reply_' + id + ', [data-board="' + board + '"]div#thread_' + id);
 			if($post.length > 0) {
 				start_hover($(this));
 			} else {
@@ -104,7 +109,7 @@ onready(function(){
 							$(data).find('div[id^="thread_"]').hide().attr('data-cached', 'yes').prependTo('form[name="postcontrols"]');
 						}
 						
-						$post = $('[data-board="' + board + '"] div.post#reply_' + id);
+						$post = $('[data-board="' + board + '"] div.post#reply_' + id + ', [data-board="' + board + '"]div#thread_' + id);
 						if(hovering && $post.length > 0) {
 							start_hover($link);
 						}
@@ -117,7 +122,7 @@ onready(function(){
 				return;
 			
 			$post.attr('style', '');
-			if($post.hasClass('hidden'))
+			if($post.hasClass('hidden') || $post.data('cached') == 'yes')
 				$post.css('display', 'none');
 			$('.post-hover').remove();
 		}).mousemove(function(e) {
-- 
cgit v1.3