From 63844f0d4b31bf3d3c90dab99eea61722d3f8eea Mon Sep 17 00:00:00 2001 From: akuma06 Date: Wed, 17 May 2017 23:00:50 +0200 Subject: [PATCH] Fix #590 --- public/js/languages.js | 31 +++++++++++++++++++++++++++++++ public/js/main.js | 33 +-------------------------------- templates/index.html | 1 + 3 files changed, 33 insertions(+), 32 deletions(-) create mode 100644 public/js/languages.js diff --git a/public/js/languages.js b/public/js/languages.js new file mode 100644 index 00000000..92c5d155 --- /dev/null +++ b/public/js/languages.js @@ -0,0 +1,31 @@ +function loadLanguages() { + var xhr = new XMLHttpRequest(); + xhr.onreadystatechange = function() { + if (xhr.readyState == 4 && xhr.status == 200) { + var selector = document.getElementById("bottom_language_selector"); + selector.hidden = false + /* Response format is + * { "current": "(user current language)", + * "languages": { + * "(language_code)": "(language_name"), + * }} */ + var response = JSON.parse(xhr.responseText); + for (var language in response.languages) { + if (!response.languages.hasOwnProperty(language)) continue; + + var opt = document.createElement("option") + opt.value = language + opt.innerHTML = response.languages[language] + if (language == response.current) { + opt.selected = true + } + + selector.appendChild(opt) + } + } + } + xhr.open("GET", "/language?format=json", true) + xhr.send() +} + +loadLanguages(); diff --git a/public/js/main.js b/public/js/main.js index 58f7a8ad..2a5b29fc 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -39,35 +39,4 @@ window.onload = function() { var shiftWindow = function() { scrollBy(0, -70) }; if (location.hash) shiftWindow(); window.addEventListener("hashchange", shiftWindow); -}; -function loadLanguages() { - var xhr = new XMLHttpRequest(); - xhr.onreadystatechange = function() { - if (xhr.readyState == 4 && xhr.status == 200) { - var selector = document.getElementById("bottom_language_selector"); - selector.hidden = false - /* Response format is - * { "current": "(user current language)", - * "languages": { - * "(language_code)": "(language_name"), - * }} */ - var response = JSON.parse(xhr.responseText); - for (var language in response.languages) { - if (!response.languages.hasOwnProperty(language)) continue; - - var opt = document.createElement("option") - opt.value = language - opt.innerHTML = response.languages[language] - if (language == response.current) { - opt.selected = true - } - - selector.appendChild(opt) - } - } - } - xhr.open("GET", "/language?format=json", true) - xhr.send() -} - -loadLanguages(); +}; \ No newline at end of file diff --git a/templates/index.html b/templates/index.html index 377c7db9..1684628d 100755 --- a/templates/index.html +++ b/templates/index.html @@ -95,6 +95,7 @@ + {{end}}