Merge Zixaphir X

CHANGELOG.md

@@ -10,6 +10,7 @@ seaweedchan:
 
 zixaphir:
 - Fix custom CSS
+- Fix [Deleted] showing up randomly after submitting a post
 
 ### 1.1.11 - 2013-05-04
 seaweedchan:

builds/4chan-X.js

@@ -6893,10 +6893,19 @@
           return setTimeout(ThreadUpdater.update, 1000);
         }
       },
-      checkpost: function() {
+      checkpost: function(e) {
+        if (!ThreadUpdater.checkPostCount) {
+          if (e.detail.threadID !== ThreadUpdater.thread.ID) {
+            return;
+          }
+          ThreadUpdater.seconds = 0;
+          ThreadUpdater.outdateCount = 0;
+          ThreadUpdater.set('timer', '...');
+        }
         if (!(g.DEAD || ThreadUpdater.foundPost || ThreadUpdater.checkPostCount >= 5)) {
           return setTimeout(ThreadUpdater.update, ++ThreadUpdater.checkPostCount * $.SECOND);
         }
+        ThreadUpdater.set('timer', ThreadUpdater.getInterval());
         ThreadUpdater.checkPostCount = 0;
         delete ThreadUpdater.foundPost;
         return delete ThreadUpdater.postID;

builds/4chan-X.user.js

@@ -6914,10 +6914,19 @@
           return setTimeout(ThreadUpdater.update, 1000);
         }
       },
-      checkpost: function() {
+      checkpost: function(e) {
+        if (!ThreadUpdater.checkPostCount) {
+          if (e.detail.threadID !== ThreadUpdater.thread.ID) {
+            return;
+          }
+          ThreadUpdater.seconds = 0;
+          ThreadUpdater.outdateCount = 0;
+          ThreadUpdater.set('timer', '...');
+        }
         if (!(g.DEAD || ThreadUpdater.foundPost || ThreadUpdater.checkPostCount >= 5)) {
           return setTimeout(ThreadUpdater.update, ++ThreadUpdater.checkPostCount * $.SECOND);
         }
+        ThreadUpdater.set('timer', ThreadUpdater.getInterval());
         ThreadUpdater.checkPostCount = 0;
         delete ThreadUpdater.foundPost;
         return delete ThreadUpdater.postID;

builds/crx/script.js

@@ -6893,10 +6893,19 @@
           return setTimeout(ThreadUpdater.update, 1000);
         }
       },
-      checkpost: function() {
+      checkpost: function(e) {
+        if (!ThreadUpdater.checkPostCount) {
+          if (e.detail.threadID !== ThreadUpdater.thread.ID) {
+            return;
+          }
+          ThreadUpdater.seconds = 0;
+          ThreadUpdater.outdateCount = 0;
+          ThreadUpdater.set('timer', '...');
+        }
         if (!(g.DEAD || ThreadUpdater.foundPost || ThreadUpdater.checkPostCount >= 5)) {
           return setTimeout(ThreadUpdater.update, ++ThreadUpdater.checkPostCount * $.SECOND);
         }
+        ThreadUpdater.set('timer', ThreadUpdater.getInterval());
         ThreadUpdater.checkPostCount = 0;
         delete ThreadUpdater.foundPost;
         return delete ThreadUpdater.postID;

src/Monitoring/ThreadUpdater.coffee

@@ -96,9 +96,15 @@ ThreadUpdater =
       return unless e.detail.threadID is ThreadUpdater.thread.ID
       ThreadUpdater.outdateCount = 0
       setTimeout ThreadUpdater.update, 1000 if ThreadUpdater.seconds > 2
-    checkpost: ->
+    checkpost: (e) ->
+      unless ThreadUpdater.checkPostCount
+        return unless e.detail.threadID is ThreadUpdater.thread.ID
+        ThreadUpdater.seconds = 0
+        ThreadUpdater.outdateCount = 0
+        ThreadUpdater.set 'timer', '...'
       unless g.DEAD or ThreadUpdater.foundPost or ThreadUpdater.checkPostCount >= 5
         return setTimeout ThreadUpdater.update, ++ThreadUpdater.checkPostCount * $.SECOND
+      ThreadUpdater.set 'timer', ThreadUpdater.getInterval()
       ThreadUpdater.checkPostCount = 0
       delete ThreadUpdater.foundPost
       delete ThreadUpdater.postID