From 6dfe5d39458652f438b7caf8632ca7dbc2c568af Mon Sep 17 00:00:00 2001
From: Zixaphir <zixaphirmoxphar@gmail.com>
Date: Fri, 10 May 2013 13:56:31 -0700
Subject: [PATCH 1/4] Uhm... this just werkz for me?

---
 builds/4chan-X.js        | 2 +-
 builds/4chan-X.user.js   | 2 +-
 builds/crx/script.js     | 2 +-
 src/General/Build.coffee | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/builds/4chan-X.js b/builds/4chan-X.js
index 27c0d6a4f..3082492b1 100644
--- a/builds/4chan-X.js
+++ b/builds/4chan-X.js
@@ -1889,7 +1889,7 @@
           capcodeStart = '';
           capcode = '';
       }
-      flag = flagCode ? (" <img src='" + staticPath + "country/troll/") + flagCode.toLowerCase() + (".gif' alt=" + flagCode + " title='" + flagName + "' class=countryFlag>") : '';
+      flag = flagCode ? (" <img src='" + staticPath + "country/" + (boardID === 'pol' ? 'troll/' : '')) + flagCode.toLowerCase() + (".gif' alt=" + flagCode + " title='" + flagName + "' class=countryFlag>") : '';
       if (file != null ? file.isDeleted : void 0) {
         fileHtml = isOP ? ("<div class=file id=f" + data.no + "><div class=fileInfo></div><span class=fileThumb>") + ("<img src='" + staticPath + "filedeleted.gif' alt='File deleted.' class=fileDeletedRes>") + "</span></div>" : ("<div class=file id=f" + data.no + "><span class=fileThumb>") + ("<img src='" + staticPath + "filedeleted-res.gif' alt='File deleted.' class=fileDeletedRes>") + "</span></div>";
       } else if (file) {
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index c04a9a8f6..d4e28058d 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -1885,7 +1885,7 @@
           capcodeStart = '';
           capcode = '';
       }
-      flag = flagCode ? (" <img src='" + staticPath + "country/troll/") + flagCode.toLowerCase() + (".gif' alt=" + flagCode + " title='" + flagName + "' class=countryFlag>") : '';
+      flag = flagCode ? (" <img src='" + staticPath + "country/" + (boardID === 'pol' ? 'troll/' : '')) + flagCode.toLowerCase() + (".gif' alt=" + flagCode + " title='" + flagName + "' class=countryFlag>") : '';
       if (file != null ? file.isDeleted : void 0) {
         fileHtml = isOP ? ("<div class=file id=f" + data.no + "><div class=fileInfo></div><span class=fileThumb>") + ("<img src='" + staticPath + "filedeleted.gif' alt='File deleted.' class=fileDeletedRes>") + "</span></div>" : ("<div class=file id=f" + data.no + "><span class=fileThumb>") + ("<img src='" + staticPath + "filedeleted-res.gif' alt='File deleted.' class=fileDeletedRes>") + "</span></div>";
       } else if (file) {
diff --git a/builds/crx/script.js b/builds/crx/script.js
index c27a48572..a10431e39 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -1887,7 +1887,7 @@
           capcodeStart = '';
           capcode = '';
       }
-      flag = flagCode ? (" <img src='" + staticPath + "country/troll/") + flagCode.toLowerCase() + (".gif' alt=" + flagCode + " title='" + flagName + "' class=countryFlag>") : '';
+      flag = flagCode ? (" <img src='" + staticPath + "country/" + (boardID === 'pol' ? 'troll/' : '')) + flagCode.toLowerCase() + (".gif' alt=" + flagCode + " title='" + flagName + "' class=countryFlag>") : '';
       if (file != null ? file.isDeleted : void 0) {
         fileHtml = isOP ? ("<div class=file id=f" + data.no + "><div class=fileInfo></div><span class=fileThumb>") + ("<img src='" + staticPath + "filedeleted.gif' alt='File deleted.' class=fileDeletedRes>") + "</span></div>" : ("<div class=file id=f" + data.no + "><span class=fileThumb>") + ("<img src='" + staticPath + "filedeleted-res.gif' alt='File deleted.' class=fileDeletedRes>") + "</span></div>";
       } else if (file) {
diff --git a/src/General/Build.coffee b/src/General/Build.coffee
index cf6d93a77..1f14e7107 100644
--- a/src/General/Build.coffee
+++ b/src/General/Build.coffee
@@ -110,7 +110,7 @@ Build =
 
     flag =
       if flagCode
-        " <img src='#{staticPath}country/troll/" +
+        " <img src='#{staticPath}country/#{if boardID is 'pol' then 'troll/' else ''}" +
         flagCode.toLowerCase() + ".gif' alt=#{flagCode} title='#{flagName}' class=countryFlag>"
       else
         ''

From 2ced33b8e2dc8d5f14c120239366d8eab225674d Mon Sep 17 00:00:00 2001
From: Zixaphir <zixaphirmoxphar@gmail.com>
Date: Fri, 10 May 2013 14:35:57 -0700
Subject: [PATCH 2/4] Found it.

---
 builds/4chan-X.js                   | 2 +-
 builds/4chan-X.user.js              | 2 +-
 builds/crx/script.js                | 2 +-
 src/Monitoring/ThreadUpdater.coffee | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/builds/4chan-X.js b/builds/4chan-X.js
index 3082492b1..a726cb686 100644
--- a/builds/4chan-X.js
+++ b/builds/4chan-X.js
@@ -7258,7 +7258,7 @@
         }
         count++;
         node = Build.postFromObject(postObject, ThreadUpdater.thread.board);
