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

Merge branch 'master' into v3

Browse Source
This commit is contained in:
Nicolas Stepien 2013-04-01 20:15:20 +02:00
commit 4318413a92
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changelog-old
View File

@ -1,5 +1,9 @@
master master
2.39.2
- Mayhem
Fix importing settings containing unicode characters.
2.39.1 2.39.1
- Mayhem - Mayhem
Add /gd/, /out/, /vp/ and /vr/ archive redirection. Add /gd/, /out/, /vp/ and /vr/ archive redirection.

2
src/features.coffee
View File

@ -402,7 +402,7 @@ Settings =
reader = new FileReader() reader = new FileReader()
reader.onload = (e) -> reader.onload = (e) ->
try try
data = JSON.parse decodeURIComponent escape e.target.result data = JSON.parse e.target.result
Settings.loadSettings data Settings.loadSettings data
if confirm 'Import successful. Refresh now?' if confirm 'Import successful. Refresh now?'
window.location.reload() window.location.reload()