Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bstable'

Browse Source
This commit is contained in:
ccd0 2016-11-26 19:22:38 -08:00
commit d1bc26b0ad
14 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -4,6 +4,10 @@
### v1.13.1 ### 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)] **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. - Revert performance issue fix from v1.13.1.10 as it may cause more issues than it solves.

BIN
builds/4chan-X-beta.crx
View File

Binary file not shown.

2
builds/4chan-X-beta.meta.js
View File

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X beta // @name 4chan X beta
// @version 1.13.1.11 // @version 1.13.1.12
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X

10
builds/4chan-X-beta.user.js
View File

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

BIN
builds/4chan-X-noupdate.crx
View File

Binary file not shown.

10
builds/4chan-X-noupdate.user.js
View File

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

BIN
builds/4chan-X.crx
View File

Binary file not shown.

2
builds/4chan-X.meta.js
View File

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X // @name 4chan X
// @version 1.13.1.11 // @version 1.13.1.12
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X

10
builds/4chan-X.user.js
View File

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

BIN
builds/4chan-X.zip
View File

Binary file not shown.

2
builds/updates-beta.xml
View File

@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'> <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
<app appid='lacclbnghgdicfifcamcmcnilckjamag'> <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> </app>
</gupdate> </gupdate>

2
builds/updates.xml
View File

@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'> <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
<app appid='lacclbnghgdicfifcamcmcnilckjamag'> <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> </app>
</gupdate> </gupdate>

2
src/Monitoring/ThreadWatcher.coffee
View File

@ -24,6 +24,7 @@ ThreadWatcher =
$.on @refreshButton, 'click', @buttonFetchAll $.on @refreshButton, 'click', @buttonFetchAll
$.on @closeButton, 'click', @toggleWatcher $.on @closeButton, 'click', @toggleWatcher
@menu.addHeaderMenuEntry()
$.onExists doc, 'body', @addDialog $.onExists doc, 'body', @addDialog
switch g.VIEW switch g.VIEW
@ -414,7 +415,6 @@ ThreadWatcher =
menu = @menu = new UI.Menu 'thread watcher' menu = @menu = new UI.Menu 'thread watcher'
$.on $('.menu-button', ThreadWatcher.dialog), 'click', (e) -> $.on $('.menu-button', ThreadWatcher.dialog), 'click', (e) ->
menu.toggle e, @, ThreadWatcher menu.toggle e, @, ThreadWatcher
@addHeaderMenuEntry()
@addMenuEntries() @addMenuEntries()
addHeaderMenuEntry: -> addHeaderMenuEntry: ->

4
version.json
View File

@ -1,4 +1,4 @@
{ {
"version": "1.13.1.11", "version": "1.13.1.12",
"date": "2016-11-26T10:56:59.519Z" "date": "2016-11-27T03:18:15.395Z"
} }