Skip to content

Commit

Permalink
Merge branch 'url-params' into pb-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
pooh-bear committed Apr 23, 2024
2 parents d4d1420 + 38b2149 commit ccfed12
Showing 1 changed file with 22 additions and 10 deletions.
32 changes: 22 additions & 10 deletions js/Config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ window.CONFIG = {
},

// Config Functions (index.html settings manager)
locationOptions:[],
locationOptions: [],
addLocationOption: (id, name, desc) => {
CONFIG.locationOptions.push({
id,
Expand Down Expand Up @@ -92,8 +92,8 @@ window.CONFIG = {
CONFIG.options.forEach((option) => {
//<div class="regular-text settings-item settings-text">Zip Code</div>
let label = document.createElement('div')
label.classList.add('strong-text', 'settings-item', 'settings-text', 'settings-padded')
label.style.textAlign='left'
label.classList.add('strong-text', 'settings-item', 'settings-text', 'settings-padded')
label.style.textAlign = 'left'
label.appendChild(document.createTextNode(option.name))
label.id = `${option.id}-label`
//<input class="settings-item settings-text" type="text" id="zip-code-text">
Expand All @@ -103,10 +103,10 @@ window.CONFIG = {
textbox.style.fontSize = '20px'
textbox.placeholder = option.desc
textbox.id = `${option.id}-text`
textbox.style.maxWidth='320px'
textbox.style.minWidth='320px'
textbox.style.height='100px'
textbox.style.marginTop='10px'
textbox.style.maxWidth = '320px'
textbox.style.minWidth = '320px'
textbox.style.height = '100px'
textbox.style.marginTop = '10px'
if (localStorage.getItem(option.id)) textbox.value = localStorage.getItem(option.id)
let br = document.createElement('br')
advancedSettingsOptions.appendChild(label)
Expand All @@ -132,9 +132,21 @@ window.CONFIG = {
btn.style = 'margin-bottom: 10px;'
btn.appendChild(document.createTextNode('Start'))
settingsPrompt.appendChild(btn)
if (CONFIG.loop || localStorage.getItem('loop') === 'y') {
CONFIG.loop = true;
hideSettings();
const urlParams = window.location.search ? new URLSearchParams(window.location.search) : null
if (urlParams) {
const params = ['zip-code', 'airport-code', 'countryCode', 'greetingText', 'crawlText', 'loop']
params.forEach((param) => {
if (urlParams.has(param)) {
CONFIG[param] = urlParams.get(param)
}
if (urlParams.get('play')) {
hideSettings()
CONFIG.submit()
}
})
} else if (CONFIG.loop || localStorage.getItem('loop') === 'y') {
CONFIG.loop = true
hideSettings()
CONFIG.submit()
}
}
Expand Down

0 comments on commit ccfed12

Please sign in to comment.