diff --git a/app/javascript/src/javascripts/common.js.erb b/app/javascript/src/javascripts/common.js similarity index 66% rename from app/javascript/src/javascripts/common.js.erb rename to app/javascript/src/javascripts/common.js index 24c033dea..931266d8e 100644 --- a/app/javascript/src/javascripts/common.js.erb +++ b/app/javascript/src/javascripts/common.js @@ -20,12 +20,8 @@ $(function() { e.preventDefault(); }); - const CANONICAL_DOMAIN = <%= Danbooru.config.domain.to_json.html_safe %>; - const CANONICAL_HOSTNAME = <%= Danbooru.config.hostname.to_json.html_safe %>; - const ENABLE_ANTIPROXYING = <%= Danbooru.config.enable_antiproxying?.to_json.html_safe %>; - - if (ENABLE_ANTIPROXYING && !location.hostname.endsWith(CANONICAL_DOMAIN)) { - location.hostname = CANONICAL_HOSTNAME; + if (Danbooru.config["enable_antiproxying?"] && !location.hostname.endsWith(Danbooru.config.domain)) { + location.hostname = Danbooru.config.hostname; } }); diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb index 7944e26c1..2fddb3018 100644 --- a/app/views/layouts/default.html.erb +++ b/app/views/layouts/default.html.erb @@ -58,6 +58,7 @@ window.Danbooru = {}; } + window.Danbooru.config = <%= [:hostname, :domain, :enable_antiproxying?].map { |opt| [opt, Danbooru.config.send(opt)] }.to_h.to_json.html_safe %>; window.Danbooru.notice = Danbooru.Utility.notice; window.Danbooru.error = Danbooru.Utility.error;