twisterarmy/twister-html
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-html.git synced 2025-01-12 07:58:06 +00:00
Code Issues Projects Releases Wiki Activity

add workaround to deal with CSP interruption of theme_option.js

Browse Source
This commit is contained in:
Simon Grim 2019-02-02 19:44:11 +05:00
parent fd4a62740a
commit f436931277
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/interface_common.js
View File

@ -2744,19 +2744,17 @@ function changeStyle() {
if (theme === 'nin') {
style = 'theme_nin/css/style.css';
profile = 'theme_nin/css/profile.css';
// we use .ajax because .getScript requires 'unsafe-inline' CSP rule for now, see https://github.com/jquery/jquery/issues/3969
$.ajax({dataType: 'text', url: 'theme_nin/js/theme_option.js'})
.done(function(script, textStatus) {
eval(script); // FIXME
//applyThemePptions();
})
;
.done(function(res) {eval(res);});
} else if (theme === 'calm') {
style = 'theme_calm/css/style.css';
profile = 'theme_calm/css/profile.css';
} else if (theme === 'original') {
style = 'css/style.css';
profile = 'css/profile.css';
$.getScript('theme_original/js/theme_option.js');
$.ajax({dataType: 'text', url: 'theme_original/js/theme_option.js'})
.done(function(res) {eval(res);});
}
$('#stylecss').attr('href', style);

3
theme_nin/js/theme_option.js
View File

@ -6,7 +6,8 @@ $(function () {
$('img[src$="img/tornado_avatar.png"]').attr("src","theme_nin/img/tornado_avatar.png");
$('.mini-profile-actions span').html('');
$.globalEval(postToElem.toString().replace(/postContext.append\(twister\.tmpl\.postRtBy/,
// indirect eval call in hope to execute code globally
(1, eval)(postToElem.toString().replace(/postContext.append\(twister\.tmpl\.postRtBy/,
'postContext.prependTo(postContext.parent()).append(twister.tmpl.postRtBy'));
$('.userMenu-home.current a').on('click', function () {