From d3cc2e60cf174645cf551c002e4a98f769d415d6 Mon Sep 17 00:00:00 2001 From: limad <35463455+limad@users.noreply.github.com> Date: Wed, 22 Apr 2026 18:17:28 +0200 Subject: [PATCH 1/5] Update log.class.js --- core/js/log.class.js | 90 ++++++++++++++++++++++---------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/core/js/log.class.js b/core/js/log.class.js index 739b966c8a..0400e67d34 100644 --- a/core/js/log.class.js +++ b/core/js/log.class.js @@ -21,8 +21,8 @@ jeedom.log.coloredThreshold = 300000 jeedom.log.maxLines = 4000 jeedom.log.list = function(_params) { - var paramsRequired = []; - var paramsSpecifics = { + const paramsRequired = []; + const paramsSpecifics = { global: _params.global || true, }; try { @@ -31,8 +31,8 @@ jeedom.log.list = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/log.ajax.php'; paramsAJAX.data = { action: 'list', @@ -41,8 +41,8 @@ jeedom.log.list = function(_params) { } jeedom.log.removeAll = function(_params) { - var paramsRequired = []; - var paramsSpecifics = { + const paramsRequired = []; + const paramsSpecifics = { global: _params.global || true, }; try { @@ -51,8 +51,8 @@ jeedom.log.removeAll = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/log.ajax.php'; paramsAJAX.data = { action: 'removeAll', @@ -63,9 +63,9 @@ jeedom.log.removeAll = function(_params) { // DEPRECATED: jeedom.log.getScTranslations -> remove in 4.6? jeedom.log.getScTranslations = function(_params) { jeedomUtils.deprecatedFunc('jeedom.log.getScTranslations', 'none', '4.6', '4.4') - var paramsSpecifics = {}; - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const paramsSpecifics = {}; + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/log.ajax.php'; paramsAJAX.data = { action: 'getScTranslations' @@ -76,8 +76,8 @@ jeedom.log.getScTranslations = function(_params) { // DEPRECATED: jeedom.log.get -> remove in 4.6? jeedom.log.get = function(_params) { jeedomUtils.deprecatedFunc('jeedom.log.get', 'jeedom.log.getDelta', '4.6', '4.4') - var paramsRequired = ['log']; - var paramsSpecifics = { + const paramsRequired = ['log']; + const paramsSpecifics = { global: _params.global || true, }; try { @@ -86,8 +86,8 @@ jeedom.log.get = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/log.ajax.php'; paramsAJAX.data = { action: 'get', @@ -97,8 +97,8 @@ jeedom.log.get = function(_params) { } jeedom.log.getDelta = function(_params) { - var paramsRequired = ['log', 'position']; - var paramsSpecifics = { + const paramsRequired = ['log', 'position']; + const paramsSpecifics = { global: _params.global || true, }; try { @@ -107,8 +107,8 @@ jeedom.log.getDelta = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/log.ajax.php'; paramsAJAX.data = { action: 'getDelta', @@ -123,8 +123,8 @@ jeedom.log.getDelta = function(_params) { } jeedom.log.remove = function(_params) { - var paramsRequired = ['log']; - var paramsSpecifics = { + const paramsRequired = ['log']; + const paramsSpecifics = { global: _params.global || true, }; try { @@ -133,8 +133,8 @@ jeedom.log.remove = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/log.ajax.php'; paramsAJAX.data = { action: 'remove', @@ -144,8 +144,8 @@ jeedom.log.remove = function(_params) { } jeedom.log.clearAll = function(_params) { - var paramsRequired = []; - var paramsSpecifics = { + const paramsRequired = []; + const paramsSpecifics = { global: _params.global || true, }; try { @@ -154,8 +154,8 @@ jeedom.log.clearAll = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/log.ajax.php'; paramsAJAX.data = { action: 'clearAll', @@ -164,8 +164,8 @@ jeedom.log.clearAll = function(_params) { } jeedom.log.clear = function(_params) { - var paramsRequired = ['log']; - var paramsSpecifics = { + const paramsRequired = ['log']; + const paramsSpecifics = { global: _params.global || true, }; try { @@ -174,8 +174,8 @@ jeedom.log.clear = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/log.ajax.php'; paramsAJAX.data = { action: 'clear', @@ -258,14 +258,14 @@ jeedom.log.autoupdate = function(_params) { slaveId: _params.slaveId, global: (_params.callNumber == 1), success: function(result) { - var log = '' - var line - var isSysLog = (_params.display.id == 'pre_globallog') ? true : false - var isScenaroLog = (_params.display.id == 'pre_scenariolog') ? true : false + let log = '' + let line + const isSysLog = (_params.display.id == 'pre_globallog') ? true : false + const isScenaroLog = (_params.display.id == 'pre_scenariolog') ? true : false if (is_array(result)) { //line by line, numbered for system log: - for (var i in result.reverse()) { + for (const i in result.reverse()) { if (!isset(_params.search) || _params.search.value == '' || result[i].toLowerCase().indexOf(_params['search'].value.toLowerCase()) != -1) { line = result[i].trim() if (isSysLog) { @@ -277,17 +277,17 @@ jeedom.log.autoupdate = function(_params) { } } - var colorMe = false - var dom_brutlogcheck = document.getElementById('brutlogcheck') + let colorMe = false + let isAuto = false + let dom_brutlogcheck = document.getElementById('brutlogcheck') if (dom_brutlogcheck == null) { - var isAuto = false dom_brutlogcheck = { checked: false } } else { - var isAuto = (dom_brutlogcheck.getAttribute('autoswitch') == 1) ? true : false + isAuto = (dom_brutlogcheck.getAttribute('autoswitch') == 1) ? true : false } - var isLong = (log.length > jeedom.log.coloredThreshold) ? true : false + const isLong = (log.length > jeedom.log.coloredThreshold) ? true : false if (!dom_brutlogcheck.checked && !isLong) { colorMe = true @@ -438,9 +438,9 @@ jeedom.log.autoUpdateDelta = function(_params) { return } - let dom_brutlogcheck = document.getElementById('brutlogcheck') + const dom_brutlogcheck = document.getElementById('brutlogcheck') // If element does NOT exists OR is disabled, Then colored - let colorMe = dom_brutlogcheck == null || !dom_brutlogcheck.checked + const colorMe = dom_brutlogcheck == null || !dom_brutlogcheck.checked jeedom.log.getDelta({ log: _params.log, @@ -505,7 +505,7 @@ jeedom.log.colorReplacement = { // DEPRECATED: jeedom.log.stringColorReplace -> remove in 4.6? jeedom.log.stringColorReplace = function(_str) { jeedomUtils.deprecatedFunc('jeedom.log.stringColorReplace', 'none', '4.6', '4.4') - for (var re in jeedom.log.colorReplacement) { + for (const re in jeedom.log.colorReplacement) { _str = _str.split(re).join(jeedom.log.colorReplacement[re]) } //Avoid html code: @@ -544,7 +544,7 @@ jeedom.log.scenarioColorReplace = function(_str) { } if (jeedom.log.colorScReplacement == null) return _str - for (var item in jeedom.log.colorScReplacement) { + for (const item in jeedom.log.colorScReplacement) { _str = _str.split(jeedom.log.colorScReplacement[item]['txt']).join(jeedom.log.colorScReplacement[item]['replace'].replace('::', jeedom.log.colorScReplacement[item]['txt'])) } return _str From ea2fafd4cc0d2430a6f1b24b5ce8ec778b09a4a3 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 22 Apr 2026 16:17:59 +0000 Subject: [PATCH 2/5] Update release-notes.md [skip ci] --- docs/release-notes.md | 43 ++++++------------------------------------- 1 file changed, 6 insertions(+), 37 deletions(-) diff --git a/docs/release-notes.md b/docs/release-notes.md index d3d81ee525..64719e3ab8 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -1,51 +1,20 @@ -# All changes since release 4.5.3 +# All changes since release 4.2.7 ## New core features -| Merge date | Title | PR | -| --- | --- | --- | -| 2026-04-19 15:18:24 | Add healthcheck in the docker container | [#2998](https://github.com/jeedom/core/pull/2998) | +no entries ## Breaking changes no entries ## Fixes -| Merge date | Title | PR | -| --- | --- | --- | -| 2026-04-21 11:24:20 | fix: prevent a possible SQL injection in archive process | [#3268](https://github.com/jeedom/core/pull/3268) | -| 2026-04-20 11:11:26 | Fix: scenario expression execute without scenario | [#3228](https://github.com/jeedom/core/pull/3228) | -| 2026-04-20 11:03:03 | Fix undefined variable in AJAX remove after market→repo migration | [#3118](https://github.com/jeedom/core/pull/3118) | -| 2026-04-19 20:34:27 | Rename count variable to count_functionality | [#3273](https://github.com/jeedom/core/pull/3273) | -| 2026-04-19 08:25:34 | fix: prevent a possible SQL injection in setComponentOrder | [#3267](https://github.com/jeedom/core/pull/3267) | -| 2026-04-17 15:14:11 | fix: display_name field (ui) | [#3262](https://github.com/jeedom/core/pull/3262) | -| 2026-04-17 14:01:55 | fix: scenario self execute mixing tags | [#3255](https://github.com/jeedom/core/pull/3255) | -| 2026-04-17 09:35:39 | fix: Suppression des arguments superflus dans les appels de méthodes (PHPStan lvl 1) | [#3258](https://github.com/jeedom/core/pull/3258) | -| 2026-04-17 09:35:16 | fix: Correction des méthodes statiques et du nommage de classes (PHPStan lvl 1) | [#3259](https://github.com/jeedom/core/pull/3259) | -| 2026-04-16 13:05:53 | Fix: issue displaying history if grouping type is set | [#3242](https://github.com/jeedom/core/pull/3242) | -| 2026-04-03 08:46:58 | fix: randText function | [#3197](https://github.com/jeedom/core/pull/3197) | -| 2026-04-02 14:13:11 | fix: resolve 3 bugs in proxy configuration in jsonrpcClient | [#3238](https://github.com/jeedom/core/pull/3238) | -| 2026-03-31 20:51:42 | fix: graphUpdate function in history class | [#3178](https://github.com/jeedom/core/pull/3178) | +no entries ## Others -| Merge date | Title | PR | -| --- | --- | --- | -| 2026-04-20 11:50:35 | Update translations | [#3285](https://github.com/jeedom/core/pull/3285) | -| 2026-04-08 09:16:23 | chore: Correction *aucun* script | [#3246](https://github.com/jeedom/core/pull/3246) | -| 2026-04-04 07:56:05 | chore: typo Securité | [#3241](https://github.com/jeedom/core/pull/3241) | +no entries ## Documentations -| Merge date | Title | PR | -| --- | --- | --- | -| 2026-04-20 11:02:18 | Auto-generated draft of release notes / changelog in develop | [#3278](https://github.com/jeedom/core/pull/3278) | +no entries ## Developer -| Merge date | Title | PR | -| --- | --- | --- | -| 2026-04-20 11:38:39 | Bump actions/cache from 3 to 5 | [#3283](https://github.com/jeedom/core/pull/3283) | -| 2026-04-20 11:29:10 | add [skip ci] in commit message to try to avoid execution of others WF | [#3287](https://github.com/jeedom/core/pull/3287) | -| 2026-04-20 11:01:32 | add dependabot only for github-actions at first | [#3239](https://github.com/jeedom/core/pull/3239) | -| 2026-04-17 21:11:17 | new workflow for translations | [#3251](https://github.com/jeedom/core/pull/3251) | -| 2026-04-17 12:26:56 | Fix PHPStan workflow on branch deletion | [#3263](https://github.com/jeedom/core/pull/3263) | -| 2026-04-16 22:32:24 | Use Composer dependency for PHPStan | [#3256](https://github.com/jeedom/core/pull/3256) | -| 2026-04-13 08:16:53 | feat: improve "do not remove log" feature | [#3245](https://github.com/jeedom/core/pull/3245) | -| 2026-04-03 15:27:29 | Update GitHub workflows to use 'develop' branch instead of 'alpha' and 'beta' | [#3240](https://github.com/jeedom/core/pull/3240) | +no entries From ac41cd358895be61ca7998339ef4e377b15bd0d4 Mon Sep 17 00:00:00 2001 From: limad <35463455+limad@users.noreply.github.com> Date: Wed, 22 Apr 2026 18:23:28 +0200 Subject: [PATCH 3/5] Replace "exp var" by "let/const" --- core/js/appMobile.class.js | 2 +- core/js/backup.class.js | 48 +++--- core/js/cache.class.js | 40 ++--- core/js/cmd.class.js | 258 +++++++++++++++---------------- core/js/config.class.js | 36 ++--- core/js/core.js | 37 ++--- core/js/cron.class.js | 24 +-- core/js/dataStore.class.js | 34 ++--- core/js/eqLogic.class.js | 238 ++++++++++++++--------------- core/js/history.class.js | 276 ++++++++++++++++----------------- core/js/interact.class.js | 48 +++--- core/js/jeedom.class.js | 303 ++++++++++++++++++------------------- core/js/listener.class.js | 24 +-- core/js/message.class.js | 32 ++-- core/js/network.class.js | 24 +-- core/js/note.class.js | 32 ++-- core/js/object.class.js | 132 ++++++++-------- core/js/plan.class.js | 112 +++++++------- core/js/plan3d.class.js | 72 ++++----- core/js/plugin.class.js | 88 +++++------ core/js/plugin.template.js | 125 +++++++-------- core/js/private.class.js | 48 +++--- core/js/queue.class.js | 16 +- core/js/recovery.class.js | 28 ++-- core/js/repo.class.js | 40 ++--- core/js/report.class.js | 32 ++-- core/js/scenario.class.js | 185 +++++++++++----------- core/js/security.class.js | 16 +- core/js/timeline.class.js | 54 +++---- core/js/update.class.js | 72 ++++----- core/js/user.class.js | 128 ++++++++-------- core/js/view.class.js | 92 +++++------ core/js/widgets.class.js | 56 +++---- 33 files changed, 1379 insertions(+), 1373 deletions(-) diff --git a/core/js/appMobile.class.js b/core/js/appMobile.class.js index a5566ef054..8628429b46 100644 --- a/core/js/appMobile.class.js +++ b/core/js/appMobile.class.js @@ -24,7 +24,7 @@ jeedom.appMobile.detected = function() { } jeedom.appMobile.postToApp = function (_action, _options = {}) { - let message = {} + const message = {} if (window.ReactNativeWebView != undefined) { message.action = _action message.options = _options diff --git a/core/js/backup.class.js b/core/js/backup.class.js index a2b72018d3..ec864a4948 100644 --- a/core/js/backup.class.js +++ b/core/js/backup.class.js @@ -17,16 +17,16 @@ jeedom.backup = function() {}; jeedom.backup.backup = function(_params) { - var paramsRequired = []; - var paramsSpecifics = {}; + const paramsRequired = []; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/jeedom.ajax.php'; paramsAJAX.data = { action: 'backup', @@ -35,16 +35,16 @@ jeedom.backup.backup = function(_params) { } jeedom.backup.restoreLocal = function(_params) { - var paramsRequired = []; - var paramsSpecifics = {}; + const paramsRequired = []; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/jeedom.ajax.php'; paramsAJAX.data = { action: 'restore', @@ -54,16 +54,16 @@ jeedom.backup.restoreLocal = function(_params) { } jeedom.backup.remove = function(_params) { - var paramsRequired = ['backup']; - var paramsSpecifics = {}; + const paramsRequired = ['backup']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/jeedom.ajax.php'; paramsAJAX.data = { action: 'removeBackup', @@ -73,16 +73,16 @@ jeedom.backup.remove = function(_params) { } jeedom.backup.uploadCloud = function(_params) { - var paramsRequired = ['backup']; - var paramsSpecifics = {}; + const paramsRequired = ['backup']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/repo.ajax.php'; paramsAJAX.data = { action: 'uploadCloud', @@ -92,16 +92,16 @@ jeedom.backup.uploadCloud = function(_params) { } jeedom.backup.restoreCloud = function(_params) { - var paramsRequired = ['backup', 'repo']; - var paramsSpecifics = {}; + const paramsRequired = ['backup', 'repo']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/repo.ajax.php'; paramsAJAX.data = { action: 'restoreCloud', @@ -112,16 +112,16 @@ jeedom.backup.restoreCloud = function(_params) { } jeedom.backup.list = function(_params) { - var paramsRequired = []; - var paramsSpecifics = {}; + const paramsRequired = []; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/jeedom.ajax.php'; paramsAJAX.data = { action: 'listBackup', diff --git a/core/js/cache.class.js b/core/js/cache.class.js index 6ecc87d7c8..8408a87d84 100644 --- a/core/js/cache.class.js +++ b/core/js/cache.class.js @@ -17,16 +17,16 @@ jeedom.cache = function() { } jeedom.cache.set = function(_params) { - var paramsRequired = ['key', 'value'] - var paramsSpecifics = {} + const paramsRequired = ['key', 'value'] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/cache.ajax.php' paramsAJAX.data = { action: 'set', @@ -39,16 +39,16 @@ jeedom.cache.set = function(_params) { } jeedom.cache.byKey = function(_params) { - var paramsRequired = ['key'] - var paramsSpecifics = {} + const paramsRequired = ['key'] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/cache.ajax.php' paramsAJAX.data = { action: 'byKey', @@ -58,16 +58,16 @@ jeedom.cache.byKey = function(_params) { } jeedom.cache.remove = function(_params) { - var paramsRequired = ['key'] - var paramsSpecifics = {} + const paramsRequired = ['key'] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/cache.ajax.php' paramsAJAX.data = { action: 'remove', @@ -77,16 +77,16 @@ jeedom.cache.remove = function(_params) { } jeedom.cache.clean = function(_params) { - var paramsRequired = [] - var paramsSpecifics = {} + const paramsRequired = [] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/cache.ajax.php' paramsAJAX.data = { action: 'clean' @@ -95,16 +95,16 @@ jeedom.cache.clean = function(_params) { } jeedom.cache.flush = function(_params) { - var paramsRequired = [] - var paramsSpecifics = {} + const paramsRequired = [] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/cache.ajax.php' paramsAJAX.data = { action: 'flush' diff --git a/core/js/cmd.class.js b/core/js/cmd.class.js index 9fee894d53..d71d8b505b 100644 --- a/core/js/cmd.class.js +++ b/core/js/cmd.class.js @@ -32,13 +32,13 @@ jeedom.cmd.notifyEq = function(_eqlogic, _hide) { return } if (isElement_jQuery(_eqlogic)) _eqlogic = _eqlogic[0] - var refresh = _eqlogic.querySelector('.cmd.refresh') + let refresh = _eqlogic.querySelector('.cmd.refresh') if (refresh != null) { refresh.addClass('spinning') } else { _eqlogic.querySelector('.widget-name')?.insertAdjacentHTML('afterbegin', '') } - var refresh = _eqlogic.querySelector('.cmd.refresh') + refresh = _eqlogic.querySelector('.cmd.refresh') if (_hide && refresh != null) { setTimeout(function() { if (refresh.hasClass('remove')) { @@ -54,22 +54,22 @@ jeedom.cmd.execute = function(_params) { if (jeedom.cmd.disableExecute) { return } - var notify = _params.notify ?? true + const notify = _params.notify ?? true if (notify) { - var eqLogic = document.querySelector('.cmd[data-cmd_id="' + _params.id + '"]')?.closest('div.eqLogic-widget') + const eqLogic = document.querySelector('.cmd[data-cmd_id="' + _params.id + '"]')?.closest('div.eqLogic-widget') if (eqLogic) jeedom.cmd.notifyEq(eqLogic, false) } if (_params.value != 'undefined' && (is_array(_params.value) || is_object(_params.value))) { _params.value = JSON.stringify(_params.value) } - var paramsRequired = ['id'] - var paramsSpecifics = { + const paramsRequired =['id'] + const paramsSpecifics ={ global: false, pre_success: function(data) { if (data.state != 'ok') { if (data.code == -32005) { if (jeedom.display.version == 'mobile') { - var result = prompt("{{Veuillez indiquer le code ?}}", "") + const result = prompt("{{Veuillez indiquer le code ?}}", "") if (result != null) { _params.codeAccess = result jeedom.cmd.execute(_params) @@ -113,7 +113,7 @@ jeedom.cmd.execute = function(_params) { } } else if (data.code == -32006) { if (jeedom.display.version == 'mobile') { - var result = confirm("{{Êtes-vous sûr de vouloir faire cette action ?}}") + const result = confirm("{{Êtes-vous sûr de vouloir faire cette action ?}}") if (result) { _params.confirmAction = 1 jeedom.cmd.execute(_params) @@ -180,10 +180,10 @@ jeedom.cmd.execute = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/cmd.ajax.php' - var cache = 1 + let cache = 1 if (_params.cache !== undefined) { cache = _params.cache } @@ -205,8 +205,8 @@ jeedom.cmd.execute = function(_params) { } jeedom.cmd.test = function(_params) { - var paramsRequired = ['id'] - var paramsSpecifics = { + const paramsRequired =['id'] + const paramsSpecifics ={ global: false, success: function(result) { switch (result.type) { @@ -244,8 +244,8 @@ jeedom.cmd.test = function(_params) { }) break case 'slider': - let min = result.configuration.minValue || 0 - let max = result.configuration.maxValue || 100 + const min = result.configuration.minValue || 0 + const max = result.configuration.maxValue || 100 jeeDialog.prompt({ title: '{{Entrer une valeur entre}}' + ' ' + min + ' ' + '{{et}}' + ' ' + max , value: parseInt(min) + (parseInt(max) / 2), @@ -307,9 +307,9 @@ jeedom.cmd.test = function(_params) { }) break case 'select': - let values = result.configuration.listValue.split(';') - let inputOptions = [] - for (let i in values) { + const values = result.configuration.listValue.split(';') + const inputOptions = [] + for (const i in values) { inputOptions.push({ text: values[i].split('|')[1], value: values[i].split('|')[0] }) } jeeDialog.prompt({ @@ -343,7 +343,7 @@ jeedom.cmd.test = function(_params) { }) break case 'message': - let productName = JEEDOM_PRODUCT_NAME + const productName = JEEDOM_PRODUCT_NAME let content = `` content += `` @@ -388,8 +388,8 @@ jeedom.cmd.test = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/cmd.ajax.php' paramsAJAX.data = { action: 'getCmd', @@ -400,7 +400,7 @@ jeedom.cmd.test = function(_params) { //deprecated jeedom.cmd.refreshByEqLogic = function(_params) { - var cmds = document.querySelectorAll('.cmd[data-eqLogic_id="' + _params.eqLogic_id + '"]') + const cmds = document.querySelectorAll('.cmd[data-eqLogic_id="' + _params.eqLogic_id + '"]') if (cmds.length == 0) { return } @@ -414,8 +414,8 @@ jeedom.cmd.refreshByEqLogic = function(_params) { id: _cmd.getAttribute('data-cmd_id'), version: _cmd.getAttribute('data-version'), success: function(data) { - var html = domUtils.parseHTML(data.html).childNodes[0] - var uid = html.getAttribute('data-cmd_uid') + const html = domUtils.parseHTML(data.html).childNodes[0] + const uid = html.getAttribute('data-cmd_uid') if (uid != 'undefined') { cmd.setAttribute('data-cmd_uid', uid) } @@ -427,8 +427,8 @@ jeedom.cmd.refreshByEqLogic = function(_params) { } jeedom.cmd.refreshValue = function(_params) { - var cmd = null - for (var i in _params) { + const cmd = null + for (const i in _params) { if(_params[i].cmd_id == ''){ continue; } @@ -445,7 +445,7 @@ jeedom.cmd.refreshValue = function(_params) { if (typeof jeedom.cmd.update[_params[i].cmd_id] == 'function') { jeedom.cmd.update[_params[i].cmd_id](_params[i]) } - for (var j in jeedom.cmd.update[_params[i].cmd_id]) { + for (const j in jeedom.cmd.update[_params[i].cmd_id]) { jeedom.cmd.update[_params[i].cmd_id][j](_params[i]) } } @@ -463,13 +463,13 @@ jeedom.cmd.addUpdateFunction = function(_cmd_id, _function) { return } if (typeof jeedom.cmd.update[_cmd_id] == 'function') { - let prevFunction = jeedom.cmd.update[_cmd_id] + const prevFunction = jeedom.cmd.update[_cmd_id] if (prevFunction.toString() == _function.toString()) { return } jeedom.cmd.update[_cmd_id] = [prevFunction, _function] } - for (var i in jeedom.cmd.update[_cmd_id]) { + for (const i in jeedom.cmd.update[_cmd_id]) { if (jeedom.cmd.update[_cmd_id][i].toString() == _function.toString()) { return } @@ -482,16 +482,16 @@ jeedom.cmd.resetUpdateFunction = function() { } jeedom.cmd.getWidgetHelp = function(_params) { - var paramsRequired = ['id', 'version'] - var paramsSpecifics = {} + const paramsRequired =['id', 'version'] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/cmd.ajax.php' paramsAJAX.data = { action: 'getWidgetHelp', @@ -503,16 +503,16 @@ jeedom.cmd.getWidgetHelp = function(_params) { } jeedom.cmd.toHtml = function(_params) { - var paramsRequired = ['id', 'version'] - var paramsSpecifics = {} + const paramsRequired =['id', 'version'] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/cmd.ajax.php' paramsAJAX.data = { action: 'toHtml', @@ -523,16 +523,16 @@ jeedom.cmd.toHtml = function(_params) { } jeedom.cmd.replaceCmd = function(_params) { - var paramsRequired = ['source_id', 'target_id'] - var paramsSpecifics = {} + const paramsRequired =['source_id', 'target_id'] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/cmd.ajax.php' paramsAJAX.data = { action: 'replaceCmd', @@ -543,8 +543,8 @@ jeedom.cmd.replaceCmd = function(_params) { } jeedom.cmd.save = function(_params) { - var paramsRequired = ['cmd'] - var paramsSpecifics = { + const paramsRequired =['cmd'] + const paramsSpecifics ={ pre_success: function(data) { if (isset(jeedom.cmd.cache.byId[data.result.id])) { delete jeedom.cmd.cache.byId[data.result.id] @@ -561,8 +561,8 @@ jeedom.cmd.save = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/cmd.ajax.php' paramsAJAX.data = { action: 'save', @@ -572,16 +572,16 @@ jeedom.cmd.save = function(_params) { } jeedom.cmd.setIsVisibles = function(_params) { - var paramsRequired = ['cmds', 'isVisible'] - var paramsSpecifics = {} + const paramsRequired =['cmds', 'isVisible'] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/cmd.ajax.php' paramsAJAX.data = { action: 'setIsVisibles', @@ -592,8 +592,8 @@ jeedom.cmd.setIsVisibles = function(_params) { } jeedom.cmd.multiSave = function(_params) { - var paramsRequired = ['cmds'] - var paramsSpecifics = { + const paramsRequired =['cmds'] + const paramsSpecifics ={ pre_success: function(data) { jeedom.cmd.cache.byId = [] return data @@ -605,8 +605,8 @@ jeedom.cmd.multiSave = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/cmd.ajax.php' paramsAJAX.data = { action: 'multiSave', @@ -616,8 +616,8 @@ jeedom.cmd.multiSave = function(_params) { } jeedom.cmd.byId = function(_params) { - var paramsRequired = ['id'] - var paramsSpecifics = { + const paramsRequired =['id'] + const paramsSpecifics ={ pre_success: function(data) { jeedom.cmd.cache.byId[data.result.id] = data.result return data @@ -629,12 +629,12 @@ jeedom.cmd.byId = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) if (isset(jeedom.cmd.cache.byId[params.id]) && init(params.noCache, false) == false) { params.success(jeedom.cmd.cache.byId[params.id]) return } - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/cmd.ajax.php' paramsAJAX.data = { action: 'byId', @@ -644,8 +644,8 @@ jeedom.cmd.byId = function(_params) { } jeedom.cmd.getHumanCmdName = function(_params) { - var paramsRequired = ['id'] - var paramsSpecifics = { + const paramsRequired =['id'] + const paramsSpecifics ={ pre_success: function(data) { jeedom.cmd.cache.byId[data.result.id] = data.result return data @@ -657,12 +657,12 @@ jeedom.cmd.getHumanCmdName = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) if (isset(jeedom.cmd.cache.byId[params.id]) && init(params.noCache, false) == false) { params.success(jeedom.cmd.cache.byId[params.id]) return } - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/cmd.ajax.php' paramsAJAX.data = { action: 'getHumanCmdName', @@ -672,8 +672,8 @@ jeedom.cmd.getHumanCmdName = function(_params) { } jeedom.cmd.byHumanName = function(_params) { - var paramsRequired = ['humanName'] - var paramsSpecifics = { + const paramsRequired =['humanName'] + const paramsSpecifics ={ pre_success: function(data) { jeedom.cmd.cache.byHumanName[data.result.humanName] = data.result return data @@ -685,12 +685,12 @@ jeedom.cmd.byHumanName = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) if (isset(jeedom.cmd.cache.byHumanName[params.humanName]) && init(params.noCache, false) == false) { params.success(jeedom.cmd.cache.byHumanName[params.humanName]) return } - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/cmd.ajax.php' paramsAJAX.data = { action: 'byHumanName', @@ -700,16 +700,16 @@ jeedom.cmd.byHumanName = function(_params) { } jeedom.cmd.usedBy = function(_params) { - var paramsRequired = ['id'] - var paramsSpecifics = {} + const paramsRequired =['id'] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/cmd.ajax.php' paramsAJAX.data = { action: 'usedBy', @@ -719,16 +719,16 @@ jeedom.cmd.usedBy = function(_params) { } jeedom.cmd.dropInflux = function(_params) { - var paramsRequired = ['cmd_id'] - var paramsSpecifics = {} + const paramsRequired =['cmd_id'] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/cmd.ajax.php' paramsAJAX.data = { action: 'dropInflux', @@ -738,16 +738,16 @@ jeedom.cmd.dropInflux = function(_params) { } jeedom.cmd.historyInflux = function(_params) { - var paramsRequired = ['cmd_id'] - var paramsSpecifics = {} + const paramsRequired =['cmd_id'] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/cmd.ajax.php' paramsAJAX.data = { action: 'historyInflux', @@ -757,16 +757,16 @@ jeedom.cmd.historyInflux = function(_params) { } jeedom.cmd.dropDatabaseInflux = function(_params) { - var paramsRequired = [] - var paramsSpecifics = {} + const paramsRequired =[] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/cmd.ajax.php' paramsAJAX.data = { action: 'dropDatabaseInflux' @@ -775,16 +775,16 @@ jeedom.cmd.dropDatabaseInflux = function(_params) { } jeedom.cmd.historyInfluxAll = function(_params) { - var paramsRequired = [] - var paramsSpecifics = {} + const paramsRequired =[] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/cmd.ajax.php' paramsAJAX.data = { action: 'historyInfluxAll' @@ -810,7 +810,7 @@ jeedom.cmd.changeType = function(_cmd, _subType) { _cmd.querySelector('.cmdAttr[data-l1key="htmlstate"]')?.seen() } - var selSubType = document.createElement('select') + const selSubType = document.createElement('select') selSubType.style.width = '120px' selSubType.style.marginTop = '5px' selSubType.addClass('cmdAttr', 'form-control', 'input-sm') @@ -824,7 +824,7 @@ jeedom.cmd.changeType = function(_cmd, _subType) { _params.error(error) }, success: function(subType) { - for (var i in subType) { + for (const i in subType) { newOption = document.createElement('option') newOption.text = subType[i].name newOption.value = i @@ -863,9 +863,9 @@ jeedom.cmd.changeSubType = function(_cmd) { _params.error(error) }, success: function(subtype) { - for (var i in subtype) { + for (const i in subtype) { if (isset(subtype[i].visible)) { - var el = _cmd.querySelector('.cmdAttr[data-l1key="' + i + '"]') + let el = _cmd.querySelector('.cmdAttr[data-l1key="' + i + '"]') if (!el) continue if (el.getAttribute('type') == 'checkbox' && el.parentNode.tagName.toLowerCase() == 'span') { el = el.parentNode @@ -903,8 +903,8 @@ jeedom.cmd.changeSubType = function(_cmd) { } } } else { - for (var j in subtype[i]) { - var el = _cmd.querySelector('.cmdAttr[data-l1key="' + i + '"][data-l2key="' + j + '"]') + for (const j in subtype[i]) { + let el = _cmd.querySelector('.cmdAttr[data-l1key="' + i + '"][data-l2key="' + j + '"]') if (!el) continue if (el.getAttribute('type') == 'checkbox' && el.parentNode.tagName.toLowerCase() == 'span') { el = el.parentNode @@ -967,7 +967,7 @@ jeedom.cmd.changeSubType = function(_cmd) { } jeedom.cmd.availableType = function() { - var selType = '' selType += '' selType += '' selType += '' @@ -1007,7 +1007,7 @@ jeedom.cmd.getSelectModal = function(_options, _callback) { className: 'success', callback: { click: function(event) { - var args = {} + const args = {} args.cmd = {} args.human = mod_insertCmd.getValue() args.cmd.id = mod_insertCmd.getCmdId() @@ -1043,7 +1043,7 @@ jeedom.cmd.displayActionOption = function(_expression, _options, _callback) { } } - var html = '' + let html = '' domUtils.ajax({ type: "POST", url: "core/ajax/scenario.ajax.php", @@ -1080,16 +1080,16 @@ jeedom.cmd.displayActionOption = function(_expression, _options, _callback) { } jeedom.cmd.displayActionsOption = function(_params) { - var paramsRequired = ['params'] - var paramsSpecifics = {} + const paramsRequired =['params'] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.async = _params.async || true paramsAJAX.url = 'core/ajax/scenario.ajax.php' paramsAJAX.data = { @@ -1100,10 +1100,10 @@ jeedom.cmd.displayActionsOption = function(_params) { } jeedom.cmd.normalizeName = function(_tagname) { - var cmdName = _tagname.toLowerCase().trim() - var cmdTests = [] - var cmdType = null - var cmdList = { + const cmdName = _tagname.toLowerCase().trim() + let cmdTests = [] + const cmdType = null + const cmdList = { 'on': 'on', 'off': 'off', 'monter': 'on', @@ -1128,11 +1128,11 @@ jeedom.cmd.normalizeName = function(_tagname) { 'stop': 'off', 'go': 'on' } - var cmdTestsList = [' ', '-', '_'] - for (var i in cmdTestsList) { + const cmdTestsList = [' ', '-', '_'] + for (const i in cmdTestsList) { cmdTests = cmdTests.concat(cmdName.split(cmdTestsList[i])) } - for (var j in cmdTests) { + for (const j in cmdTests) { if (cmdList[cmdTests[j]]) { return cmdList[cmdTests[j]] } @@ -1141,16 +1141,16 @@ jeedom.cmd.normalizeName = function(_tagname) { } jeedom.cmd.setOrder = function(_params) { - var paramsRequired = ['cmds'] - var paramsSpecifics = {} + const paramsRequired =['cmds'] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/cmd.ajax.php' paramsAJAX.data = { action: 'setOrder', @@ -1160,16 +1160,16 @@ jeedom.cmd.setOrder = function(_params) { } jeedom.cmd.getDeadCmd = function(_params) { - var paramsRequired = [] - var paramsSpecifics = {} + const paramsRequired =[] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/cmd.ajax.php' paramsAJAX.data = { action: 'getDeadCmd' @@ -1179,9 +1179,9 @@ jeedom.cmd.getDeadCmd = function(_params) { /* time widgets */ jeedom.cmd.formatMomentDuration = function(_duration) { - var durationString = '' - var used = 0 - var lang = jeeFrontEnd.language + let durationString = '' + let used = 0 + const lang = jeeFrontEnd.language if (_duration._data.years > 0) { durationString += _duration._data.years + jeedom.config.locales[lang].duration.year @@ -1221,10 +1221,11 @@ jeedom.cmd.displayDuration = function(_date, _el, _type = 'duration') { if (isElement_jQuery(_el)) _el = _el[0] //Deprecated, keep for mobile during transition if (_type == 'date') { moment.locale(jeeFrontEnd.language.substring(0, 2)) + let dateString if (isset(jeedom.config.locales[jeeFrontEnd.language].calendar)) { - var dateString = moment(_date, 'YYYY-MM-DD HH:mm:ss').calendar(jeedom.config.locales[jeeFrontEnd.language].calendar) + dateString = moment(_date, 'YYYY-MM-DD HH:mm:ss').calendar(jeedom.config.locales[jeeFrontEnd.language].calendar) } else { - var dateString = moment(_date, 'YYYY-MM-DD HH:mm:ss').calendar(jeedom.config.locales['en_US'].calendar) + dateString = moment(_date, 'YYYY-MM-DD HH:mm:ss').calendar(jeedom.config.locales['en_US'].calendar) } _el.innerHTML = dateString return true @@ -1234,29 +1235,30 @@ jeedom.cmd.displayDuration = function(_date, _el, _type = 'duration') { clearInterval(_el.getAttribute('data-interval')) } - var tsDate = moment(_date).unix() * 1000 - var now = Date.now() + ((new Date).getTimezoneOffset() + jeeFrontEnd.serverTZoffsetMin) * 60000 + jeeFrontEnd.clientServerDiffDatetime + const tsDate = moment(_date).unix() * 1000 + const now = Date.now() + ((new Date).getTimezoneOffset() + jeeFrontEnd.serverTZoffsetMin) * 60000 + jeeFrontEnd.clientServerDiffDatetime - var interval = 10000 + let interval = 10000 + let durationString //_past more than one second ? if (now - tsDate > 1000) { - var duration = moment.duration(moment() - moment(_date)) - var durationSec = duration._milliseconds / 1000 + const duration = moment.duration(moment() - moment(_date)) + const durationSec = duration._milliseconds / 1000 if (durationSec > 86399) { interval = 3600000 } else if (durationSec > 3599) { interval = 60000 } - var durationString = jeedom.cmd.formatMomentDuration(duration) + durationString = jeedom.cmd.formatMomentDuration(duration) } else { - var durationString = "0" + jeedom.config.locales[jeeFrontEnd.language].duration.second + durationString = "0" + jeedom.config.locales[jeeFrontEnd.language].duration.second } _el.innerHTML = durationString //set refresh interval: - var myinterval = setInterval(function() { - var duration = moment.duration(moment() - moment(_date)) - var durationString = jeedom.cmd.formatMomentDuration(duration) + const myinterval = setInterval(function() { + const duration = moment.duration(moment() - moment(_date)) + const durationString = jeedom.cmd.formatMomentDuration(duration) _el.innerHTML = durationString }, interval) diff --git a/core/js/config.class.js b/core/js/config.class.js index 00824e6766..e782429b88 100644 --- a/core/js/config.class.js +++ b/core/js/config.class.js @@ -109,16 +109,16 @@ jeedom.config.locales = { } jeedom.config.save = function(_params) { - var paramsRequired = ['configuration']; - var paramsSpecifics = {}; + const paramsRequired = ['configuration']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/config.ajax.php'; paramsAJAX.data = { action: 'addKey', @@ -129,8 +129,8 @@ jeedom.config.save = function(_params) { } jeedom.config.load = function(_params) { - var paramsRequired = ['configuration']; - var paramsSpecifics = { + const paramsRequired = ['configuration']; + const paramsSpecifics = { global: _params.global || true }; try { @@ -139,8 +139,8 @@ jeedom.config.load = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/config.ajax.php'; paramsAJAX.data = { action: 'getKey', @@ -152,16 +152,16 @@ jeedom.config.load = function(_params) { } jeedom.config.remove = function(_params) { - var paramsRequired = ['configuration']; - var paramsSpecifics = {}; + const paramsRequired = ['configuration']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/config.ajax.php'; paramsAJAX.data = { action: 'removeKey', @@ -172,16 +172,16 @@ jeedom.config.remove = function(_params) { } jeedom.config.removeImage = function(_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/config.ajax.php'; paramsAJAX.data = { action: 'removeImage', @@ -197,7 +197,7 @@ jeedom.config.getGenericTypeModal = function(_options, callback) { if (!isset(_options.type)) { _options.type = 'info' } - var url = 'index.php?v=d&modal=genericType.human.insert&type=' + _options.type + let url = 'index.php?v=d&modal=genericType.human.insert&type=' + _options.type if (_options.object) url += '&object=' + _options.object document.getElementById('mod_insertGenericType')?.remove() @@ -216,7 +216,7 @@ jeedom.config.getGenericTypeModal = function(_options, callback) { className: 'success', callback: { click: function(event) { - var args = {} + const args = {} args.human = mod_insertGenericType.getValue() args.id = mod_insertGenericType.getId() if (args.human.trim() != '') { diff --git a/core/js/core.js b/core/js/core.js index 71482433cc..05c8257b1a 100644 --- a/core/js/core.js +++ b/core/js/core.js @@ -15,12 +15,13 @@ */ function getTemplate(_folder, _version, _filename, _replace) { + let path; if (_folder == 'core') { - var path = _folder + '/template/' + _version + '/' + _filename; + path = _folder + '/template/' + _version + '/' + _filename; } else { - var path = 'plugins/' + _folder + '/desktop/template/' + _version + '/' + _filename; + path = 'plugins/' + _folder + '/desktop/template/' + _version + '/' + _filename; } - var template = ''; + let template = ''; domUtils.ajax({ type: "POST", url: path, @@ -30,7 +31,7 @@ function getTemplate(_folder, _version, _filename, _replace) { }, success: function(data) { if (isset(_replace) && _replace != null) { - var reg = null; + let reg = null; for (i in _replace) { reg = new RegExp(i, "g"); data = data.replace(reg, _replace[i]); @@ -74,13 +75,15 @@ function init(_value, _default) { } function getUrlVars(_key,_url) { - var vars = [], hash, nbVars = 0; + const vars = []; + let hash, nbVars = 0; + let hashes; if(_url){ - var hashes = _url.split('?')[1].split('&'); + hashes = _url.split('?')[1].split('&'); }else{ - var hashes = window.location.search.replace('?', '').split('&'); + hashes = window.location.search.replace('?', '').split('&'); } - for (var i = 0; i < hashes.length; i++) { + for (let i = 0; i < hashes.length; i++) { if (hashes[i] !== "" && hashes[i] !== "?") { hash = hashes[i].split('='); nbVars++; @@ -98,17 +101,17 @@ function getUrlVars(_key,_url) { } function setCookie(cname, cvalue, exdays) { - var d = new Date(); + const d = new Date(); if (!isset(exdays)) exdays = 1; d.setTime(d.getTime() + (exdays * 24 * 60 * 60 * 1000)); - var expires = "expires=" + d.toUTCString(); + const expires = "expires=" + d.toUTCString(); document.cookie = cname + "=" + cvalue + ";" + expires + ";path=/;samesite=Strict"; } function getCookie(name) { - var cookies = document.cookie.split(';'); - var csplit = null; - for (var i in cookies) { + const cookies = document.cookie.split(';'); + let csplit = null; + for (const i in cookies) { csplit = cookies[i].split('='); if (name.trim() == csplit[0].trim()) { return csplit[1]; @@ -118,8 +121,8 @@ function getCookie(name) { } function getDeviceType() { - var ua = navigator.userAgent - var result = {} + const ua = navigator.userAgent + const result = {} result.width = window.innerWidth result.type = 'desktop' result.subType = '' @@ -147,8 +150,8 @@ function getDeviceType() { } if (result.type == 'phone') { - var margin = (result.subType == 'ios' ? 6 : 7) - var ori = window.orientation + const margin = (result.subType == 'ios' ? 6 : 7) + const ori = window.orientation if (ori == 90 || ori == -90) { //landscape result.bSize = (result.width / 4) - margin } else { //portrait diff --git a/core/js/cron.class.js b/core/js/cron.class.js index 2754280f9b..4eafb93794 100644 --- a/core/js/cron.class.js +++ b/core/js/cron.class.js @@ -17,16 +17,16 @@ jeedom.cron = function() {}; jeedom.cron.setState = function(_params) { - var paramsRequired = ['id', 'state']; - var paramsSpecifics = {}; + const paramsRequired = ['id', 'state']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/cron.ajax.php'; paramsAJAX.data = { action: _params.state, @@ -36,16 +36,16 @@ jeedom.cron.setState = function(_params) { } jeedom.cron.all = function(_params) { - var paramsRequired = []; - var paramsSpecifics = {}; + const paramsRequired = []; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/cron.ajax.php'; paramsAJAX.data = { action: 'all' @@ -54,16 +54,16 @@ jeedom.cron.all = function(_params) { } jeedom.cron.save = function(_params) { - var paramsRequired = ['crons']; - var paramsSpecifics = {}; + const paramsRequired = ['crons']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/cron.ajax.php'; paramsAJAX.data = { action: 'save', diff --git a/core/js/dataStore.class.js b/core/js/dataStore.class.js index 54593bdb16..9057af557b 100644 --- a/core/js/dataStore.class.js +++ b/core/js/dataStore.class.js @@ -17,16 +17,16 @@ jeedom.dataStore = function() {}; jeedom.dataStore.save = function(_params) { - var paramsRequired = ['id', 'value', 'type', 'key', 'link_id']; - var paramsSpecifics = {}; + const paramsRequired = ['id', 'value', 'type', 'key', 'link_id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.async = _params.async || true; paramsAJAX.url = 'core/ajax/dataStore.ajax.php'; @@ -42,16 +42,16 @@ jeedom.dataStore.save = function(_params) { } jeedom.dataStore.byTypeLinkIdKey = function(_params) { - var paramsRequired = ['type', 'linkId', 'key', 'usedBy']; - var paramsSpecifics = {}; + const paramsRequired = ['type', 'linkId', 'key', 'usedBy']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/dataStore.ajax.php'; paramsAJAX.data = { action: 'byTypeLinkIdKey', @@ -64,16 +64,16 @@ jeedom.dataStore.byTypeLinkIdKey = function(_params) { } jeedom.dataStore.all = function(_params) { - var paramsRequired = ['type', 'usedBy']; - var paramsSpecifics = {}; + const paramsRequired = ['type', 'usedBy']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/dataStore.ajax.php'; paramsAJAX.data = { action: 'all', @@ -103,7 +103,7 @@ jeedom.dataStore.getSelectModal = function(_options, callback) { className: 'success', callback: { click: function(event) { - var args = {} + const args = {} args.human = mod_insertDataStore.getValue() args.id = mod_insertDataStore.getId() if (args.human.trim() != '') { @@ -127,16 +127,16 @@ jeedom.dataStore.getSelectModal = function(_options, callback) { } jeedom.dataStore.remove = function(_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/dataStore.ajax.php'; paramsAJAX.data = { action: 'remove', diff --git a/core/js/eqLogic.class.js b/core/js/eqLogic.class.js index 3c7ea9878a..7f3bb8856b 100644 --- a/core/js/eqLogic.class.js +++ b/core/js/eqLogic.class.js @@ -40,8 +40,8 @@ if(!isset(jeedom.eqLogic.cache.byLogical)){ } jeedom.eqLogic.save = function(_params) { - var paramsRequired = ['type', 'eqLogics'] - var paramsSpecifics = { + const paramsRequired = ['type', 'eqLogics'] + const paramsSpecifics = { pre_success: function(data) { if (isset(jeedom.eqLogic.cache.byId[data.result.id])) { delete jeedom.eqLogic.cache.byId[data.result.id] @@ -61,8 +61,8 @@ jeedom.eqLogic.save = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.async = _params.async || true paramsAJAX.url = 'core/ajax/eqLogic.ajax.php' paramsAJAX.data = { @@ -74,16 +74,16 @@ jeedom.eqLogic.save = function(_params) { } jeedom.eqLogic.byType = function(_params) { - var paramsRequired = ['type'] - var paramsSpecifics = {} + const paramsRequired = ['type'] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/eqLogic.ajax.php' paramsAJAX.data = { action: 'listByType', @@ -93,16 +93,16 @@ jeedom.eqLogic.byType = function(_params) { } jeedom.eqLogic.byObjectId = function(_params) { - var paramsRequired = ['object_id'] - var paramsSpecifics = {} + const paramsRequired = ['object_id'] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/eqLogic.ajax.php' paramsAJAX.data = { action: 'listByObject', @@ -115,16 +115,16 @@ jeedom.eqLogic.byObjectId = function(_params) { } jeedom.eqLogic.simpleSave = function(_params) { - var paramsRequired = ['eqLogic'] - var paramsSpecifics = {} + const paramsRequired = ['eqLogic'] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/eqLogic.ajax.php' paramsAJAX.data = { action: 'simpleSave', @@ -134,16 +134,16 @@ jeedom.eqLogic.simpleSave = function(_params) { } jeedom.eqLogic.getUseBeforeRemove = function(_params) { - var paramsRequired = ['id'] - var paramsSpecifics = {} + const paramsRequired = ['id'] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/eqLogic.ajax.php' paramsAJAX.data = { action: 'getUseBeforeRemove', @@ -153,16 +153,16 @@ jeedom.eqLogic.getUseBeforeRemove = function(_params) { } jeedom.eqLogic.usedBy = function(_params) { - var paramsRequired = ['id'] - var paramsSpecifics = {} + const paramsRequired = ['id'] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/eqLogic.ajax.php' paramsAJAX.data = { action: 'usedBy', @@ -172,8 +172,8 @@ jeedom.eqLogic.usedBy = function(_params) { } jeedom.eqLogic.remove = function(_params) { - var paramsRequired = ['id', 'type'] - var paramsSpecifics = { + const paramsRequired = ['id', 'type'] + const paramsSpecifics = { pre_success: function(data) { if (isset(jeedom.eqLogic.cache.byId[_params.id])) { delete jeedom.eqLogic.cache.byId[_params.id] @@ -187,8 +187,8 @@ jeedom.eqLogic.remove = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/eqLogic.ajax.php' paramsAJAX.data = { action: 'remove', @@ -199,8 +199,8 @@ jeedom.eqLogic.remove = function(_params) { } jeedom.eqLogic.copy = function(_params) { - var paramsRequired = ['id', 'name'] - var paramsSpecifics = { + const paramsRequired = ['id', 'name'] + const paramsSpecifics = { pre_success: function(data) { if (isset(jeedom.eqLogic.cache.byId[_params.id])) { delete jeedom.eqLogic.cache.byId[_params.id] @@ -214,8 +214,8 @@ jeedom.eqLogic.copy = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/eqLogic.ajax.php' paramsAJAX.data = { action: 'copy', @@ -226,8 +226,8 @@ jeedom.eqLogic.copy = function(_params) { } jeedom.eqLogic.print = function(_params) { - var paramsRequired = ['id', 'type'] - var paramsSpecifics = { + const paramsRequired = ['id', 'type'] + const paramsSpecifics = { pre_success: function(data) { if (data.result && data.result.cmd) { jeedom.eqLogic.cache.getCmd[_params.id] = data.result.cmd @@ -241,8 +241,8 @@ jeedom.eqLogic.print = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/eqLogic.ajax.php' paramsAJAX.data = { action: 'get', @@ -255,16 +255,16 @@ jeedom.eqLogic.print = function(_params) { } jeedom.eqLogic.toHtml = function(_params) { - var paramsRequired = ['id', 'version'] - var paramsSpecifics = {} + const paramsRequired = ['id', 'version'] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/eqLogic.ajax.php' paramsAJAX.data = { action: 'toHtml', @@ -276,8 +276,8 @@ jeedom.eqLogic.toHtml = function(_params) { } jeedom.eqLogic.getCmd = function(_params) { - var paramsRequired = ['id'] - var paramsSpecifics = { + const paramsRequired = ['id'] + const paramsSpecifics = { pre_success: function(data) { jeedom.eqLogic.cache.getCmd[_params.id] = data.result return data @@ -293,8 +293,8 @@ jeedom.eqLogic.getCmd = function(_params) { _params.success(jeedom.eqLogic.cache.getCmd[_params.id]) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/cmd.ajax.php' paramsAJAX.data = { action: 'byEqLogic', @@ -305,8 +305,8 @@ jeedom.eqLogic.getCmd = function(_params) { } jeedom.eqLogic.byId = function(_params) { - var paramsRequired = ['id'] - var paramsSpecifics = { + const paramsRequired = ['id'] + const paramsSpecifics = { pre_success: function(data) { jeedom.eqLogic.cache.byId[data.result.id] = data.result return data @@ -322,8 +322,8 @@ jeedom.eqLogic.byId = function(_params) { _params.success(jeedom.eqLogic.cache.byId[_params.id]) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/eqLogic.ajax.php' paramsAJAX.data = { action: 'byId', @@ -333,16 +333,16 @@ jeedom.eqLogic.byId = function(_params) { } jeedom.eqLogic.removeImage = function(_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/eqLogic.ajax.php'; paramsAJAX.data = { action: 'removeImage', @@ -352,8 +352,8 @@ jeedom.eqLogic.removeImage = function(_params) { } jeedom.eqLogic.byLogical = function(_params) { - var paramsRequired = ['logical', 'type'] - var paramsSpecifics = { + const paramsRequired = ['logical', 'type'] + const paramsSpecifics = { pre_success: function(data) { jeedom.eqLogic.cache.byLogical[data.result.logical, data.result.type] = data.result return data @@ -369,8 +369,8 @@ jeedom.eqLogic.byLogical = function(_params) { _params.success(jeedom.eqLogic.cache.byLogical[_params.logical, _params.type]) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/eqLogic.ajax.php' paramsAJAX.data = { action: 'byLogical', @@ -388,8 +388,8 @@ jeedom.eqLogic.buildSelectCmd = function(_params) { id: _params.id, async: false, success: function(cmds) { - var result = '' - for (var i in cmds) { + let result = '' + for (const i in cmds) { if ((init(_params.filter.type, 'all') == 'all' || cmds[i].type == _params.filter.type) && (init(_params.filter.subType, 'all') == 'all' || cmds[i].subType == _params.filter.subType) && (init(_params.filter.isHistorized, 'all') == 'all' || cmds[i].isHistorized == _params.filter.isHistorized) @@ -421,7 +421,7 @@ jeedom.eqLogic.getSelectModal = function(_options, callback) { className: 'success', callback: { click: function(event) { - var args = {} + const args = {} args.human = mod_insertEqLogic.getValue() args.id = mod_insertEqLogic.getId() if (args.human.trim() != '') { @@ -445,17 +445,17 @@ jeedom.eqLogic.getSelectModal = function(_options, callback) { } jeedom.eqLogic.refreshValue = function(_params) { - var paramsRequired = [] - var eqLogics = {} - var sends = {} - var eqLogic = null - var page = document.body.getAttribute('data-page') + const paramsRequired = [] + const eqLogics = {} + const sends = {} + let eqLogic = null + const page = document.body.getAttribute('data-page') - for (var i in _params) { + for (const i in _params) { eqLogic = document.querySelector('.eqLogic[data-eqLogic_id="' + _params[i].eqLogic_id + '"]') if (eqLogic != null) { if ((page == 'dashboard' && _params[i].visible == '0') || _params[i].enable == '0') { //Remove it - let parent = eqLogic.parentNode + const parent = eqLogic.parentNode eqLogic.remove() if (parent.querySelectorAll('.eqLogic').length == 0) { if (page == 'dashboard') { @@ -482,13 +482,13 @@ jeedom.eqLogic.refreshValue = function(_params) { if (Object.keys(eqLogics).length == 0) { return } - var paramsSpecifics = { + const paramsSpecifics = { global: false, noDisplayError: true, success: function(result) { - var eqLogic = null - var uid = null - for (var i in result) { + let eqLogic = null + let uid = null + for (const i in result) { tile = domUtils.parseHTML(result[i].html) if (tile.childNodes.length == 0) { continue @@ -500,6 +500,7 @@ jeedom.eqLogic.refreshValue = function(_params) { if (isElement_jQuery(eqLogic)) eqLogic = eqLogic[0] if (eqLogic == null) { if (page == 'dashboard') { + let object_div, previousEqLogic if ((object_div = document.getElementById('div_ob' + result[i].object_id)) != null) { if (object_div.querySelector('.eqLogic')?.getAttribute('data-order') >= result[i].order) { object_div.querySelector('.eqLogic').before(tile) @@ -509,7 +510,7 @@ jeedom.eqLogic.refreshValue = function(_params) { object_div.html(result[i].html, true) } jeedomUtils.positionEqLogic(result[i].id) - var packer = Packery.data(object_div) + const packer = Packery.data(object_div) if (packer != undefined) packer.destroy() new Packery(object_div, {isLayoutInstant: true, transitionDuration: 0}) @@ -521,7 +522,7 @@ jeedom.eqLogic.refreshValue = function(_params) { document.querySelector('.alertListContainer').html(result[i].html, true) jeedomUtils.positionEqLogic(result[i].id, false) jeedomUtils.initTooltips() - let container = document.querySelector('.alertListContainer') + const container = document.querySelector('.alertListContainer') Packery.data(container).destroy() new Packery(container, { itemSelector: "#alertEqlogic .eqLogic-widget", isLayoutInstant: true, transitionDuration: 0 }) } else if (page == 'plan' && !jeeFrontEnd.planEditOption.state) { //no create if plan is in edition @@ -536,8 +537,8 @@ jeedom.eqLogic.refreshValue = function(_params) { }, success: function(plans) { try { - var object - for (var ii in plans) { + let object + for (const ii in plans) { if (plans[ii].plan.link_id == result[i].id) { object = jeeP.displayObject(plans[ii].plan, plans[ii].html, true) if (object != undefined) { @@ -558,8 +559,8 @@ jeedom.eqLogic.refreshValue = function(_params) { if (page == 'eqAnalyse' && result[i].alert == '') { eqLogic.remove() if (document.querySelector('.alertListContainer')?.querySelectorAll('.eqLogic').length > 0) { - let container = document.querySelector('.alertListContainer') - var packer = Packery.data(container) + const container = document.querySelector('.alertListContainer') + const packer = Packery.data(container) if (packer != undefined) packer.destroy() } continue @@ -602,8 +603,8 @@ jeedom.eqLogic.refreshValue = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/eqLogic.ajax.php' paramsAJAX.data = { action: 'toHtml', @@ -613,9 +614,9 @@ jeedom.eqLogic.refreshValue = function(_params) { } jeedom.eqLogic.initGraphInfo = function(_eqLogicUid, _doNotHighlightGraphCmd) { - var divGraph = document.querySelector('div.eqLogic[data-eqlogic_uid="' + _eqLogicUid + '"]:not(.zone-widget) div.eqlogicbackgraph') + const divGraph = document.querySelector('div.eqLogic[data-eqlogic_uid="' + _eqLogicUid + '"]:not(.zone-widget) div.eqlogicbackgraph') if (divGraph != null) { - var cmdId = divGraph.dataset.cmdid + const cmdId = divGraph.dataset.cmdid if (!_doNotHighlightGraphCmd || _doNotHighlightGraphCmd === false) { document.querySelector('div.eqLogic[data-eqlogic_uid="' + _eqLogicUid + '"] div.cmd-widget[data-cmd_id="' + cmdId + '"] .cmdName')?.insertAdjacentHTML('afterbegin', '• ') } @@ -624,18 +625,19 @@ jeedom.eqLogic.initGraphInfo = function(_eqLogicUid, _doNotHighlightGraphCmd) { } jeedom.eqLogic.drawGraphInfo = function(_eqLogicUid, _cmdId) { - var drawEqEl = document.querySelector('div.eqLogic[data-eqlogic_uid="' + _eqLogicUid + '"] .eqlogicbackgraph[data-cmdid="' + _cmdId + '"]') + const drawEqEl = document.querySelector('div.eqLogic[data-eqlogic_uid="' + _eqLogicUid + '"] .eqlogicbackgraph[data-cmdid="' + _cmdId + '"]') if (drawEqEl == null) return drawEqEl.empty() if (drawEqEl.length == 0) return false + let topMargin if (drawEqEl.hasClass('fixedbackgraph')) { - var topMargin = 0 + topMargin = 0 } else { - var topMargin = 35 + topMargin = 35 } - var dateEnd = moment().format('YYYY-MM-DD HH:mm:ss') - var dateStart - var decay = drawEqEl.dataset.format + const dateEnd = moment().format('YYYY-MM-DD HH:mm:ss') + let dateStart + const decay = drawEqEl.dataset.format switch (decay) { case 'hour': jeedom.eqLogic.backGraphIntervals[_cmdId] = 2 * 60 * 1000 @@ -670,12 +672,12 @@ jeedom.eqLogic.drawGraphInfo = function(_eqLogicUid, _cmdId) { success: function(result) { if (result.data.length == 0) return false if (result.timelineOnly) return false - var now = (moment().unix() + (jeeFrontEnd.serverTZoffsetMin * 60)) * 1000 - var values = result.data.map(function(elt) { + const now = (moment().unix() + (jeeFrontEnd.serverTZoffsetMin * 60)) * 1000 + const values = result.data.map(function(elt) { return elt[1] }) - var minValue = result.cmd.subType == 'binary' ? 0 : Math.min.apply(null, values) - var maxValue = result.cmd.subType == 'binary' ? 1.1 : Math.max.apply(null, values) * 1.01 + const minValue = result.cmd.subType == 'binary' ? 0 : Math.min.apply(null, values) + const maxValue = result.cmd.subType == 'binary' ? 1.1 : Math.max.apply(null, values) * 1.01 result.data.push([now, result.data.slice(-1)[0][1]]) new Highcharts.StockChart({ chart: { @@ -754,16 +756,16 @@ jeedom.eqLogic.drawGraphInfo = function(_eqLogicUid, _cmdId) { } jeedom.eqLogic.setOrder = function(_params) { - var paramsRequired = ['eqLogics'] - var paramsSpecifics = {} + const paramsRequired = ['eqLogics'] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/eqLogic.ajax.php' paramsAJAX.data = { action: 'setOrder', @@ -773,16 +775,16 @@ jeedom.eqLogic.setOrder = function(_params) { } jeedom.eqLogic.setGenericType = function(_params) { - var paramsRequired = ['eqLogics'] - var paramsSpecifics = {} + const paramsRequired = ['eqLogics'] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/eqLogic.ajax.php' paramsAJAX.data = { action: 'setGenericType', @@ -792,16 +794,16 @@ jeedom.eqLogic.setGenericType = function(_params) { } jeedom.eqLogic.removes = function(_params) { - var paramsRequired = ['eqLogics'] - var paramsSpecifics = {} + const paramsRequired = ['eqLogics'] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/eqLogic.ajax.php' paramsAJAX.data = { action: 'removes', @@ -811,16 +813,16 @@ jeedom.eqLogic.removes = function(_params) { } jeedom.eqLogic.setIsVisibles = function(_params) { - var paramsRequired = ['eqLogics', 'isVisible'] - var paramsSpecifics = {} + const paramsRequired = ['eqLogics', 'isVisible'] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/eqLogic.ajax.php' paramsAJAX.data = { action: 'setIsVisibles', @@ -831,16 +833,16 @@ jeedom.eqLogic.setIsVisibles = function(_params) { } jeedom.eqLogic.setIsEnables = function(_params) { - var paramsRequired = ['eqLogics', 'isEnable'] - var paramsSpecifics = {} + const paramsRequired = ['eqLogics', 'isEnable'] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/eqLogic.ajax.php' paramsAJAX.data = { action: 'setIsEnables', @@ -851,16 +853,16 @@ jeedom.eqLogic.setIsEnables = function(_params) { } jeedom.eqLogic.htmlAlert = function(_params) { - var paramsRequired = ['version'] - var paramsSpecifics = {} + const paramsRequired = ['version'] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/eqLogic.ajax.php' paramsAJAX.data = { action: 'htmlAlert', @@ -870,16 +872,16 @@ jeedom.eqLogic.htmlAlert = function(_params) { } jeedom.eqLogic.htmlBattery = function(_params) { - var paramsRequired = ['version'] - var paramsSpecifics = {} + const paramsRequired = ['version'] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/eqLogic.ajax.php' paramsAJAX.data = { action: 'htmlBattery', diff --git a/core/js/history.class.js b/core/js/history.class.js index 0d1d80f807..b0f55da15d 100644 --- a/core/js/history.class.js +++ b/core/js/history.class.js @@ -19,8 +19,8 @@ jeedom.history.chart = [] jeedom.history.chartDrawTime = 150 jeedom.history.get = function(_params) { - var paramsRequired = ['cmd_id', 'dateStart', 'dateEnd'] - var paramsSpecifics = { + const paramsRequired = ['cmd_id', 'dateStart', 'dateEnd'] + const paramsSpecifics = { global: _params.global || true, pre_success: function(data) { if (data.result == undefined) return data @@ -36,8 +36,8 @@ jeedom.history.get = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/cmd.ajax.php' paramsAJAX.data = { action: 'getHistory', @@ -50,8 +50,8 @@ jeedom.history.get = function(_params) { } jeedom.history.getLast = function(_params) { - var paramsRequired = ['cmd_id', 'time'] - var paramsSpecifics = { + const paramsRequired = ['cmd_id', 'time'] + const paramsSpecifics = { global: _params.global || true, pre_success: function(data) { if (isset(jeedom.cmd.cache.byId[data.result.id])) { @@ -66,8 +66,8 @@ jeedom.history.getLast = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = $.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = $.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/cmd.ajax.php' paramsAJAX.data = { action: 'getLastHistory', @@ -78,16 +78,16 @@ jeedom.history.getLast = function(_params) { } jeedom.history.getInitDates = function(_params) { - var paramsRequired = [] - var paramsSpecifics = {} + const paramsRequired = [] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/cmd.ajax.php' paramsAJAX.data = { action: 'getInitDates' @@ -96,16 +96,16 @@ jeedom.history.getInitDates = function(_params) { } jeedom.history.removeHistoryInFutur = function(_params) { - var paramsRequired = [] - var paramsSpecifics = {} + const paramsRequired = [] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/history.ajax.php' paramsAJAX.data = { action: 'removeHistoryInFutur' @@ -114,16 +114,16 @@ jeedom.history.removeHistoryInFutur = function(_params) { } jeedom.history.copyHistoryToCmd = function(_params) { - var paramsRequired = ['source_id', 'target_id'] - var paramsSpecifics = {} + const paramsRequired = ['source_id', 'target_id'] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/cmd.ajax.php' paramsAJAX.data = { action: 'copyHistoryToCmd', @@ -134,13 +134,13 @@ jeedom.history.copyHistoryToCmd = function(_params) { } jeedom.history.generatePlotBand = function(_startTime, _endTime) { - var plotBands = [] - var day = 86400000 + const plotBands = [] + const day = 86400000 if ((_endTime - _startTime) > (9 * day)) { return plotBands } _startTime = Math.floor(_startTime / day) * day - var plotBand + let plotBand while (_startTime < _endTime) { plotBand = {} plotBand.from = _startTime @@ -155,12 +155,12 @@ jeedom.history.generatePlotBand = function(_startTime, _endTime) { } jeedom.history.graphUpdate = function(_params) { - for (var i in _params) { + for (const i in _params) { if(_params[i].cmd_id == ''){ continue; } - for(var chart in jeedom.history.chart){ - for(var serie in jeedom.history.chart[chart].chart.series){ + for(const chart in jeedom.history.chart){ + for(const serie in jeedom.history.chart[chart].chart.series){ if(jeedom.history.chart[chart].chart.series[serie] && jeedom.history.chart[chart].chart.series[serie].options.id == _params[i].cmd_id){ jeedom.history.chart[chart].chart.series[serie].addPoint([Date.now()+(-1*(new Date()).getTimezoneOffset()*60*1000),_params[i].value]) } @@ -171,8 +171,8 @@ jeedom.history.graphUpdate = function(_params) { jeedom.history.changePoint = function(_params) { // console.log('changePoint:', _params) - var paramsRequired = ['cmd_id', 'datetime', 'value', 'oldValue'] - var paramsSpecifics = { + const paramsRequired = ['cmd_id', 'datetime', 'value', 'oldValue'] + const paramsSpecifics = { error: function(error) { jeedomUtils.showAlert({ message: error.message, @@ -189,7 +189,7 @@ jeedom.history.changePoint = function(_params) { message: '{{La valeur a été éditée avec succès}}', level: 'success' }) - var shown = document.getElementById('ul_history').querySelectorAll('li.li_history.active[data-cmd_id="' + _params.cmd_id + '"]') + const shown = document.getElementById('ul_history').querySelectorAll('li.li_history.active[data-cmd_id="' + _params.cmd_id + '"]') if (shown) { jeeFrontEnd.history.addChart(_params.cmd_id, 0) jeeFrontEnd.history.addChart(_params.cmd_id, 1) @@ -202,8 +202,8 @@ jeedom.history.changePoint = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/cmd.ajax.php' paramsAJAX.data = { action: 'changeHistoryPoint', @@ -228,9 +228,9 @@ jeedom.history.modalchangePoint = function(event, _this, _params) { return } - var id = _this.series.userOptions.id - var datetime = Highcharts.dateFormat('%Y-%m-%d %H:%M:%S', _this.x) - var value = _this.y + const id = _this.series.userOptions.id + const datetime = Highcharts.dateFormat('%Y-%m-%d %H:%M:%S', _this.x) + const value = _this.y jeeDialog.prompt({ title: "{{Edition d'historique}}", message: "" + _this.series.name + "
{{date :}} " + datetime + "
{{valeur :}} " + value + "
{{Ne rien mettre pour supprimer la valeur}}" @@ -257,7 +257,7 @@ jeedom.history.drawChart = function(_params) { _params.option = init(_params.option, { derive: '' }) - var _visible = (isset(_params.visible)) ? _params.visible : true + const _visible = (isset(_params.visible)) ? _params.visible : true //get command history domUtils.ajax({ @@ -297,7 +297,7 @@ jeedom.history.drawChart = function(_params) { return } if (!_params.noError) { - var message = '{{Il n\'existe encore aucun historique pour cette commande :}} ' + data.result.history_name + let message = '{{Il n\'existe encore aucun historique pour cette commande :}} ' + data.result.history_name if (init(data.result.dateStart) != '') { message += (init(data.result.dateEnd) != '') ? ' {{du}} ' + data.result.dateStart + ' {{au}} ' + data.result.dateEnd : ' {{à partir de}} ' + data.result.dateStart } else { @@ -333,27 +333,26 @@ jeedom.history.drawChart = function(_params) { @tsLast: last timestamp existing in data @tsEnd: dateEnd timestamp, data must end there and difference between end and start must be the same on both series */ - var comparisonSerie = false + let comparisonSerie = false if (isset(_params.compare) && _params.compare == 1) comparisonSerie = true if (isset(jeedom.history.chart[_params.el]) && (jeedom.history.chart[_params.el].comparing)) { - var tsFirst, tsStart, tsLast, tsEnd - tsFirst = data.result.data[0][0] - tsStart = Date.parse(data.result.dateStart.replace(/-/g, '/') + ' GMT') + const tsFirst = data.result.data[0][0] + const tsStart = Date.parse(data.result.dateStart.replace(/-/g, '/') + ' GMT') if (tsStart < tsFirst) { data.result.data.unshift([tsStart, data.result.data[0][1]]) } - if (!comparisonSerie) { //reference series, may ends at current time: + let tsEnd + if (!comparisonSerie) { tsEnd = Date.parse(data.result.dateEnd.replace(/-/g, '/') + ' GMT') jeedom.history.chart[_params.el].comparingToEnd = data.result.dateEnd jeedom.history.chart[_params.el].comparingTsDiff = tsEnd - tsStart - } else { //comparison series, must ends at same timestamp diff than reference one: + } else { tsEnd = tsStart + jeedom.history.chart[_params.el].comparingTsDiff - //remove leading and trailing over data: data.result.data = data.result.data.filter(v => v[0] <= tsEnd) } - tsLast = data.result.data.slice(-1)[0][0] + const tsLast = data.result.data.slice(-1)[0][0] if (tsEnd > tsLast) { data.result.data.push([tsEnd, data.result.data.slice(-1)[0][1]]) } @@ -366,21 +365,21 @@ jeedom.history.drawChart = function(_params) { _params.option.graphDerive = (data.result.derive == "1") ? true : false //series colors, options defined in core/js/jeedom.class.js jeedom.init(): - var colors = Highcharts.getOptions().colors - var colorsNbr = colors.length - var colorUsed = [] - var numSeries = 0 + const colors = Highcharts.getOptions().colors + const colorsNbr = colors.length + const colorUsed = [] + let numSeries = 0 if (isset(jeedom.history.chart[_params.el]) && isset(jeedom.history.chart[_params.el].chart) && isset(jeedom.history.chart[_params.el].chart.series)) { if (jeedom.history.chart[_params.el].chart.series.length > colorsNbr) { //More series than colors, rotate colors: numSeries = Math.abs(jeedom.history.chart[_params.el].chart.series.length % colorsNbr) - 1 } else { //Ensure no two series with same color: jeedom.history.chart[_params.el].chart.series.forEach((serie, index) => { if (!serie.userOptions.group) { - var sColorHindex = Highcharts.getOptions().colors.indexOf(serie.color) + const sColorHindex = Highcharts.getOptions().colors.indexOf(serie.color) if (!colorUsed.includes(sColorHindex)) colorUsed.push(sColorHindex) } - for (var i = 0; i < colorsNbr; i++) { + for (let i = 0; i < colorsNbr; i++) { if (!colorUsed.includes(i)) { numSeries = i break @@ -389,7 +388,7 @@ jeedom.history.drawChart = function(_params) { }) } } - var seriesNumber = numSeries + 1 + let seriesNumber = numSeries + 1 if (seriesNumber <= 0 || seriesNumber > colorsNbr) seriesNumber = 1 if (!isset(_params.option.graphColor) || _params.option.graphColor === undefined) { _params.option.graphColor = colors[seriesNumber - 1] @@ -408,7 +407,7 @@ jeedom.history.drawChart = function(_params) { _params.option.graphType = (isset(data.result.cmd.display) && init(data.result.cmd.display.graphType) != '') ? data.result.cmd.display.graphType : 'area' } if (init(_params.option.groupingType) == '' && isset(data.result.cmd.display) && init(data.result.cmd.display.groupingType) != '') { - var split = data.result.cmd.display.groupingType.split('||')[0] + let split = data.result.cmd.display.groupingType.split('||')[0] split = split.split('::') _params.option.groupingType = { function: split[0], @@ -417,7 +416,7 @@ jeedom.history.drawChart = function(_params) { } } - var stacking = (_params.option.graphStack == undefined || _params.option.graphStack == null || _params.option.graphStack == 0) ? null : 'value' + const stacking = (_params.option.graphStack == undefined || _params.option.graphStack == null || _params.option.graphStack == 0) ? null : 'value' _params.option.graphStack = (_params.option.graphStack == undefined || _params.option.graphStack == null || _params.option.graphStack == 0) ? Math.floor(Math.random() * 10000 + 2) : 1 _params.showLegend = (init(_params.showLegend, true) && init(_params.showLegend, true) != "0") ? true : false _params.showTimeSelector = (init(_params.showTimeSelector, true) && init(_params.showTimeSelector, true) != "0") ? true : false @@ -426,7 +425,7 @@ jeedom.history.drawChart = function(_params) { _params.showAxis = (init(_params.option.graphScaleVisible, true) && init(_params.option.graphScaleVisible, true) != "0") ? true : false //define legend and reset graph: - var legend = { + const legend = { borderColor: 'transparent', borderWidth: 0, symbolHeight: 8, @@ -441,7 +440,7 @@ jeedom.history.drawChart = function(_params) { } //___________________________jeedom default chart params: - var charts = { + const charts = { zoomType: 'xy', marginTop: 40, //ensure same top space for buttons with or without rangeSelector resetZoomButton: { @@ -467,7 +466,7 @@ jeedom.history.drawChart = function(_params) { //default min/max set earlier in series //.doing initialized at 1 when chart created with first curve - var thisId = event.target.userOptions._jeeId + const thisId = event.target.userOptions._jeeId setTimeout(function() { try { jeedom.history.setRangeSelectorButtons(event.target.userOptions._jeeId) @@ -495,7 +494,7 @@ jeedom.history.drawChart = function(_params) { }, render: function(event) { //shift dotted zones clipPaths to ensure no overlapping step mode: - var solidClip = null + let solidClip = null document.querySelectorAll('.highcharts-zone-graph-0.customSolidZone').forEach(function(element) { solidClip = element.getAttribute('clip-path').replace('url(#', '#').replace(')', '') document.querySelector(solidClip).style.transform = 'translate(5px)' @@ -506,7 +505,7 @@ jeedom.history.drawChart = function(_params) { }) }, addSeries: function(event) { - var thisId = this._jeeId + const thisId = this._jeeId if (jeedom.history.chart[thisId].doing > 0) { //chart not done, loading several series at once: jeedom.history.chart[thisId].doing += 1 } else { //chart done (-1), loading another series later: @@ -528,7 +527,7 @@ jeedom.history.drawChart = function(_params) { } }, selection: function(event) { - var chartId = event.target._jeeId + const chartId = event.target._jeeId if (event.resetSelection) { //Zoom back after reset zoom button this.resetZoomButton.hide() @@ -550,14 +549,14 @@ jeedom.history.drawChart = function(_params) { setTimeout(function() { try { if (jeedom.history.chart[chartId].comparing) { - var options = { + const options = { type: 'selection', redraw: true, resetDateRange: true, } jeedom.history.chartCallback(chartId, options) } else { - var options = { + const options = { type: 'selection', redraw: true, extremeXmin: jeedom.history.chart[chartId].zoomPrevXmin, @@ -599,7 +598,7 @@ jeedom.history.drawChart = function(_params) { //pie chart option from views: if (_params.option.graphType == 'pie') { - var series = { + const series = { type: _params.option.graphType, id: _params.cmd_id, cursor: 'pointer', @@ -673,11 +672,11 @@ jeedom.history.drawChart = function(_params) { //not pie, standard curve history: if (_params.option.graphType != 'pie') { - var dataGrouping = { + let dataGrouping = { enabled: false } if (isset(_params.option.groupingType) && typeof _params.option.groupingType === 'string' && _params.option.groupingType != '') { - var split = _params.option.groupingType.split('||')[0] + let split = _params.option.groupingType.split('||')[0] split=split.split('::') _params.option.groupingType = { function: split[0], @@ -704,7 +703,7 @@ jeedom.history.drawChart = function(_params) { nbTimeline = jeedom.history.chart[_params.el].nbTimeline } - var series = { + const series = { type: 'flags', visible: _visible, name: (isset(_params.option.name)) ? _params.option.name + ' ' + data.result.unite : data.result.history_name + ' ' + data.result.unite, @@ -723,7 +722,7 @@ jeedom.history.drawChart = function(_params) { } } - for (var i in data.result.data) { + for (const i in data.result.data) { series.data.push({ x: data.result.data[i][0], title: data.result.data[i][1] @@ -734,16 +733,16 @@ jeedom.history.drawChart = function(_params) { _params.option.graphType = 'area' } if (_params.calcul) { - for (var i in data.result.data) { + for (const i in data.result.data) { data.result.data[i][1] = _params.calcul(data.result.data[i][1]) } } if (_params.option.invertData) { - for (var i in data.result.data) { + for (const i in data.result.data) { data.result.data[i][1] = -data.result.data[i][1] } } - var series = { + const series = { dataGrouping: dataGrouping, type: _params.option.graphType, visible: _visible, @@ -787,10 +786,10 @@ jeedom.history.drawChart = function(_params) { if (init(_params.option.groupingType) == '' && !comparisonSerie && _params.option.graphType != 'column') { //continue value to now, dotted if last value older than one minute (ts in millisecond): - var dateEnd = new Date(data.result.dateEnd) + const dateEnd = new Date(data.result.dateEnd) dateEnd.setTime(dateEnd.getTime() - dateEnd.getTimezoneOffset() * 60 * 1000) - var dateEndTs = dateEnd.getTime() - var diffms = dateEndTs - data.result.data[data.result.data.length - 1][0] + const dateEndTs = dateEnd.getTime() + const diffms = dateEndTs - data.result.data[data.result.data.length - 1][0] if (diffms > 60000) { series.zoneAxis = 'x' data.result.data.push([dateEndTs, data.result.data[data.result.data.length - 1][1]]) @@ -814,7 +813,7 @@ jeedom.history.drawChart = function(_params) { } //set axis position. View allow to set left/right on graph axis, or odd/even: - var axisOpposite + let axisOpposite if (_params.option.graphScale == undefined) { if (!isset(jeedom.history.chart[_params.el])) { axisOpposite = true @@ -836,7 +835,7 @@ jeedom.history.drawChart = function(_params) { jeedom.history.chart[_params.el].yAxisScaling = true //dateRange buttons config: - var dateRange = ['all', '30 min', '1 hour', '1 day', '7 days', '1 month', '1 year'].indexOf(_params.dateRange) + let dateRange = ['all', '30 min', '1 hour', '1 day', '7 days', '1 month', '1 year'].indexOf(_params.dateRange) if (dateRange == -1) dateRange = 4 jeedom.history.chart[_params.el].type = _params.option.graphType @@ -1017,7 +1016,7 @@ jeedom.history.drawChart = function(_params) { jeedom.history.chart[_params.el].chart._jeeId = _params.el //else only in useroptions jeedom.history.chart[_params.el].doing = 1 - var options = { default: {} } + const options = { default: {} } if (isset(_params.yAxisScaling) && _params.yAxisScaling !== '') options.default.yAxisScaling = _params.yAxisScaling if (isset(_params.yAxisByUnit) && _params.yAxisByUnit !== '') options.default.yAxisByUnit = _params.yAxisByUnit if (isset(_params.yAxisScalePercent) && _params.yAxisScalePercent !== '') options.default.yAxisScalePercent = _params.yAxisScalePercent @@ -1057,7 +1056,7 @@ jeedom.history.drawChart = function(_params) { }, false) } else if (_params.option.graphStack != 1) { //add new yAxis: - var yAxis = { + const yAxis = { id: _params.cmd_id + '-yAxis', showEmpty: false, gridLineWidth: 0, @@ -1129,7 +1128,7 @@ Hicharts events calls yAxis scaling */ jeedom.history.initChart = function(_chartId, _options) { - var thisId = _chartId + const thisId = _chartId jeedom.history.chart[thisId].comparing = false jeedom.history.chart[thisId].zoom = false jeedom.history.chart[thisId].mode = jeedom.getPageType() @@ -1158,7 +1157,7 @@ jeedom.history.initChart = function(_chartId, _options) { 3: disabled */ - var xStart = (jeedom.history.chart[thisId].rangeSelector === undefined ? -15 : 0) + const xStart = (jeedom.history.chart[thisId].rangeSelector === undefined ? -15 : 0) //Tracking button: jeedom.history.chart[thisId].btTracking = jeedom.history.chart[thisId].chart.renderer.button('', undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, true) @@ -1292,13 +1291,13 @@ jeedom.history.initLegendContextMenu = function(_chartId) { selector: "div.chartContainer .highcharts-legend-item", position: function(opt, x, y) { //legend bottom graph, open menu upside if possible: - var menuHeight = opt.ctxMenu.clientHeight - var menuWidth = opt.ctxMenu.clientWidth - var winHeight = window.innerHeight - var winWidth = window.innerWidth + const menuHeight = opt.ctxMenu.clientHeight + const menuWidth = opt.ctxMenu.clientWidth + const winHeight = window.innerHeight + const winWidth = window.innerWidth - var newTop = y - menuHeight - var newLeft = x + let newTop = y - menuHeight + let newLeft = x if ((y - menuHeight - 20) < 0) { newTop = y @@ -1312,17 +1311,17 @@ jeedom.history.initLegendContextMenu = function(_chartId) { }) }, build: function(trigger) { - var __ctxel__ = trigger.parentNode.closest('div.chartContainer').getAttribute('id') + const __ctxel__ = trigger.parentNode.closest('div.chartContainer').getAttribute('id') if (isset(jeeFrontEnd.history) && isset(jeeFrontEnd.history.__ctxel__) && jeedom.history.chart[jeeFrontEnd.history.__ctxel__].comparing) return false - var chart = jeedom.history.chart[__ctxel__].chart + const chart = jeedom.history.chart[__ctxel__].chart if (!chart) return false if (jeedom.history.chart[chart._jeeId].type == 'pie') return false if (jeedom.history.chart[chart._jeeId].comparing) return false - var serieId = trigger.getAttribute('class').split('highcharts-series-')[1].split(' ')[0] - var cmdId = chart.series[serieId].userOptions.id - var axis = chart.get(cmdId) - var contextmenuitems = {} + const serieId = trigger.getAttribute('class').split('highcharts-series-')[1].split(' ')[0] + const cmdId = chart.series[serieId].userOptions.id + const axis = chart.get(cmdId) + const contextmenuitems = {} contextmenuitems['cmdid'] = { 'name': 'id: ' + cmdId, 'id': 'cmdid', 'disabled': true } contextmenuitems['isolate'] = { 'name': '{{Isoler}} (Ctrl Clic)', 'id': 'isolate', 'icon': 'fas fa-chart-line' } contextmenuitems['showall'] = { 'name': '{{Afficher tout}} (Alt Clic)', 'id': 'showall', 'icon': 'fas fa-poll-h' } @@ -1332,7 +1331,7 @@ jeedom.history.initLegendContextMenu = function(_chartId) { contextmenuitems['showaxis'] = { 'name': '{{Afficher axe}}', 'id': 'showaxis', 'icon': 'far fa-eye' } } - var idx = 0 + let idx = 0 Highcharts.getOptions().colors.forEach(function(color) { contextmenuitems['color_' + idx] = { 'name': '', @@ -1375,7 +1374,7 @@ jeedom.history.initLegendContextMenu = function(_chartId) { }) //synch "yAxis Visible" - var allVisible = true + let allVisible = true chart.yAxis.filter(v => v.userOptions.id != 'navigator-y-axis').forEach(function(yAxis) { if (!yAxis.visible) allVisible = false }) @@ -1389,10 +1388,10 @@ jeedom.history.initLegendContextMenu = function(_chartId) { return } if (key.startsWith('color_')) { - var idx = key.split('_')[1] - var opacityHigh = 0.85 - var opacityLow = 0.1 - var newC = Highcharts.getOptions().colors[idx] + const idx = key.split('_')[1] + const opacityHigh = 0.85 + const opacityLow = 0.1 + const newC = Highcharts.getOptions().colors[idx] chart.series[serieId].update({ color: newC, fillColor: { @@ -1451,7 +1450,7 @@ Once chart is done jeedom.history.chartDone = function(_chartId) { if (_chartId === undefined) return false if (jeedom.history.chart[_chartId].doing > 0) return false - var chart = jeedom.history.chart[_chartId].chart + const chart = jeedom.history.chart[_chartId].chart jeedom.history.chart[_chartId].doing = -1 try { setTimeout(function() { @@ -1483,7 +1482,7 @@ Set each existing yAxis scale according to chart yAxisScaling and yAxisByUnit jeedom.history.setAxisScales = function(_chartId, _options) { if (_chartId === undefined) return false if (jeedom.history.chart[_chartId].type == 'pie') return false - var chart = jeedom.history.chart[_chartId].chart + const chart = jeedom.history.chart[_chartId].chart //All done with render false, redraw at end if in _options @@ -1505,11 +1504,11 @@ jeedom.history.setAxisScales = function(_chartId, _options) { } } - var units = {} + const units = {} //No scale | unit : All axis with same unit will get same min/max if (!jeedom.history.chart[_chartId].yAxisScaling && jeedom.history.chart[_chartId].yAxisByUnit) { - var unit, mathMin, mathMax + let unit, mathMin, mathMax chart.yAxis.filter(v => v.userOptions.id != 'navigator-y-axis').forEach((axis, index) => { if (axis.series.length == 0) return unit = axis.series[0].userOptions.unite @@ -1525,11 +1524,11 @@ jeedom.history.setAxisScales = function(_chartId, _options) { units[unit].axis.push(axis.userOptions.id) if (axis.series[0].data.length > 0) { - var mathMin = Math.min.apply(Math, axis.series[0].data.filter(x => x.y !== null).map(function(key) { return key.y })) - var mathMax = Math.max.apply(Math, axis.series[0].data.filter(x => x.y !== null).map(function(key) { return key.y })) + mathMin = Math.min.apply(Math, axis.series[0].data.filter(x => x.y !== null).map(function(key) { return key.y })) + mathMax = Math.max.apply(Math, axis.series[0].data.filter(x => x.y !== null).map(function(key) { return key.y })) } else if (axis.series[0].points) { - var mathMin = Math.min.apply(Math, axis.series[0].points.filter(x => x.y !== null).map(function(key) { return key.y })) - var mathMax = Math.max.apply(Math, axis.series[0].points.filter(x => x.y !== null).map(function(key) { return key.y })) + mathMin = Math.min.apply(Math, axis.series[0].points.filter(x => x.y !== null).map(function(key) { return key.y })) + mathMax = Math.max.apply(Math, axis.series[0].points.filter(x => x.y !== null).map(function(key) { return key.y })) } if (mathMin < units[unit].min) units[unit].min = mathMin if (mathMax > units[unit].max) units[unit].max = mathMax @@ -1566,8 +1565,8 @@ jeedom.history.setAxisScales = function(_chartId, _options) { //No scale | No unit : (HighChart default) All axis will get same global min/max if (!jeedom.history.chart[_chartId].yAxisScaling && !jeedom.history.chart[_chartId].yAxisByUnit) { - var softMax = 0 - var mathMax + let softMax = 0 + let mathMax chart.yAxis.filter(v => v.userOptions.id != 'navigator-y-axis').forEach((axis, index) => { mathMax = Math.max.apply(Math, axis.series[0].data.filter(x => x !== null).map(function(key) { return key.y })) if (mathMax > softMax) softMax = mathMax @@ -1590,7 +1589,7 @@ jeedom.history.setAxisScales = function(_chartId, _options) { //scale | unit : (Jeedom default) All axis with same unit will get same min/max if (jeedom.history.chart[_chartId].yAxisScaling && jeedom.history.chart[_chartId].yAxisByUnit) { - var unit, mathMin, mathMax, cmin, cmax + let unit, mathMin, mathMax, cmin, cmax chart.yAxis.filter(v => v.userOptions.id != 'navigator-y-axis').forEach((axis, index) => { if (axis.series.length == 0) return unit = axis.series[0].userOptions.unite @@ -1606,11 +1605,11 @@ jeedom.history.setAxisScales = function(_chartId, _options) { units[unit].axis.push(axis.userOptions.id) if (axis.series[0].data.length > 0) { - var mathMin = Math.min.apply(Math, axis.series[0].data.filter(x => x !== null).map(function(key) { return key.options.y })) - var mathMax = Math.max.apply(Math, axis.series[0].data.filter(x => x !== null).map(function(key) { return key.options.y })) + mathMin = Math.min.apply(Math, axis.series[0].data.filter(x => x !== null).map(function(key) { return key.options.y })) + mathMax = Math.max.apply(Math, axis.series[0].data.filter(x => x !== null).map(function(key) { return key.options.y })) } else if (axis.series[0].points) { - var mathMin = Math.min.apply(Math, axis.series[0].points.filter(x => x !== null).map(function(key) { return key.y })) - var mathMax = Math.max.apply(Math, axis.series[0].points.filter(x => x !== null).map(function(key) { return key.y })) + mathMin = Math.min.apply(Math, axis.series[0].points.filter(x => x !== null).map(function(key) { return key.y })) + mathMax = Math.max.apply(Math, axis.series[0].points.filter(x => x !== null).map(function(key) { return key.y })) } if (mathMin < units[unit].min) units[unit].min = mathMin @@ -1649,14 +1648,14 @@ jeedom.history.setAxisScales = function(_chartId, _options) { //scale | No unit : Each axis will get its own min/max if (jeedom.history.chart[_chartId].yAxisScaling && !jeedom.history.chart[_chartId].yAxisByUnit) { - var min, max + let min, max chart.yAxis.filter(v => v.userOptions.id != 'navigator-y-axis').forEach((axis, index) => { if (axis.series[0].data.length > 0) { - var min = Math.min.apply(Math, axis.series[0].data.filter(x => x !== null).map(function(key) { return key.options.y })) - var max = Math.max.apply(Math, axis.series[0].data.filter(x => x !== null).map(function(key) { return key.options.y })) + min = Math.min.apply(Math, axis.series[0].data.filter(x => x !== null).map(function(key) { return key.options.y })) + max = Math.max.apply(Math, axis.series[0].data.filter(x => x !== null).map(function(key) { return key.options.y })) } else if (axis.series[0].points) { - var min = Math.min.apply(Math, axis.series[0].points.filter(x => x !== null).map(function(key) { return key.y })) - var max = Math.max.apply(Math, axis.series[0].points.filter(x => x !== null).map(function(key) { return key.y })) + min = Math.min.apply(Math, axis.series[0].points.filter(x => x !== null).map(function(key) { return key.y })) + max = Math.max.apply(Math, axis.series[0].points.filter(x => x !== null).map(function(key) { return key.y })) } if (jeedom.history.chart[_chartId].comparing && axis.series[1]) { @@ -1696,7 +1695,7 @@ jeedom.history.setAxisScales = function(_chartId, _options) { if (Object.keys(units).length == 0) { //no unit chart.yAxis.filter(v => v.userOptions.id != 'navigator-y-axis').forEach((axis, index) => { if (axis.series.length == 0) return - var seriesColor = axis.series[0].color + const seriesColor = axis.series[0].color axis.update({ visible: true, labels: { @@ -1707,10 +1706,10 @@ jeedom.history.setAxisScales = function(_chartId, _options) { }, false) }) } else { //unit - var overUnits = Object.keys(units).filter(key => units[key].axis.length > 1) + const overUnits = Object.keys(units).filter(key => units[key].axis.length > 1) overUnits.forEach((unit, index) => { units[unit].axis.forEach((id, idx) => { - var axis = chart.get(id) + const axis = chart.get(id) if (idx == 0) { axis.update({ visible: true, @@ -1737,7 +1736,7 @@ jeedom.history.setAxisScales = function(_chartId, _options) { if (jeedom.history.chart[_chartId].mode == 'view') { if (Object.keys(units).length == 0) { //no unit chart.yAxis.filter(v => v.userOptions.id != 'navigator-y-axis').forEach((axis, index) => { - var seriesColor = axis.series[0].color + const seriesColor = axis.series[0].color axis.update({ labels: { style: { @@ -1771,7 +1770,7 @@ Toggle all yAxis scaling */ jeedom.history.toggleyAxisScaling = function(_chartId) { if (jeedom.history.chart[_chartId].zoom) return - var chart = jeedom.history.chart[_chartId].chart + const chart = jeedom.history.chart[_chartId].chart jeedom.history.chart[_chartId].yAxisScaling = !jeedom.history.chart[_chartId].yAxisScaling if (!jeedom.history.chart[_chartId].yAxisScaling) { @@ -1786,12 +1785,13 @@ jeedom.history.toggleyAxisScaling = function(_chartId) { Set inactive opacity for tracking */ jeedom.history.toggleTracking = function(_chartId) { - var chart = jeedom.history.chart[_chartId].chart + const chart = jeedom.history.chart[_chartId].chart + let opacity if (jeedom.history.chart[_chartId].tracking) { jeedom.history.chart[_chartId].btTracking.setState(0) - var opacity = 1 + opacity = 1 } else { - var opacity = Highcharts.getOptions().jeedom.opacityLow + opacity = Highcharts.getOptions().jeedom.opacityLow jeedom.history.chart[_chartId].btTracking.setState(2) } jeedom.history.chart[_chartId].tracking = !jeedom.history.chart[_chartId].tracking @@ -1813,7 +1813,7 @@ jeedom.history.toggleTracking = function(_chartId) { Toggle all yAxis visibility */ jeedom.history.toggleYaxisVisible = function(_chartId) { - var chart = jeedom.history.chart[_chartId].chart + const chart = jeedom.history.chart[_chartId].chart if (jeedom.history.chart[_chartId].yAxisVisible) { jeedom.history.chart[_chartId].btToggleyaxisVisible.setState(0) } else { @@ -1837,7 +1837,7 @@ jeedom.history.emptyChart = function(_chartId, _yAxis) { jeedom.history.chart[_chartId].chart.series.forEach(function(series) { if (series.options && !isNaN(series.options.id)) { if (!series.name.includes('Navigator ')) { - var cmd_id = series.options.id + const cmd_id = series.options.id series.remove(false) if (_yAxis) { try { @@ -1852,9 +1852,9 @@ jeedom.history.emptyChart = function(_chartId, _yAxis) { jeedom.history.setRangeSelectorButtons = function(_chartId) { if (_chartId === undefined || jeedom.history.chart[_chartId].chart === undefined || jeedom.history.chart[_chartId].chart.rangeSelector === undefined) return false - var chart = jeedom.history.chart[_chartId].chart - var min = chart.xAxis[0].dataMin - var max = chart.xAxis[0].dataMax + const chart = jeedom.history.chart[_chartId].chart + const min = chart.xAxis[0].dataMin + const max = chart.xAxis[0].dataMax chart.rangeSelector.buttonOptions.forEach(function(option, index) { if (max - (option._range + min) < 0) { chart.rangeSelector.buttons[index].addClass('warning') @@ -1868,18 +1868,18 @@ jeedom.history.setRangeSelectorButtons = function(_chartId) { Handle rangeSelector buttons for dynamic reloading: */ jeedom.history.handleRangeButton = function(_button, _chartId) { - var mStart = moment(jeedom.history.chart[_chartId].dateStart, 'YYYY-MM-DD') - var mEnd = moment(jeedom.history.chart[_chartId].dateEnd, 'YYYY-MM-DD hh:mm:ss') - var mRequestStart = mEnd.clone().subtract(_button.count, _button.type) + const mStart = moment(jeedom.history.chart[_chartId].dateStart, 'YYYY-MM-DD') + const mEnd = moment(jeedom.history.chart[_chartId].dateEnd, 'YYYY-MM-DD hh:mm:ss') + const mRequestStart = mEnd.clone().subtract(_button.count, _button.type) if (mRequestStart.isBefore(mStart)) { - var cmds = jeedom.history.chart[_chartId].cmd + const cmds = jeedom.history.chart[_chartId].cmd //delete all series and their yAxis, then reload them with larger date range and same parameters! - var chart = jeedom.history.chart[_chartId].chart - var dateEnd = jeedom.history.chart[_chartId].dateEnd - var done = 0 - var cmd_id, cmd_option + const chart = jeedom.history.chart[_chartId].chart + const dateEnd = jeedom.history.chart[_chartId].dateEnd + let done = 0 + let cmd_id, cmd_option jeedom.history.chart[_chartId].chart.series.forEach(function(series) { if (series.options && !isNaN(series.options.id)) { cmd_id = series.options.id @@ -1911,7 +1911,7 @@ jeedom.history.handleRangeButton = function(_button, _chartId) { } }) - var in_startDate = document.getElementById("in_startDate") + const in_startDate = document.getElementById("in_startDate") if (in_startDate) in_startDate.value = mRequestStart.format('YYYY-MM-DD') return true diff --git a/core/js/interact.class.js b/core/js/interact.class.js index b4b454e678..158a833c19 100644 --- a/core/js/interact.class.js +++ b/core/js/interact.class.js @@ -17,16 +17,16 @@ jeedom.interact = function() {}; jeedom.interact.all = function(_params) { - var paramsRequired = []; - var paramsSpecifics = {}; + const paramsRequired = []; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/interact.ajax.php'; paramsAJAX.data = { action: "all", @@ -35,16 +35,16 @@ jeedom.interact.all = function(_params) { } jeedom.interact.remove = function(_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/interact.ajax.php'; paramsAJAX.data = { action: "remove", @@ -54,16 +54,16 @@ jeedom.interact.remove = function(_params) { } jeedom.interact.get = function(_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/interact.ajax.php'; paramsAJAX.data = { action: "byId", @@ -73,16 +73,16 @@ jeedom.interact.get = function(_params) { } jeedom.interact.save = function(_params) { - var paramsRequired = ['interact']; - var paramsSpecifics = {}; + const paramsRequired = ['interact']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/interact.ajax.php'; paramsAJAX.data = { action: 'save', @@ -92,16 +92,16 @@ jeedom.interact.save = function(_params) { } jeedom.interact.regenerateInteract = function(_params) { - var paramsRequired = []; - var paramsSpecifics = {}; + const paramsRequired = []; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/interact.ajax.php'; paramsAJAX.data = { action: 'regenerateInteract', @@ -110,16 +110,16 @@ jeedom.interact.regenerateInteract = function(_params) { } jeedom.interact.execute = function(_params) { - var paramsRequired = ['query']; - var paramsSpecifics = {}; + const paramsRequired = ['query']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/interact.ajax.php'; paramsAJAX.data = { action: 'execute', diff --git a/core/js/jeedom.class.js b/core/js/jeedom.class.js index d8b6e26014..2ad6b03532 100644 --- a/core/js/jeedom.class.js +++ b/core/js/jeedom.class.js @@ -49,15 +49,14 @@ sendVarToJS([ */ jeephp2js = {} -var Highcharts if (!isset(jeedom.cache.getConfiguration)) { jeedom.cache.getConfiguration = null } jeedom.changes = function() { - var paramsRequired = [] - var paramsSpecifics = { + const paramsRequired =[] + const paramsSpecifics ={ global: false, noDisplayError: true, success: function(data) { @@ -65,10 +64,10 @@ jeedom.changes = function() { jeedom.connect = 0 } jeedom.datetime = data.datetime - var cmd_update = [] - var eqLogic_update = [] - var object_summary_update = [] - for (var i in data.result) { + const cmd_update = [] + const eqLogic_update = [] + const object_summary_update = [] + for (const i in data.result) { if (data.result[i].name == 'cmd::update') { cmd_update.push(data.result[i].option) continue @@ -122,8 +121,8 @@ jeedom.changes = function() { (paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/event.ajax.php' paramsAJAX.data = { action: 'changes', @@ -136,7 +135,7 @@ jeedom.init = function() { jeedom.datetime = jeeFrontEnd.serverDatetime jeedom.display.version = document.body.dataset.uimode - var cssComputedStyle = getComputedStyle(document.documentElement) + const cssComputedStyle = getComputedStyle(document.documentElement) Highcharts.setOptions({ accessibility: { enabled: false @@ -229,7 +228,7 @@ jeedom.init = function() { } } else { if (isset(_event.detail.page) && _event.detail.page != '') { - let options = { + const options = { message: _event.detail.message, level: _event.detail.level } @@ -291,7 +290,7 @@ jeedom.init = function() { jeedom.getPageType = function(_modal) { if (isset(_modal) && _modal == true) { let modalType = undefined - let modals = Array.prototype.slice.call(document.querySelectorAll('.jeeDialogMain')).filter(item => item.isVisible()) + const modals = Array.prototype.slice.call(document.querySelectorAll('.jeeDialogMain')).filter(item => item.isVisible()) if (modals.length == 1) { modalType = modals[0].querySelector('div[data-modalType]')?.getAttribute('data-modalType') } else if (modals.length > 1) { @@ -355,7 +354,7 @@ jeedom.notify = function(_title, _text, _class_name) { return true } if (typeof jeeDialog !== 'undefined' && typeof jeeDialog.toast !== 'undefined') { - let options = { + const options = { title: _title, message: _text, onclick: function() { @@ -378,16 +377,16 @@ jeedom.notify = function(_title, _text, _class_name) { } jeedom.getStringUsedBy = function(_params) { - var paramsRequired = ['search'] - var paramsSpecifics = {} + const paramsRequired =['search'] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/jeedom.ajax.php' paramsAJAX.data = { action: 'getStringUsedBy', @@ -397,16 +396,16 @@ jeedom.getStringUsedBy = function(_params) { } jeedom.getIdUsedBy = function(_params) { - var paramsRequired = ['search'] - var paramsSpecifics = {} + const paramsRequired =['search'] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/jeedom.ajax.php' paramsAJAX.data = { action: 'getIdUsedBy', @@ -416,13 +415,13 @@ jeedom.getIdUsedBy = function(_params) { } jeedom.getConfiguration = function(_params) { - var paramsRequired = ['key'] - var paramsSpecifics = { + const paramsRequired =['key'] + const paramsSpecifics ={ pre_success: function(data) { jeedom.cache.getConfiguration = data.result - var keys = _params.key.split(':') + const keys = _params.key.split(':') data.result = jeedom.cache.getConfiguration - for (var i in keys) { + for (const i in keys) { if (data.result[keys[i]]) { data.result = data.result[keys[i]] } @@ -436,11 +435,11 @@ jeedom.getConfiguration = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) if (jeedom.cache.getConfiguration != null) { - var keys = _params.key.split(':') - var result = jeedom.cache.getConfiguration - for (var i in keys) { + const keys = _params.key.split(':') + let result = jeedom.cache.getConfiguration + for (const i in keys) { if (result[keys[i]]) { result = result[keys[i]] } @@ -448,7 +447,7 @@ jeedom.getConfiguration = function(_params) { _params.success(result) return } - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/jeedom.ajax.php' paramsAJAX.data = { action: 'getConfiguration', @@ -458,16 +457,16 @@ jeedom.getConfiguration = function(_params) { } jeedom.getInfoApplication = function(_params) { - var paramsRequired = [] - var paramsSpecifics = {} + const paramsRequired =[] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/jeedom.ajax.php' paramsAJAX.data = { action: 'getInfoApplication', @@ -476,16 +475,16 @@ jeedom.getInfoApplication = function(_params) { } jeedom.haltSystem = function(_params) { - var paramsRequired = [] - var paramsSpecifics = {} + const paramsRequired =[] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/jeedom.ajax.php' paramsAJAX.data = { action: 'haltSystem', @@ -500,16 +499,16 @@ jeedom.ssh = function(_params) { command = _params _params = {} } - var paramsRequired = [] - var paramsSpecifics = {} + const paramsRequired =[] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/jeedom.ajax.php' paramsAJAX.data = { action: 'ssh', @@ -526,16 +525,16 @@ jeedom.db = function(_params) { command = _params _params = {} } - var paramsRequired = [] - var paramsSpecifics = {} + const paramsRequired =[] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/jeedom.ajax.php' paramsAJAX.data = { action: 'db', @@ -546,16 +545,16 @@ jeedom.db = function(_params) { } jeedom.dbcorrectTable = function(_params) { - var paramsRequired = ['table'] - var paramsSpecifics = {} + const paramsRequired =['table'] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/jeedom.ajax.php' paramsAJAX.data = { action: 'dbcorrectTable', @@ -565,16 +564,16 @@ jeedom.dbcorrectTable = function(_params) { } jeedom.rebootSystem = function(_params) { - var paramsRequired = [] - var paramsSpecifics = {} + const paramsRequired =[] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/jeedom.ajax.php' paramsAJAX.data = { action: 'rebootSystem', @@ -583,16 +582,16 @@ jeedom.rebootSystem = function(_params) { } jeedom.systemCorrectPackage = function(_params) { - var paramsRequired = ['package'] - var paramsSpecifics = {} + const paramsRequired =['package'] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/jeedom.ajax.php' paramsAJAX.data = { action: 'systemCorrectPackage', @@ -602,16 +601,16 @@ jeedom.systemCorrectPackage = function(_params) { } jeedom.health = function(_params) { - var paramsRequired = [] - var paramsSpecifics = {} + const paramsRequired =[] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/jeedom.ajax.php' paramsAJAX.data = { action: 'health', @@ -620,16 +619,16 @@ jeedom.health = function(_params) { } jeedom.forceSyncHour = function(_params) { - var paramsRequired = [] - var paramsSpecifics = {} + const paramsRequired =[] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/jeedom.ajax.php' paramsAJAX.data = { action: 'forceSyncHour', @@ -653,7 +652,7 @@ jeedom.getCronSelectModal = function(_options, _callback) { className: 'success', callback: { click: function(event) { - var args = {} + const args = {} args.cron = {} args.value = mod_insertCron.getValue() if (args.value != undefined && args.value.trim() != '' && 'function' === typeof (_callback)) { @@ -697,7 +696,7 @@ jeedom.getSelectActionModal = function(_options, _callback) { className: 'success', callback: { click: function(event) { - var args = {} + const args = {} args.human = mod_insertAction.getValue() if (args.human.trim() != '' && 'function' === typeof (_callback)) { _callback(args) @@ -720,16 +719,16 @@ jeedom.getSelectActionModal = function(_options, _callback) { } jeedom.getGraphData = function(_params) { - var paramsRequired = [] - var paramsSpecifics = {} + const paramsRequired =[] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/jeedom.ajax.php' paramsAJAX.data = { action: 'getGraphData', @@ -740,16 +739,16 @@ jeedom.getGraphData = function(_params) { } jeedom.getDocumentationUrl = function(_params) { - var paramsRequired = [] - var paramsSpecifics = {} + const paramsRequired =[] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/jeedom.ajax.php' paramsAJAX.data = { action: 'getDocumentationUrl', @@ -761,16 +760,16 @@ jeedom.getDocumentationUrl = function(_params) { } jeedom.addWarnme = function(_params) { - var paramsRequired = [] - var paramsSpecifics = {} + const paramsRequired =[] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/jeedom.ajax.php' paramsAJAX.data = { action: 'addWarnme', @@ -781,16 +780,16 @@ jeedom.addWarnme = function(_params) { } jeedom.getFileFolder = function(_params) { - var paramsRequired = ['type', 'path'] - var paramsSpecifics = {} + const paramsRequired =['type', 'path'] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/jeedom.ajax.php' paramsAJAX.data = { action: 'getFileFolder', @@ -801,16 +800,16 @@ jeedom.getFileFolder = function(_params) { } jeedom.getFileContent = function(_params) { - var paramsRequired = ['path'] - var paramsSpecifics = {} + const paramsRequired =['path'] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/jeedom.ajax.php' paramsAJAX.data = { action: 'getFileContent', @@ -820,16 +819,16 @@ jeedom.getFileContent = function(_params) { } jeedom.setFileContent = function(_params) { - var paramsRequired = ['path', 'content'] - var paramsSpecifics = {} + const paramsRequired =['path', 'content'] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/jeedom.ajax.php' paramsAJAX.data = { action: 'setFileContent', @@ -840,16 +839,16 @@ jeedom.setFileContent = function(_params) { } jeedom.deleteFile = function(_params) { - var paramsRequired = ['path'] - var paramsSpecifics = {} + const paramsRequired =['path'] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/jeedom.ajax.php' paramsAJAX.data = { action: 'deleteFile', @@ -859,16 +858,16 @@ jeedom.deleteFile = function(_params) { } jeedom.createFolder = function(_params) { - var paramsRequired = ['path', 'name'] - var paramsSpecifics = {} + const paramsRequired =['path', 'name'] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/jeedom.ajax.php' paramsAJAX.data = { action: 'createFolder', @@ -879,16 +878,16 @@ jeedom.createFolder = function(_params) { } jeedom.renameFolder = function(_params) { - var paramsRequired = ['src', 'dst'] - var paramsSpecifics = {} + const paramsRequired =['src', 'dst'] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/jeedom.ajax.php' paramsAJAX.data = { action: 'renameFolder', @@ -899,16 +898,16 @@ jeedom.renameFolder = function(_params) { } jeedom.deleteFolder = function(_params) { - var paramsRequired = ['path'] - var paramsSpecifics = {} + const paramsRequired =['path'] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/jeedom.ajax.php' paramsAJAX.data = { action: 'deleteFolder', @@ -918,16 +917,16 @@ jeedom.deleteFolder = function(_params) { } jeedom.createFile = function(_params) { - var paramsRequired = ['path', 'name'] - var paramsSpecifics = {} + const paramsRequired =['path', 'name'] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/jeedom.ajax.php' paramsAJAX.data = { action: 'createFile', @@ -938,16 +937,16 @@ jeedom.createFile = function(_params) { } jeedom.emptyRemoveHistory = function(_params) { - var paramsRequired = [] - var paramsSpecifics = {} + const paramsRequired =[] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/jeedom.ajax.php' paramsAJAX.data = { action: 'emptyRemoveHistory', @@ -956,16 +955,16 @@ jeedom.emptyRemoveHistory = function(_params) { } jeedom.version = function(_params) { - var paramsRequired = [] - var paramsSpecifics = {} + const paramsRequired =[] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/jeedom.ajax.php' paramsAJAX.data = { action: 'version' @@ -974,16 +973,16 @@ jeedom.version = function(_params) { } jeedom.removeImageIcon = function(_params) { - var paramsRequired = ['filepath'] - var paramsSpecifics = {} + const paramsRequired =['filepath'] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/jeedom.ajax.php' paramsAJAX.data = { action: 'removeImageIcon', @@ -993,16 +992,16 @@ jeedom.removeImageIcon = function(_params) { } jeedom.cleanFileSystemRight = function(_params) { - var paramsRequired = [] - var paramsSpecifics = {} + const paramsRequired =[] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/jeedom.ajax.php' paramsAJAX.data = { action: 'cleanFileSystemRight' @@ -1011,16 +1010,16 @@ jeedom.cleanFileSystemRight = function(_params) { } jeedom.consistency = function(_params) { - var paramsRequired = [] - var paramsSpecifics = {} + const paramsRequired =[] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/jeedom.ajax.php' paramsAJAX.data = { action: 'consistency' @@ -1029,16 +1028,16 @@ jeedom.consistency = function(_params) { } jeedom.cleanDatabase = function(_params) { - var paramsRequired = [] - var paramsSpecifics = {} + const paramsRequired =[] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/jeedom.ajax.php' paramsAJAX.data = { action: 'cleanDatabase' @@ -1047,16 +1046,16 @@ jeedom.cleanDatabase = function(_params) { } jeedom.massEditSave = function(_params) { - var paramsRequired = ['type', 'objects'] - var paramsSpecifics = {} + const paramsRequired =['type', 'objects'] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/jeedom.ajax.php' paramsAJAX.data = { action: 'massEditSave', @@ -1067,16 +1066,16 @@ jeedom.massEditSave = function(_params) { } jeedom.massReplace = function(_params) { - var paramsRequired = ['options', 'eqlogics', 'cmds'] - var paramsSpecifics = {} + const paramsRequired =['options', 'eqlogics', 'cmds'] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/jeedom.ajax.php' paramsAJAX.data = { action: 'massReplace', @@ -1088,16 +1087,16 @@ jeedom.massReplace = function(_params) { } jeedom.systemGetUpgradablePackage = function(_params) { - var paramsRequired = ['type'] - var paramsSpecifics = {} + const paramsRequired =['type'] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/jeedom.ajax.php' paramsAJAX.data = { action: 'systemGetUpgradablePackage', @@ -1108,16 +1107,16 @@ jeedom.systemGetUpgradablePackage = function(_params) { } jeedom.systemUpgradablePackage = function(_params) { - var paramsRequired = ['type'] - var paramsSpecifics = {} + const paramsRequired =['type'] + const paramsSpecifics ={} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/jeedom.ajax.php' paramsAJAX.data = { action: 'systemUpgradablePackage', diff --git a/core/js/listener.class.js b/core/js/listener.class.js index a15b65a15d..15f32acda4 100644 --- a/core/js/listener.class.js +++ b/core/js/listener.class.js @@ -17,16 +17,16 @@ jeedom.listener = function() {}; jeedom.listener.all = function(_params) { - var paramsRequired = []; - var paramsSpecifics = {}; + const paramsRequired = []; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/listener.ajax.php'; paramsAJAX.data = { action: 'all' @@ -35,16 +35,16 @@ jeedom.listener.all = function(_params) { } jeedom.listener.save = function(_params) { - var paramsRequired = ['listeners']; - var paramsSpecifics = {}; + const paramsRequired = ['listeners']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/listener.ajax.php'; paramsAJAX.data = { action: 'save', @@ -54,16 +54,16 @@ jeedom.listener.save = function(_params) { } jeedom.listener.remove = function(_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/listener.ajax.php'; paramsAJAX.data = { action: 'remove', diff --git a/core/js/message.class.js b/core/js/message.class.js index caf43bd785..0ab7344b4c 100644 --- a/core/js/message.class.js +++ b/core/js/message.class.js @@ -19,16 +19,16 @@ jeedom.message = function() {}; jeedom.message.cache = Array(); jeedom.message.all = function(_params) { - var paramsRequired = []; - var paramsSpecifics = {}; + const paramsRequired = []; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/message.ajax.php'; paramsAJAX.data = { action: "all", @@ -38,16 +38,16 @@ jeedom.message.all = function(_params) { } jeedom.message.remove = function(_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/message.ajax.php'; paramsAJAX.data = { action: 'removeMessage', @@ -57,16 +57,16 @@ jeedom.message.remove = function(_params) { } jeedom.message.clear = function(_params) { - var paramsRequired = []; - var paramsSpecifics = {}; + const paramsRequired = []; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/message.ajax.php'; paramsAJAX.data = { action: 'clearMessage', @@ -76,8 +76,8 @@ jeedom.message.clear = function(_params) { } jeedom.message.number = function(_params) { - var paramsRequired = []; - var paramsSpecifics = { + const paramsRequired = []; + const paramsSpecifics = { global: false, noDisplayError: true, }; @@ -87,8 +87,8 @@ jeedom.message.number = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/message.ajax.php'; paramsAJAX.data = { action: 'nbMessage', diff --git a/core/js/network.class.js b/core/js/network.class.js index 9ca3758462..753849af6f 100644 --- a/core/js/network.class.js +++ b/core/js/network.class.js @@ -17,16 +17,16 @@ jeedom.network = function() {}; jeedom.network.restartDns = function(_params) { - var paramsRequired = []; - var paramsSpecifics = {}; + const paramsRequired = []; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/network.ajax.php'; paramsAJAX.data = { action: 'restartDns', @@ -35,16 +35,16 @@ jeedom.network.restartDns = function(_params) { } jeedom.network.stopDns = function(_params) { - var paramsRequired = []; - var paramsSpecifics = {}; + const paramsRequired = []; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/network.ajax.php'; paramsAJAX.data = { action: 'stopDns', @@ -53,16 +53,16 @@ jeedom.network.stopDns = function(_params) { } jeedom.network.getInterfacesInfo = function(_params) { - var paramsRequired = []; - var paramsSpecifics = {}; + const paramsRequired = []; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/network.ajax.php'; paramsAJAX.data = { action: 'getInterfacesInfo' diff --git a/core/js/note.class.js b/core/js/note.class.js index c95aaf17aa..78f2d1d36f 100644 --- a/core/js/note.class.js +++ b/core/js/note.class.js @@ -17,16 +17,16 @@ jeedom.note = function() {}; jeedom.note.remove = function(_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/note.ajax.php'; paramsAJAX.data = { action: "remove", @@ -36,16 +36,16 @@ jeedom.note.remove = function(_params) { } jeedom.note.byId = function(_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/note.ajax.php'; paramsAJAX.data = { action: "byId", @@ -55,16 +55,16 @@ jeedom.note.byId = function(_params) { } jeedom.note.save = function(_params) { - var paramsRequired = ['note']; - var paramsSpecifics = {}; + const paramsRequired = ['note']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/note.ajax.php'; paramsAJAX.data = { action: 'save', @@ -74,16 +74,16 @@ jeedom.note.save = function(_params) { } jeedom.note.all = function(_params) { - var paramsRequired = []; - var paramsSpecifics = {}; + const paramsRequired = []; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/note.ajax.php'; paramsAJAX.data = { action: 'all' diff --git a/core/js/object.class.js b/core/js/object.class.js index 82574b4b6a..49d21d299c 100644 --- a/core/js/object.class.js +++ b/core/js/object.class.js @@ -26,16 +26,16 @@ if (!isset(jeedom.object.cache.byId)) { } jeedom.object.getEqLogic = function(_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/eqLogic.ajax.php'; paramsAJAX.data = { action: "listByObject", @@ -48,16 +48,16 @@ jeedom.object.getEqLogic = function(_params) { } jeedom.object.getEqLogicsFromSummary = function(_params) { - var paramsRequired = ['id', 'summary']; - var paramsSpecifics = {}; + const paramsRequired = ['id', 'summary']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/object.ajax.php'; paramsAJAX.data = { @@ -71,8 +71,8 @@ jeedom.object.getEqLogicsFromSummary = function(_params) { } jeedom.object.all = function(_params) { - var paramsRequired = []; - var paramsSpecifics = { + const paramsRequired = []; + const paramsSpecifics = { pre_success: function(data) { if (!isset(_params.onlyHasEqLogic)) { jeedom.object.cache.all = data.result; @@ -86,7 +86,7 @@ jeedom.object.all = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); if (isset(jeedom.object.cache.all) && !isset(_params.onlyHasEqLogic) && init(params.noCache, false) == false) { params.success(jeedom.object.cache.all); return; @@ -94,7 +94,7 @@ jeedom.object.all = function(_params) { if (_params.onlyVisible == undefined) { _params.onlyVisible = true } - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/object.ajax.php'; paramsAJAX.data = { action: 'all', @@ -106,16 +106,16 @@ jeedom.object.all = function(_params) { } jeedom.object.toHtml = function(_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/object.ajax.php'; paramsAJAX.data = { action: 'toHtml', @@ -130,8 +130,8 @@ jeedom.object.toHtml = function(_params) { } jeedom.object.remove = function(_params) { - var paramsRequired = ['id']; - var paramsSpecifics = { + const paramsRequired = ['id']; + const paramsSpecifics = { pre_success: function(data) { if (isset(jeedom.object.cache.all)) { delete jeedom.object.cache.all; @@ -151,8 +151,8 @@ jeedom.object.remove = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/object.ajax.php'; paramsAJAX.data = { action: 'remove', @@ -162,8 +162,8 @@ jeedom.object.remove = function(_params) { } jeedom.object.save = function(_params) { - var paramsRequired = ['object']; - var paramsSpecifics = { + const paramsRequired = ['object']; + const paramsSpecifics = { pre_success: function(data) { if (isset(jeedom.object.cache.all)) { delete jeedom.object.cache.all; @@ -183,8 +183,8 @@ jeedom.object.save = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/object.ajax.php'; paramsAJAX.data = { action: 'save', @@ -194,8 +194,8 @@ jeedom.object.save = function(_params) { } jeedom.object.byId = function(_params) { - var paramsRequired = ['id']; - var paramsSpecifics = { + const paramsRequired = ['id']; + const paramsSpecifics = { pre_success: function(data) { jeedom.object.cache.byId[data.result.id] = data.result; return data; @@ -207,12 +207,12 @@ jeedom.object.byId = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); if (isset(jeedom.object.cache.byId[params.id]) && init(_params.cache, true) == true) { params.success(jeedom.object.cache.byId[params.id]); return; } - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/object.ajax.php'; paramsAJAX.data = { action: 'byId', @@ -222,16 +222,16 @@ jeedom.object.byId = function(_params) { } jeedom.object.orderEqLogicByUsage = function(_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/object.ajax.php'; paramsAJAX.data = { action: 'orderEqLogicByUsage', @@ -241,16 +241,16 @@ jeedom.object.orderEqLogicByUsage = function(_params) { } jeedom.object.getActionSummary = function(_params) { - var paramsRequired = ['object_id', 'summary']; - var paramsSpecifics = {}; + const paramsRequired = ['object_id', 'summary']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/object.ajax.php'; paramsAJAX.data = { action: 'getActionSummary', @@ -262,16 +262,16 @@ jeedom.object.getActionSummary = function(_params) { } jeedom.object.setOrder = function(_params) { - var paramsRequired = ['objects']; - var paramsSpecifics = {}; + const paramsRequired = ['objects']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/object.ajax.php'; paramsAJAX.data = { action: 'setOrder', @@ -281,16 +281,16 @@ jeedom.object.setOrder = function(_params) { } jeedom.object.getUISelectList = function(_params) { - var paramsRequired = []; - var paramsSpecifics = {}; + const paramsRequired = []; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/object.ajax.php'; paramsAJAX.data = { action: 'getUISelectList', @@ -302,27 +302,25 @@ jeedom.object.getUISelectList = function(_params) { jeedom.object.summaryUpdate = function(_params) { - var summaryUpdate = {}; - var sends = {}; - var object = null; - var summarySpan = null; - var keySpan = null; - var updated = null; - var icon = null; + const summaryUpdate = {}; + const sends = {}; + let summarySpan = null; + let keySpan = null; + let updated = null; + let icon = null; //modifiy html summaries icons / numbers both desktop/mobile. - for (var i in _params) { + for (const i in _params) { //object can be global summary element, or nodelist of object summary and dashOverviewPrev summary objectSummaryList = Array.from(document.querySelectorAll('.objectSummary' + _params[i].object_id)) if (objectSummaryList.length == 0) continue version = objectSummaryList[0].getAttribute('data-version') if (version == undefined) continue - var updated if (isset(_params[i]['keys'])) { objectSummaryList.forEach(function(objectSummary) { updated = false - for (var key in _params[i]['keys']) { + for (const key in _params[i]['keys']) { summarySpan = objectSummary.querySelector('.objectSummaryParent[data-summary="' + key + '"]') if (summarySpan == null) { summarySpan = document.querySelector('div.objectPreview[data-object_id="' + _params[i].object_id + '"]')?.querySelector('.objectSummaryParent[data-summary="' + key + '"]') @@ -374,11 +372,11 @@ jeedom.object.summaryUpdate = function(_params) { return } - var paramsRequired = []; - var paramsSpecifics = { + const paramsRequired = []; + const paramsSpecifics = { global: false, success: function(result) { - for (var id in result) { + for (const id in result) { try { summaryUpdate[id].objectSummaryList.forEach(function(objectSummary) { summary = domUtils.parseHTML(result[id].html) @@ -398,8 +396,8 @@ jeedom.object.summaryUpdate = function(_params) { return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/object.ajax.php'; paramsAJAX.data = { action: 'getSummaryHtml', @@ -435,16 +433,16 @@ jeedom.object.getImgPath = function(_params) { } jeedom.object.removeImage = function(_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/object.ajax.php'; paramsAJAX.data = { action: 'removeImage', @@ -454,16 +452,16 @@ jeedom.object.removeImage = function(_params) { } jeedom.object.uploadImage = function(_params) { - var paramsRequired = ['id', 'file']; - var paramsSpecifics = {}; + const paramsRequired = ['id', 'file']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/object.ajax.php'; paramsAJAX.data = { action: 'uploadImage', diff --git a/core/js/plan.class.js b/core/js/plan.class.js index 306c84d1fd..92db7c3f26 100644 --- a/core/js/plan.class.js +++ b/core/js/plan.class.js @@ -18,16 +18,16 @@ jeedom.plan = function() {}; jeedom.plan.cache = Array(); jeedom.plan.remove = function(_params) { - var paramsRequired = []; - var paramsSpecifics = {}; + const paramsRequired = []; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/plan.ajax.php'; paramsAJAX.data = { action: 'remove', @@ -40,8 +40,8 @@ jeedom.plan.remove = function(_params) { } jeedom.plan.execute = function(_params) { - var paramsRequired = ['id']; - var paramsSpecifics = { + const paramsRequired = ['id']; + const paramsSpecifics = { global: false }; try { @@ -50,8 +50,8 @@ jeedom.plan.execute = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/plan.ajax.php'; paramsAJAX.data = { action: 'execute', @@ -61,8 +61,8 @@ jeedom.plan.execute = function(_params) { } jeedom.plan.save = function(_params) { - var paramsRequired = ['plans']; - var paramsSpecifics = { + const paramsRequired = ['plans']; + const paramsSpecifics = { global: _params.global || true, }; try { @@ -71,9 +71,9 @@ jeedom.plan.save = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/plan.ajax.php'; paramsAJAX.data = { action: 'save', @@ -83,16 +83,16 @@ jeedom.plan.save = function(_params) { } jeedom.plan.byId = function(_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/plan.ajax.php'; paramsAJAX.data = { action: 'get', @@ -102,16 +102,16 @@ jeedom.plan.byId = function(_params) { } jeedom.plan.getObjectPlan = function(_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/plan.ajax.php'; paramsAJAX.data = { action: 'getObjectPlan', @@ -122,16 +122,16 @@ jeedom.plan.getObjectPlan = function(_params) { } jeedom.plan.create = function(_params) { - var paramsRequired = ['plan']; - var paramsSpecifics = {}; + const paramsRequired = ['plan']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/plan.ajax.php'; paramsAJAX.data = { action: 'create', @@ -142,16 +142,16 @@ jeedom.plan.create = function(_params) { } jeedom.plan.copy = function(_params) { - var paramsRequired = []; - var paramsSpecifics = {}; + const paramsRequired = []; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/plan.ajax.php'; paramsAJAX.data = { action: 'copy', @@ -164,16 +164,16 @@ jeedom.plan.copy = function(_params) { } jeedom.plan.byPlanHeader = function(_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/plan.ajax.php'; paramsAJAX.data = { action: 'planHeader', @@ -185,16 +185,16 @@ jeedom.plan.byPlanHeader = function(_params) { } jeedom.plan.removeImageHeader = function(_params) { - var paramsRequired = ['planHeader_id']; - var paramsSpecifics = {}; + const paramsRequired = ['planHeader_id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/plan.ajax.php'; paramsAJAX.data = { action: 'removeImageHeader', @@ -204,16 +204,16 @@ jeedom.plan.removeImageHeader = function(_params) { } jeedom.plan.saveHeader = function(_params) { - var paramsRequired = ['planHeader']; - var paramsSpecifics = {}; + const paramsRequired = ['planHeader']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/plan.ajax.php'; paramsAJAX.data = { action: 'savePlanHeader', @@ -223,16 +223,16 @@ jeedom.plan.saveHeader = function(_params) { } jeedom.plan.copyHeader = function(_params) { - var paramsRequired = ['id', 'name']; - var paramsSpecifics = {}; + const paramsRequired = ['id', 'name']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/plan.ajax.php'; paramsAJAX.data = { action: 'copyPlanHeader', @@ -243,16 +243,16 @@ jeedom.plan.copyHeader = function(_params) { } jeedom.plan.removeHeader = function(_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/plan.ajax.php'; paramsAJAX.data = { action: 'removePlanHeader', @@ -262,16 +262,16 @@ jeedom.plan.removeHeader = function(_params) { } jeedom.plan.getHeader = function(_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/plan.ajax.php'; paramsAJAX.data = { action: 'getPlanHeader', @@ -282,8 +282,8 @@ jeedom.plan.getHeader = function(_params) { } jeedom.plan.allHeader = function(_params) { - var paramsRequired = []; - var paramsSpecifics = { + const paramsRequired = []; + const paramsSpecifics = { pre_success: function(data) { jeedom.plan.cache.all = data.result; return data; @@ -295,12 +295,12 @@ jeedom.plan.allHeader = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); if (isset(jeedom.plan.cache.all)) { params.success(jeedom.plan.cache.all); return; } - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/plan.ajax.php'; paramsAJAX.data = { action: 'allHeader', diff --git a/core/js/plan3d.class.js b/core/js/plan3d.class.js index f03e09def4..e771137900 100644 --- a/core/js/plan3d.class.js +++ b/core/js/plan3d.class.js @@ -18,16 +18,16 @@ jeedom.plan3d = function() {}; jeedom.plan3d.cache = Array(); jeedom.plan3d.remove = function(_params) { - var paramsRequired = []; - var paramsSpecifics = {}; + const paramsRequired = []; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/plan3d.ajax.php'; paramsAJAX.data = { action: 'remove', @@ -40,8 +40,8 @@ jeedom.plan3d.remove = function(_params) { } jeedom.plan3d.save = function(_params) { - var paramsRequired = ['plan3ds']; - var paramsSpecifics = { + const paramsRequired = ['plan3ds']; + const paramsSpecifics = { global: _params.global || true, }; try { @@ -50,9 +50,9 @@ jeedom.plan3d.save = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/plan3d.ajax.php'; paramsAJAX.data = { action: 'save', @@ -62,16 +62,16 @@ jeedom.plan3d.save = function(_params) { } jeedom.plan3d.byId = function(_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/plan3d.ajax.php'; paramsAJAX.data = { action: 'get', @@ -81,16 +81,16 @@ jeedom.plan3d.byId = function(_params) { } jeedom.plan3d.byName = function(_params) { - var paramsRequired = ['name', 'plan3dHeader_id']; - var paramsSpecifics = {}; + const paramsRequired = ['name', 'plan3dHeader_id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/plan3d.ajax.php'; paramsAJAX.data = { action: 'byName', @@ -101,16 +101,16 @@ jeedom.plan3d.byName = function(_params) { } jeedom.plan3d.byplan3dHeader = function(_params) { - var paramsRequired = ['plan3dHeader_id']; - var paramsSpecifics = {}; + const paramsRequired = ['plan3dHeader_id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/plan3d.ajax.php'; paramsAJAX.data = { action: 'plan3dHeader', @@ -120,16 +120,16 @@ jeedom.plan3d.byplan3dHeader = function(_params) { } jeedom.plan3d.saveHeader = function(_params) { - var paramsRequired = ['plan3dHeader']; - var paramsSpecifics = {}; + const paramsRequired = ['plan3dHeader']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/plan3d.ajax.php'; paramsAJAX.data = { action: 'saveplan3dHeader', @@ -139,16 +139,16 @@ jeedom.plan3d.saveHeader = function(_params) { } jeedom.plan3d.removeHeader = function(_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/plan3d.ajax.php'; paramsAJAX.data = { action: 'removeplan3dHeader', @@ -158,16 +158,16 @@ jeedom.plan3d.removeHeader = function(_params) { } jeedom.plan3d.getHeader = function(_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/plan3d.ajax.php'; paramsAJAX.data = { action: 'getplan3dHeader', @@ -178,8 +178,8 @@ jeedom.plan3d.getHeader = function(_params) { } jeedom.plan3d.allHeader = function(_params) { - var paramsRequired = []; - var paramsSpecifics = { + const paramsRequired = []; + const paramsSpecifics = { pre_success: function(data) { jeedom.plan3d.cache.all = data.result; return data; @@ -191,12 +191,12 @@ jeedom.plan3d.allHeader = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); if (isset(jeedom.plan3d.cache.all)) { params.success(jeedom.plan3d.cache.all); return; } - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/plan3d.ajax.php'; paramsAJAX.data = { action: 'allHeader', diff --git a/core/js/plugin.class.js b/core/js/plugin.class.js index 7a17f656fe..fd76e21b05 100644 --- a/core/js/plugin.class.js +++ b/core/js/plugin.class.js @@ -18,8 +18,8 @@ jeedom.plugin = function () { }; jeedom.plugin.cache = Array(); jeedom.plugin.all = function (_params) { - var paramsRequired = []; - var paramsSpecifics = { + const paramsRequired = []; + const paramsSpecifics = { pre_success: function (data) { jeedom.plugin.cache.all = data.result; return data; @@ -35,8 +35,8 @@ jeedom.plugin.all = function (_params) { _params.success(jeedom.plugin.cache.all); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/plugin.ajax.php'; paramsAJAX.data = { action: 'all', @@ -46,16 +46,16 @@ jeedom.plugin.all = function (_params) { } jeedom.plugin.toggle = function (_params) { - var paramsRequired = ['id', 'state']; - var paramsSpecifics = {}; + const paramsRequired = ['id', 'state']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/plugin.ajax.php'; paramsAJAX.data = { action: 'toggle', @@ -66,16 +66,16 @@ jeedom.plugin.toggle = function (_params) { } jeedom.plugin.get = function (_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/plugin.ajax.php'; paramsAJAX.data = { action: 'getConf', @@ -86,8 +86,8 @@ jeedom.plugin.get = function (_params) { } jeedom.plugin.getDependancyInfo = function (_params) { - var paramsRequired = ['id']; - var paramsSpecifics = { + const paramsRequired = ['id']; + const paramsSpecifics = { global: false, }; try { @@ -96,8 +96,8 @@ jeedom.plugin.getDependancyInfo = function (_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/plugin.ajax.php'; paramsAJAX.data = { action: 'getDependancyInfo', @@ -107,16 +107,16 @@ jeedom.plugin.getDependancyInfo = function (_params) { } jeedom.plugin.dependancyInstall = function (_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/plugin.ajax.php'; paramsAJAX.data = { action: 'dependancyInstall', @@ -126,16 +126,16 @@ jeedom.plugin.dependancyInstall = function (_params) { } jeedom.plugin.dependancyChangeAutoMode = function (_params) { - var paramsRequired = ['id', 'mode']; - var paramsSpecifics = {}; + const paramsRequired = ['id', 'mode']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/plugin.ajax.php'; paramsAJAX.data = { action: 'dependancyChangeAutoMode', @@ -146,8 +146,8 @@ jeedom.plugin.dependancyChangeAutoMode = function (_params) { } jeedom.plugin.getDeamonInfo = function (_params) { - var paramsRequired = ['id']; - var paramsSpecifics = { + const paramsRequired = ['id']; + const paramsSpecifics = { global: false, }; try { @@ -156,8 +156,8 @@ jeedom.plugin.getDeamonInfo = function (_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/plugin.ajax.php'; paramsAJAX.data = { action: 'getDeamonInfo', @@ -167,16 +167,16 @@ jeedom.plugin.getDeamonInfo = function (_params) { } jeedom.plugin.deamonStart = function (_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/plugin.ajax.php'; paramsAJAX.data = { action: 'deamonStart', @@ -188,16 +188,16 @@ jeedom.plugin.deamonStart = function (_params) { } jeedom.plugin.deamonStop = function (_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/plugin.ajax.php'; paramsAJAX.data = { action: 'deamonStop', @@ -207,16 +207,16 @@ jeedom.plugin.deamonStop = function (_params) { } jeedom.plugin.deamonChangeAutoMode = function (_params) { - var paramsRequired = ['id', 'mode']; - var paramsSpecifics = {}; + const paramsRequired = ['id', 'mode']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/plugin.ajax.php'; paramsAJAX.data = { action: 'deamonChangeAutoMode', @@ -227,16 +227,16 @@ jeedom.plugin.deamonChangeAutoMode = function (_params) { } jeedom.plugin.createCommunityPost = function (_params) { - var paramsRequired = ['type']; - var paramsSpecifics = {}; + const paramsRequired = ['type']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/plugin.ajax.php'; paramsAJAX.data = { action: 'createCommunityPost', diff --git a/core/js/plugin.template.js b/core/js/plugin.template.js index 80cce76a1c..2266f7639d 100644 --- a/core/js/plugin.template.js +++ b/core/js/plugin.template.js @@ -26,16 +26,16 @@ if (!jeeFrontEnd.pluginTemplate) { if (is_numeric(getUrlVars('id'))) { jeeFrontEnd.pluginTemplate.displayEqlogic(null, getUrlVars('id')) } - let returnToThumbnailDisplay = document.querySelector('.eqLogicAction[data-action="returnToThumbnailDisplay"]') + const returnToThumbnailDisplay = document.querySelector('.eqLogicAction[data-action="returnToThumbnailDisplay"]') if (returnToThumbnailDisplay) { returnToThumbnailDisplay.removeAttribute('data-target') returnToThumbnailDisplay.removeAttribute('href') } }, setTableDisplay: function() { - var butDisp = document.getElementById('bt_pluginDisplayAsTable') + const butDisp = document.getElementById('bt_pluginDisplayAsTable') if (!butDisp) return - var coreSupport = butDisp.dataset.coresupport == '1' ? true : false + const coreSupport = butDisp.dataset.coresupport == '1' ? true : false if (butDisp != null) { butDisp.removeClass('hidden') //Not shown on previous core versions if (getCookie('jeedom_displayAsTable') == 'true' || jeedom.theme.theme_displayAsTable == 1) { @@ -108,7 +108,7 @@ if (!jeeFrontEnd.pluginTemplate) { printEqLogic(data) } document.querySelectorAll('.cmd').remove() - for (var i in data.cmd) { + for (const i in data.cmd) { if (data.cmd[i].type == 'info') { data.cmd[i].state = String(data.cmd[i].state).replace(/<[^>]*>?/gm, '') data.cmd[i]['htmlstate'] = ' { jeedom.cmd.addUpdateFunction(_cmdState.getAttribute('data-cmd_id'), function(_options) { _options.value = String(_options.value).replace(/<[^>]*>?/gm, '') - let cmd = document.querySelector('.cmdTableState[data-cmd_id="' + _options.cmd_id + '"]') + const cmd = document.querySelector('.cmdTableState[data-cmd_id="' + _options.cmd_id + '"]') if (cmd === null) { return } @@ -167,7 +167,7 @@ if (!jeeFrontEnd.pluginTemplate) { addCmdToTableDefault: function(_cmd) { if (document.getElementById('table_cmd') == null) return if (document.querySelector('#table_cmd thead') == null) { - table = '' + let table = '' table += '' table += '{{Id}}' table += '{{Nom}}' @@ -184,12 +184,12 @@ if (!jeeFrontEnd.pluginTemplate) { document.getElementById('table_cmd').insertAdjacentHTML('beforeend', table) } if (!isset(_cmd)) { - var _cmd = { configuration: {} } + _cmd = { configuration: {} } } if (!isset(_cmd.configuration)) { _cmd.configuration = {} } - var tr = '' + let tr = '' tr += '' tr += '' tr += '' @@ -241,7 +241,7 @@ if (!jeeFrontEnd.pluginTemplate) { tr += '' tr += '' - let newRow = document.createElement('tr') + const newRow = document.createElement('tr') newRow.innerHTML = tr newRow.addClass('cmd') newRow.setAttribute('data-cmd_id', init(_cmd.id)) @@ -275,9 +275,9 @@ if (!jeeFrontEnd.pluginTemplate) { }) }, success: function(_data) { - var vars = getUrlVars() - var url = 'index.php?' - for (var i in vars) { + const vars = getUrlVars() + let url = 'index.php?' + for (const i in vars) { if (i != 'id' && i != 'saveSuccessFull' && i != 'removeSuccessFull') { url += i + '=' + vars[i].replace('#', '') + '&' } @@ -294,10 +294,10 @@ if (!jeeFrontEnd.pluginTemplate) { saveEqLogic: function() { jeeFrontEnd.modifyWithoutSave = false modifyWithoutSave = false - var eqLogics = [] + const eqLogics = [] document.querySelectorAll('.eqLogic').forEach(_eqLogic => { if (_eqLogic.isVisible()) { - var eqLogic = _eqLogic.getJeeValues('.eqLogicAttr')[0] + let eqLogic = _eqLogic.getJeeValues('.eqLogicAttr')[0] //No subType will break: _eqLogic.querySelectorAll('tr.cmd select[data-l1key="subType"]').forEach(_select => { @@ -330,15 +330,15 @@ if (!jeeFrontEnd.pluginTemplate) { success: function(data) { jeeFrontEnd.modifyWithoutSave = false modifyWithoutSave = false - var vars = getUrlVars() - var url = 'index.php?' - for (var i in vars) { + const vars = getUrlVars() + let url = 'index.php?' + for (const i in vars) { if (i != 'id' && i != 'saveSuccessFull' && i != 'removeSuccessFull') { url += i + '=' + vars[i].replace('#', '') + '&' } } - var id + let id if (Array.isArray(data)) { id = data[0].id } else { @@ -358,8 +358,8 @@ if (!jeeFrontEnd.pluginTemplate) { return false }, copyEqLogic: function() { - var name = document.querySelector('.eqLogicAttr[data-l1key="name"]').jeeValue() - var id = document.querySelector('.eqLogicAttr[data-l1key="id"]').jeeValue() + const name = document.querySelector('.eqLogicAttr[data-l1key="name"]').jeeValue() + const id = document.querySelector('.eqLogicAttr[data-l1key="id"]').jeeValue() if (id != undefined && id != '') { jeeDialog.prompt({ value: name + ' {{copie}}', @@ -378,9 +378,9 @@ if (!jeeFrontEnd.pluginTemplate) { success: function(data) { jeeFrontEnd.modifyWithoutSave = false modifyWithoutSave = false - var vars = getUrlVars() - var url = 'index.php?' - for (var i in vars) { + const vars = getUrlVars() + let url = 'index.php?' + for (const i in vars) { if (i != 'id' && i != 'saveSuccessFull' && i != 'removeSuccessFull') { url += i + '=' + vars[i].replace('#', '') + '&' } @@ -396,10 +396,10 @@ if (!jeeFrontEnd.pluginTemplate) { } }, removeEqLogic: function() { - var eqLogicId = document.querySelector('.eqLogicAttr[data-l1key="id"]').jeeValue() + const eqLogicId = document.querySelector('.eqLogicAttr[data-l1key="id"]').jeeValue() if (eqLogicId != undefined) { - let thisEqType = document.querySelector('.eqLogicDisplayCard[data-eqlogic_id="' + eqLogicId + '"]')?.getAttribute('data-eqLogic_type') - let textEqtype = thisEqType || eqType + const thisEqType = document.querySelector('.eqLogicDisplayCard[data-eqlogic_id="' + eqLogicId + '"]')?.getAttribute('data-eqLogic_type') + const textEqtype = thisEqType || eqType jeedom.eqLogic.getUseBeforeRemove({ id: eqLogicId, error: function(error) { @@ -409,11 +409,11 @@ if (!jeeFrontEnd.pluginTemplate) { }) }, success: function(data) { - var text = '{{Êtes-vous sûr de vouloir supprimer l\'équipement}} ' + textEqtype + ' ' + document.querySelector('.eqLogicAttr[data-l1key="name"]').jeeValue() + ' ?' + let text = '{{Êtes-vous sûr de vouloir supprimer l\'équipement}} ' + textEqtype + ' ' + document.querySelector('.eqLogicAttr[data-l1key="name"]').jeeValue() + ' ?' if (Object.keys(data).length > 0) { text += '
{{Il est utilisé par:}}
' - var complement = null - for (var i in data) { + let complement = null + for (const i in data) { complement = '' if ('sourceName' in data[i]) { complement = ' (' + data[i].sourceName + ')' @@ -434,9 +434,9 @@ if (!jeeFrontEnd.pluginTemplate) { }) }, success: function() { - var vars = getUrlVars() - var url = 'index.php?' - for (var i in vars) { + const vars = getUrlVars() + let url = 'index.php?' + for (const i in vars) { if (i != 'id' && i != 'removeSuccessFull' && i != 'saveSuccessFull') { url += i + '=' + vars[i].replace('#', '') + '&' } @@ -465,14 +465,14 @@ jeeFrontEnd.pluginTemplate.init() //searching document.getElementById('in_searchEqlogic')?.addEventListener('keyup', function(event) { - var search = event.target.value + let search = event.target.value if (search == '') { document.querySelectorAll('.eqLogicDisplayCard').seen() return } document.querySelectorAll('.eqLogicDisplayCard').unseen() search = jeedomUtils.normTextLower(search) - var text + let text document.querySelectorAll('.eqLogicDisplayCard .name').forEach(_name => { text = jeedomUtils.normTextLower(_name.textContent) if (text.includes(search)) { @@ -487,7 +487,7 @@ domUtils(function() { if (typeof Core_noEqContextMenu !== 'undefined') return false if (document.querySelector('.nav.nav-tabs') == null) return false - var pluginId = document.body.getAttribute('data-page') || getUrlVars('p') + const pluginId = document.body.getAttribute('data-page') || getUrlVars('p') jeedom.eqLogic.byType({ type: pluginId, error: function(error) { @@ -500,9 +500,9 @@ domUtils(function() { if (_eqs.length == 0) { return } - var eqsGroups = [] - var humanName, humanCut, group, name - for (var i = 0; i < _eqs.length; i++) { + let eqsGroups = [] + let humanName, humanCut, group, name + for (let i = 0; i < _eqs.length; i++) { humanName = _eqs[i].humanName humanCut = humanName.split(']') group = humanCut[0].substr(1) @@ -511,11 +511,12 @@ domUtils(function() { } eqsGroups = Array.from(new Set(eqsGroups)) eqsGroups.sort() - var eqsList = [], group, eqGroup - for (var i = 0; i < eqsGroups.length; i++) { + const eqsList = [] + let eqGroup + for (let i = 0; i < eqsGroups.length; i++) { group = eqsGroups[i] eqsList[group] = [] - for (var j = 0; j < _eqs.length; j++) { + for (let j = 0; j < _eqs.length; j++) { humanName = _eqs[j].humanName humanCut = humanName.split(']') eqGroup = humanCut[0].substr(1) @@ -525,12 +526,12 @@ domUtils(function() { } } //set context menu! - var contextmenuitems = {} - var uniqId = 0, groupEq, items - for (var group in eqsList) { + const contextmenuitems = {} + let uniqId = 0, groupEq, items + for (const group in eqsList) { groupEq = eqsList[group] items = {} - for (var index in groupEq) { + for (const index in groupEq) { items[uniqId] = { 'name': groupEq[index][0], 'id': groupEq[index][1] @@ -561,8 +562,8 @@ domUtils(function() { } jeedomUtils.hideAlert() if (event.ctrlKey || event.which == 2) { - var type = document.body.getAttribute('data-page') - var url = 'index.php?v=d&m=' + type + '&p=' + type + '&id=' + options.commands[key].id + const type = document.body.getAttribute('data-page') + let url = 'index.php?v=d&m=' + type + '&p=' + type + '&id=' + options.commands[key].id if (tabObj) url += tab window.open(url).focus() } else { @@ -587,7 +588,7 @@ domUtils(function() { $("#table_cmd").sortable("destroy") } - var tableCmd = document.getElementById('table_cmd') + const tableCmd = document.getElementById('table_cmd') if (!tableCmd) return jeeFrontEnd.pluginTemplate.cmdSortable = Sortable.create(tableCmd.tBodies[0], { delay: 100, @@ -612,7 +613,7 @@ document.registerEvent('keydown', function(event) { if (jeedomUtils.getOpenedModal()) return if ((event.ctrlKey || event.metaKey) && event.which == 83) { //s event.preventDefault() - let bt = document.querySelector('.eqLogicAction[data-action="save"]') + const bt = document.querySelector('.eqLogicAction[data-action="save"]') if (bt != null && bt.isVisible()) { jeeFrontEnd.pluginTemplate.saveEqLogic() } @@ -623,7 +624,7 @@ document.registerEvent('keydown', function(event) { /*Events delegations */ document.getElementById('div_pageContainer').addEventListener('click', function(event) { - var _target = null + let _target = null if (_target = event.target.closest('#bt_resetSearch')) { document.getElementById('in_searchEqlogic').jeeValue('').triggerEvent('keyup') return @@ -641,7 +642,7 @@ document.getElementById('div_pageContainer').addEventListener('click', function( if (_target = event.target.closest('.eqLogicAction[data-action="returnToThumbnailDisplay"]')) { setTimeout(function() { - let id = document.querySelector('.tab-pane.active')?.getAttribute('id') + const id = document.querySelector('.tab-pane.active')?.getAttribute('id') document.querySelectorAll('.nav li.active').removeClass('active') document.querySelector('a[data-target="#' + id + '"]')?.closest('li').addClass('active') }, 500) @@ -656,12 +657,12 @@ document.getElementById('div_pageContainer').addEventListener('click', function( if (_target = event.target.closest('.eqLogicDisplayCard')) { jeedomUtils.hideAlert() - let type = document.body.getAttribute('data-page') - let thisEqId = _target.getAttribute('data-eqlogic_id') + const type = document.body.getAttribute('data-page') + const thisEqId = _target.getAttribute('data-eqlogic_id') if ((isset(event.detail) && event.detail.ctrlKey) || event.ctrlKey || event.metaKey) { window.open('index.php?v=d&m=' + type + '&p=' + type + '&id=' + thisEqId).focus() } else { - let thisEqType = _target.getAttribute('data-eqLogic_type') + const thisEqType = _target.getAttribute('data-eqLogic_type') jeeFrontEnd.pluginTemplate.displayEqlogic(thisEqType, thisEqId) } return @@ -718,9 +719,9 @@ document.getElementById('div_pageContainer').addEventListener('click', function( } if (_target = event.target.closest('.cmd .cmdAction[data-l1key="chooseIcon"]')) { - let cmd = _target.closest('.cmd') - let icon = cmd.querySelector('[data-l2key="icon"] > i') - let params = {} + const cmd = _target.closest('.cmd') + const icon = cmd.querySelector('[data-l2key="icon"] > i') + const params = {} if (icon) params.icon = icon.attributes.class.value jeedomUtils.chooseIcon(function(_icon) { cmd.querySelector('.cmdAttr[data-l1key="display"][data-l2key="icon"]').empty().innerHTML = _icon @@ -738,7 +739,7 @@ document.getElementById('div_pageContainer').addEventListener('click', function( } if (_target = event.target.closest('.cmd .cmdAction[data-action="copy"]')) { - let cmd = _target.closest('.cmd').getJeeValues('.cmdAttr')[0] + const cmd = _target.closest('.cmd').getJeeValues('.cmdAttr')[0] cmd.id = '' if (typeof addCmdToTable === 'function') { addCmdToTable(cmd) @@ -778,11 +779,11 @@ document.getElementById('div_pageContainer').addEventListener('click', function( document.getElementById('div_pageContainer').addEventListener('mouseup', function(event) { - var _target = null + let _target = null if (_target = event.target.closest('.eqLogicDisplayCard')) { if (event.which == 2) { event.preventDefault() - let id = _target.getAttribute('data-eqlogic_id') + const id = _target.getAttribute('data-eqlogic_id') document.querySelector('.eqLogicDisplayCard[data-eqlogic_id="' + id + '"]')?.triggerEvent('click', { detail: { ctrlKey: true } }) } return @@ -790,7 +791,7 @@ document.getElementById('div_pageContainer').addEventListener('mouseup', functio }) document.getElementById('div_pageContainer').addEventListener('dblclick', function(event) { - var _target = null + let _target = null if (event.target.matches('.cmd input, textarea, select, span, a')) { event.stopPropagation() return @@ -814,7 +815,7 @@ document.getElementById('div_pageContainer').addEventListener('dblclick', functi }) document.getElementById('div_pageContainer').addEventListener('change', function(event) { - var _target = null + let _target = null if (_target = event.target.closest('.eqLogic .eqLogicAttr')) { if (_target.isVisible()) { jeeFrontEnd.modifyWithoutSave = true diff --git a/core/js/private.class.js b/core/js/private.class.js index 2276e73ded..91d434c7d8 100644 --- a/core/js/private.class.js +++ b/core/js/private.class.js @@ -2,7 +2,7 @@ * Set of configuration default, variables and functions * @namespace jeedom.private */ -var init = function(_param, _default) { +const _init = function(_param, _default) { return (typeof _param == 'number') ? _param : (typeof _param != 'boolean' || _param) && (_param !== false && _param || _default || ''); } @@ -79,7 +79,7 @@ jeedom.private.handleAjaxErrorAPI = function(_request, _status, _error) { */ jeedom.private.getParamsAJAX = function(_params) { // Special case parameter type - var typeInData = false; + let typeInData = false; if (!['POST', 'GET'].includes(_params.type)) { typeInData = true; _params.data = _params.data || {}; @@ -87,7 +87,7 @@ jeedom.private.getParamsAJAX = function(_params) { _params.type = 'POST'; //Use POST } - var paramsAJAX = { + const paramsAJAX = { type: _params.type, dataType: _params.dataType, async: _params.async, @@ -106,7 +106,7 @@ jeedom.private.getParamsAJAX = function(_params) { }); } else { //Directly send data object to caller - var result = init(data.result, jeedom.private.no_result); + let result = _init(data.result, jeedom.private.no_result); if (data.result === false) { result = false; @@ -151,13 +151,13 @@ jeedom.private.checkParamValue = function(_params) { }; } - var value = _params.value; - var regexp = _params.regexp; - var name = _params.name || 'One parameter'; + let value = _params.value; + const regexp = _params.regexp; + const name = _params.name || 'One parameter'; if (typeof value == 'object') { //Recursivity for array or object - for (var i in value) { + for (const i in value) { checkParamValue({ name: name, value: value[i], @@ -194,17 +194,17 @@ jeedom.private.checkParamValue = function(_params) { * @return {string} ret.missing.toString : return missing parameter as string (used for display) */ jeedom.private.checkParamsRequired = function(_params, _paramsRequired) { - var missings = Array(); - var group = Array(); - var missingAtLeastOneParam = false; - var optionalGroupNumber = 0; - var ok = null; - for (var key in _paramsRequired) { + const missings = Array(); + const group = Array(); + let missingAtLeastOneParam = false; + let optionalGroupNumber = 0; + let ok = null; + for (const key in _paramsRequired) { if (typeof _paramsRequired[key] === 'object') { optionalGroupNumber++; ok = false; //One is enough, but need all present / missing parameters: - for (var key2 in _paramsRequired[key]) { + for (const key2 in _paramsRequired[key]) { if (_params.hasOwnProperty(_paramsRequired[key][key2])) { ok = true; } else { @@ -241,14 +241,14 @@ jeedom.private.checkParamsRequired = function(_params, _paramsRequired) { } if (missingAtLeastOneParam) { - var tostring = 'Parameters missing : '; - var miss = null; - for (var i in missings) { + let tostring = 'Parameters missing : '; + let miss = null; + for (const i in missings) { miss = missings[i]; tostring += miss.name + ' '; //If optionnal parameter, define if optionnal group is set - var checkedstring = miss.optional && (group[miss.group.id].checked) ? 'yes' : 'no' || ''; + const checkedstring = miss.optional && (group[miss.group.id].checked) ? 'yes' : 'no' || ''; tostring += (miss.optional) ? '[optional, group=' + miss.group.id + ' checked=' + checkedstring + ']' : '[needed]'; tostring += ', '; } @@ -271,15 +271,15 @@ jeedom.private.checkAndGetParams = function(_params, _paramsSpecifics, _paramsRe //Throw execption if error jeedom.private.checkParamsRequired(_params, _paramsRequired || []); //Merge default and function specific parameters - var params = domUtils.extend({}, jeedom.private.default_params, _paramsSpecifics, _params || {}); + const params = domUtils.extend({}, jeedom.private.default_params, _paramsSpecifics, _params || {}); //Convert all objects in params to json - var param = null; - for (var attr in params) { + const param = null; + for (const attr in params) { params[attr] = (typeof params[attr] == 'object') ? JSON.stringify(params[attr]) : params[attr]; } - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const paramsAJAX = jeedom.private.getParamsAJAX(params); return { params: params, @@ -294,7 +294,7 @@ jeedom.private.checkParamsValue = function(_params) { if (Object.prototype.toString.call(_params) == '[object Object]') { jeedom.private.checkParamValue(_params); } else { - for (var i in _params) { + for (const i in _params) { jeedom.private.checkParamValue(_params[i]); } } diff --git a/core/js/queue.class.js b/core/js/queue.class.js index 5e395c2579..6d62a5811e 100644 --- a/core/js/queue.class.js +++ b/core/js/queue.class.js @@ -18,16 +18,16 @@ jeedom.queue = function() {}; jeedom.queue.all = function(_params) { - var paramsRequired = []; - var paramsSpecifics = {}; + const paramsRequired = []; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/queue.ajax.php'; paramsAJAX.data = { action: 'all' @@ -36,16 +36,16 @@ jeedom.queue.all = function(_params) { } jeedom.queue.save = function(_params) { - var paramsRequired = ['queues']; - var paramsSpecifics = {}; + const paramsRequired = ['queues']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/queue.ajax.php'; paramsAJAX.data = { action: 'save', diff --git a/core/js/recovery.class.js b/core/js/recovery.class.js index 664b600a46..6383d33261 100644 --- a/core/js/recovery.class.js +++ b/core/js/recovery.class.js @@ -17,16 +17,16 @@ jeedom.recovery = function() { } jeedom.recovery.start = function(_params) { - var paramsRequired = ['hardware', 'mode'] - var paramsSpecifics = {} + const paramsRequired = ['hardware', 'mode'] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/recovery.ajax.php' paramsAJAX.data = { action: 'start', @@ -37,9 +37,9 @@ jeedom.recovery.start = function(_params) { } jeedom.recovery.cancel = function(_params) { - var paramsSpecifics = {} - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const paramsSpecifics = {} + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/recovery.ajax.php' paramsAJAX.data = { action: 'cancel' @@ -48,9 +48,9 @@ jeedom.recovery.cancel = function(_params) { } jeedom.recovery.getProgress = function(_params) { - var paramsSpecifics = {} - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const paramsSpecifics = {} + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/recovery.ajax.php' paramsAJAX.data = { action: 'getProgress' @@ -59,16 +59,16 @@ jeedom.recovery.getProgress = function(_params) { } jeedom.recovery.usbConnected = function(_params) { - var paramsRequired = ['hardware'] - var paramsSpecifics = {} + const paramsRequired = ['hardware'] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/recovery.ajax.php' paramsAJAX.data = { action: 'usbConnected', diff --git a/core/js/repo.class.js b/core/js/repo.class.js index e44a27ffff..670a1ef199 100644 --- a/core/js/repo.class.js +++ b/core/js/repo.class.js @@ -17,8 +17,8 @@ jeedom.repo = function() {}; jeedom.repo.install = function(_params) { - var paramsRequired = ['id', 'repo']; - var paramsSpecifics = { + const paramsRequired = ['id', 'repo']; + const paramsSpecifics = { global: _params.global || true, }; try { @@ -27,8 +27,8 @@ jeedom.repo.install = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/repo.ajax.php'; paramsAJAX.data = { action: 'install', @@ -40,8 +40,8 @@ jeedom.repo.install = function(_params) { } jeedom.repo.remove = function(_params) { - var paramsRequired = ['id', 'repo']; - var paramsSpecifics = { + const paramsRequired = ['id', 'repo']; + const paramsSpecifics = { global: _params.global || true, }; try { @@ -50,8 +50,8 @@ jeedom.repo.remove = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/repo.ajax.php'; paramsAJAX.data = { action: 'remove', @@ -62,8 +62,8 @@ jeedom.repo.remove = function(_params) { } jeedom.repo.test = function(_params) { - var paramsRequired = ['repo']; - var paramsSpecifics = { + const paramsRequired = ['repo']; + const paramsSpecifics = { global: _params.global || true, }; try { @@ -72,8 +72,8 @@ jeedom.repo.test = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/repo.ajax.php'; paramsAJAX.data = { action: 'test', @@ -83,8 +83,8 @@ jeedom.repo.test = function(_params) { } jeedom.repo.backupList = function(_params) { - var paramsRequired = ['repo']; - var paramsSpecifics = { + const paramsRequired = ['repo']; + const paramsSpecifics = { global: _params.global || true, }; try { @@ -93,8 +93,8 @@ jeedom.repo.backupList = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/repo.ajax.php'; paramsAJAX.data = { action: 'backupList', @@ -104,8 +104,8 @@ jeedom.repo.backupList = function(_params) { } jeedom.repo.pullInstall = function(_params) { - var paramsRequired = ['repo']; - var paramsSpecifics = { + const paramsRequired = ['repo']; + const paramsSpecifics = { global: _params.global || true, }; try { @@ -114,8 +114,8 @@ jeedom.repo.pullInstall = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/repo.ajax.php'; paramsAJAX.data = { repo: _params.repo, diff --git a/core/js/report.class.js b/core/js/report.class.js index 02578ebe2d..47e9dd8945 100644 --- a/core/js/report.class.js +++ b/core/js/report.class.js @@ -17,16 +17,16 @@ jeedom.report = function() {}; jeedom.report.list = function(_params) { - var paramsRequired = ['type', 'id']; - var paramsSpecifics = {}; + const paramsRequired = ['type', 'id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/report.ajax.php'; paramsAJAX.data = { action: 'list', @@ -37,16 +37,16 @@ jeedom.report.list = function(_params) { } jeedom.report.get = function(_params) { - var paramsRequired = ['type', 'id', 'report']; - var paramsSpecifics = {}; + const paramsRequired = ['type', 'id', 'report']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/report.ajax.php'; paramsAJAX.data = { action: 'get', @@ -58,16 +58,16 @@ jeedom.report.get = function(_params) { } jeedom.report.remove = function(_params) { - var paramsRequired = ['type', 'id', 'report']; - var paramsSpecifics = {}; + const paramsRequired = ['type', 'id', 'report']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/report.ajax.php'; paramsAJAX.data = { action: 'remove', @@ -79,16 +79,16 @@ jeedom.report.remove = function(_params) { } jeedom.report.removeAll = function(_params) { - var paramsRequired = ['type', 'id']; - var paramsSpecifics = {}; + const paramsRequired = ['type', 'id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/report.ajax.php'; paramsAJAX.data = { action: 'removeAll', diff --git a/core/js/scenario.class.js b/core/js/scenario.class.js index f6b6f0c0a0..d0d9515ec7 100644 --- a/core/js/scenario.class.js +++ b/core/js/scenario.class.js @@ -25,8 +25,8 @@ if (!isset(jeedom.scenario.cache.byGroupObjectName)) { } jeedom.scenario.all = function(_params) { - var paramsRequired = [] - var paramsSpecifics = { + const paramsRequired = [] + const paramsSpecifics = { pre_success: function(data) { jeedom.scenario.cache.all = data.result return data @@ -38,12 +38,12 @@ jeedom.scenario.all = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) if (isset(jeedom.scenario.cache.all) && jeedom.scenario.cache.all != null && init(_params.nocache, false) == false) { params.success(jeedom.scenario.cache.all) return } - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/scenario.ajax.php' paramsAJAX.data = { action: 'all', @@ -52,10 +52,10 @@ jeedom.scenario.all = function(_params) { } jeedom.scenario.allOrderedByGroupObjectName = function(_params) { - var asGroup = _params.asGroup ? _params.asGroup : 0 - var asTag = _params.asTag ? _params.asTag : 0 - var paramsRequired = [] - var paramsSpecifics = { + const asGroup = _params.asGroup ? _params.asGroup : 0 + const asTag = _params.asTag ? _params.asTag : 0 + const paramsRequired = [] + const paramsSpecifics = { pre_success: function(data) { if (!isset(jeedom.scenario.cache.byGroupObjectName)) jeedom.scenario.cache.byGroupObjectName = Array() if (asTag) return data @@ -69,14 +69,14 @@ jeedom.scenario.allOrderedByGroupObjectName = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) /* if (!asTag && isset(jeedom.scenario.cache.byGroupObjectName) && isset(jeedom.scenario.cache.byGroupObjectName[asGroup]) && jeedom.scenario.cache.byGroupObjectName[asGroup] != null && init(_params.nocache, false) == false) { params.success(jeedom.scenario.cache.byGroupObjectName[asGroup]) return } */ - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/scenario.ajax.php' paramsAJAX.data = { action: 'allOrderedByGroupObjectName', @@ -87,8 +87,8 @@ jeedom.scenario.allOrderedByGroupObjectName = function(_params) { } jeedom.scenario.saveAll = function(_params) { - var paramsRequired = ['scenarios'] - var paramsSpecifics = {} + const paramsRequired = ['scenarios'] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { @@ -97,8 +97,8 @@ jeedom.scenario.saveAll = function(_params) { } delete jeedom.scenario.cache.all delete jeedom.scenario.cache.byGroupObjectName - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/scenario.ajax.php' paramsAJAX.data = { action: 'saveAll', @@ -108,16 +108,16 @@ jeedom.scenario.saveAll = function(_params) { } jeedom.scenario.toHtml = function(_params) { - var paramsRequired = ['id', 'version'] - var paramsSpecifics = {} + const paramsRequired = ['id', 'version'] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/scenario.ajax.php' paramsAJAX.data = { action: 'toHtml', @@ -128,8 +128,8 @@ jeedom.scenario.toHtml = function(_params) { } jeedom.scenario.changeState = function(_params) { - var paramsRequired = ['id', 'state'] - var paramsSpecifics = { + const paramsRequired = ['id', 'state'] + const paramsSpecifics = { global: false } try { @@ -138,8 +138,8 @@ jeedom.scenario.changeState = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/scenario.ajax.php' paramsAJAX.data = { action: 'changeState', @@ -150,8 +150,8 @@ jeedom.scenario.changeState = function(_params) { } jeedom.scenario.getTemplate = function(_params) { - var paramsRequired = [] - var paramsSpecifics = { + const paramsRequired = [] + const paramsSpecifics = { global: false } try { @@ -160,8 +160,8 @@ jeedom.scenario.getTemplate = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/scenario.ajax.php' paramsAJAX.data = { action: 'getTemplate', @@ -170,16 +170,16 @@ jeedom.scenario.getTemplate = function(_params) { } jeedom.scenario.convertToTemplate = function(_params) { - var paramsRequired = ['id'] - var paramsSpecifics = {} + const paramsRequired = ['id'] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/scenario.ajax.php' paramsAJAX.data = { action: 'convertToTemplate', @@ -190,16 +190,16 @@ jeedom.scenario.convertToTemplate = function(_params) { } jeedom.scenario.removeTemplate = function(_params) { - var paramsRequired = ['template'] - var paramsSpecifics = {} + const paramsRequired = ['template'] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/scenario.ajax.php' paramsAJAX.data = { action: 'removeTemplate', @@ -209,16 +209,16 @@ jeedom.scenario.removeTemplate = function(_params) { } jeedom.scenario.loadTemplateDiff = function(_params) { - var paramsRequired = ['template', 'id'] - var paramsSpecifics = {} + const paramsRequired = ['template', 'id'] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/scenario.ajax.php' paramsAJAX.data = { action: 'loadTemplateDiff', @@ -229,16 +229,16 @@ jeedom.scenario.loadTemplateDiff = function(_params) { } jeedom.scenario.applyTemplate = function(_params) { - var paramsRequired = ['template', 'id', 'convert'] - var paramsSpecifics = {} + const paramsRequired = ['template', 'id', 'convert'] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/scenario.ajax.php' paramsAJAX.data = { action: 'applyTemplate', @@ -256,23 +256,24 @@ jeedom.scenario.refreshValue = function(_params) { return } } - var sc = document.querySelector('.scenario-widget[data-scenario_id="' + _params.scenario_id + '"]') + const sc = document.querySelector('.scenario-widget[data-scenario_id="' + _params.scenario_id + '"]') if (sc == null) { return } - var version = sc.getAttribute('data-version') - var paramsRequired = ['id'] - var paramsSpecifics = { + const version = sc.getAttribute('data-version') + const paramsRequired = ['id'] + const paramsSpecifics = { global: false, success: function(result) { + let tile try { - var tile = domUtils.parseHTML(result) + tile = domUtils.parseHTML(result) sc.empty().appendChild(tile) sc.querySelector('.scenario-widget').replaceWith(...sc.querySelector('scenario-widget').childNodes) } catch (error) { console.error(error) } - var tile = domUtils.parseHTML(result) + tile = domUtils.parseHTML(result) sc.empty().appendChild(result.childNodes) if (jeedomUtils.userDevice.type == undefined) { sc.triggerEvent('create') @@ -286,8 +287,8 @@ jeedom.scenario.refreshValue = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/scenario.ajax.php' paramsAJAX.data = { action: 'toHtml', @@ -298,8 +299,8 @@ jeedom.scenario.refreshValue = function(_params) { } jeedom.scenario.copy = function(_params) { - var paramsRequired = ['id', 'name'] - var paramsSpecifics = {} + const paramsRequired = ['id', 'name'] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { @@ -308,8 +309,8 @@ jeedom.scenario.copy = function(_params) { } delete jeedom.scenario.cache.all delete jeedom.scenario.cache.byGroupObjectName - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/scenario.ajax.php' paramsAJAX.data = { action: 'copy', @@ -320,16 +321,16 @@ jeedom.scenario.copy = function(_params) { } jeedom.scenario.byId = function(_params) { - var paramsRequired = ['id'] - var paramsSpecifics = {} + const paramsRequired = ['id'] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/scenario.ajax.php' paramsAJAX.data = { action: 'byId', @@ -339,16 +340,16 @@ jeedom.scenario.byId = function(_params) { } jeedom.scenario.get = function(_params) { - var paramsRequired = ['id'] - var paramsSpecifics = {} + const paramsRequired = ['id'] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/scenario.ajax.php' paramsAJAX.data = { action: 'get', @@ -358,8 +359,8 @@ jeedom.scenario.get = function(_params) { } jeedom.scenario.save = function(_params) { - var paramsRequired = ['scenario'] - var paramsSpecifics = {} + const paramsRequired = ['scenario'] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { @@ -368,8 +369,8 @@ jeedom.scenario.save = function(_params) { } delete jeedom.scenario.cache.all delete jeedom.scenario.cache.byGroupObjectName - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/scenario.ajax.php' paramsAJAX.data = { action: 'save', @@ -379,8 +380,8 @@ jeedom.scenario.save = function(_params) { } jeedom.scenario.remove = function(_params) { - var paramsRequired = ['id'] - var paramsSpecifics = {} + const paramsRequired = ['id'] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { @@ -389,8 +390,8 @@ jeedom.scenario.remove = function(_params) { } delete jeedom.scenario.cache.all delete jeedom.scenario.cache.byGroupObjectName - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/scenario.ajax.php' paramsAJAX.data = { action: 'remove', @@ -400,16 +401,16 @@ jeedom.scenario.remove = function(_params) { } jeedom.scenario.clearAllLogs = function(_params) { - var paramsRequired = [] - var paramsSpecifics = {} + const paramsRequired = [] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/scenario.ajax.php' paramsAJAX.data = { action: 'clearAllLogs' @@ -418,16 +419,16 @@ jeedom.scenario.clearAllLogs = function(_params) { } jeedom.scenario.emptyLog = function(_params) { - var paramsRequired = ['id'] - var paramsSpecifics = {} + const paramsRequired = ['id'] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/scenario.ajax.php' paramsAJAX.data = { action: 'emptyLog', @@ -456,7 +457,7 @@ jeedom.scenario.getSelectModal = function(_options, callback) { className: 'success', callback: { click: function(event) { - var args = {} + const args = {} args.human = mod_insertScenario.getValue() args.id = mod_insertScenario.getId() if (args.human.trim() != '') { @@ -480,16 +481,16 @@ jeedom.scenario.getSelectModal = function(_options, callback) { } jeedom.scenario.testExpression = function(_params) { - var paramsRequired = ['expression'] - var paramsSpecifics = {} + const paramsRequired = ['expression'] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/scenario.ajax.php' paramsAJAX.data = { action: 'testExpression', @@ -499,16 +500,16 @@ jeedom.scenario.testExpression = function(_params) { } jeedom.scenario.setOrder = function(_params) { - var paramsRequired = ['scenarios'] - var paramsSpecifics = {} + const paramsRequired = ['scenarios'] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/scenario.ajax.php' paramsAJAX.data = { action: 'setOrder', @@ -606,7 +607,7 @@ jeedom.scenario.setAutoComplete = function(_params) { _params.parent.querySelectorAll('.expression').forEach(_expr => { //Empty Action block ? - var attrType = _expr.querySelector('.expressionAttr[data-l1key="type"]') + const attrType = _expr.querySelector('.expressionAttr[data-l1key="type"]') if (attrType) { if (attrType.value == 'condition') { _expr.querySelector('.expressionAttr[data-l1key="' + _params.type + '"]').jeeComplete({ @@ -614,8 +615,8 @@ jeedom.scenario.setAutoComplete = function(_params) { minLength: 1, source: function(request, response) { //return last term after last space: - var values = request.term.split(' ') - var term = values[values.length - 1] + const values = request.term.split(' ') + const term = values[values.length - 1] if (term == '') return false //only space entered response( jeedom.scenario.autoCompleteCondition.filter(item => item.includes(term)) @@ -636,8 +637,8 @@ jeedom.scenario.setAutoComplete = function(_params) { if (data.value.substr(-1) == '#') { data.value = data.value.slice(0, -1) + data.value } else { - var values = data.value.split(' ') - var term = values[values.length - 1] + const values = data.value.split(' ') + const term = values[values.length - 1] data.value = data.value.slice(0, -term.length) + data.value } } diff --git a/core/js/security.class.js b/core/js/security.class.js index 9d6f504236..155a479b4d 100644 --- a/core/js/security.class.js +++ b/core/js/security.class.js @@ -17,16 +17,16 @@ jeedom.security = function() {}; jeedom.security.remove = function(_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/connection.ajax.php'; paramsAJAX.data = { action: 'remove', @@ -36,16 +36,16 @@ jeedom.security.remove = function(_params) { } jeedom.security.ban = function(_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/connection.ajax.php'; paramsAJAX.data = { action: 'ban', diff --git a/core/js/timeline.class.js b/core/js/timeline.class.js index ccd61fbbcd..e7f913b3cc 100644 --- a/core/js/timeline.class.js +++ b/core/js/timeline.class.js @@ -17,16 +17,16 @@ jeedom.timeline = function() {}; jeedom.timeline.getLength = function(_params) { - var paramsRequired = []; - var paramsSpecifics = {}; + const paramsRequired = []; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/timeline.ajax.php'; paramsAJAX.data = { action: 'getLength', @@ -36,16 +36,16 @@ jeedom.timeline.getLength = function(_params) { } jeedom.timeline.byFolder = function(_params) { - var paramsRequired = []; - var paramsSpecifics = {}; + const paramsRequired = []; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/timeline.ajax.php'; paramsAJAX.data = { action: 'byFolder', @@ -57,16 +57,16 @@ jeedom.timeline.byFolder = function(_params) { } jeedom.timeline.deleteAll = function(_params) { - var paramsRequired = []; - var paramsSpecifics = {}; + const paramsRequired = []; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/timeline.ajax.php'; paramsAJAX.data = { action: 'deleteAll' @@ -75,16 +75,16 @@ jeedom.timeline.deleteAll = function(_params) { } jeedom.timeline.listFolder = function(_params) { - var paramsRequired = []; - var paramsSpecifics = {}; + const paramsRequired = []; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/timeline.ajax.php'; paramsAJAX.data = { action: 'listFolder' @@ -93,16 +93,16 @@ jeedom.timeline.listFolder = function(_params) { } jeedom.timeline.removeEventInFutur = function(_params) { - var paramsRequired = [] - var paramsSpecifics = {} + const paramsRequired = [] + const paramsSpecifics = {} try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired) } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e) return } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) - var paramsAJAX = jeedom.private.getParamsAJAX(params) + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}) + const paramsAJAX = jeedom.private.getParamsAJAX(params) paramsAJAX.url = 'core/ajax/timeline.ajax.php' paramsAJAX.data = { action: 'removeEventInFutur' @@ -114,8 +114,8 @@ jeedom.timeline.autocompleteFolder = function() { jeedom.timeline.listFolder({ global: false, success: function(data) { - var availableTags = [] - for (var i in data) { + const availableTags = [] + for (const i in data) { if (data[i] != 'main') { availableTags.push(data[i]) } @@ -130,16 +130,16 @@ jeedom.timeline.autocompleteFolder = function() { }, select: function(event, data) { //Ensure timeline folders comma sperated: - var inputValue = data.item.value - var term = data.value + let inputValue = data.item.value + const term = data.value if (inputValue.includes(' ')) { - var values = inputValue.split(' ') + const values = inputValue.split(' ') values.pop() inputValue = values.join(',') + ',' + data.value } - var values = inputValue.split(',') + const values = inputValue.split(',') values.pop() - var newValue = values.join(',') + ',' + data.value + let newValue = values.join(',') + ',' + data.value if (newValue.substring(0, 1) == ',') newValue = newValue.substr(1) data.item.value = newValue diff --git a/core/js/update.class.js b/core/js/update.class.js index d8df081887..4a90082048 100644 --- a/core/js/update.class.js +++ b/core/js/update.class.js @@ -17,16 +17,16 @@ jeedom.update = function() {}; jeedom.update.doAll = function(_params) { - var paramsRequired = []; - var paramsSpecifics = {}; + const paramsRequired = []; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/update.ajax.php'; paramsAJAX.data = { action: 'updateAll', @@ -36,16 +36,16 @@ jeedom.update.doAll = function(_params) { } jeedom.update.do = function(_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/update.ajax.php'; paramsAJAX.data = { action: 'update', @@ -55,16 +55,16 @@ jeedom.update.do = function(_params) { } jeedom.update.remove = function(_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/update.ajax.php'; paramsAJAX.data = { action: 'remove', @@ -74,16 +74,16 @@ jeedom.update.remove = function(_params) { } jeedom.update.checkAll = function(_params) { - var paramsRequired = []; - var paramsSpecifics = {}; + const paramsRequired = []; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/update.ajax.php'; paramsAJAX.data = { action: 'checkAllUpdate' @@ -92,16 +92,16 @@ jeedom.update.checkAll = function(_params) { } jeedom.update.check = function(_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/update.ajax.php'; paramsAJAX.data = { action: 'checkUpdate', @@ -111,16 +111,16 @@ jeedom.update.check = function(_params) { } jeedom.update.get = function(_params) { - var paramsRequired = []; - var paramsSpecifics = {}; + const paramsRequired = []; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/update.ajax.php'; paramsAJAX.data = { action: 'all' @@ -129,16 +129,16 @@ jeedom.update.get = function(_params) { } jeedom.update.save = function(_params) { - var paramsRequired = ['update']; - var paramsSpecifics = {}; + const paramsRequired = ['update']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/update.ajax.php'; paramsAJAX.data = { action: 'save', @@ -148,16 +148,16 @@ jeedom.update.save = function(_params) { } jeedom.update.saves = function(_params) { - var paramsRequired = ['updates']; - var paramsSpecifics = {}; + const paramsRequired = ['updates']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/update.ajax.php'; paramsAJAX.data = { action: 'saves', @@ -167,8 +167,8 @@ jeedom.update.saves = function(_params) { } jeedom.update.number = function(_params) { - var paramsRequired = []; - var paramsSpecifics = { + const paramsRequired = []; + const paramsSpecifics = { global: false, }; try { @@ -177,8 +177,8 @@ jeedom.update.number = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/update.ajax.php'; paramsAJAX.data = { action: 'nbUpdate', diff --git a/core/js/user.class.js b/core/js/user.class.js index df5151d7ba..fc6c7e1a7b 100644 --- a/core/js/user.class.js +++ b/core/js/user.class.js @@ -18,16 +18,16 @@ jeedom.user = function() {}; jeedom.user.connectCheck = 0; jeedom.user.all = function(_params) { - var paramsRequired = []; - var paramsSpecifics = {}; + const paramsRequired = []; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/user.ajax.php'; paramsAJAX.data = { action: 'all', @@ -36,16 +36,16 @@ jeedom.user.all = function(_params) { } jeedom.user.remove = function(_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/user.ajax.php'; paramsAJAX.data = { action: 'remove', @@ -55,16 +55,16 @@ jeedom.user.remove = function(_params) { } jeedom.user.save = function(_params) { - var paramsRequired = ['users']; - var paramsSpecifics = {}; + const paramsRequired = ['users']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/user.ajax.php'; paramsAJAX.data = { action: 'save', @@ -74,16 +74,16 @@ jeedom.user.save = function(_params) { } jeedom.user.saveProfils = function(_params) { - var paramsRequired = ['profils']; - var paramsSpecifics = {}; + const paramsRequired = ['profils']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/user.ajax.php'; paramsAJAX.data = { action: 'saveProfils', @@ -93,16 +93,16 @@ jeedom.user.saveProfils = function(_params) { } jeedom.user.get = function(_params) { - var paramsRequired = []; - var paramsSpecifics = {}; + const paramsRequired = []; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/user.ajax.php'; paramsAJAX.data = { action: 'get', @@ -114,8 +114,8 @@ jeedom.user.get = function(_params) { jeedom.user.isConnect = function(_params) { if (Math.round(+new Date() / 1000) > (jeedom.user.connectCheck + 300)) { - var paramsRequired = []; - var paramsSpecifics = { + const paramsRequired = []; + const paramsSpecifics = { pre_success: function(data) { if (data.state != 'ok') { return { @@ -137,8 +137,8 @@ jeedom.user.isConnect = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/user.ajax.php'; paramsAJAX.global = false; paramsAJAX.data = { @@ -153,16 +153,16 @@ jeedom.user.isConnect = function(_params) { } jeedom.user.validateTwoFactorCode = function(_params) { - var paramsRequired = ['code']; - var paramsSpecifics = {}; + const paramsRequired = ['code']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/user.ajax.php'; paramsAJAX.data = { action: 'validateTwoFactorCode', @@ -173,16 +173,16 @@ jeedom.user.validateTwoFactorCode = function(_params) { } jeedom.user.removeTwoFactorCode = function(_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/user.ajax.php'; paramsAJAX.data = { action: 'removeTwoFactorCode', @@ -192,8 +192,8 @@ jeedom.user.removeTwoFactorCode = function(_params) { } jeedom.user.useTwoFactorAuthentification = function(_params) { - var paramsRequired = ['login']; - var paramsSpecifics = { + const paramsRequired = ['login']; + const paramsSpecifics = { global: false, } try { @@ -202,8 +202,8 @@ jeedom.user.useTwoFactorAuthentification = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/user.ajax.php'; paramsAJAX.data = { action: 'useTwoFactorAuthentification', @@ -213,16 +213,16 @@ jeedom.user.useTwoFactorAuthentification = function(_params) { } jeedom.user.login = function(_params) { - var paramsRequired = ['username', 'password']; - var paramsSpecifics = {}; + const paramsRequired = ['username', 'password']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/user.ajax.php'; paramsAJAX.data = { action: 'login', @@ -235,16 +235,16 @@ jeedom.user.login = function(_params) { } jeedom.user.refresh = function(_params) { - var paramsRequired = []; - var paramsSpecifics = {}; + const paramsRequired = []; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/user.ajax.php'; paramsAJAX.data = { action: 'refresh', @@ -253,16 +253,16 @@ jeedom.user.refresh = function(_params) { } jeedom.user.removeBanIp = function(_params) { - var paramsRequired = []; - var paramsSpecifics = {}; + const paramsRequired = []; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/user.ajax.php'; paramsAJAX.data = { action: 'removeBanIp', @@ -271,16 +271,16 @@ jeedom.user.removeBanIp = function(_params) { } jeedom.user.removeRegisterDevice = function(_params) { - var paramsRequired = []; - var paramsSpecifics = {}; + const paramsRequired = []; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/user.ajax.php'; paramsAJAX.data = { action: 'removeRegisterDevice', @@ -291,16 +291,16 @@ jeedom.user.removeRegisterDevice = function(_params) { } jeedom.user.deleteSession = function(_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/user.ajax.php'; paramsAJAX.data = { action: 'deleteSession', @@ -310,16 +310,16 @@ jeedom.user.deleteSession = function(_params) { } jeedom.user.supportAccess = function(_params) { - var paramsRequired = ['enable']; - var paramsSpecifics = {}; + const paramsRequired = ['enable']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/user.ajax.php'; paramsAJAX.data = { action: 'supportAccess', @@ -329,16 +329,16 @@ jeedom.user.supportAccess = function(_params) { } jeedom.user.copyRights = function(_params) { - var paramsRequired = ['from','to']; - var paramsSpecifics = {}; + const paramsRequired = ['from','to']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/user.ajax.php'; paramsAJAX.data = { action: 'copyRights', diff --git a/core/js/view.class.js b/core/js/view.class.js index 67501f4f14..7f8b6cd980 100644 --- a/core/js/view.class.js +++ b/core/js/view.class.js @@ -18,8 +18,8 @@ jeedom.view = function() {}; jeedom.view.cache = Array(); jeedom.view.all = function(_params) { - var paramsRequired = []; - var paramsSpecifics = { + const paramsRequired = []; + const paramsSpecifics = { pre_success: function(data) { jeedom.view.cache.all = data.result; return data; @@ -35,8 +35,8 @@ jeedom.view.all = function(_params) { _params.success(jeedom.view.cache.all); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/view.ajax.php'; paramsAJAX.data = { action: 'all', @@ -45,8 +45,8 @@ jeedom.view.all = function(_params) { } jeedom.view.toHtml = function(_params) { - var paramsRequired = ['id', 'version']; - var paramsSpecifics = { + const paramsRequired = ['id', 'version']; + const paramsSpecifics = { pre_success: function(data) { result = jeedom.view.handleViewAjax({ view: data.result @@ -62,8 +62,8 @@ jeedom.view.toHtml = function(_params) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/view.ajax.php'; paramsAJAX.data = { action: "get", @@ -75,16 +75,16 @@ jeedom.view.toHtml = function(_params) { } jeedom.view.copy = function(_params) { - var paramsRequired = ['id', 'name']; - var paramsSpecifics = {}; + const paramsRequired = ['id', 'name']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/view.ajax.php'; paramsAJAX.data = { action: 'copy', @@ -95,19 +95,19 @@ jeedom.view.copy = function(_params) { } jeedom.view.handleViewAjax = function(_params) { - var result = { + const result = { html: '', scenario: [], cmd: [], eqLogic: [] }; - var colIdx = 0 - var viewZone = null; - var div_class = null; - var div_id = null; - var viewData = null; - var configuration = null; - for (var i in _params.view.viewZone) { + let colIdx = 0 + let viewZone = null; + let div_class = null; + let div_id = null; + let viewData = null; + let configuration = null; + for (const i in _params.view.viewZone) { viewZone = _params.view.viewZone[i]; if (colIdx == 0) result.html += '
'; div_class = 'div_viewZone '; @@ -123,7 +123,7 @@ jeedom.view.handleViewAjax = function(_params) { /* * *****************viewZone widget***************** */ if (viewZone.type == 'widget') { result.html += '
'; - for (var j in viewZone.viewData) { + for (const j in viewZone.viewData) { viewData = viewZone.viewData[j]; result.html += viewData.html; result[viewData.type].push(viewData.id); @@ -132,7 +132,7 @@ jeedom.view.handleViewAjax = function(_params) { } else if (viewZone.type == 'graph') { result.html += '
'; result.html += '
'; - for (var j in viewZone.viewData) { + for (const j in viewZone.viewData) { viewData = viewZone.viewData[j]; configuration = JSON.stringify(viewData.configuration); option = configuration.replace(/"/g, "'"); @@ -152,16 +152,16 @@ jeedom.view.handleViewAjax = function(_params) { } jeedom.view.remove = function(_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/view.ajax.php'; paramsAJAX.data = { action: 'remove', @@ -171,16 +171,16 @@ jeedom.view.remove = function(_params) { } jeedom.view.save = function(_params) { - var paramsRequired = ['id', 'view']; - var paramsSpecifics = {}; + const paramsRequired = ['id', 'view']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/view.ajax.php'; paramsAJAX.data = { action: 'save', @@ -191,16 +191,16 @@ jeedom.view.save = function(_params) { } jeedom.view.get = function(_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/view.ajax.php'; paramsAJAX.data = { action: 'get', @@ -210,16 +210,16 @@ jeedom.view.get = function(_params) { } jeedom.view.setComponentOrder = function(_params) { - var paramsRequired = ['components']; - var paramsSpecifics = {}; + const paramsRequired = ['components']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/view.ajax.php'; paramsAJAX.data = { action: 'setComponentOrder', @@ -229,16 +229,16 @@ jeedom.view.setComponentOrder = function(_params) { } jeedom.view.setOrder = function(_params) { - var paramsRequired = ['views']; - var paramsSpecifics = {}; + const paramsRequired = ['views']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/view.ajax.php'; paramsAJAX.data = { action: 'setOrder', @@ -248,16 +248,16 @@ jeedom.view.setOrder = function(_params) { } jeedom.view.removeImage = function(_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/view.ajax.php'; paramsAJAX.data = { action: 'removeImage', diff --git a/core/js/widgets.class.js b/core/js/widgets.class.js index 19039796fb..3309928ed9 100644 --- a/core/js/widgets.class.js +++ b/core/js/widgets.class.js @@ -17,16 +17,16 @@ jeedom.widgets = function() {}; jeedom.widgets.remove = function(_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/widgets.ajax.php'; paramsAJAX.data = { action: "remove", @@ -36,16 +36,16 @@ jeedom.widgets.remove = function(_params) { } jeedom.widgets.byId = function(_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/widgets.ajax.php'; paramsAJAX.data = { action: "byId", @@ -55,16 +55,16 @@ jeedom.widgets.byId = function(_params) { } jeedom.widgets.save = function(_params) { - var paramsRequired = ['widgets']; - var paramsSpecifics = {}; + const paramsRequired = ['widgets']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/widgets.ajax.php'; paramsAJAX.data = { action: 'save', @@ -74,16 +74,16 @@ jeedom.widgets.save = function(_params) { } jeedom.widgets.all = function(_params) { - var paramsRequired = []; - var paramsSpecifics = {}; + const paramsRequired = []; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/widgets.ajax.php'; paramsAJAX.data = { action: 'all' @@ -92,16 +92,16 @@ jeedom.widgets.all = function(_params) { } jeedom.widgets.getTemplateConfiguration = function(_params) { - var paramsRequired = ['template']; - var paramsSpecifics = {}; + const paramsRequired = ['template']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/widgets.ajax.php'; paramsAJAX.data = { action: 'getTemplateConfiguration', @@ -111,16 +111,16 @@ jeedom.widgets.getTemplateConfiguration = function(_params) { } jeedom.widgets.getPreview = function(_params) { - var paramsRequired = ['id']; - var paramsSpecifics = {}; + const paramsRequired = ['id']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/widgets.ajax.php'; paramsAJAX.data = { action: "getPreview", @@ -130,16 +130,16 @@ jeedom.widgets.getPreview = function(_params) { } jeedom.widgets.replacement = function(_params) { - var paramsRequired = ['version', 'replace', 'by']; - var paramsSpecifics = {}; + const paramsRequired = ['version', 'replace', 'by']; + const paramsSpecifics = {}; try { jeedom.private.checkParamsRequired(_params || {}, paramsRequired); } catch (e) { (_params.error || paramsSpecifics.error || jeedom.private.default_params.error)(e); return; } - var params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); - var paramsAJAX = jeedom.private.getParamsAJAX(params); + const params = domUtils.extend({}, jeedom.private.default_params, paramsSpecifics, _params || {}); + const paramsAJAX = jeedom.private.getParamsAJAX(params); paramsAJAX.url = 'core/ajax/widgets.ajax.php'; paramsAJAX.data = { action: "replacement", From dcf3cb78fe497168f744cc8f9eb6e5be7b946e82 Mon Sep 17 00:00:00 2001 From: limad <35463455+limad@users.noreply.github.com> Date: Sat, 25 Apr 2026 16:54:45 +0200 Subject: [PATCH 4/5] =?UTF-8?q?Fix=20scoping=20regressions=20and=20implici?= =?UTF-8?q?t=20globals=20from=20var=E2=86=92let/const=20migration?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - cmd.class.js: hoist eqLogic out of `if (notify)` block (was breaking callbacks at lines 87-172 with ReferenceError) - history.class.js: hoist series out of mutually-exclusive if/else blocks (referenced after the block in addSeries calls and config object) - core.js: declare loop variable `i` in `for (i in _replace)` (was leaking as implicit global) - view.class.js: declare `result` and `option` (were leaking as implicit globals in pre_success and handleViewAjax) - private.class.js: remove dead `const param = null` declaration - desktop/js/log.js: apply PR #3270 multi-term search refactor with proper const/let usage instead of var Found via ESLint (no-var, prefer-const, no-const-assign) plus targeted audit for var→let/const block-scoping regressions. --- core/js/cmd.class.js | 8 ++++---- core/js/core.js | 2 +- core/js/history.class.js | 5 +++-- core/js/private.class.js | 2 -- core/js/view.class.js | 4 ++-- desktop/js/log.js | 35 +++++++++++++++-------------------- 6 files changed, 25 insertions(+), 31 deletions(-) diff --git a/core/js/cmd.class.js b/core/js/cmd.class.js index d71d8b505b..b1fc3a0870 100644 --- a/core/js/cmd.class.js +++ b/core/js/cmd.class.js @@ -55,10 +55,10 @@ jeedom.cmd.execute = function(_params) { return } const notify = _params.notify ?? true - if (notify) { - const eqLogic = document.querySelector('.cmd[data-cmd_id="' + _params.id + '"]')?.closest('div.eqLogic-widget') - if (eqLogic) jeedom.cmd.notifyEq(eqLogic, false) - } + const eqLogic = notify + ? document.querySelector('.cmd[data-cmd_id="' + _params.id + '"]')?.closest('div.eqLogic-widget') + : null + if (eqLogic) jeedom.cmd.notifyEq(eqLogic, false) if (_params.value != 'undefined' && (is_array(_params.value) || is_object(_params.value))) { _params.value = JSON.stringify(_params.value) } diff --git a/core/js/core.js b/core/js/core.js index 05c8257b1a..464cb50a68 100644 --- a/core/js/core.js +++ b/core/js/core.js @@ -32,7 +32,7 @@ function getTemplate(_folder, _version, _filename, _replace) { success: function(data) { if (isset(_replace) && _replace != null) { let reg = null; - for (i in _replace) { + for (const i in _replace) { reg = new RegExp(i, "g"); data = data.replace(reg, _replace[i]); } diff --git a/core/js/history.class.js b/core/js/history.class.js index b0f55da15d..09c1d04952 100644 --- a/core/js/history.class.js +++ b/core/js/history.class.js @@ -695,6 +695,7 @@ jeedom.history.drawChart = function(_params) { } //cmd info string has no value: + let series if (data.result.timelineOnly) { if (!isset(jeedom.history.chart[_params.el]) || !isset(jeedom.history.chart[_params.el].nbTimeline)) { nbTimeline = 1 @@ -703,7 +704,7 @@ jeedom.history.drawChart = function(_params) { nbTimeline = jeedom.history.chart[_params.el].nbTimeline } - const series = { + series = { type: 'flags', visible: _visible, name: (isset(_params.option.name)) ? _params.option.name + ' ' + data.result.unite : data.result.history_name + ' ' + data.result.unite, @@ -742,7 +743,7 @@ jeedom.history.drawChart = function(_params) { data.result.data[i][1] = -data.result.data[i][1] } } - const series = { + series = { dataGrouping: dataGrouping, type: _params.option.graphType, visible: _visible, diff --git a/core/js/private.class.js b/core/js/private.class.js index 91d434c7d8..2c858bb0d6 100644 --- a/core/js/private.class.js +++ b/core/js/private.class.js @@ -273,8 +273,6 @@ jeedom.private.checkAndGetParams = function(_params, _paramsSpecifics, _paramsRe //Merge default and function specific parameters const params = domUtils.extend({}, jeedom.private.default_params, _paramsSpecifics, _params || {}); - //Convert all objects in params to json - const param = null; for (const attr in params) { params[attr] = (typeof params[attr] == 'object') ? JSON.stringify(params[attr]) : params[attr]; } diff --git a/core/js/view.class.js b/core/js/view.class.js index 7f8b6cd980..68fbc77cfc 100644 --- a/core/js/view.class.js +++ b/core/js/view.class.js @@ -48,7 +48,7 @@ jeedom.view.toHtml = function(_params) { const paramsRequired = ['id', 'version']; const paramsSpecifics = { pre_success: function(data) { - result = jeedom.view.handleViewAjax({ + const result = jeedom.view.handleViewAjax({ view: data.result }); result.raw = data.result; @@ -135,7 +135,7 @@ jeedom.view.handleViewAjax = function(_params) { for (const j in viewZone.viewData) { viewData = viewZone.viewData[j]; configuration = JSON.stringify(viewData.configuration); - option = configuration.replace(/"/g, "'"); + const option = configuration.replace(/"/g, "'"); result.html += ''; } result.html += '
'; diff --git a/desktop/js/log.js b/desktop/js/log.js index bd7e191a60..a37cdfc8b5 100644 --- a/desktop/js/log.js +++ b/desktop/js/log.js @@ -24,8 +24,8 @@ if (!jeeFrontEnd.log) { this.logListButtons = document.querySelectorAll('#ul_object .li_log') //autoclick first log: - var logfile = getUrlVars('logfile') - var log = document.querySelector('#div_displayLogList .li_log[data-log="' + logfile + '"]') + const logfile = getUrlVars('logfile') + const log = document.querySelector('#div_displayLogList .li_log[data-log="' + logfile + '"]') if (log != null) { log.click() } else { @@ -37,28 +37,23 @@ if (!jeeFrontEnd.log) { //searching document.getElementById('in_searchLogFilter')?.addEventListener('keyup', function(event) { - var search = event.target.value - if (search == '') { + const raw = event.target.value + if (raw == '') { jeeP.logListButtons.seen() return } - var not = search.startsWith(":not(") - if (not) { - search = search.replace(':not(', '') - } - search = jeedomUtils.normTextLower(search) + + const terms = raw.split(',').map(t => t.trim()).filter(t => t.length > 0) + jeeP.logListButtons.unseen() - var match, text jeeP.logListButtons.forEach(_bt => { - match = false - text = jeedomUtils.normTextLower(_bt.textContent) - if (text.includes(search)) { - match = true - } - if (not) match = !match - if (match) { - _bt.seen() - } + const text = jeedomUtils.normTextLower(_bt.textContent) + const match = terms.some(term => { + const not = term.startsWith(':not(') + const search = jeedomUtils.normTextLower(not ? term.slice(5, -1) : term) + return not ? !text.includes(search) : text.includes(search) + }) + if (match) _bt.seen() }) }) @@ -66,7 +61,7 @@ document.getElementById('in_searchLogFilter')?.addEventListener('keyup', functio */ //div_pageContainer events delegation: document.getElementById('div_pageContainer').addEventListener('click', function(event) { - var _target = null + let _target = null // "Raw log" button clicked if (_target = event.target.closest('#brutlogcheck')) { From 813cc637c9aabd54efb380e23ff0af43a766258b Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 25 Apr 2026 14:58:21 +0000 Subject: [PATCH 5/5] Update release-notes.md [skip ci] --- docs/release-notes.md | 53 +++++-------------------------------------- 1 file changed, 6 insertions(+), 47 deletions(-) diff --git a/docs/release-notes.md b/docs/release-notes.md index fa7e19ca28..64719e3ab8 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -1,61 +1,20 @@ -# All changes since release 4.5.3 +# All changes since release 4.2.7 ## New core features -| Merge date | Title | PR | -| --- | --- | --- | -| 2026-04-19 15:18:24 | Add healthcheck in the docker container | [#2998](https://github.com/jeedom/core/pull/2998) | +no entries ## Breaking changes no entries ## Fixes -| Merge date | Title | PR | -| --- | --- | --- | -| 2026-04-25 08:00:07 | Fix: translations string concatenation | [#3289](https://github.com/jeedom/core/pull/3289) | -| 2026-04-21 11:24:20 | fix: prevent a possible SQL injection in archive process | [#3268](https://github.com/jeedom/core/pull/3268) | -| 2026-04-20 11:11:26 | Fix: scenario expression execute without scenario | [#3228](https://github.com/jeedom/core/pull/3228) | -| 2026-04-20 11:03:03 | Fix undefined variable in AJAX remove after market→repo migration | [#3118](https://github.com/jeedom/core/pull/3118) | -| 2026-04-19 20:34:27 | Rename count variable to count_functionality | [#3273](https://github.com/jeedom/core/pull/3273) | -| 2026-04-19 08:25:34 | fix: prevent a possible SQL injection in setComponentOrder | [#3267](https://github.com/jeedom/core/pull/3267) | -| 2026-04-17 15:14:11 | fix: display_name field (ui) | [#3262](https://github.com/jeedom/core/pull/3262) | -| 2026-04-17 14:01:55 | fix: scenario self execute mixing tags | [#3255](https://github.com/jeedom/core/pull/3255) | -| 2026-04-17 09:35:39 | fix: Suppression des arguments superflus dans les appels de méthodes (PHPStan lvl 1) | [#3258](https://github.com/jeedom/core/pull/3258) | -| 2026-04-17 09:35:16 | fix: Correction des méthodes statiques et du nommage de classes (PHPStan lvl 1) | [#3259](https://github.com/jeedom/core/pull/3259) | -| 2026-04-16 13:05:53 | Fix: issue displaying history if grouping type is set | [#3242](https://github.com/jeedom/core/pull/3242) | -| 2026-04-03 08:46:58 | fix: randText function | [#3197](https://github.com/jeedom/core/pull/3197) | -| 2026-04-02 14:13:11 | fix: resolve 3 bugs in proxy configuration in jsonrpcClient | [#3238](https://github.com/jeedom/core/pull/3238) | -| 2026-03-31 20:51:42 | fix: graphUpdate function in history class | [#3178](https://github.com/jeedom/core/pull/3178) | +no entries ## Others -| Merge date | Title | PR | -| --- | --- | --- | -| 2026-04-25 08:04:11 | Update translations | [#3295](https://github.com/jeedom/core/pull/3295) | -| 2026-04-25 07:30:36 | Update translations | [#3293](https://github.com/jeedom/core/pull/3293) | -| 2026-04-20 11:50:35 | Update translations | [#3285](https://github.com/jeedom/core/pull/3285) | -| 2026-04-08 09:16:23 | chore: Correction *aucun* script | [#3246](https://github.com/jeedom/core/pull/3246) | -| 2026-04-04 07:56:05 | chore: typo Securité | [#3241](https://github.com/jeedom/core/pull/3241) | +no entries ## Documentations -| Merge date | Title | PR | -| --- | --- | --- | -| 2026-04-20 11:02:18 | Auto-generated draft of release notes / changelog in develop | [#3278](https://github.com/jeedom/core/pull/3278) | +no entries ## Developer -| Merge date | Title | PR | -| --- | --- | --- | -| 2026-04-25 11:58:25 | Increase PR list limit to 1000 iso 30 by default | [#3296](https://github.com/jeedom/core/pull/3296) | -| 2026-04-24 17:12:16 | don't use core translations | [#3294](https://github.com/jeedom/core/pull/3294) | -| 2026-04-24 15:04:14 | Bump docker/setup-qemu-action from 2 to 4 | [#3279](https://github.com/jeedom/core/pull/3279) | -| 2026-04-24 15:03:36 | Bump docker/login-action from 2 to 4 | [#3280](https://github.com/jeedom/core/pull/3280) | -| 2026-04-24 15:03:23 | Bump docker/build-push-action from 3 to 7 | [#3281](https://github.com/jeedom/core/pull/3281) | -| 2026-04-24 14:54:09 | Bump docker/setup-buildx-action from 2 to 4 | [#3282](https://github.com/jeedom/core/pull/3282) | -| 2026-04-24 14:03:50 | remove french translations from others languages file | [#3290](https://github.com/jeedom/core/pull/3290) | -| 2026-04-20 11:38:39 | Bump actions/cache from 3 to 5 | [#3283](https://github.com/jeedom/core/pull/3283) | -| 2026-04-20 11:29:10 | add [skip ci] in commit message to try to avoid execution of others WF | [#3287](https://github.com/jeedom/core/pull/3287) | -| 2026-04-20 11:01:32 | add dependabot only for github-actions at first | [#3239](https://github.com/jeedom/core/pull/3239) | -| 2026-04-17 21:11:17 | new workflow for translations | [#3251](https://github.com/jeedom/core/pull/3251) | -| 2026-04-17 12:26:56 | Fix PHPStan workflow on branch deletion | [#3263](https://github.com/jeedom/core/pull/3263) | -| 2026-04-16 22:32:24 | Use Composer dependency for PHPStan | [#3256](https://github.com/jeedom/core/pull/3256) | -| 2026-04-13 08:16:53 | feat: improve "do not remove log" feature | [#3245](https://github.com/jeedom/core/pull/3245) | -| 2026-04-03 15:27:29 | Update GitHub workflows to use 'develop' branch instead of 'alpha' and 'beta' | [#3240](https://github.com/jeedom/core/pull/3240) | +no entries