From bca664de299ff3413395e4cd0565e0f00cc69b27 Mon Sep 17 00:00:00 2001 From: David Grudl Date: Mon, 18 Feb 2019 16:07:58 +0100 Subject: [PATCH] bar: replaced attribute 'rel' with 'data-tracy-action' for closing & open-to-window links --- src/Tracy/Bar/assets/bar.js | 10 +++++----- src/Tracy/Bar/assets/bar.phtml | 2 +- src/Tracy/Bar/assets/panels.phtml | 4 ++-- tests/Tracy/expected/Debugger.barDump().expect | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Tracy/Bar/assets/bar.js b/src/Tracy/Bar/assets/bar.js index 1efffe2d0..3c25eb79a 100644 --- a/src/Tracy/Bar/assets/bar.js +++ b/src/Tracy/Bar/assets/bar.js @@ -62,9 +62,9 @@ elem.querySelectorAll('.tracy-icons a').forEach((link) => { link.addEventListener('click', (e) => { - if (link.rel === 'close') { + if (link.dataset.tracyAction === 'close') { this.toPeek(); - } else if (link.rel === 'window') { + } else if (link.dataset.tracyAction === 'window') { this.toWindow(); } e.preventDefault(); @@ -258,7 +258,7 @@ initTabs(elem) { elem.querySelectorAll('a').forEach((link) => { link.addEventListener('click', (e) => { - if (link.rel === 'close') { + if (link.dataset.tracyAction === 'close') { this.close(); } else if (link.rel) { @@ -284,7 +284,7 @@ }); link.addEventListener('mouseenter', (e) => { - if (e.buttons || !link.rel || link.rel === 'close' || elem.classList.contains('tracy-dragged')) { + if (e.buttons || !link.rel || elem.classList.contains('tracy-dragged')) { return; } @@ -311,7 +311,7 @@ link.addEventListener('mouseleave', () => { clearTimeout(this.displayTimeout); - if (link.rel && link.rel !== 'close' && !elem.classList.contains('tracy-dragged')) { + if (link.rel && !elem.classList.contains('tracy-dragged')) { Debug.panels[link.rel].blur(); } }); diff --git a/src/Tracy/Bar/assets/bar.phtml b/src/Tracy/Bar/assets/bar.phtml index baac001ba..8fa3a8641 100644 --- a/src/Tracy/Bar/assets/bar.phtml +++ b/src/Tracy/Bar/assets/bar.phtml @@ -32,6 +32,6 @@ namespace Tracy; -
  • ×
  • +
  • ×
  • diff --git a/src/Tracy/Bar/assets/panels.phtml b/src/Tracy/Bar/assets/panels.phtml index 77183bd75..b993aae80 100644 --- a/src/Tracy/Bar/assets/panels.phtml +++ b/src/Tracy/Bar/assets/panels.phtml @@ -18,8 +18,8 @@ use Tracy\Helpers; $icons = '
    - ¤ - × + ¤ + ×
    '; diff --git a/tests/Tracy/expected/Debugger.barDump().expect b/tests/Tracy/expected/Debugger.barDump().expect index 22bf7aff2..7a5a6a8bd 100644 --- a/tests/Tracy/expected/Debugger.barDump().expect +++ b/tests/Tracy/expected/Debugger.barDump().expect @@ -17,6 +17,6 @@ in file %a% on line %d%" data-tracy-href="editor:%a%"> - ¤ - × + ¤ + ×