diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js index e12e7f67..938517ef 100644 --- a/www/assets/js/callbacks.js +++ b/www/assets/js/callbacks.js @@ -270,14 +270,14 @@ Callbacks = { document.title = opts.pagetitle; PAGETITLE = opts.pagetitle; $("#chanexternalcss").remove(); - if(opts.externalcss.trim() != "") { + if(opts.externalcss.trim() != "" && !USEROPTS.ignore_channelcss) { $("") .attr("rel", "stylesheet") .attr("href", opts.externalcss) .attr("id", "chanexternalcss") .appendTo($("head")); } - if(opts.externaljs.trim() != "") { + if(opts.externaljs.trim() != "" && !USEROPTS.ignore_channeljs) { if(opts.externaljs != CHANNEL.opts.externaljs) { $.getScript(opts.externaljs); } @@ -301,22 +301,20 @@ Callbacks = { channelCSSJS: function(data) { $("#chancss").remove(); - $("#chanjs").remove(); - CHANNEL.css = data.css; - CHANNEL.js = data.js; - $("#csstext").val(data.css); - $("#jstext").val(data.js); - - if(data.css) { + if(data.css && !USEROPTS.ignore_channelcss) { $("").attr("type", "text/css") .attr("id", "chancss") .text(data.css) .appendTo($("head")); } - if(data.js) { + $("#chanjs").remove(); + CHANNEL.js = data.js; + $("#jstext").val(data.js); + + if(data.js && !USEROPTS.ignore_channeljs) { $("").attr("type", "text/javascript") .attr("id", "chanjs") .text(data.js) diff --git a/www/assets/js/data.js b/www/assets/js/data.js index 6d313eea..4043086e 100644 --- a/www/assets/js/data.js +++ b/www/assets/js/data.js @@ -95,7 +95,9 @@ var USEROPTS = { joinmessage : getOrDefault("joinmessage", true), qbtn_hide : getOrDefault("qbtn_hide", false), qbtn_idontlikechange : getOrDefault("qbtn_idontlikechange", false), - first_visit : getOrDefault("first_visit", true) + first_visit : getOrDefault("first_visit", true), + ignore_channelcss : getOrDefault("ignore_channelcss", false), + ignore_channeljs : getOrDefault("ignore_channeljs", false) }; var Rank = { diff --git a/www/assets/js/util.js b/www/assets/js/util.js index b4f95863..b6131162 100644 --- a/www/assets/js/util.js +++ b/www/assets/js/util.js @@ -384,6 +384,17 @@ function showOptionsMenu() { .text("Changing layouts may require a refresh") addOption("", warn); $("