Always a[href]

brandonkelly · brandonkelly · commit 7fe5c4c27897 · 2024-04-03T16:12:16.000-07:00
Fixes #14751
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,7 @@
 - Fixed a bug where the “Utilities” global nav item could get two badge counts.
 - Fixed a bug where custom fields whose previous types were missing would lose their values when updating to Craft 5.
 - Fixed a bug where Dropdown fields could be marked as invalid on save, if the saved value was invalid and they were initially marked as changed (to the default value) on page load. ([#14738](https://github.com/craftcms/cms/pull/14738))
+- Fixed a bug where double-clicking on an element’s label within an element selection modal wasn’t selecting the element. ([#14751](https://github.com/craftcms/cms/issues/14751))
 
 ## 5.0.0 - 2024-03-26
 
diff --git a/src/web/assets/cp/dist/cp.js b/src/web/assets/cp/dist/cp.js
diff --git a/src/web/assets/cp/dist/cp.js.map b/src/web/assets/cp/dist/cp.js.map
diff --git a/src/web/assets/cp/src/js/BaseElementIndexView.js b/src/web/assets/cp/src/js/BaseElementIndexView.js
@@ -59,7 +59,7 @@ Craft.BaseElementIndexView = Garnish.Base.extend(
             multi: this.settings.multiSelect,
             vertical: this.isVerticalList(),
             filter: (target) => {
-              return !$(target).closest('a,.toggle,.btn').length;
+              return !$(target).closest('a[href],.toggle,.btn').length;
             },
             checkboxMode: this.settings.checkboxMode,
             onSelectionChange: this.onSelectionChange.bind(this),
@@ -83,7 +83,7 @@ Craft.BaseElementIndexView = Garnish.Base.extend(
       // Enable inline element editing if this is an index page
       if (this.elementIndex.isAdministrative) {
         this._handleElementEditing = (ev) => {
-          if ($(ev.target).closest('a,button').length) {
+          if ($(ev.target).closest('a[href],button').length) {
             // Let the link/button do its thing
             return;
           }
diff --git a/src/web/assets/cp/src/js/BaseElementSelectInput.js b/src/web/assets/cp/src/js/BaseElementSelectInput.js
@@ -139,7 +139,7 @@ Craft.BaseElementSelectInput = Garnish.Base.extend(
       return {
         multi: this.settings.sortable,
         filter: (target) => {
-          return !$(target).closest('a,button').length;
+          return !$(target).closest('a[href],button').length;
         },
         // prevent keyboard focus since element selection is only needed for drag-n-drop
         makeFocusable: false,
diff --git a/src/web/assets/cp/src/js/ComponentSelectInput.js b/src/web/assets/cp/src/js/ComponentSelectInput.js
@@ -114,7 +114,7 @@ Craft.ComponentSelectInput = Garnish.Base.extend(
         this.componentSelect = new Garnish.Select({
           multi: this.settings.sortable,
           filter: (target) => {
-            return !$(target).closest('a,button').length;
+            return !$(target).closest('a[href],button').length;
           },
           // prevent keyboard focus since component selection is only needed for drag-n-drop
           makeFocusable: false,
diff --git a/src/web/assets/cp/src/js/NestedElementManager.js b/src/web/assets/cp/src/js/NestedElementManager.js
@@ -382,7 +382,7 @@ Craft.NestedElementManager = Garnish.Base.extend(
     initElement($element) {
       if (Garnish.hasAttr($element, 'data-editable')) {
         this.addListener($element, 'dblclick,taphold', (ev) => {
-          if ($(ev.target).closest('a,button').length) {
+          if ($(ev.target).closest('a[href],button').length) {
             // Let the link/button do its thing
             return;
           }

Original file line number	Diff line number	Diff line change
`@@ -382,7 +382,7 @@ Craft.NestedElementManager = Garnish.Base.extend(`
`382`	`382`	`initElement($element) {`
`383`	`383`	`if (Garnish.hasAttr($element, 'data-editable')) {`
`384`	`384`	`this.addListener($element, 'dblclick,taphold', (ev) => {`
`385`		`- if ($(ev.target).closest('a,button').length) {`
	`385`	`+ if ($(ev.target).closest('a[href],button').length) {`
`386`	`386`	`// Let the link/button do its thing`
`387`	`387`	`return;`
`388`	`388`	`}`