Merge pull request #2279 from jeedom/alpha

merge
jeedom · Aug 24, 2023 · 0be55d0 · 0be55d0
2 parents bcdbf23 + 7980e96
commit 0be55d0
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git a/core/dom/dom.utils.js b/core/dom/dom.utils.js
@@ -694,7 +694,7 @@ EventTarget.prototype.unRegisterEvent = function(_type, _id) {
 }
 
 EventTarget.prototype.getRegisteredEvent = function(_type, _id) {
-  var self = this
+  let self = this
   let listeners = domUtils.registeredEvents.filter(function(listener) {
     return ( (isset(_type)? listener.type == _type : true) && (isset(_id)? listener.id == _id : true) && listener.element == self )
   })

diff --git a/desktop/js/dashboard.js b/desktop/js/dashboard.js
@@ -231,7 +231,7 @@ if (!jeeFrontEnd.dashboard) {
     },
     getObjectHtmlFromSummary: function(_object_id) {
       if (_object_id == null) return
-      self = this
+      let self = this
       self._object_id = _object_id
       self.summaryObjEqs = []
       self.summaryObjEqs[_object_id] = []
@@ -297,7 +297,7 @@ if (!jeeFrontEnd.dashboard) {
       })
     },
     getObjectHtml: function(_object_id) {
-      self = this
+      let self = this
       jeedom.object.toHtml({
         id: _object_id,
         version: 'dashboard',

diff --git a/desktop/js/editor.js b/desktop/js/editor.js
@@ -259,7 +259,7 @@ var options = {
             name : '{{Editer}}'
           },
           load : function(textarea) {
-            self = this
+            let self = this
             var elfinderInstance = $('#elfinder').elfinder(options).elfinder('instance')
             var fileUrl = elfinderInstance.url(self.file.hash)
             fileUrl = fileUrl.replace('/core/php/../../', '')

diff --git a/desktop/js/history.js b/desktop/js/history.js
@@ -311,7 +311,7 @@ if (!jeeFrontEnd.history) {
       jeedom.history.emptyChart(this.__el__, true)
 
       //add data from both date range:
-      self = this
+      let self = this
       jeedom.history.drawChart({
         cmd_id: _cmd_id,
         el: self.__el__,

diff --git a/desktop/js/overview.js b/desktop/js/overview.js
@@ -82,7 +82,7 @@ if (!jeeFrontEnd.overview) {
     },
     getSummaryHtml: function(_object_id, _summary, _title) {
       this.summaryObjEqs[_object_id] = []
-      self = this
+      let self = this
       jeedom.object.getEqLogicsFromSummary({
         id: _object_id,
         onlyEnable: '1',

diff --git a/desktop/js/plugin.js b/desktop/js/plugin.js
@@ -49,7 +49,7 @@ if (!jeeFrontEnd.plugin) {
     },
     displayPlugin: function(_pluginId) {
       jeedomUtils.hideAlert()
-      var self = this
+      let self = this
       //Is plugin page displayed inside modal from _pluginId page or Core plugin management page:
       this.modal = jeeDialog.get('#div_confPlugin', 'dialog')
       if (this.modal != null) {

diff --git a/desktop/modal/cmd.history.php b/desktop/modal/cmd.history.php
@@ -83,7 +83,7 @@
     done: null,
     loadIds: null,
     init: function(_cmdIds) {
-      self = this
+      let self = this
       document.getElementById(this.__el__).style.position = 'relative'
       document.getElementById(this.__el__).style.width = '100%'
       delete jeedom.history.chart[this.__el__]

diff --git a/desktop/modal/search.php b/desktop/modal/search.php
@@ -216,7 +216,7 @@
 if (!jeeFrontEnd.md_search) {
   jeeFrontEnd.md_search = {
     init: function() {
-      var self = this
+      let self = this
       this.tableScSearch = document.getElementById('table_ScenarioSearch')
       this.tablePlanSearch = document.getElementById('table_DesignSearch')
       this.tableViewSearch = document.getElementById('table_ViewSearch')
@@ -255,7 +255,7 @@
     },
     /* ------            Searching            -------*/
     searchFor_variable: function(_searchFor) {
-      self = this
+      let self = this
       jeedom.dataStore.byTypeLinkIdKey({
         type: 'scenario',
         linkId: -1,
@@ -295,7 +295,7 @@
       })
     },
     searchFor_plugin: function(_searchFor) {
-      self = this
+      let self = this
       jeedom.eqLogic.byType({
         type: _searchFor,
         error: function(error) {
@@ -319,7 +319,7 @@
         var eQiD = _byId
       }
 
-      self = this
+      let self = this
       jeedom.eqLogic.usedBy({
         id: eQiD,
         error: function(error) {
@@ -373,7 +373,7 @@
         var cmdId = _byId
       }
 
-      self = this
+      let self = this
       jeedom.cmd.usedBy({
         id: cmdId,
         error: function(error) {
@@ -406,7 +406,7 @@
       })
     },
     searchFor_string: function(_searchFor) {
-      self = this
+      let self = this
       jeedom.getStringUsedBy({
         search: _searchFor,
         error: function(error) {
@@ -436,7 +436,7 @@
       })
     },
     searchFor_id: function(_searchFor) {
-      self = this
+      let self = this
       jeedom.getIdUsedBy({
         search: _searchFor,
         error: function(error) {