BlueScreen: is wrapped in <tracy-div> and uses CSS reset instead of d…

…isabling stylesheets [Closes nette#533]
forrest79 · Apr 1, 2022 · 8c22ebc · 8c22ebc
1 parent 0cd7933
commit 8c22ebc
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 32 deletions.
diff --git a/src/Tracy/BlueScreen/BlueScreen.php b/src/Tracy/BlueScreen/BlueScreen.php
@@ -167,6 +167,7 @@ private function renderTemplate(\Throwable $exception, string $template, $toScre
 		$dump = $this->getDumper();
 
 		$css = array_map('file_get_contents', array_merge([
+			__DIR__ . '/../assets/reset.css',
 			__DIR__ . '/assets/bluescreen.css',
 			__DIR__ . '/../assets/toggle.css',
 			__DIR__ . '/../assets/table-sort.css',

diff --git a/src/Tracy/BlueScreen/assets/bluescreen.js b/src/Tracy/BlueScreen/assets/bluescreen.js
@@ -6,28 +6,11 @@ class BlueScreen
 {
 	static init(ajax) {
 		let blueScreen = document.getElementById('tracy-bs');
-		let styles = [];
-
-		for (let i = 0; i < document.styleSheets.length; i++) {
-			let style = document.styleSheets[i];
-			if (!style.ownerNode.classList.contains('tracy-debug')) {
-				style.oldDisabled = style.disabled;
-				style.disabled = true;
-				styles.push(style);
-			}
-		}
 
 		if (navigator.platform.indexOf('Mac') > -1) {
 			blueScreen.classList.add('tracy-mac');
 		}
 
-		document.getElementById('tracy-bs-toggle').addEventListener('tracy-toggle', function() {
-			let collapsed = this.classList.contains('tracy-collapsed');
-			for (let i = 0; i < styles.length; i++) {
-				styles[i].disabled = collapsed ? styles[i].oldDisabled : true;
-			}
-		});
-
 		if (!ajax) {
 			document.body.appendChild(blueScreen);
 			let id = location.href + document.querySelector('.tracy-section--error').textContent;

diff --git a/src/Tracy/BlueScreen/assets/content.phtml b/src/Tracy/BlueScreen/assets/content.phtml
@@ -21,7 +21,7 @@ namespace Tracy;
  * @var ?array $obStatus
  */
 ?>
-<div id="tracy-bs" itemscope>
+<tracy-div id="tracy-bs" itemscope>
 	<a id="tracy-bs-toggle" href="#" class="tracy-toggle"></a>
 	<div class="tracy-bs-main">
 <?php $ex = $exception; $exceptions = []; ?>
@@ -68,4 +68,4 @@ namespace Tracy;
 		</footer>
 	</div>
 	<meta itemprop=tracy-snapshot content=<?= Dumper::formatSnapshotAttribute($snapshot) ?>>
-</div>
+</tracy-div>
diff --git a/src/Tracy/BlueScreen/assets/page.phtml b/src/Tracy/BlueScreen/assets/page.phtml
@@ -14,7 +14,7 @@ namespace Tracy;
 $code = $exception->getCode() ? ' #' . $exception->getCode() : '';
 $nonceAttr = $nonce ? ' nonce="' . Helpers::escapeHtml($nonce) . '"' : '';
 $chain = Helpers::getExceptionChain($exception);
-?><!DOCTYPE html><!-- "' --></textarea></script></style></pre></xmp></a></iframe></noembed></noframes></noscript></option></select></template></title></table>
+?><!DOCTYPE html><!-- "' --></textarea></script></style></pre></xmp></a></iframe></noembed></noframes></noscript></option></select></template></title></table></p>
 <html>
 <head>
 	<meta charset="utf-8">

diff --git a/tests/Tracy/expected/Debugger.E_ERROR.html.expect b/tests/Tracy/expected/Debugger.E_ERROR.html.expect
@@ -1,4 +1,4 @@
-<!DOCTYPE html><!-- "' --></textarea></script></style></pre></xmp></a></iframe></noembed></noframes></noscript></option></select></template></title></table>
+<!DOCTYPE html><!-- "' --></textarea></script></style></pre></xmp></a></iframe></noembed></noframes></noscript></option></select></template></title></table></p>
 <html>
 <head>
 	<meta charset="utf-8">
@@ -13,7 +13,7 @@
 
 
 <body>
-<div id="tracy-bs" itemscope>
+<tracy-div id="tracy-bs" itemscope>
 	<a id="tracy-bs-toggle" href="#" class="tracy-toggle"></a>
 	<div class="tracy-bs-main">
 <section class="tracy-section tracy-section--error">
@@ -259,7 +259,7 @@
 		</footer>
 	</div>
 	<meta itemprop=tracy-snapshot content=%a%>
-</div>
+</tracy-div>
 
 <script>%A%</script>
 </body>

diff --git a/tests/Tracy/expected/Debugger.error-in-eval.expect b/tests/Tracy/expected/Debugger.error-in-eval.expect
@@ -1,4 +1,4 @@
-<!DOCTYPE html><!-- "' --></textarea></script></style></pre></xmp></a></iframe></noembed></noframes></noscript></option></select></template></title></table>
+<!DOCTYPE html><!-- "' --></textarea></script></style></pre></xmp></a></iframe></noembed></noframes></noscript></option></select></template></title></table></p>
 <html>
 <head>
 	<meta charset="utf-8">
@@ -13,7 +13,7 @@
 
 
 <body>
-<div id="tracy-bs" itemscope>
+<tracy-div id="tracy-bs" itemscope>
 	<a id="tracy-bs-toggle" href="#" class="tracy-toggle"></a>
 	<div class="tracy-bs-main">
 <section class="tracy-section tracy-section--error">
@@ -204,7 +204,7 @@
 		</footer>
 	</div>
 	<meta itemprop=tracy-snapshot content=%a%>
-</div>
+</tracy-div>
 
 <script>%A%</script>
 </body>

diff --git a/tests/Tracy/expected/Debugger.exception.html.expect b/tests/Tracy/expected/Debugger.exception.html.expect
@@ -1,4 +1,4 @@
-<!DOCTYPE html><!-- "' --></textarea></script></style></pre></xmp></a></iframe></noembed></noframes></noscript></option></select></template></title></table>
+<!DOCTYPE html><!-- "' --></textarea></script></style></pre></xmp></a></iframe></noembed></noframes></noscript></option></select></template></title></table></p>
 <html>
 <head>
 	<meta charset="utf-8">
@@ -13,7 +13,7 @@
 
 
 <body>
-<div id="tracy-bs" itemscope>
+<tracy-div id="tracy-bs" itemscope>
 	<a id="tracy-bs-toggle" href="#" class="tracy-toggle"></a>
 	<div class="tracy-bs-main">
 <section class="tracy-section tracy-section--error">
@@ -213,7 +213,7 @@
 		</footer>
 	</div>
 	<meta itemprop=tracy-snapshot content=%a%>
-</div>
+</tracy-div>
 
 <script>%A%</script>
 </body>

diff --git a/tests/Tracy/expected/Debugger.strict.html.expect b/tests/Tracy/expected/Debugger.strict.html.expect
@@ -1,4 +1,4 @@
-<!DOCTYPE html><!-- "' --></textarea></script></style></pre></xmp></a></iframe></noembed></noframes></noscript></option></select></template></title></table>
+<!DOCTYPE html><!-- "' --></textarea></script></style></pre></xmp></a></iframe></noembed></noframes></noscript></option></select></template></title></table></p>
 <html>
 <head>
 	<meta charset="utf-8">
@@ -13,7 +13,7 @@
 
 
 <body>
-<div id="tracy-bs" itemscope>
+<tracy-div id="tracy-bs" itemscope>
 	<a id="tracy-bs-toggle" href="#" class="tracy-toggle"></a>
 	<div class="tracy-bs-main">
 <section class="tracy-section tracy-section--error">
@@ -207,7 +207,7 @@
 		</footer>
 	</div>
 	<meta itemprop=tracy-snapshot content=%a%>
-</div>
+</tracy-div>
 
 <script>%A%</script>
 </body>