События и получение конфигурации (проверка включен ли дебаг) переведены на D7

Author: ggrachdev

assets/DebugBar/js/initializer.js

@@ -61,8 +61,16 @@ Ggrach.Utils.User = {
 
 Ggrach.Utils.DOM = {
 
+    hideOverlay: function () {
+        Ggrach.Utils.DOM.getOverlay().style.display = 'none';
+    },
+
+    showOverlay: function () {
+        Ggrach.Utils.DOM.getOverlay().style.display = 'block';
+    },
+
     getDebugBarLogsType: function (type) {
-        return document.querySelector('.ggrach__debug_bar__log[data-type-notice="' + type + '"]')
+        return document.querySelector('.ggrach__debug_bar__log[data-type-notice="' + type + '"]');
     },
 
     getDebugBarLogs: function () {
@@ -82,7 +90,7 @@ Ggrach.Handlers = {
 
     // Нажатие клавиши esc
     onKeyEsc: function (e) {
-        if ((e.key == 'Escape' || e.key == 'Esc' || e.keyCode == 27) && (e.target.nodeName == 'BODY')) {
+        if ((e.key === 'Escape' || e.key === 'Esc' || e.keyCode == 27) && (e.target.nodeName === 'BODY')) {
 
             if (document.querySelector('[data-type-notice].active'))
             {
@@ -116,13 +124,13 @@ Ggrach.Handlers = {
             e.target.classList.remove('active');
             document.querySelector('body').style.overflow = null;
             $targetLogPanel.style.display = 'none';
-            Ggrach.Utils.DOM.getOverlay().style.display = 'none';
+            Ggrach.Utils.DOM.hideOverlay();
         } else
         {
             e.target.classList.add('active');
             document.querySelector('body').style.overflow = 'hidden';
             $targetLogPanel.style.display = 'block';
-            Ggrach.Utils.DOM.getOverlay().style.display = 'block';
+            Ggrach.Utils.DOM.showOverlay();
         }
     }
 };

events.php

@@ -1,7 +1,11 @@
 <?php
 
 // Добавляем дебаг-бар
-AddEventHandler("main", "OnEndBufferContent", "GgrachAddDebugBar");
+\Bitrix\Main\EventManager::getInstance()->addEventHandler(
+    "main",
+    "OnEndBufferContent",
+    "GgrachAddDebugBar"
+);
 
 function GgrachAddDebugBar(&$content) {
 
@@ -26,6 +30,6 @@ function GgrachAddDebugBar(&$content) {
         return;
     }
 
-    $logData = \GGrach\BitrixDebugger\Representer\DebugBarRepresenter::render(GD());
+    $logData = \GGrach\BitrixDebugger\Representer\DebugBarRepresenter::render(DD());
     $content = \str_replace('</body>', $logData . '</body>', $content);
 }

initializer.php

@@ -49,21 +49,21 @@
     $ggrachDebuggerConfigurator->setLogPath('success', __DIR__ . '/logs/success.log');
     $ggrachDebuggerConfigurator->setLogPath('notice', __DIR__ . '/logs/notice.log');
 
-    global $GD;
-    $GD = new \GGrach\BitrixDebugger\Debugger\Debugger($ggrachDebuggerConfigurator, $ggrachDebugBarConfigurator);
+    global $DD;
+    $DD = new \GGrach\BitrixDebugger\Debugger\Debugger($ggrachDebuggerConfigurator, $ggrachDebugBarConfigurator);
 
     /*
      * code - отображать дебаг-данные в коде
      * debug_bar - отображать дебаг-данные в debug_bar
      */
-    $GD->setShowModes(['code', 'debug_bar']);
+    $DD->setShowModes(['code', 'debug_bar']);
 
-    function GD() {
-        global $GD;
-        return $GD;
+    function DD() {
+        global $DD;
+        return $DD;
     }
 
-    if (\GGrach\BitrixDebugger\Validator\ShowModeDebuggerValidator::needShowInDebugBar($GD)) {
+    if (\GGrach\BitrixDebugger\Validator\ShowModeDebuggerValidator::needShowInDebugBar($DD)) {
 
         Asset::getInstance()->addJs($ggrachDebuggerRootPath . "/assets/DebugBar/js/initializer.js");
         Asset::getInstance()->addCss($ggrachDebuggerRootPath . '/assets/DebugBar/themes/general.css');

src/BitrixDebugger/Representer/DebugBarRepresenter.php

@@ -13,17 +13,18 @@ class DebugBarRepresenter {
 
     public static function render(Debugger $debugger): string {
 
-        global $DBDebug, $APPLICATION;
+        global $DBDebug;
 
         $debugIsOn = false;
 
-        $bxSettings = require $_SERVER['DOCUMENT_ROOT'] . '/bitrix/.settings.php';
-
+//        $bxSettings = require $_SERVER['DOCUMENT_ROOT'] . '/bitrix/.settings.php';
+        $bxSettingsDebug = \Bitrix\Main\Config\Configuration::getValue("exception_handling")['debug'];
+        
         $log = $debugger->getLog();
 
         $view = '<section class="ggrach__overlay" style="display: none;"></section><section class="ggrach__debug_bar">';
 
-        if ($DBDebug || $bxSettings['exception_handling']['value']['debug']) {
+        if ($DBDebug || $bxSettingsDebug) {
             $debugIsOn = true;
         } else {
             $debugIsOn = false;