diff --git a/desktop/js/cron.js b/desktop/js/cron.js
index 443526142f..84e58412c2 100644
--- a/desktop/js/cron.js
+++ b/desktop/js/cron.js
@@ -63,9 +63,9 @@ if (!jeeFrontEnd.cron) {
jeeFrontEnd.cron.cronDataTable.destroy()
delete jeeFrontEnd.cron.cronDataTable
}
- var table = document.getElementById('table_cron').querySelector('tbody')
+ const table = document.getElementById('table_cron').querySelector('tbody')
table.empty()
- for (var i in data) {
+ for (const i in data) {
let newRow = document.createElement("tr")
newRow.innerHTML = jeeP.addCron(data[i])
newRow.setJeeValues(data[i], '.cronAttr')
@@ -82,11 +82,11 @@ if (!jeeFrontEnd.cron) {
},
addCron: function(_cron) {
jeedomUtils.hideAlert()
- var disabled = ''
+ const disabled = ''
if (init(_cron.deamon) == 1) {
disabled = 'disabled'
}
- var tr = '
'
tr += ' | '
tr += ''
tr += init(_queue.pid)
@@ -318,8 +318,8 @@ if (!jeeFrontEnd.cron) {
tr += init(_queue.createTime)
tr += ' | '
tr += ''
- var label = 'label label-info'
- var state = init(_queue.state)
+ let label = 'label label-info'
+ let state = init(_queue.state)
if (init(_queue.state) == 'run') {
label = 'label label-success'
state = '{{En cours}}'
@@ -388,7 +388,7 @@ document.getElementById('bt_save')?.addEventListener('click', function(event) {
})
document.getElementById('bt_changeCronState')?.addEventListener('click', function(event) {
- var _target = event.target
+ const _target = event.target
jeedom.config.save({
configuration: {
enableCron: _target.getAttribute('data-state')
@@ -421,7 +421,7 @@ document.registerEvent('keydown', function(event) {
/*Events delegations
*/
document.getElementById('div_pageContainer').addEventListener('click', function(event) {
- var _target = null
+ const _target = null
if (_target = event.target.closest('ul.nav.nav-tabs')) {
if (document.getElementById('tab_tableCron').hasClass('active')) {
document.querySelector('div.floatingbar').seen()
@@ -433,7 +433,7 @@ document.getElementById('div_pageContainer').addEventListener('click', function(
})
document.getElementById('div_pageContainer').addEventListener('change', function(event) {
- var _target = null
+ const _target = null
if (_target = event.target.closest('.cronAttr')) {
jeeFrontEnd.modifyWithoutSave = true
}
@@ -443,7 +443,7 @@ document.getElementById('div_pageContainer').addEventListener('change', function
//Table cron
document.getElementById('table_cron')?.tBodies[0].addEventListener('click', function(event) {
// console.log('click:', event.target)
- var _target = null
+ const _target = null
if (_target = event.target.closest('.remove')) {
_target.closest('tr').remove()
if (jeeFrontEnd.cron.cronDataTable) jeeFrontEnd.cron.cronDataTable.refresh()
@@ -495,7 +495,7 @@ document.getElementById('table_cron')?.tBodies[0].addEventListener('click', func
})
document.getElementById('table_cron')?.tBodies[0].addEventListener('change', function(event) {
- var _target = null
+ const _target = null
if (_target = event.target.closest('.cronAttr[data-l1key="deamon"]')) {
if (_target.jeeValue() == 1) {
_target.closest('tr').querySelector('.cronAttr[data-l1key="deamonSleepTime"]').seen()
@@ -510,7 +510,7 @@ document.getElementById('table_cron')?.tBodies[0].addEventListener('change', fun
document.getElementById('table_queue')?.tBodies[0].addEventListener('click', function(event) {
// console.log('click:', event.target)
- var _target = null
+ const _target = null
if (_target = event.target.closest('.displayQueue')) {
jeeDialog.dialog({
id: 'jee_modal',
@@ -526,7 +526,7 @@ document.getElementById('table_queue')?.tBodies[0].addEventListener('click', fun
//Table listeners
document.getElementById('table_listener')?.tBodies[0].addEventListener('click', function(event) {
- var _target = null
+ const _target = null
if (_target = event.target.closest('.display')) {
jeeDialog.dialog({
id: 'jee_modal',
@@ -537,7 +537,7 @@ document.getElementById('table_listener')?.tBodies[0].addEventListener('click',
}
if (_target = event.target.closest('.removeListener')) {
- var tr = _target.closest('tr')
+ const tr = _target.closest('tr')
jeedom.listener.remove({
id: tr.querySelector('span[data-l1key="id"]').innerHTML,
success: function() {
@@ -550,10 +550,10 @@ document.getElementById('table_listener')?.tBodies[0].addEventListener('click',
//Table daemons
document.getElementById('table_deamon')?.tBodies[0].addEventListener('click', function(event) {
- var _target = null
+ const _target = null
if (_target = event.target.closest('.bt_deamonAction')) {
- var plugin = _target.getAttribute('data-plugin')
- var action = _target.getAttribute('data-action')
+ const plugin = _target.getAttribute('data-plugin')
+ const action = _target.getAttribute('data-action')
if (action == 'start') {
jeedom.plugin.deamonStart({
id: plugin,
diff --git a/desktop/js/editor.js b/desktop/js/editor.js
index 2c0a23034d..9bbf301563 100644
--- a/desktop/js/editor.js
+++ b/desktop/js/editor.js
@@ -48,7 +48,7 @@ if (!jeeFrontEnd.editor) {
className: 'success',
callback: {
click: function(event) {
- var SubType = document.querySelector('.selectWidgetSubType[data-type="' + document.getElementById('sel_widgetType')?.value + '"]')?.value
+ const SubType = document.querySelector('.selectWidgetSubType[data-type="' + document.getElementById('sel_widgetType')?.value + '"]')?.value
if (!SubType || SubType.value == '') {
jeedomUtils.showAlert({message: '{{Le sous-type ne peut être vide}}', level: 'danger'})
return
@@ -57,8 +57,8 @@ if (!jeeFrontEnd.editor) {
jeedomUtils.showAlert({message: '{{Le nom ne peut être vide}}', level: 'danger'})
return
}
- var name = 'cmd.'+document.getElementById('sel_widgetType').value+'.'+SubType+'.'+document.getElementById('in_widgetName').value+'.html'
- var filePath = 'data/customTemplates/' + document.getElementById('sel_widgetVersion').value + '/'
+ const name = 'cmd.'+document.getElementById('sel_widgetType').value+'.'+SubType+'.'+document.getElementById('in_widgetName').value+'.html'
+ const filePath = 'data/customTemplates/' + document.getElementById('sel_widgetVersion').value + '/'
jeedom.createFile({
path: filePath,
name: name,
@@ -68,11 +68,11 @@ if (!jeeFrontEnd.editor) {
success: function() {
document.getElementById('md_widgetCreation')._jeeDialog.destroy()
jeedomUtils.showAlert({message: '{{Fichier enregistré avec succès}}', level: 'success'})
- var hash = jeeP.getHashFromPath(filePath.replace('data/customTemplates/', '').replace('/', ''))
+ let hash = jeeP.getHashFromPath(filePath.replace('data/customTemplates/', '').replace('/', ''))
jeeFrontEnd.editor._elfInstance.exec('open', hash)
//jeeFrontEnd.editor._elfInstance.exec('reload')
- var path = filePath.replace('data/customTemplates/', '') + name
+ const path = filePath.replace('data/customTemplates/', '') + name
hash = jeeP.getHashFromPath(path)
setTimeout(function() {
jeeFrontEnd.editor._elfInstance.exec('edit', hash)
@@ -146,9 +146,9 @@ if (!jeeFrontEnd.editor) {
return $.Deferred().done()
}
this.getActive = function() {
- var myClass = ''
- var myIcon = ''
- var $button = $('#elfinder .elfinder-button-icon-jee_onoffcustom + .elfinder-button-text')
+ let myClass = ''
+ let myIcon = ''
+ const $button = $('#elfinder .elfinder-button-icon-jee_onoffcustom + .elfinder-button-text')
if (this.config == 1) {
myClass = 'btn-warning'
myIcon = ' '
@@ -185,7 +185,7 @@ jeeFrontEnd.editor.init()
CodeMirror.modeURL = "3rdparty/codemirror/mode/%N/%N.js"
-var options = {
+let options = {
url: 'core/php/editor.connector.php?root='+root,
baseUrl: '3rdparty/elfinder/',
cssAutoLoad: false,
@@ -255,10 +255,10 @@ var options = {
},
load : function(textarea) {
let self = this
- var elfinderInstance = $('#elfinder').elfinder(options).elfinder('instance')
- var fileUrl = elfinderInstance.url(self.file.hash)
+ const elfinderInstance = $('#elfinder').elfinder(options).elfinder('instance')
+ let fileUrl = elfinderInstance.url(self.file.hash)
fileUrl = fileUrl.replace('/core/php/../../', '')
- var modal = textarea.closest('.ui-front')
+ const modal = textarea.closest('.ui-front')
modal.querySelector('.elfinder-dialog-title').innerHTML = fileUrl
this.myCodeMirror = CodeMirror.fromTextArea(textarea, {
@@ -270,10 +270,10 @@ var options = {
foldGutter: true,
gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"]
})
- var editor = this.myCodeMirror
+ const editor = this.myCodeMirror
//Auto mode set:
- var info, m, mode, spec;
+ let info, m, mode, spec;
if (!info) {
info = CodeMirror.findModeByMIME(self.file.mime);
}
diff --git a/desktop/js/history.js b/desktop/js/history.js
index e1240e6631..b9028024fe 100644
--- a/desktop/js/history.js
+++ b/desktop/js/history.js
@@ -44,7 +44,7 @@ if (!jeeFrontEnd.history) {
this.loadIds = this.loadIds.split('-')
if (is_numeric(this.loadIds[0])) {
this.loadIds.forEach(function(cmd_id) {
- var li = document.querySelector('.li_history[data-cmd_id="' + cmd_id + '"]')
+ const li = document.querySelector('.li_history[data-cmd_id="' + cmd_id + '"]')
if (li) {
li.addClass('active')
jeeFrontEnd.history.addChart(cmd_id, 1)
@@ -68,12 +68,12 @@ if (!jeeFrontEnd.history) {
//grouping/type/variation/step Compare mode available only if one curve in chart
setChartOptions: function() {
if (!isset(jeedom.history.chart[this.__el__])) return
- var _disabled = true
- var currentSeries = jeedom.history.chart[this.__el__].chart.series.filter(key => !key.name.includes('Navigator '))
+ let _disabled = true
+ const currentSeries = jeedom.history.chart[this.__el__].chart.series.filter(key => !key.name.includes('Navigator '))
if (currentSeries.length == 1) { //only one series in chart:
- var serieId = currentSeries[0].userOptions.id
- var isCalcul = document.querySelector('li.li_history[data-cmd_id="' + serieId + '"] a.history')?.getAttribute('data-calcul') === null ? false : true
+ const serieId = currentSeries[0].userOptions.id
+ const isCalcul = document.querySelector('li.li_history[data-cmd_id="' + serieId + '"] a.history')?.getAttribute('data-calcul') === null ? false : true
if (isCalcul) {
this.__lastId__ = null
document.getElementById('cb_derive').checked = false
@@ -84,16 +84,16 @@ if (!jeeFrontEnd.history) {
this.__lastId__ = currentSeries[currentSeries.length - 1].userOptions.id
_disabled = false
if (isset(currentSeries[0].userOptions.dataGrouping)) {
- var grouping = currentSeries[0].userOptions.dataGrouping.enabled
+ const grouping = currentSeries[0].userOptions.dataGrouping.enabled
if (grouping) {
- var groupingType = currentSeries[0].userOptions.dataGrouping.approximation + '::' + currentSeries[0].userOptions.dataGrouping.units[0][0]
+ const groupingType = currentSeries[0].userOptions.dataGrouping.approximation + '::' + currentSeries[0].userOptions.dataGrouping.units[0][0]
document.getElementById('sel_groupingType').value = groupingType
} else {
document.getElementById('sel_groupingType').selectedIndex = 0
}
}
- var type = currentSeries[0].userOptions.type
+ const type = currentSeries[0].userOptions.type
if (type == 'areaspline') type = 'area'
document.getElementById('sel_chartType').value = type
document.getElementById('cb_derive').checked = currentSeries[0].userOptions.derive
@@ -131,8 +131,8 @@ if (!jeeFrontEnd.history) {
}
//Add series:
- var dateStart = document.getElementById('in_startDate').value
- var dateEnd = document.getElementById('in_endDate').value
+ const dateStart = document.getElementById('in_startDate').value
+ const dateEnd = document.getElementById('in_endDate').value
jeedom.history.drawChart({
cmd_id: _cmd_id,
el: this.__el__,
@@ -199,10 +199,10 @@ if (!jeeFrontEnd.history) {
width: 720,
height: 260,
callback: function() {
- var contentEl = jeeDialog.get('#md_historyCompare', 'content')
+ const contentEl = jeeDialog.get('#md_historyCompare', 'content')
if (contentEl.querySelector('#md_getCompareRange') == null) {
- var newContent = document.getElementById('md_getCompareRange-template').cloneNode(true)
+ const newContent = document.getElementById('md_getCompareRange-template').cloneNode(true)
newContent.setAttribute('id', 'md_getCompareRange')
newContent.removeClass('hidden')
contentEl.appendChild(newContent)
@@ -210,17 +210,17 @@ if (!jeeFrontEnd.history) {
//Set modal events:
document.getElementById('md_getCompareRange').addEventListener('change', function(event) {
- var _target = null
- var _md = document.getElementById('md_getCompareRange')
+ let _target = null
+ const _md = document.getElementById('md_getCompareRange')
if (_target = event.target.closest('#md_getCompareRange input.in_datepicker')) {
- var fromStart = moment(_md.querySelector('#in_compareStart1').value + ' 00:00:00', 'YYYY-MM-DD HH:mm:ss')
- var fromEnd = moment(_md.querySelector('#in_compareEnd1').value + ' 23:59:59', 'YYYY-MM-DD HH:mm:ss')
- var toStart = moment(_md.querySelector('#in_compareStart2').value + ' 00:00:00', 'YYYY-MM-DD HH:mm:ss')
- var toEnd = moment(_md.querySelector('#in_compareEnd2').value + ' 23:59:59', 'YYYY-MM-DD HH:mm:ss')
-
- var diffPeriod = fromEnd.diff(fromStart, 'days')
- var cdiffPeriod = toEnd.diff(toStart, 'days')
- var text = '{{Comparer}} ' + diffPeriod + ' {{jours avec}} ' + cdiffPeriod + ' {{jours il y a}} ' + document.getElementById('sel_comparePeriod').selectedOptions[0].text
+ const fromStart = moment(_md.querySelector('#in_compareStart1').value + ' 00:00:00', 'YYYY-MM-DD HH:mm:ss')
+ const fromEnd = moment(_md.querySelector('#in_compareEnd1').value + ' 23:59:59', 'YYYY-MM-DD HH:mm:ss')
+ const toStart = moment(_md.querySelector('#in_compareStart2').value + ' 00:00:00', 'YYYY-MM-DD HH:mm:ss')
+ const toEnd = moment(_md.querySelector('#in_compareEnd2').value + ' 23:59:59', 'YYYY-MM-DD HH:mm:ss')
+
+ const diffPeriod = fromEnd.diff(fromStart, 'days')
+ const cdiffPeriod = toEnd.diff(toStart, 'days')
+ const text = '{{Comparer}} ' + diffPeriod + ' {{jours avec}} ' + cdiffPeriod + ' {{jours il y a}} ' + document.getElementById('sel_comparePeriod').selectedOptions[0].text
_md.querySelector('.spanCompareDiffResult').textContent = text
if (diffPeriod != cdiffPeriod) {
_md.querySelector('.spanCompareDiff').seen()
@@ -231,12 +231,12 @@ if (!jeeFrontEnd.history) {
}
if (_target = event.target.closest('#md_getCompareRange #sel_setPeriod')) {
- var startDate = _md.querySelector('#in_compareEnd1').value
- var num = event.target.value.split('.')[0]
- var type = event.target.value.split('.')[1]
+ let startDate = _md.querySelector('#in_compareEnd1').value
+ const num = event.target.value.split('.')[0]
+ const type = event.target.value.split('.')[1]
- var m_startDate = moment(startDate, 'YYYY-MM-DD HH:mm:ss')
- var endDate = m_startDate.subtract(num, type).format("YYYY-MM-DD")
+ let m_startDate = moment(startDate, 'YYYY-MM-DD HH:mm:ss')
+ let endDate = m_startDate.subtract(num, type).format("YYYY-MM-DD")
_md.querySelector('#in_compareStart1').value = endDate
//range to compare with:
@@ -252,12 +252,12 @@ if (!jeeFrontEnd.history) {
}
if (_target = event.target.closest('#md_getCompareRange #sel_comparePeriod')) {
- var startDate = _md.querySelector('#in_compareEnd1').value
- var num = event.target.value.split('.')[0]
- var type = event.target.value.split('.')[1]
+ let startDate = _md.querySelector('#in_compareEnd1').value
+ const num = event.target.value.split('.')[0]
+ const type = event.target.value.split('.')[1]
- var m_startDate = moment(startDate, 'YYYY-MM-DD HH:mm:ss')
- var endDate = m_startDate.subtract(num, type).format("YYYY-MM-DD")
+ let m_startDate = moment(startDate, 'YYYY-MM-DD HH:mm:ss')
+ let endDate = m_startDate.subtract(num, type).format("YYYY-MM-DD")
_md.querySelector('#in_compareEnd2').value = endDate
startDate = _md.querySelector('#in_compareStart1').value
@@ -269,7 +269,7 @@ if (!jeeFrontEnd.history) {
}
})
- var _md = document.getElementById('md_getCompareRange')
+ const _md = document.getElementById('md_getCompareRange')
_md.querySelector('#in_compareStart1').value = document.querySelector('#in_startDate').value
_md.querySelector('#sel_setPeriod').triggerEvent('change')
_md.querySelector('#sel_comparePeriod').triggerEvent('change')
@@ -302,8 +302,8 @@ if (!jeeFrontEnd.history) {
},
compareChart: function(_cmd_id) {
//compare:
- var fromStart, fromEnd, toStart, toEnd
- var _md = document.getElementById('md_getCompareRange')
+ const fromStart, fromEnd, toStart, toEnd
+ const _md = document.getElementById('md_getCompareRange')
fromStart = _md.querySelector('#in_compareStart1').value + ' 00:00:00'
fromEnd = _md.querySelector('#in_compareEnd1').value + ' 23:59:59'
toStart = _md.querySelector('#in_compareStart2').value + ' 00:00:00'
@@ -356,8 +356,8 @@ if (!jeeFrontEnd.history) {
})
},
setCalculList: function() {
- var elCalculList = document.getElementById('historyCalculs')
- var isOpened = false
+ const elCalculList = document.getElementById('historyCalculs')
+ let isOpened = false
if (elCalculList != null && elCalculList.querySelector('.displayObject i.fas')?.hasClass('fa-arrow-circle-down')) isOpened = true
jeedom.config.load({
configuration: 'calculHistory',
@@ -370,12 +370,12 @@ if (!jeeFrontEnd.history) {
elCalculList.empty()
if (data.length == 0) return
- var html = '{{Mes Calculs}} '
+ let html = '{{Mes Calculs}} '
html += ' '
html += ''
- for (var i in data) {
+ for (const i in data) {
if (isset(data[i].calcul) && data[i].calcul != '') {
- var dataName = data[i].name != '' ? data[i].name : data[i].calcul.substring(0, 40)
+ const dataName = data[i].name != '' ? data[i].name : data[i].calcul.substring(0, 40)
html += ' ';
html += '' + dataName + '';
html += '';
@@ -405,12 +405,12 @@ window.registerEvent("resize", function history(event) {
*/
//Options
document.getElementById('div_historyOptions').addEventListener('click', function(event) {
- var _target = null
+ let _target = null
if (_target = event.target.closest('#bt_validChangeDate')) {
if (jeedom.history.chart[jeeP.__el__] === undefined) return
jeedom.history.chart[jeeP.__el__].chart.series.forEach(_series => {
if (_series.options && !isNaN(_series.options.id)) {
- var cmdId = _series.options.id
+ const cmdId = _series.options.id
jeeP.addChart(cmdId, 0)
jeeP.addChart(cmdId, 1)
}
@@ -441,12 +441,12 @@ document.getElementById('div_historyOptions').addEventListener('click', function
})
document.getElementById('div_historyOptions').addEventListener('change', function(event) {
- var _target = null
+ let _target = null
if (_target = event.target.closest('#sel_groupingType')) {
if (event.isTrigger == 3) return
if (jeeP.__lastId__ == null) return
- var currentId = jeeP.__lastId__
- var groupingType = _target.value
+ const currentId = jeeP.__lastId__
+ const groupingType = _target.value
jeeP.addChart(currentId, 0)
jeedom.cmd.save({
cmd: {
@@ -471,8 +471,8 @@ document.getElementById('div_historyOptions').addEventListener('change', functio
if (_target = event.target.closest('#sel_chartType')) {
if (event.isTrigger == 3) return
if (jeeP.__lastId__ == null) return
- var currentId = jeeP.__lastId__
- var graphType = _target.value
+ const currentId = jeeP.__lastId__
+ const graphType = _target.value
jeeP.addChart(currentId, 0)
jeedom.cmd.save({
cmd: {
@@ -497,8 +497,8 @@ document.getElementById('div_historyOptions').addEventListener('change', functio
if (_target = event.target.closest('#cb_derive')) {
if (event.isTrigger == 3) return
if (jeeP.__lastId__ == null) return
- var currentId = jeeP.__lastId__
- var graphDerive = _target.checked ? '1' : '0'
+ const currentId = jeeP.__lastId__
+ const graphDerive = _target.checked ? '1' : '0'
jeeP.addChart(currentId, 0)
jeedom.cmd.save({
cmd: {
@@ -523,8 +523,8 @@ document.getElementById('div_historyOptions').addEventListener('change', functio
if (_target = event.target.closest('#cb_step')) {
if (event.isTrigger == 3) return
if (jeeP.__lastId__ == null) return
- var currentId = jeeP.__lastId__
- var graphStep = _target.checked ? '1' : '0'
+ const currentId = jeeP.__lastId__
+ const graphStep = _target.checked ? '1' : '0'
jeeP.addChart(currentId, 0)
jeedom.cmd.save({
cmd: {
@@ -548,7 +548,7 @@ document.getElementById('div_historyOptions').addEventListener('change', functio
})
//Sidebar:
document.getElementById('sidebar').addEventListener('click', function(event) {
- var _target = null
+ let _target = null
if (_target = event.target.closest('#bt_findCmdCalculHistory')) {
jeedom.cmd.getSelectModal({
cmd: {
@@ -563,7 +563,7 @@ document.getElementById('sidebar').addEventListener('click', function(event) {
}
if (_target = event.target.closest('#bt_displayCalculHistory')) {
- var calcul = document.getElementById('in_calculHistory').jeeValue()
+ const calcul = document.getElementById('in_calculHistory').jeeValue()
if (calcul != '') jeeP.addChart(calcul, 1)
return
}
@@ -630,9 +630,9 @@ document.getElementById('sidebar').addEventListener('click', function(event) {
if (_target.hasClass('remove') || _target.hasClass('export')) return
if (isset(jeedom.history.chart[jeeP.__el__]) && jeedom.history.chart[jeeP.__el__].comparing) return
- var options = null
+ let options = null
if (_target.hasClass('historycalcul')) {
- var options = {
+ let options = {
graphType: _target.getAttribute('data-graphtype'),
groupingType: _target.getAttribute('data-groupingtype'),
graphStep: (_target.getAttribute('data-graphstep') == 0) ? false : true,
@@ -652,7 +652,7 @@ document.getElementById('sidebar').addEventListener('click', function(event) {
})
document.getElementById('sidebar').addEventListener('keyup', function(event) {
- var _target = null
+ let _target = null
if (_target = event.target.closest('ul li input.filter')) {
if (event.target.value == '') {
document.querySelectorAll('#ul_history .cmdList').unseen()
diff --git a/desktop/js/interact.js b/desktop/js/interact.js
index 00a26911fb..f72dbb2a62 100644
--- a/desktop/js/interact.js
+++ b/desktop/js/interact.js
@@ -44,45 +44,45 @@ if (!jeeFrontEnd.interact) {
document.querySelectorAll('.interactAttr[data-l1key="filtres"]').forEach(_filter => {
_filter.selected = false
})
- var option = null
+ let option = null
if (isset(data.filtres) && isset(data.filtres.type) && isPlainObject(data.filtres.type)) {
- for (var i in data.filtres.type) {
+ for (const i in data.filtres.type) {
if (data.filtres.type[i] == '1') (option = document.querySelector('.interactAttr[data-l1key="filtres"][data-l2key="type"][data-l3key="' + i + '"]')) != null ? option.selected = true : null
}
}
if (isset(data.filtres) && isset(data.filtres.subtype) && isPlainObject(data.filtres.subtype)) {
- for (var i in data.filtres.subtype) {
+ for (const i in data.filtres.subtype) {
if (data.filtres.subtype[i] == '1') (option = document.querySelector('.interactAttr[data-l1key="filtres"][data-l2key="subtype"][data-l3key="' + i + '"]')) != null ? option.selected = true : null
}
}
if (isset(data.filtres) && isset(data.filtres.unite) && isPlainObject(data.filtres.unite)) {
- for (var i in data.filtres.unite) {
+ for (const i in data.filtres.unite) {
if (data.filtres.unite[i] == '1') (option = document.querySelector('.interactAttr[data-l1key="filtres"][data-l2key="unite"][data-l3key="' + i + '"]')) != null ? option.selected = true : null
}
}
if (isset(data.filtres) && isset(data.filtres.object) && isPlainObject(data.filtres.object)) {
- for (var i in data.filtres.object) {
+ for (const i in data.filtres.object) {
if (data.filtres.object[i] == '1') (option = document.querySelector('.interactAttr[data-l1key="filtres"][data-l2key="object"][data-l3key="' + i + '"]')) != null ? option.selected = true : null
}
}
if (isset(data.filtres) && isset(data.filtres.plugin) && isPlainObject(data.filtres.plugin)) {
- for (var i in data.filtres.plugin) {
+ for (const i in data.filtres.plugin) {
if (data.filtres.plugin[i] == '1') (option = document.querySelector('.interactAttr[data-l1key="filtres"][data-l2key="plugin"][data-l3key="' + i + '"]')) != null ? option.selected = true : null
}
}
if (isset(data.filtres) && isset(data.filtres.category) && isPlainObject(data.filtres.category)) {
- for (var i in data.filtres.category) {
+ for (const i in data.filtres.category) {
if (data.filtres.category[i] == '1') (option = document.querySelector('.interactAttr[data-l1key="filtres"][data-l2key="category"][data-l3key="' + i + '"]')) != null ? option.selected = true : null
}
}
if (isset(data.actions) && isset(data.actions.cmd) && Array.isArray(data.actions.cmd) && data.actions.cmd.length != null) {
- for (var i in data.actions.cmd) {
+ for (const i in data.actions.cmd) {
jeeP.addAction(data.actions.cmd[i], 'action', '{{Action}}')
}
}
jeedomUtils.taAutosize()
- var hash = window.location.hash
+ const hash = window.location.hash
jeedomUtils.addOrUpdateUrl('id', data.id)
if (hash == '') {
document.querySelector('.nav-tabs a[href="#generaltab"]')?.click()
@@ -100,7 +100,7 @@ if (!jeeFrontEnd.interact) {
})
},
success: function(data) {
- for (var i in data) {
+ for (const i in data) {
if (data[i].html != '') {
document.getElementById(data[i].id).html(data[i].html.html)
}
@@ -120,7 +120,7 @@ if (!jeeFrontEnd.interact) {
if (!isset(_action.options)) {
_action.options = {}
}
- var div = ' '
+ let div = ' '
div += ' '
div += ' '
div += ' '
@@ -134,7 +134,7 @@ if (!jeeFrontEnd.interact) {
div += ''
div += ' '
div += ' '
- var actionOption_id = jeedomUtils.uniqId()
+ const actionOption_id = jeedomUtils.uniqId()
div += ' '
document.getElementById('div_' + _type).insertAdjacentHTML('beforeend', div)
document.querySelectorAll('#div_' + _type + ' .' + _type + '').last().setJeeValues(_action, '.expressionAttr')
@@ -157,7 +157,7 @@ if (!jeeFrontEnd.interact) {
if (interacts.length == 0) {
return
}
- var interactGroups = []
+ let interactGroups = []
for (i = 0; i < interacts.length; i++) {
group = interacts[i].group
if (group == null) continue
@@ -167,13 +167,13 @@ if (!jeeFrontEnd.interact) {
}
interactGroups = Array.from(new Set(interactGroups))
interactGroups.sort()
- var interactList = []
- for (var i = 0; i < interactGroups.length; i++) {
+ const interactList = []
+ for (let i = 0; i < interactGroups.length; i++) {
group = interactGroups[i]
interactList[group] = []
- for (var j = 0; j < interacts.length; j++) {
- var sc = interacts[j]
- var scGroup = sc.group
+ for (let j = 0; j < interacts.length; j++) {
+ const sc = interacts[j]
+ let scGroup = sc.group
if (scGroup == null) continue
if (scGroup == "") scGroup = 'Aucun'
if (scGroup.toLowerCase() != group.toLowerCase()) continue
@@ -182,15 +182,15 @@ if (!jeeFrontEnd.interact) {
}
}
//set context menu!
- var contextmenuitems = {}
- var uniqId = 0
- for (var group in interactList) {
- var groupinteracts = interactList[group]
- var items = {}
- for (var index in groupinteracts) {
- var sc = groupinteracts[index]
- var scName = sc[0]
- var scId = sc[1]
+ const contextmenuitems = {}
+ let uniqId = 0
+ for (const group in interactList) {
+ const groupinteracts = interactList[group]
+ const items = {}
+ for (const index in groupinteracts) {
+ const sc = groupinteracts[index]
+ const scName = sc[0]
+ const scId = sc[1]
items[uniqId] = {
'name': scName,
'id': scId
@@ -212,7 +212,7 @@ if (!jeeFrontEnd.interact) {
callback: function(key, options, event) {
if (!jeedomUtils.checkPageModified()) {
if (event.ctrlKey || event.metaKey || event.which == 2) {
- var url = 'index.php?v=d&p=interact&id=' + options.commands[key].id
+ const url = 'index.php?v=d&p=interact&id=' + options.commands[key].id
if (window.location.hash != '') {
url += window.location.hash
}
@@ -261,7 +261,7 @@ if (!jeeFrontEnd.interact) {
},
//Get filters for save / duplicate
getInteractFilters: function() {
- var filters = {}
+ const filters = {}
filters.type = {}
document.querySelectorAll('option[data-l1key="filtres"][data-l2key="type"]').forEach(_option => {
filters.type[_option.getAttribute('data-l3key')] = (_option.selected) ? '1' : '0'
@@ -321,20 +321,20 @@ document.registerEvent('keydown', function(event) {
//searching
document.getElementById('in_searchInteract')?.addEventListener('keyup', function(event) {
- var search = event.target.value
+ let search = event.target.value
if (search == '') {
document.querySelectorAll('#accordionInteract .accordion-toggle:not(.collapsed)').forEach(_panel => { _panel.click() })
document.querySelectorAll('.interactDisplayCard').seen()
return
}
search = jeedomUtils.normTextLower(search)
- var not = search.startsWith(":not(")
+ const not = search.startsWith(":not(")
if (not) {
search = search.replace(':not(', '')
}
document.querySelectorAll('#accordionInteract .accordion-toggle').forEach(_panel => { _panel.setAttribute('data-show', 0) })
document.querySelectorAll('.interactDisplayCard').unseen()
- var match, text
+ let match, text
document.querySelectorAll('.interactDisplayCard .name').forEach(_name => {
match = false
text = jeedomUtils.normTextLower(_name.textContent)
@@ -355,7 +355,7 @@ document.getElementById('in_searchInteract')?.addEventListener('keyup', function
/*Events delegations
*/
document.getElementById('div_pageContainer').addEventListener('change', function(event) {
- var _target = null
+ let _target = null
if (_target = event.target.closest('.interactAttr')) {
if (_target.isVisible()) jeeFrontEnd.modifyWithoutSave = true
return
@@ -364,7 +364,7 @@ document.getElementById('div_pageContainer').addEventListener('change', function
//ThumbnailDisplay
document.getElementById('interactThumbnailDisplay').addEventListener('click', function(event) {
- var _target = null
+ let _target = null
if (_target = event.target.closest('#bt_openAll')) {
document.querySelectorAll('#accordionInteract .accordion-toggle.collapsed').forEach(_panel => { _panel.click() })
return
@@ -382,7 +382,7 @@ document.getElementById('interactThumbnailDisplay').addEventListener('click', fu
if (_target = event.target.closest('.interactDisplayCard')) {
if ((isset(event.detail) && event.detail.ctrlKey) || event.ctrlKey || event.metaKey) {
- var url = '/index.php?v=d&p=interact&id=' + _target.getAttribute('data-interact_id')
+ const url = '/index.php?v=d&p=interact&id=' + _target.getAttribute('data-interact_id')
window.open(url).focus()
} else {
jeeP.printInteract(_target.getAttribute('data-interact_id'))
@@ -449,7 +449,7 @@ document.getElementById('interactThumbnailDisplay').addEventListener('click', fu
})
document.getElementById('interactThumbnailDisplay').addEventListener('mouseup', function(event) {
- var _target = null
+ let _target = null
if (_target = event.target.closest('.interactDisplayCard')) {
if (event.which == 2) {
event.preventDefault()
@@ -463,7 +463,7 @@ document.getElementById('interactThumbnailDisplay').addEventListener('mouseup',
//Interaction
document.getElementById('div_conf').addEventListener('click', function(event) {
- var _target = null
+ let _target = null
if (_target = event.target.closest('#bt_interactThumbnailDisplay')) {
if (jeedomUtils.checkPageModified()) return
document.getElementById('div_conf').unseen()
@@ -473,7 +473,7 @@ document.getElementById('div_conf').addEventListener('click', function(event) {
}
if (_target = event.target.closest('#bt_chooseIcon')) {
- var _icon = document.querySelector('div[data-l2key="icon"] > i')
+ let _icon = document.querySelector('div[data-l2key="icon"] > i')
if (_icon != null) {
_icon = _icon.getAttribute('class')
} else {
@@ -489,7 +489,7 @@ document.getElementById('div_conf').addEventListener('click', function(event) {
if (_target = event.target.closest('#bt_duplicate')) {
jeeDialog.prompt("{{Nom}} ?", function(result) {
if (result !== null) {
- var interact = document.querySelectorAll('.interact').getJeeValues('.interactAttr')[0]
+ const interact = document.querySelectorAll('.interact').getJeeValues('.interactAttr')[0]
interact.filtres = jeeFrontEnd.interact.getInteractFilters()
interact.actions = {}
interact.actions.cmd = document.querySelectorAll('#div_action .action').getJeeValues('.expressionAttr')
@@ -514,7 +514,7 @@ document.getElementById('div_conf').addEventListener('click', function(event) {
}
if (_target = event.target.closest('#bt_saveInteract')) {
- var interact = document.querySelectorAll('.interact').getJeeValues('.interactAttr')[0]
+ const interact = document.querySelectorAll('.interact').getJeeValues('.interactAttr')[0]
interact.filtres = jeeFrontEnd.interact.getInteractFilters()
interact.actions = {}
interact.actions.cmd = document.querySelectorAll('#div_action .action').getJeeValues('.expressionAttr')
@@ -588,8 +588,8 @@ document.getElementById('div_conf').addEventListener('click', function(event) {
}
if (_target = event.target.closest('.listCmd')) {
- var type = _target.getAttribute('data-type')
- var el = _target.closest('.' + type).querySelector('.expressionAttr[data-l1key="cmd"]')
+ const type = _target.getAttribute('data-type')
+ const el = _target.closest('.' + type).querySelector('.expressionAttr[data-l1key="cmd"]')
jeedom.cmd.getSelectModal({
cmd: {
type: 'action'
@@ -606,8 +606,8 @@ document.getElementById('div_conf').addEventListener('click', function(event) {
}
if (_target = event.target.closest('.listAction')) {
- var type = _target.getAttribute('data-type')
- var el = _target.closest('.' + type).querySelector('.expressionAttr[data-l1key="cmd"]')
+ const type = _target.getAttribute('data-type')
+ const el = _target.closest('.' + type).querySelector('.expressionAttr[data-l1key="cmd"]')
jeedom.getSelectActionModal({}, function(result) {
el.jeeValue(result.human)
jeeFrontEnd.modifyWithoutSave = true
@@ -620,7 +620,7 @@ document.getElementById('div_conf').addEventListener('click', function(event) {
}
if (_target = event.target.closest('.bt_removeAction')) {
- var type = _target.getAttribute('data-type')
+ const type = _target.getAttribute('data-type')
_target.closest('.' + type).remove()
jeeFrontEnd.modifyWithoutSave = true
return
@@ -628,7 +628,7 @@ document.getElementById('div_conf').addEventListener('click', function(event) {
})
document.getElementById('div_conf').addEventListener('dblclick', function(event) {
- var _target = null
+ let _target = null
if (_target = event.target.closest('.interactAttr[data-l1key="display"][data-l2key="icon"]')) {
_target.remove()
return
@@ -636,10 +636,10 @@ document.getElementById('div_conf').addEventListener('dblclick', function(event)
})
document.getElementById('div_conf').addEventListener('focusout', function(event) {
- var _target = null
+ let _target = null
if (_target = event.target.closest('.cmdAction.expressionAttr[data-l1key="cmd"]')) {
- var type = _target.getAttribute('data-type')
- var expression = _target.closest('.' + type).getJeeValues('.expressionAttr')
+ const type = _target.getAttribute('data-type')
+ const expression = _target.closest('.' + type).getJeeValues('.expressionAttr')
jeedom.cmd.displayActionOption(_target.jeeValue(), init(expression[0].options), function(html) {
_target.closest('.' + type).querySelector('.actionOptions').html(html)
jeedomUtils.taAutosize()
diff --git a/desktop/js/object.js b/desktop/js/object.js
index d78a675586..30eb0b9164 100644
--- a/desktop/js/object.js
+++ b/desktop/js/object.js
@@ -48,7 +48,7 @@ if (!jeeFrontEnd.object) {
return
}
if (isset(data.result.result.filepath)) {
- var filePath = data.result.result.filepath
+ let filePath = data.result.result.filepath
filePath = '/data/object/' + filePath.split('/data/object/')[1]
document.querySelector('.objectImg').seen().querySelector('img').src = filePath
} else {
@@ -98,9 +98,9 @@ if (!jeeFrontEnd.object) {
}
if (!isset(data.configuration.useCustomColor) || data.configuration.useCustomColor == "0") {
- var bodyStyles = window.getComputedStyle(document.body)
- var objectBkgdColor = bodyStyles.getPropertyValue('--objectBkgd-color')
- var objectTxtColor = bodyStyles.getPropertyValue('--objectTxt-color')
+ const bodyStyles = window.getComputedStyle(document.body)
+ let objectBkgdColor = bodyStyles.getPropertyValue('--objectBkgd-color')
+ let objectTxtColor = bodyStyles.getPropertyValue('--objectTxt-color')
if (objectBkgdColor !== '' && objectBkgdColor != null) {
objectBkgdColor = jeedomUtils.rgbToHex(objectBkgdColor)
@@ -129,12 +129,12 @@ if (!jeeFrontEnd.object) {
//set summary tab:
if (isset(data.configuration) && isset(data.configuration.summary)) {
- var el
- var summary = data.configuration.summary
- for (var i in summary) {
+ const el
+ const summary = data.configuration.summary
+ for (const i in summary) {
el = document.querySelector('.type' + i)
if (el != null) {
- for (var j in summary[i]) {
+ for (const j in summary[i]) {
jeeP.addSummaryInfo('.type' + i, summary[i][j])
}
if (summary[i].length != 0) {
@@ -143,13 +143,13 @@ if (!jeeFrontEnd.object) {
}
}
} else {
- var summary = {}
+ const summary = {}
}
//set eqlogics tab:
jeeP.addEqlogicsInfo(_id, data.name, summary)
- var hash = window.location.hash
+ const hash = window.location.hash
jeedomUtils.addOrUpdateUrl('id', data.id)
if (hash == '') {
document.querySelector('.nav-tabs a[data-target="#objecttab"]')?.click()
@@ -168,7 +168,7 @@ if (!jeeFrontEnd.object) {
if (!isset(_summary)) {
_summary = {}
}
- var div = ' |