From 7a0cbbe1fd534663e52130366be4b8485fd7d216 Mon Sep 17 00:00:00 2001 From: pifou25 Date: Sat, 18 May 2024 12:22:42 +0200 Subject: [PATCH 1/3] fix: debug option show stack trace MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Je suppose qu'on a perdu cette fonctionnalité avec la v4.4 mais avant on avait la possibilité d'activer les traces en debug. --- core/js/core.js | 15 +++++++++++++++ core/php/utils.inc.php | 6 +++--- sick.php | 2 +- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/core/js/core.js b/core/js/core.js index 71482433cc..0953e2da0c 100644 --- a/core/js/core.js +++ b/core/js/core.js @@ -14,6 +14,21 @@ * along with Jeedom. If not, see . */ + +function toggle(id, event = null) { + if(event !== null){ + event.stopPropagation(); + } + var x = document.getElementById(id); + console.debug(x.style.display); + if (x.style.display === "none") { + x.style.display = "block"; + } else { + x.style.display = "none"; + } + return false; +} + function getTemplate(_folder, _version, _filename, _replace) { if (_folder == 'core') { var path = _folder + '/template/' + _version + '/' + _filename; diff --git a/core/php/utils.inc.php b/core/php/utils.inc.php index d63792f03c..06d2b6a180 100644 --- a/core/php/utils.inc.php +++ b/core/php/utils.inc.php @@ -254,9 +254,9 @@ function mySqlIsHere() { function displayException($e) { $message = '' . $e->getMessage() . ''; - if (DEBUG) { - $message .= 'Show traces'; - $message .= '
'; + if (DEBUG !== 0) { + $message .= "Show traces"; + $message .= '
'; } return $message; } diff --git a/sick.php b/sick.php index 6855776dc6..83725699c7 100644 --- a/sick.php +++ b/sick.php @@ -75,7 +75,7 @@ $user->save(); echo "OK (admin/admin)\n"; } -} catch (Exeption $e) { +} catch (Exception $e) { echo "ERROR\n"; echo "Description : " . $e->getMessage(); echo "\n"; From f7d0c89791ebf970947f1acad1dc4ad706d89aef Mon Sep 17 00:00:00 2001 From: pifou25 Date: Sat, 18 May 2024 12:22:42 +0200 Subject: [PATCH 2/3] fix: debug option show stack trace MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Je suppose qu'on a perdu cette fonctionnalité avec la v4.4 mais avant on avait la possibilité d'activer les traces en debug. --- core/dom/dom.ui.js | 15 ++++++++++++++- core/php/utils.inc.php | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/core/dom/dom.ui.js b/core/dom/dom.ui.js index 44ae6a101b..343994b4e4 100644 --- a/core/dom/dom.ui.js +++ b/core/dom/dom.ui.js @@ -77,7 +77,20 @@ NodeList.prototype.unseen = function() { } return this } - +Element.prototype.toggle = function() { + if (this.offsetParent === null){ + this.style.display = '' + } else { + this.style.display = 'none' + } + return this +} +NodeList.prototype.toggle = function() { + for (var idx = 0; idx < this.length; idx++) { + this[idx].toggle() + } + return this +} Element.prototype.empty = function() { while (this.firstChild) { this.removeChild(this.lastChild) diff --git a/core/php/utils.inc.php b/core/php/utils.inc.php index e33bae9587..a786c0d20e 100644 --- a/core/php/utils.inc.php +++ b/core/php/utils.inc.php @@ -255,7 +255,7 @@ function mySqlIsHere() { function displayException($e) { $message = '' . $e->getMessage() . ''; if (DEBUG !== 0) { - $message .= "Show traces"; + $message .= "Show traces"; $message .= '
'; } return $message; From 2c023f6cf1fd5ceae62844a8f5226990e2f95761 Mon Sep 17 00:00:00 2001 From: pifou25 Date: Sun, 2 Jun 2024 00:11:54 +0200 Subject: [PATCH 3/3] remove unused toggle function from core.js --- core/js/core.js | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/core/js/core.js b/core/js/core.js index 0953e2da0c..71482433cc 100644 --- a/core/js/core.js +++ b/core/js/core.js @@ -14,21 +14,6 @@ * along with Jeedom. If not, see . */ - -function toggle(id, event = null) { - if(event !== null){ - event.stopPropagation(); - } - var x = document.getElementById(id); - console.debug(x.style.display); - if (x.style.display === "none") { - x.style.display = "block"; - } else { - x.style.display = "none"; - } - return false; -} - function getTemplate(_folder, _version, _filename, _replace) { if (_folder == 'core') { var path = _folder + '/template/' + _version + '/' + _filename;