Skip to content

Commit 52351eb

Browse files
committed
fix: when both lp edit and dismiss edit classes, tool boxes not getting dismissed
1 parent 0279d36 commit 52351eb

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

src/LiveDevelopment/BrowserScripts/LiveDevProtocolRemote.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -492,10 +492,7 @@
492492
// Get the user's current selection
493493
const selection = window.getSelection();
494494
var element = event.target;
495-
if(element && (element.closest('.phcode-no-lp-edit') || element.classList.contains('phcode-no-lp-edit-this'))) {
496-
return;
497-
}
498-
// Check for dismiss action - dismiss LP editing when clicked
495+
// Check for dismiss action first - dismiss LP editing when clicked (takes precedence over no-edit)
499496
if(element && (element.closest('.phcode-dismiss-lp-edit')
500497
|| element.classList.contains('phcode-dismiss-lp-edit-this'))) {
501498
// dismissUIAndCleanupState is in RemoteFunctions, accessible via window._LD
@@ -506,6 +503,9 @@
506503
event.stopPropagation();
507504
return;
508505
}
506+
if(element && (element.closest('.phcode-no-lp-edit') || element.classList.contains('phcode-no-lp-edit-this'))) {
507+
return;
508+
}
509509
if (element && element.hasAttribute('data-brackets-id')) {
510510
// Check if it's a double-click for direct editing
511511
if (event.detail === 2 && !['INPUT', 'TEXTAREA', 'SELECT'].includes(element.tagName)) {

src/LiveDevelopment/BrowserScripts/RemoteFunctions.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -756,17 +756,17 @@ function RemoteFunctions(config = {}) {
756756
* @param {Event} event - The click event
757757
*/
758758
function handleElementClick(element, event) {
759-
if(element && (element.closest('.phcode-no-lp-edit') || element.classList.contains('phcode-no-lp-edit-this'))) {
760-
return;
761-
}
762-
// Check for dismiss action - dismiss LP editing when clicked
759+
// Check for dismiss action first - dismiss LP editing when clicked (takes precedence over no-edit)
763760
if(element && (
764761
element.closest('.phcode-dismiss-lp-edit') || element.classList.contains('phcode-dismiss-lp-edit-this'))) {
765762
dismissUIAndCleanupState();
766763
event.preventDefault();
767764
event.stopPropagation();
768765
return;
769766
}
767+
if(element && (element.closest('.phcode-no-lp-edit') || element.classList.contains('phcode-no-lp-edit-this'))) {
768+
return;
769+
}
770770
if (!LivePreviewView.isElementInspectable(element)) {
771771
dismissUIAndCleanupState();
772772
return;

0 commit comments

Comments
 (0)