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

Fix SFW/NSFW themes.

Browse Source
This commit is contained in:
Zixaphir 2013-04-11 14:54:44 -07:00
parent 41c2300263
commit bd688515e9
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
appchan-x.user.js
View File

@ -295,6 +295,8 @@
embedWidth: 640, embedWidth: 640,
embedHeight: 390, embedHeight: 390,
theme: 'Yotsuba B', theme: 'Yotsuba B',
'theme_sfw': 'Yotsuba B',
'theme_nsfw': 'Yotsuba',
mascot: '' mascot: ''
}; };
@ -12831,6 +12833,9 @@
} else { } else {
g.MASCOTSTRING = "Enabled Mascots"; g.MASCOTSTRING = "Enabled Mascots";
} }
if (Conf["NSFW/SFW Themes"]) {
Conf["theme"] = Conf["theme_" + g.TYPE];
}
switch (location.hostname) { switch (location.hostname) {
case 'sys.4chan.org': case 'sys.4chan.org':
Report.init(); Report.init();

6
src/config.coffee
View File

@ -897,7 +897,9 @@ box-shadow: inset 2px 2px 2px rgba(0,0,0,0.2);
] ]
'Interval': 30 'Interval': 30
embedWidth: 640 embedWidth: 640
embedHeight: 390 embedHeight: 390
theme : 'Yotsuba B' theme : 'Yotsuba B'
'theme_sfw': 'Yotsuba B'
'theme_nsfw': 'Yotsuba'
mascot : '' mascot : ''

6
src/main.coffee
View File

@ -334,8 +334,7 @@ Main =
if ['b', 'd', 'e', 'gif', 'h', 'hc', 'hm', 'hr', 'pol', 'r', 'r9k', 'rs', 's', 'soc', 't', 'u', 'y'].contains g.BOARD if ['b', 'd', 'e', 'gif', 'h', 'hc', 'hm', 'hr', 'pol', 'r', 'r9k', 'rs', 's', 'soc', 't', 'u', 'y'].contains g.BOARD
g.TYPE = 'nsfw' g.TYPE = 'nsfw'
$.extend Themes, Conf["userThemes"]
$.extend Themes, Conf["userThemes"]
$.extend Mascots, Conf["userMascots"] $.extend Mascots, Conf["userMascots"]
if Conf["NSFW/SFW Mascots"] if Conf["NSFW/SFW Mascots"]
@ -343,6 +342,9 @@ Main =
else else
g.MASCOTSTRING = "Enabled Mascots" g.MASCOTSTRING = "Enabled Mascots"
if Conf["NSFW/SFW Themes"]
Conf["theme"] = Conf["theme_#{g.TYPE}"]
switch location.hostname switch location.hostname
when 'sys.4chan.org' when 'sys.4chan.org'
Report.init() Report.init()