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 = '' + const tr = '' tr += '' tr += '' tr += '' @@ -118,8 +118,8 @@ if (!jeeFrontEnd.cron) { tr += init(_cron.runtime, '0') + 's' tr += '' tr += '' - var label = 'label label-info' - var state = init(_cron.state) + let label = 'label label-info' + let state = init(_cron.state) if (init(_cron.state) == 'run') { label = 'label label-success' state = '{{En cours}}' @@ -175,9 +175,9 @@ if (!jeeFrontEnd.cron) { jeedom.listener.all({ success: function(data) { domUtils.showLoading() - var table = document.getElementById('table_listener').querySelector('tbody') + const table = document.getElementById('table_listener').querySelector('tbody') table.empty() - for (var i in data) { + for (const i in data) { let newRow = document.createElement("tr") newRow.innerHTML = jeeP.addListener(data[i]) newRow.setJeeValues(data[i], '.listenerAttr') @@ -190,8 +190,8 @@ if (!jeeFrontEnd.cron) { }, addListener: function(_listener) { jeedomUtils.hideAlert() - var disabled = '' - var tr = '' + const disabled = '' + const tr = '' tr += '' tr += '' if (init(_listener.id) != '') { @@ -217,7 +217,7 @@ if (!jeeFrontEnd.cron) { }) }, success: function(plugins) { - for (var i in plugins) { + for (const i in plugins) { if (plugins[i].hasOwnDeamon == 0) continue jeedom.plugin.getDeamonInfo({ @@ -230,7 +230,7 @@ if (!jeeFrontEnd.cron) { }) }, success: function(deamonInfo) { - var html = '' + let html = '' html += '' html += deamonInfo.plugin.name html += '' @@ -284,9 +284,9 @@ if (!jeeFrontEnd.cron) { jeeFrontEnd.cron.queueDataTable.destroy() delete jeeFrontEnd.cron.queueDataTable } - var table = document.getElementById('table_queue').querySelector('tbody') + const table = document.getElementById('table_queue').querySelector('tbody') table.empty() - for (var i in data) { + for (const i in data) { let newRow = document.createElement("tr") newRow.innerHTML = jeeP.addQueue(data[i]) newRow.setJeeValues(data[i], '.queueAttr') @@ -303,7 +303,7 @@ if (!jeeFrontEnd.cron) { }, addQueue: function(_queue) { jeedomUtils.hideAlert() - var tr = '' + const 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 += '