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

Merge branch 'bstable'

Browse Source 
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-18 21:37:42 -08:00
commit 7f86dd4fbf
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -43,6 +43,9 @@ The links to individual versions below are to copies of the script with the upda
## v1.10.0 ## v1.10.0
**v1.10.0.7** *(2015-02-18)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.0.7/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.0.7/builds/4chan-X-noupdate.crx "Chromium version")]
- Work around more issues with clearing settings in Firefox 35+.
**v1.10.0.6** *(2015-02-17)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.0.6/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.0.6/builds/4chan-X-noupdate.crx "Chromium version")] **v1.10.0.6** *(2015-02-17)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.0.6/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.10.0.6/builds/4chan-X-noupdate.crx "Chromium version")]
- Fix bugs when `Fixed Header` is off but `Bottom Header` is on. - Fix bugs when `Fixed Header` is off but `Bottom Header` is on.

5
src/General/lib/$.coffee
View File

@ -482,9 +482,6 @@ $.set = do ->
cb?() cb?()
$.clear = (cb) -> $.clear = (cb) ->
try
$.delete GM_listValues().map (key) -> key.replace g.NAMESPACE, ''
catch err
# XXX https://github.com/greasemonkey/greasemonkey/issues/2033 # XXX https://github.com/greasemonkey/greasemonkey/issues/2033
$.delete Object.keys(Conf) $.delete Object.keys(Conf)
$.delete ['previousversion', 'AutoWatch', 'cooldown.global', 'QR Size', 'captchas', 'QR.persona', 'hiddenPSA'] $.delete ['previousversion', 'AutoWatch', 'cooldown.global', 'QR Size', 'captchas', 'QR.persona', 'hiddenPSA']
@ -492,6 +489,8 @@ $.clear = (cb) ->
boards = (a.textContent for a in $$ '#boardNavDesktop > .boardList > a') boards = (a.textContent for a in $$ '#boardNavDesktop > .boardList > a')
boards.push 'qa' boards.push 'qa'
$.delete ("cooldown.#{board}" for board in boards) $.delete ("cooldown.#{board}" for board in boards)
try
$.delete GM_listValues().map (key) -> key.replace g.NAMESPACE, ''
cb?() cb?()
<% } %> <% } %>