Merge branch 'bstable'

This commit is contained in:
ccd0 2019-03-22 03:03:08 -07:00
commit ef92c3a8a8
16 changed files with 30 additions and 17 deletions

View File

@ -4,6 +4,10 @@
### v1.14.5
**v1.14.5.14** *(2019-03-22)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.5.14/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.5.14/builds/4chan-X-noupdate.crx)]
- Add message alerting Chrome extension users to disable chrome://flags/#network-service
- Minor bugfix in catalog/index loading.
**v1.14.5.13** *(2019-03-08)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.5.13/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.5.13/builds/4chan-X-noupdate.crx)]
- Fix bugs related to additional permissions requests. #2230
- Revert changes in thread watcher that caused performance decrease.

Binary file not shown.

View File

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

View File

@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X beta
// @version 1.14.5.13
// @version 1.14.5.14
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@ -198,7 +198,7 @@ docSet = function() {
};
g = {
VERSION: '1.14.5.13',
VERSION: '1.14.5.14',
NAMESPACE: '4chan X.',
boards: {}
};
@ -10996,7 +10996,8 @@ Index = (function() {
onabort: Index.load,
onloadend: Index.load
}, {
whenModified: 'Index'
whenModified: 'Index',
bypassCache: true
});
return $.addClass(Index.button, 'fa-spin');
},

Binary file not shown.

View File

@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
// @version 1.14.5.13
// @version 1.14.5.14
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@ -198,7 +198,7 @@ docSet = function() {
};
g = {
VERSION: '1.14.5.13',
VERSION: '1.14.5.14',
NAMESPACE: '4chan X.',
boards: {}
};
@ -10996,7 +10996,8 @@ Index = (function() {
onabort: Index.load,
onloadend: Index.load
}, {
whenModified: 'Index'
whenModified: 'Index',
bypassCache: true
});
return $.addClass(Index.button, 'fa-spin');
},

Binary file not shown.

View File

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

View File

@ -1,6 +1,6 @@
// ==UserScript==
// @name 4chan X
// @version 1.14.5.13
// @version 1.14.5.14
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@ -198,7 +198,7 @@ docSet = function() {
};
g = {
VERSION: '1.14.5.13',
VERSION: '1.14.5.14',
NAMESPACE: '4chan X.',
boards: {}
};
@ -10996,7 +10996,8 @@ Index = (function() {
onabort: Index.load,
onloadend: Index.load
}, {
whenModified: 'Index'
whenModified: 'Index',
bypassCache: true
});
return $.addClass(Index.button, 'fa-spin');
},

Binary file not shown.

View File

@ -3,7 +3,7 @@
"4chan-x@4chan-x.net": {
"updates": [
{
"version": "1.14.5.13",
"version": "1.14.5.14",
"update_link": "https://www.4chan-x.net/builds/4chan-X-beta.crx"
}
]

View File

@ -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.14.5.13' />
<updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.14.5.14' />
</app>
</gupdate>

View File

@ -3,7 +3,7 @@
"4chan-x@4chan-x.net": {
"updates": [
{
"version": "1.14.5.13",
"version": "1.14.5.14",
"update_link": "https://www.4chan-x.net/builds/4chan-X.crx"
}
]

View File

@ -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.14.5.13' />
<updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.14.5.14' />
</app>
</gupdate>

View File

@ -73,6 +73,12 @@ $.ajax = do ->
$.extend r.upload, upCallbacks
# connection error or content blocker
$.on r, 'error', -> (c.warn "4chan X failed to load: #{url}" unless r.status)
<% if (type === 'crx') { %>
$.on r, 'load', ->
return unless r.readyState is 4 and r.status is 200 and r.statusText is '' and r.response is null and !$.ajaxWarningShown
new Notice 'warning', "Error loading #{url}; try going to chrome://flags/#network-service and disabling the network service flag."
$.ajaxWarningShown = true
<% } %>
r.send form
catch err
# XXX Some content blockers in Firefox (e.g. Adblock Plus and NoScript) throw an exception instead of simulating a connection error.

View File

@ -1,4 +1,4 @@
{
"version": "1.14.5.13",
"date": "2019-03-08T23:32:11.908Z"
"version": "1.14.5.14",
"date": "2019-03-22T09:53:32.789Z"
}