Prevent debug breaking in front-end

joomla · Mar 18, 2017 · 6a6b209 · 6a6b209
1 parent 93841e1
commit 6a6b209
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 12 deletions.
diff --git a/administrator/templates/atum/index.php b/administrator/templates/atum/index.php
@@ -254,10 +254,9 @@
 
 		</div>
 
-		<div id="debug-wrapper"></div>
-		<jdoc:include type="modules" name="debug" style="none" />
-
 	</div>
 
+	<jdoc:include type="modules" name="debug" style="none" />
+
 </body>
 </html>
diff --git a/media/plg_system_debug/js/debug.js b/media/plg_system_debug/js/debug.js
@@ -0,0 +1,25 @@
+/**
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+Joomla = window.Joomla || {};
+
+(function( Joomla, document ) {
+	"use strict";
+
+	document.addEventListener('DOMContentLoaded', function() {
+		Joomla.toggleContainer = function(name)
+		{
+			var e = document.getElementById(name); // MooTools might not be available ;)
+			e.style.display = (e.style.display == 'none') ? 'block' : 'none';
+		};
+
+		var sidebarWrapper = document.getElementById('sidebar-wrapper'),
+		    debugWrapper   = document.getElementById('system-debug');
+		if (sidebarWrapper && debugWrapper) {
+			debugWrapper.style.marginLeft = '60px';
+		}
+	});
+
+}( Joomla, document ));
diff --git a/media/plg_system_debug/js/debug.min.js b/media/plg_system_debug/js/debug.min.js
diff --git a/plugins/system/debug/debug.php b/plugins/system/debug/debug.php
@@ -195,6 +195,7 @@ public function onAfterDispatch()
 		if ((JDEBUG || $this->debugLang) && $this->isAuthorisedDisplayDebug())
 		{
 			JHtml::_('stylesheet', 'system/debug.css', array('version' => 'auto', 'relative' => true));
+			JHtml::_('script', 'plg_system_debug/debug.min.js', array('version' => 'auto', 'relative' => true));
 		}
 
 		// Only if debugging is enabled for SQL query popovers.
@@ -254,13 +255,6 @@ public function onAfterRespond()
 
 		$html = array();
 
-		// Some "mousewheel protecting" JS.
-		$html[] = "<script>function toggleContainer(name)
-		{
-			var e = document.getElementById(name);// MooTools might not be available ;)
-			e.style.display = (e.style.display == 'none') ? 'block' : 'none';
-		}</script>";
-
 		$html[] = '<div id="system-debug" class="profiler">';
 
 		$html[] = '<h1>' . JText::_('PLG_DEBUG_TITLE') . '</h1>';
@@ -324,7 +318,7 @@ public function onAfterRespond()
 
 		$html[] = '</div>';
 
-		echo str_replace('<div id="debug-wrapper"></div>', implode('', $html) . '<div id="debug-wrapper"></div>', $contents);
+		echo str_replace('</body>', implode('', $html) . '</body>', $contents);
 	}
 
 	/**
@@ -426,7 +420,7 @@ protected function display($item, array $errors = array())
 
 		$html = array();
 
-		$js = "toggleContainer('dbg_container_" . $item . "');";
+		$js = "Joomla.toggleContainer('dbg_container_" . $item . "');";
 
 		$class = 'dbg-header' . $status;