Merge branch 'bstable'

2016-11-26 19:22:38 -08:00 · 2016-11-26 19:22:38 -08:00 · d1bc26b0ad
commit d1bc26b0ad
parent 6e62b3bec9 256c3ad220
14 changed files with 26 additions and 22 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -4,6 +4,10 @@

 ### v1.13.1

+**v1.13.1.12** *(2016-11-27)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.1.12/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.1.12/builds/4chan-X-noupdate.crx)]
+- Fix race condition bug from v1.13.0.0 causing 'Watch thread' item to sometimes not appear in header menu.
+- Turn `Auto Prune` in Thread Watcher options back off by default.
+
 **v1.13.1.11** *(2016-11-26)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.1.11/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.13.1.11/builds/4chan-X-noupdate.crx)]
 - Revert performance issue fix from v1.13.1.10 as it may cause more issues than it solves.

--- a/builds/4chan-X-beta.crx
+++ b/builds/4chan-X-beta.crx
--- a/builds/4chan-X-beta.meta.js
+++ b/builds/4chan-X-beta.meta.js
@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X beta
-// @version      1.13.1.11
+// @version      1.13.1.12
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
--- a/builds/4chan-X-beta.user.js
+++ b/builds/4chan-X-beta.user.js
@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X beta
-// @version      1.13.1.11
+// @version      1.13.1.12
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@ -147,7 +147,7 @@ docSet = function() {
 };

 g = {
-  VERSION:   '1.13.1.11',
+  VERSION:   '1.13.1.12',
  NAMESPACE: '4chan X.',
  boards:    {}
 };