-        posts.push(new Post(node, ThreadUpdater.thread, ThreadUpdater.thread.board));
+        posts.push(new Post(node, ThreadUpdater.thread, ThreadUpdater.thread.board.ID));
       }
       deletedPosts = [];
       deletedFiles = [];
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index d4e28058d..0a3d41259 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -7267,7 +7267,7 @@
         }
         count++;
         node = Build.postFromObject(postObject, ThreadUpdater.thread.board);
-        posts.push(new Post(node, ThreadUpdater.thread, ThreadUpdater.thread.board));
+        posts.push(new Post(node, ThreadUpdater.thread, ThreadUpdater.thread.board.ID));
       }
       deletedPosts = [];
       deletedFiles = [];
diff --git a/builds/crx/script.js b/builds/crx/script.js
index a10431e39..63255c9b7 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -7245,7 +7245,7 @@
         }
         count++;
         node = Build.postFromObject(postObject, ThreadUpdater.thread.board);
-        posts.push(new Post(node, ThreadUpdater.thread, ThreadUpdater.thread.board));
+        posts.push(new Post(node, ThreadUpdater.thread, ThreadUpdater.thread.board.ID));
       }
       deletedPosts = [];
       deletedFiles = [];
diff --git a/src/Monitoring/ThreadUpdater.coffee b/src/Monitoring/ThreadUpdater.coffee
index ad8dea5c3..87d1dd3b9 100644
--- a/src/Monitoring/ThreadUpdater.coffee
+++ b/src/Monitoring/ThreadUpdater.coffee
@@ -269,7 +269,7 @@ ThreadUpdater =
       # Insert new posts, not older ones.
       count++
       node = Build.postFromObject postObject, ThreadUpdater.thread.board
-      posts.push new Post node, ThreadUpdater.thread, ThreadUpdater.thread.board
+      posts.push new Post node, ThreadUpdater.thread, ThreadUpdater.thread.board.ID
 
     deletedPosts = []
     deletedFiles = []

From 17755b435b785802bda525116c3c9dd5e1c44ca1 Mon Sep 17 00:00:00 2001
From: Zixaphir <zixaphirmoxphar@gmail.com>
Date: Fri, 10 May 2013 15:56:14 -0700
Subject: [PATCH 3/4] And this is why you should do you bugtesting on the
 source Not the compiled output.

---
 builds/4chan-X.js                   | 4 ++--
 builds/4chan-X.user.js              | 4 ++--
 builds/crx/script.js                | 4 ++--
 src/Monitoring/ThreadUpdater.coffee | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/builds/4chan-X.js b/builds/4chan-X.js
index a726cb686..be23ea12c 100644
--- a/builds/4chan-X.js
+++ b/builds/4chan-X.js
@@ -7257,8 +7257,8 @@
           continue;
         }
         count++;
-        node = Build.postFromObject(postObject, ThreadUpdater.thread.board);
-        posts.push(new Post(node, ThreadUpdater.thread, ThreadUpdater.thread.board.ID));
+        node = Build.postFromObject(postObject, ThreadUpdater.thread.board.ID);
+        posts.push(new Post(node, ThreadUpdater.thread, ThreadUpdater.thread.board));
       }
       deletedPosts = [];
       deletedFiles = [];
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 0a3d41259..248dd7a38 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -7266,8 +7266,8 @@
           continue;
         }
         count++;
