GeezerVison is showing github.com — fix: stop sidebar resizer stranding in the editor area · phcode-dev/phoenix@e0107ea
File tree
Expand file treeCollapse file tree
Open diff view settings
Expand file treeCollapse file tree
Open diff view settings
Collapse file
Copy file name to clipboardExpand all lines: src/utils/Resizer.js +6-2Lines changed: 6 additions & 2 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -394,9 +394,13 @@ define(function (require, exports, module) { |
394 | 394 | // reposition it if the element size changes externally |
395 | 395 | function repositionResizer(elementSize) { |
396 | 396 | var resizerPosition = elementSize || 1; |
397 | | - if (position === POSITION_RIGHT || position === POSITION_BOTTOM) { |
398 | | - $resizer.css(resizerCSSPosition, resizerPosition); |
| 397 | + if (position !== POSITION_RIGHT && position !== POSITION_BOTTOM) { |
| 398 | + return; |
399 | 399 | } |
| 400 | + if (collapsible && !isVisible($element)) { |
| 401 | + return; |
| 402 | + } |
| 403 | + $resizer.css(resizerCSSPosition, resizerPosition); |
400 | 404 | } |
401 | 405 |
|
402 | 406 | $element.data("removeSizable", function () { |
|
Collapse file
Copy file name to clipboardExpand all lines: src/view/CentralControlBar.js +2-1Lines changed: 2 additions & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -213,7 +213,8 @@ define(function (require, exports, module) { |
213 | 213 | if (targetWidth < minLPToolbarWidth) { |
214 | 214 | targetWidth = minLPToolbarWidth; |
215 | 215 | } |
216 | | - if (sidebarWidth + BAR_WIDTH + targetWidth + MIN_EDITOR_WIDTH > window.innerWidth) { |
| 216 | + if (SidebarView.isVisible() && |
| 217 | + sidebarWidth + BAR_WIDTH + targetWidth + MIN_EDITOR_WIDTH > window.innerWidth) { |
217 | 218 | const trimmedSidebar = Math.max(30, window.innerWidth - BAR_WIDTH - targetWidth - MIN_EDITOR_WIDTH); |
218 | 219 | $sidebar.width(trimmedSidebar); |
219 | 220 | // jQuery .width() sidesteps Resizer — manually reposition its handle so |
|
Collapse file
Copy file name to clipboardExpand all lines: src/view/WorkspaceManager.js +1-1Lines changed: 1 addition & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
@@ -608,7 +608,7 @@ define(function (require, exports, module) { |
608 | 608 | return; |
609 | 609 | } |
610 | 610 | var $sb = $("#sidebar"); |
611 | | - if (!$sb.length || $sb[0].offsetWidth === 0) { |
| 611 | + if (!$sb.length || !Resizer.isVisible($sb) || $sb[0].offsetWidth === 0) { |
612 | 612 | return; |
613 | 613 | } |
614 | 614 | var toolbarW = $mainToolbar.is(":visible") ? $mainToolbar.width() : 0; |
|