Merge branch 'bstable'

Conflicts:
	LICENSE
	builds/4chan-X-beta.crx
	builds/4chan-X-beta.meta.js
	builds/4chan-X-beta.user.js
	builds/4chan-X-noupdate.crx
	builds/4chan-X-noupdate.user.js
	builds/4chan-X.crx
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/4chan-X.zip
	builds/updates-beta.xml
	builds/updates.xml
	package.json
This commit is contained in:
ccd0 2015-02-12 09:59:28 -08:00
commit 862fd39b00
2 changed files with 15 additions and 1 deletions

View File

@ -31,6 +31,11 @@ The links to individual versions below are to copies of the script with the upda
- (Zixaphir, ccd0) Various other minor changes and bugfixes.
<!-- v1.9.23.x -->
### v1.9.23.11
*2015-02-12* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.23.11/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.23.11/builds/4chan-X-noupdate.crx "Chromium version")]
- Fix importing/resetting settings in Firefox 35+.
### v1.9.23.10
*2015-02-11* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.23.10/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.9.23.10/builds/4chan-X-noupdate.crx "Chromium version")]

View File

@ -495,7 +495,16 @@ $.set = do ->
set key, val
return
$.clear = (cb) ->
$.delete GM_listValues().map (key) -> key.replace g.NAMESPACE, ''
try
$.delete GM_listValues().map (key) -> key.replace g.NAMESPACE, ''
catch err
# XXX https://github.com/greasemonkey/greasemonkey/issues/2033
$.delete Object.keys(Conf)
$.delete ['previousversion', 'AutoWatch', 'cooldown.global', 'QR Size', 'captchas', 'QR.persona', 'hiddenPSA']
$.delete ("#{id}.position" for id in ['embedding', 'updater', 'thread-stats', 'thread-watcher', 'qr'])
boards = (a.textContent for a in $$ '#boardNavDesktop > .boardList > a')
boards.push 'qa'
$.delete ("cooldown.#{board}" for board in boards)
cb?()
<% } %>