Skip to content

refactor(desktop/js): replace var with const/let in remaining desktop modules #3323

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
limad wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

refactor(desktop/js): replace var with const/let in remaining desktop modules #3323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c33ff59
refactor(desktop/js): replace var with const/let in remaining desktop…
limad May 7, 2026
32c3303
merge: resolve conflict with upstream/develop (Lot 1 .values→.value fix)
May 8, 2026
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
56 changes: 28 additions & 28 deletions desktop/js/cron.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand All @@ -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>'
const tr = '<tr>'
tr += '<td><span class="cronAttr label label-info" data-l1key="id"></span></td>'
tr += '<td class="center">'
tr += '<input type="checkbox"class="cronAttr" data-l1key="enable" checked ' + disabled + '/>'
Expand Down Expand Up @@ -118,8 +118,8 @@ if (!jeeFrontEnd.cron) {
tr += init(_cron.runtime, '0') + 's'
tr += '</td>'
tr += '<td>'
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}}'
Expand Down Expand Up @@ -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')
Expand All @@ -190,8 +190,8 @@ if (!jeeFrontEnd.cron) {
},
addListener: function(_listener) {
jeedomUtils.hideAlert()
var disabled = ''
var tr = '<tr>'
const disabled = ''
const tr = '<tr>'
tr += '<td class="option"><span class="listenerAttr" data-l1key="id"></span></td>'
tr += '<td>'
if (init(_listener.id) != '') {
Expand All @@ -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({
Expand All @@ -230,7 +230,7 @@ if (!jeeFrontEnd.cron) {
})
},
success: function(deamonInfo) {
var html = '<tr>'
let html = '<tr>'
html += '<td>'
html += deamonInfo.plugin.name
html += '</td>'
Expand Down Expand Up @@ -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')
Expand All @@ -303,7 +303,7 @@ if (!jeeFrontEnd.cron) {
},
addQueue: function(_queue) {
jeedomUtils.hideAlert()
var tr = '<tr>'
const tr = '<tr>'
tr += '<td><span class="queueAttr label label-info" data-l1key="id"></span></td>'
tr += '<td>'
tr += init(_queue.pid)
Expand All @@ -318,8 +318,8 @@ if (!jeeFrontEnd.cron) {
tr += init(_queue.createTime)
tr += '</td>'
tr += '<td>'
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}}'
Expand Down Expand Up @@ -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')
Expand Down Expand Up @@ -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()
Expand All @@ -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
}
Expand All @@ -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()
Expand Down Expand Up @@ -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()
Expand All @@ -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',
Expand All @@ -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',
Expand All @@ -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() {
Expand All @@ -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,
Expand Down
28 changes: 14 additions & 14 deletions desktop/js/editor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
Expand All @@ -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)
Expand Down Expand Up @@ -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 = ' <i class="fas fa-toggle-on"></i>'
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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, {
Expand All @@ -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);
}
Expand Down
Loading
Loading