@ -357,7 +357,7 @@ Config = (function() {
      'Auto Update Thread Watcher': [true, 'Periodically check status of watched threads.'],
      'Auto Watch': [true, 'Automatically watch threads you start.'],
      'Auto Watch Reply': [true, 'Automatically watch threads you reply to.'],
-      'Auto Prune': [true, 'Automatically remove dead threads.'],
+      'Auto Prune': [false, 'Automatically remove dead threads.'],
      'Show Unread Count': [true, 'Show number of unread posts in watched threads.']
    },
    filter: {
@ -11190,7 +11190,7 @@ Settings = (function() {
        }
      }
      if (compareString < '00001.00012.00003.00000') {
-        ref6 = ['Image Hover in Catalog', 'Auto Watch', 'Auto Watch Reply', 'Auto Prune'];
+        ref6 = ['Image Hover in Catalog', 'Auto Watch', 'Auto Watch Reply'];
        for (k = 0, len1 = ref6.length; k < len1; k++) {
          key = ref6[k];
          setD(key, false);
@ -18295,6 +18295,7 @@ ThreadWatcher = (function() {
      $.on(sc, 'click', this.toggleWatcher);
      $.on(this.refreshButton, 'click', this.buttonFetchAll);
      $.on(this.closeButton, 'click', this.toggleWatcher);
+      this.menu.addHeaderMenuEntry();
      $.onExists(doc, 'body', this.addDialog);
      switch (g.VIEW) {
        case 'index':
@ -18966,7 +18967,6 @@ ThreadWatcher = (function() {
        $.on($('.menu-button', ThreadWatcher.dialog), 'click', function(e) {
          return menu.toggle(e, this, ThreadWatcher);
        });
-        this.addHeaderMenuEntry();
        return this.addMenuEntries();
      },
      addHeaderMenuEntry: function() {
--- a/builds/4chan-X-noupdate.crx
+++ b/builds/4chan-X-noupdate.crx
--- a/builds/4chan-X-noupdate.user.js
+++ b/builds/4chan-X-noupdate.user.js
@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.13.1.11
+// @version      1.13.1.12
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@ -147,7 +147,7 @@ docSet = function() {
 };

 g = {
-  VERSION:   '1.13.1.11',
+  VERSION:   '1.13.1.12',
  NAMESPACE: '4chan X.',
  boards:    {}
 };
@ -357,7 +357,7 @@ Config = (function() {
      'Auto Update Thread Watcher': [true, 'Periodically check status of watched threads.'],
      'Auto Watch': [true, 'Automatically watch threads you start.'],
      'Auto Watch Reply': [true, 'Automatically watch threads you reply to.'],
-      'Auto Prune': [true, 'Automatically remove dead threads.'],
+      'Auto Prune': [false, 'Automatically remove dead threads.'],
      'Show Unread Count': [true, 'Show number of unread posts in watched threads.']
    },
    filter: {
@ -11190,7 +11190,7 @@ Settings = (function() {
        }
      }
      if (compareString < '00001.00012.00003.00000') {
-        ref6 = ['Image Hover in Catalog', 'Auto Watch', 'Auto Watch Reply', 'Auto Prune'];
+        ref6 = ['Image Hover in Catalog', 'Auto Watch', 'Auto Watch Reply'];
        for (k = 0, len1 = ref6.length; k < len1; k++) {
          key = ref6[k];
          setD(key, false);
@ -18295,6 +18295,7 @@ ThreadWatcher = (function() {
      $.on(sc, 'click', this.toggleWatcher);
      $.on(this.refreshButton, 'click', this.buttonFetchAll);
      $.on(this.closeButton, 'click', this.toggleWatcher);
+      this.menu.addHeaderMenuEntry();
      $.onExists(doc, 'body', this.addDialog);
      switch (g.VIEW) {
        case 'index':
@ -18966,7 +18967,6 @@ ThreadWatcher = (function() {
        $.on($('.menu-button', ThreadWatcher.dialog), 'click', function(e) {
          return menu.toggle(e, this, ThreadWatcher);
        });
-        this.addHeaderMenuEntry();
        return this.addMenuEntries();
      },
      addHeaderMenuEntry: function() {
--- a/builds/4chan-X.crx
+++ b/builds/4chan-X.crx
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.13.1.11
+// @version      1.13.1.12
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.13.1.11
+// @version      1.13.1.12
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@ -147,7 +147,7 @@ docSet = function() {
 };

 g = {
-  VERSION:   '1.13.1.11',
+  VERSION:   '1.13.1.12',
  NAMESPACE: '4chan X.',
  boards:    {}
 };
@ -357,7 +357,7 @@ Config = (function() {
      'Auto Update Thread Watcher': [true, 'Periodically check status of watched threads.'],
      'Auto Watch': [true, 'Automatically watch threads you start.'],
      'Auto Watch Reply': [true, 'Automatically watch threads you reply to.'],
-      'Auto Prune': [true, 'Automatically remove dead threads.'],
+      'Auto Prune': [false, 'Automatically remove dead threads.'],
      'Show Unread Count': [true, 'Show number of unread posts in watched threads.']
    },
    filter: {
@ -11190,7 +11190,7 @@ Settings = (function() {
        }
      }
      if (compareString < '00001.00012.00003.00000') {
-        ref6 = ['Image Hover in Catalog', 'Auto Watch', 'Auto Watch Reply', 'Auto Prune'];
+        ref6 = ['Image Hover in Catalog', 'Auto Watch', 'Auto Watch Reply'];
        for (k = 0, len1 = ref6.length; k < len1; k++) {
          key = ref6[k];
          setD(key, false);
@ -18295,6 +18295,7 @@ ThreadWatcher = (function() {
      $.on(sc, 'click', this.toggleWatcher);
      $.on(this.refreshButton, 'click', this.buttonFetchAll);
      $.on(this.closeButton, 'click', this.toggleWatcher);
+      this.menu.addHeaderMenuEntry();
      $.onExists(doc, 'body', this.addDialog);
      switch (g.VIEW) {
        case 'index':
@ -18966,7 +18967,6 @@ ThreadWatcher = (function() {
        $.on($('.menu-button', ThreadWatcher.dialog), 'click', function(e) {
          return menu.toggle(e, this, ThreadWatcher);
        });
-        this.addHeaderMenuEntry();
        return this.addMenuEntries();
      },
      addHeaderMenuEntry: function() {
--- a/builds/4chan-X.zip
+++ b/builds/4chan-X.zip
--- a/builds/updates-beta.xml
+++ b/builds/updates-beta.xml
@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
  <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
-    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.13.1.11' />
+    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.13.1.12' />
  </app>
 </gupdate>

--- a/builds/updates.xml
+++ b/builds/updates.xml
@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
  <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
-    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.13.1.11' />
+    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.13.1.12' />
  </app>
 </gupdate>

--- a/src/Monitoring/ThreadWatcher.coffee
+++ b/src/Monitoring/ThreadWatcher.coffee
@ -24,6 +24,7 @@ ThreadWatcher =
    $.on @refreshButton, 'click', @buttonFetchAll
    $.on @closeButton, 'click', @toggleWatcher

+    @menu.addHeaderMenuEntry()
    $.onExists doc, 'body', @addDialog

    switch g.VIEW
@ -414,7 +415,6 @@ ThreadWatcher =
      menu = @menu = new UI.Menu 'thread watcher'
      $.on $('.menu-button', ThreadWatcher.dialog), 'click', (e) ->
        menu.toggle e, @, ThreadWatcher
-      @addHeaderMenuEntry()
      @addMenuEntries()

    addHeaderMenuEntry: ->
--- a/version.json
+++ b/version.json
@ -1,4 +1,4 @@
 {
-  "version": "1.13.1.11",
-  "date": "2016-11-26T10:56:59.519Z"
+  "version": "1.13.1.12",
+  "date": "2016-11-27T03:18:15.395Z"
 }