-        node = Build.postFromObject(postObject, ThreadUpdater.thread.board);
-        posts.push(new Post(node, ThreadUpdater.thread, ThreadUpdater.thread.board.ID));
+        node = Build.postFromObject(postObject, ThreadUpdater.thread.board.ID);
+        posts.push(new Post(node, ThreadUpdater.thread, ThreadUpdater.thread.board));
       }
       deletedPosts = [];
       deletedFiles = [];
diff --git a/builds/crx/script.js b/builds/crx/script.js
index 63255c9b7..20a31443c 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -7244,8 +7244,8 @@
           continue;
         }
         count++;
-        node = Build.postFromObject(postObject, ThreadUpdater.thread.board);
-        posts.push(new Post(node, ThreadUpdater.thread, ThreadUpdater.thread.board.ID));
+        node = Build.postFromObject(postObject, ThreadUpdater.thread.board.ID);
+        posts.push(new Post(node, ThreadUpdater.thread, ThreadUpdater.thread.board));
       }
       deletedPosts = [];
       deletedFiles = [];
diff --git a/src/Monitoring/ThreadUpdater.coffee b/src/Monitoring/ThreadUpdater.coffee
index 87d1dd3b9..5a4fc92a3 100644
--- a/src/Monitoring/ThreadUpdater.coffee
+++ b/src/Monitoring/ThreadUpdater.coffee
@@ -268,8 +268,8 @@ ThreadUpdater =
       continue if num <= ThreadUpdater.lastPost
       # Insert new posts, not older ones.
       count++
-      node = Build.postFromObject postObject, ThreadUpdater.thread.board
-      posts.push new Post node, ThreadUpdater.thread, ThreadUpdater.thread.board.ID
+      node = Build.postFromObject postObject, ThreadUpdater.thread.board.ID
+      posts.push new Post node, ThreadUpdater.thread, ThreadUpdater.thread.board
 
     deletedPosts = []
     deletedFiles = []

From 0bb1a4db1882dceaf9012a3ab6e0c3ddeb854a0d Mon Sep 17 00:00:00 2001
From: Zixaphir <zixaphirmoxphar@gmail.com>
Date: Fri, 10 May 2013 22:59:14 -0700
Subject: [PATCH 4/4] Fix Nav.scroll

---
 builds/4chan-X.js            | 2 +-
 builds/4chan-X.user.js       | 2 +-
 builds/crx/script.js         | 2 +-
 src/Miscellaneous/Nav.coffee | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/builds/4chan-X.js b/builds/4chan-X.js
index be23ea12c..f1b011f7d 100644
--- a/builds/4chan-X.js
+++ b/builds/4chan-X.js
@@ -8966,7 +8966,7 @@
     getThread: function(full) {
       var headRect, i, rect, thread, threads, topMargin, _i, _len;
 
-      if (Conf['Bottom header']) {
+      if (Conf['Bottom header'] || !Conf['Fixed Header']) {
         topMargin = 0;
       } else {
         headRect = Header.bar.getBoundingClientRect();
diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 248dd7a38..620733d3c 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -8975,7 +8975,7 @@
     getThread: function(full) {
       var headRect, i, rect, thread, threads, topMargin, _i, _len;
 
-      if (Conf['Bottom header']) {
+      if (Conf['Bottom header'] || !Conf['Fixed Header']) {
         topMargin = 0;
       } else {
         headRect = Header.bar.getBoundingClientRect();
diff --git a/builds/crx/script.js b/builds/crx/script.js
index 20a31443c..5a5cf90d0 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -8958,7 +8958,7 @@
     getThread: function(full) {
       var headRect, i, rect, thread, threads, topMargin, _i, _len;
 
-      if (Conf['Bottom header']) {
+      if (Conf['Bottom header'] || !Conf['Fixed Header']) {
         topMargin = 0;
       } else {
         headRect = Header.bar.getBoundingClientRect();
diff --git a/src/Miscellaneous/Nav.coffee b/src/Miscellaneous/Nav.coffee
index fa78f8784..ac1fdc10d 100644
--- a/src/Miscellaneous/Nav.coffee
+++ b/src/Miscellaneous/Nav.coffee
@@ -39,7 +39,7 @@ Nav =
       Nav.scroll +1
 
   getThread: (full) ->
-    if Conf['Bottom header']
+    if Conf['Bottom header'] or !Conf['Fixed Header']
       topMargin = 0
     else
       headRect  = Header.bar.getBoundingClientRect()