Skip to content

Commit dffab2f

Browse files
authored
Merge pull request #3305 from jeedom/fix/scenario-timeline-folder-visibility
Fix timeline folder field visibility on scenario page load
2 parents 9184f08 + e8bd799 commit dffab2f

1 file changed

Lines changed: 16 additions & 16 deletions

File tree

desktop/js/scenario.js

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1614,6 +1614,14 @@ document.querySelector('.scenarioAttr[data-l1key="mode"]').addEventListener('cha
16141614
}
16151615
})
16161616

1617+
document.querySelector('.scenarioAttr[data-l2key="timeline::enable"]').addEventListener('change', function(event) {
1618+
if (this.checked) {
1619+
document.querySelector('.scenarioAttr[data-l2key="timeline::folder"]').seen()
1620+
} else {
1621+
document.querySelector('.scenarioAttr[data-l2key="timeline::folder"]').unseen()
1622+
}
1623+
})
1624+
16171625
var select = document.getElementById('in_addElementType')
16181626
var input = document.getElementById('in_addElementTypeFilter')
16191627
var allOptions = Array.from(select.options)
@@ -1633,7 +1641,7 @@ function filterOptions() {
16331641
})
16341642
}
16351643

1636-
input.addEventListener('input', filterOptions)
1644+
input.addEventListener('input', filterOptions)
16371645

16381646
select.addEventListener('change', function(event) {
16391647
document.querySelectorAll('.addElementTypeDescription').unseen()
@@ -1999,11 +2007,11 @@ document.getElementById('div_editScenario').querySelector('div.floatingbar').add
19992007
_target.setAttribute('data-state', '1')
20002008
//open code blocks for later search:
20012009
document.querySelectorAll('#div_scenarioElement div.elementCODE.elementCollapse').forEach(_code => {
2002-
_code.classList.remove('elementCollapse');
2003-
const textarea = _code.querySelector('textarea[data-l1key="expression"]');
2004-
if (textarea) {
2005-
textarea.style.display = 'block';
2006-
}
2010+
_code.classList.remove('elementCollapse')
2011+
const textarea = _code.querySelector('textarea[data-l1key="expression"]')
2012+
if (textarea) {
2013+
textarea.style.display = 'block'
2014+
}
20072015
})
20082016
jeeP.setEditors()
20092017
document.querySelectorAll('textarea[data-l1key="expression"]').unseen()
@@ -2044,14 +2052,6 @@ document.getElementById('div_editScenario').querySelector('div.floatingbar').add
20442052
//_________________General tab events:
20452053
document.getElementById('generaltab').addEventListener('click', function(event) {
20462054
var _target = null
2047-
if (_target = event.target.closest('.scenarioAttr[data-l2key="timeline::enable"]')) {
2048-
if (_target.checked) {
2049-
document.querySelector('.scenarioAttr[data-l2key="timeline::folder"]').seen()
2050-
} else {
2051-
document.querySelector('.scenarioAttr[data-l2key="timeline::folder"]').unseen()
2052-
}
2053-
return
2054-
}
20552055

20562056
if (_target = event.target.closest('.scenario_link')) {
20572057
jeedomUtils.hideAlert()
@@ -2213,11 +2213,11 @@ document.getElementById('scenariotab').addEventListener('click', function(event)
22132213
return
22142214
}
22152215

2216-
if (_target = event.target.closest('#bt_cancelElementSave')) {
2216+
if (_target = event.target.closest('#bt_cancelElementSave')) {
22172217
jeeDialog.modal(document.getElementById('md_addElement'))._jeeDialog.hide()
22182218
}
22192219

2220-
if (_target = event.target.closest('#bt_crossElementSave')) {
2220+
if (_target = event.target.closest('#bt_crossElementSave')) {
22212221
jeeDialog.modal(document.getElementById('md_addElement'))._jeeDialog.hide()
22222222
}
22232223

0 commit comments

Comments
 (0)