Fix #1471: Make the handle stay in bounds when resizing

django-commons · May 14, 2021 · ebd4ae3 · ebd4ae3
1 parent d36b7d6
commit ebd4ae3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/debug_toolbar/static/debug_toolbar/js/toolbar.js b/debug_toolbar/static/debug_toolbar/js/toolbar.js
@@ -190,6 +190,7 @@ const djdt = {
                 requestAnimationFrame(function () {
                     djdt.handleDragged = false;
                 });
+                djdt.ensure_handle_visibility();
             }
         });
         const show =
@@ -210,23 +211,24 @@ const djdt = {
             e.classList.remove("djdt-active");
         });
     },
+    ensure_handle_visibility() {
+        const handle = document.getElementById("djDebugToolbarHandle");
+        // set handle position
+        const handleTop = Math.min(
+            localStorage.getItem("djdt.top") || 0,
+            window.innerHeight - handle.offsetWidth
+        );
+        handle.style.top = handleTop + "px";
+    },
     hide_toolbar() {
         djdt.hide_panels();
 
         $$.hide(document.getElementById("djDebugToolbar"));
 
         const handle = document.getElementById("djDebugToolbarHandle");
         $$.show(handle);
-        // set handle position
-        let handleTop = localStorage.getItem("djdt.top");
-        if (handleTop) {
-            handleTop = Math.min(
-                handleTop,
-                window.innerHeight - handle.offsetWidth
-            );
-            handle.style.top = handleTop + "px";
-        }
-
+        djdt.ensure_handle_visibility();
+        window.addEventListener("resize", djdt.ensure_handle_visibility);
         document.removeEventListener("keydown", onKeyDown);
 
         localStorage.setItem("djdt.show", "false");
@@ -249,6 +251,7 @@ const djdt = {
         $$.hide(document.getElementById("djDebugToolbarHandle"));
         $$.show(document.getElementById("djDebugToolbar"));
         localStorage.setItem("djdt.show", "true");
+        window.removeEventListener("resize", djdt.ensure_handle_visibility);
     },
     cookie: {
         get(key) {

diff --git a/docs/changes.rst b/docs/changes.rst
@@ -4,6 +4,8 @@ Change log
 Next version
 ------------
 
+* Ensured that the handle stays within bounds when resizing the window.
+
 
 3.2.1 (2021-04-14)
 ------------------
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,8 @@ Change log @@
     Next version
     ------------
+    * Ensured that the handle stays within bounds when resizing the window.
 .2.1 (2021-04-14)
     ------------------
@@ Expand Down @@