Skip to content

Refactor var to const/let in core JS utilities (1/4) #3300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mips2648 merged 2 commits into from
May 5, 2026
Merged

Refactor var to const/let in core JS utilities (1/4) #3300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5de8622
Refactor var to const/let in core JS utilities
limad Apr 28, 2026
148493b
Restore space after = on empty initializations (kwizer15 review)
limad May 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions core/js/cache.class.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
Expand All @@ -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',
Expand All @@ -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'
Expand All @@ -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'
Expand Down
39 changes: 21 additions & 18 deletions core/js/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -30,8 +31,8 @@ function getTemplate(_folder, _version, _filename, _replace) {
},
success: function(data) {
if (isset(_replace) && _replace != null) {
var reg = null;
for (i in _replace) {
let reg = null;
for (const i in _replace) {
reg = new RegExp(i, "g");
data = data.replace(reg, _replace[i]);
}
Expand Down Expand Up @@ -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++;
Expand All @@ -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];
Expand All @@ -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 = ''
Expand Down Expand Up @@ -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
Expand Down
34 changes: 17 additions & 17 deletions core/js/dataStore.class.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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',
Expand All @@ -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',
Expand Down Expand Up @@ -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() != '') {
Expand All @@ -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',
Expand Down
Loading
Loading