Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make sure we always set a valid language #771

Merged
merged 2 commits into from
Jul 4, 2022
Merged

Make sure we always set a valid language #771

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7493789
Make sure we always set a valid language
aurelien-reeves Jul 4, 2022
76bb5d3
Prevent removing the prefered language when browsing a page without l…
aurelien-reeves Jul 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 21 additions & 41 deletions themes/cucumber-sb/static/js/site.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,45 +120,31 @@ function getLangFromUrl(){

// Activate

var supportedLanguages = [
"java",
"javascript",
"ruby",
"kotlin",
"scala"
]

var defaulLanguage = 'java'

ready(function() {
var selectedLang = getLangFromUrl();
if((selectedLang == '' || selectedLang == null)){
if(localStorage.getItem('language') == ''){
showOnly(defaulLanguage)
localStorage.setItem('language', defaulLanguage)
}else{
showOnly(localStorage.getItem('language'))
}
}else{
if(supportedLanguages.includes(selectedLang)){
showOnly(selectedLang)
}else{
if(localStorage.getItem('language') == ''){
showOnly(defaulLanguage)
localStorage.setItem('language', defaulLanguage)
}else{
showOnly(localStorage.getItem('language'))
}
const supportedLanguages = [...document.querySelectorAll('.tabs li')].map((li) => li.getAttribute('data-language'))

if (supportedLanguages.length >= 1) {
const defaultLanguage = supportedLanguages[0]
const localLanguage = localStorage.getItem('language');
const selectedLanguage = getLangFromUrl();

if (supportedLanguages.includes(selectedLanguage)) {
showOnly(selectedLanguage)
} else if (supportedLanguages.includes(localLanguage)) {
showOnly(localLanguage)
} else {
showOnly(defaultLanguage)
}
}

each(document, '.tabs li', function(li) {
var language = li.getAttribute('data-language')
li.addEventListener('click', function () {
window.location.search = updateQueryParam(language);
showOnly(language)
each(document, '.tabs li', function(li) {
var language = li.getAttribute('data-language')
li.addEventListener('click', function () {
window.location.search = updateQueryParam(language);
showOnly(language)
})
})
})
}


each(document, '.panel.collapsible > a', function(a) {
var targetSelector = a.getAttribute('data-target');
Expand All @@ -168,12 +154,6 @@ ready(function() {
})
})

var firstLi = document.querySelector('.tabs li')
if(firstLi) {
var language = localStorage.getItem('language') || firstLi.getAttribute('data-language')
showOnly(language)
}

// Toggle navbar menu
var burger = document.querySelector('.navbar-burger')
if(burger) {
Expand Down