initialize standalone with ensureToolbarContainer

Author: michalsn

system/Debug/Toolbar/Views/toolbar.js

@@ -8,8 +8,7 @@ var ciDebugBar = {
     icon: null,
 
     init: function () {
-        // Standalone debugbar pages do not have #toolbarContainer, use body as fallback.
-        this.toolbarContainer = document.getElementById("toolbarContainer") || document.body;
+        this.toolbarContainer = document.getElementById("toolbarContainer");
         this.toolbar = document.getElementById("debug-bar");
         this.icon = document.getElementById("debug-icon");
 

system/Debug/Toolbar/Views/toolbarstandalone.js

@@ -9,22 +9,54 @@ if (! document.getElementById('debugbar_loader')) {
                 return;
             }
 
-            localStorage.setItem('debugbar-time', time);
-            localStorage.setItem('debugbar-time-new', time);
             window.location.href = ciSiteURL + '?debugbar_time=' + time;
         };
     }
 
     (function () {
+        function ensureToolbarContainer(icon, toolbar) {
+            let toolbarContainer = document.getElementById('toolbarContainer');
+
+            if (toolbarContainer) {
+                return;
+            }
+
+            toolbarContainer = document.createElement('div');
+            toolbarContainer.setAttribute('id', 'toolbarContainer');
+
+            if (icon) {
+                toolbarContainer.appendChild(icon);
+            }
+
+            if (toolbar) {
+                toolbarContainer.appendChild(toolbar);
+            }
+
+            document.body.appendChild(toolbarContainer);
+        }
+
         function initStandaloneToolbar() {
             if (typeof ciDebugBar !== 'object') {
                 return;
             }
 
-            if (! document.getElementById('debug-bar') || ! document.getElementById('debug-icon')) {
+            const icon = document.getElementById('debug-icon');
+            const toolbar = document.getElementById('debug-bar');
+
+            if (! toolbar || ! icon) {
                 return;
             }
 
+            const currentTime = new URLSearchParams(window.location.search).get('debugbar_time');
+
+            if (currentTime && ! isNaN(currentTime)) {
+                if (! localStorage.getItem('debugbar-time')) {
+                    localStorage.setItem('debugbar-time', currentTime);
+                }
+                localStorage.setItem('debugbar-time-new', currentTime);
+            }
+
+            ensureToolbarContainer(icon, toolbar);
             ciDebugBar.init();
         }