Skip to content

Revert "fix: loop and local storage fixes" #57

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Revert "fix: loop and local storage fixes" #57

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 11 additions & 25 deletions js/Config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,54 +32,40 @@ window.CONFIG = {
},
submit: (btn, e) => {
let args = {}
const currentLoop = (localStorage.getItem('loop') === 'y')
CONFIG.locationOptions.forEach((opt) => {
args[opt.id] = getElement(`${opt.id}-text`).value
args[`${opt.id}-button`] = getElement(`${opt.id}-button`).checked
if (!currentLoop) {
localStorage.setItem(opt.id, args[opt.id])
}
localStorage.setItem(opt.id, args[opt.id])
})
args['countryCode'] = getElement('country-code-text').value
if (!currentLoop) {
localStorage.setItem('countryCode', args['countryCode'])
}
CONFIG.options.forEach((opt) => {
args[opt.id] = getElement(`${opt.id}-text`).value
if (!currentLoop) {
localStorage.setItem(opt.id, args[opt.id])
}
localStorage.setItem(opt.id, args[opt.id])
})
console.log(args)
if (currentLoop) {
if (localStorage.getItem('crawlText')) CONFIG.crawl = localStorage.getItem('crawlText')
if (localStorage.getItem('greetingText')) CONFIG.greeting = localStorage.getItem('greetingText')
if (localStorage.getItem('countryCode')) CONFIG.countryCode = localStorage.getItem('countryCode')
} else {
if (args.crawlText !== '') CONFIG.crawl = args.crawlText
if (args.greetingText !== '') CONFIG.greeting = args.greetingText
if (args.countryCode !== '') CONFIG.countryCode = args.countryCode
if (args.loop === 'y') CONFIG.loop = true
}
if (args.crawlText !== '') CONFIG.crawl = args.crawlText
if (args.greetingText !== '') CONFIG.greeting = args.greetingText
if(args.countryCode !== '') CONFIG.countryCode = args.countryCode
if (args.loop === 'y') CONFIG.loop = true

if (args['airport-code-button']==true){
CONFIG.locationMode="AIRPORT"
if(args['airport-code'].length==0){
alert("Please enter an airport code")
return
return;
}
}
else {
CONFIG.locationMode="POSTAL"
if(!currentLoop && args['zip-code'].length==0){
if(args['zip-code'].length==0){
alert("Please enter a postal code")
return
return;
}

}

zipCode = args['zip-code'] || localStorage.getItem('zip-code')
airportCode = args['airport-code'] || localStorage.getItem('airport-code')
zipCode = args['zip-code'];
airportCode = args['airport-code'];

CONFIG.unitField = CONFIG.units === 'm' ? 'metric' : (CONFIG.units === 'h' ? 'uk_hybrid' : 'imperial')
fetchCurrentWeather();
Expand Down