Merge branch 'v3' of https://github.com/craftcms/cms into develop

# Conflicts: # src/web/assets/garnish/dist/garnish.js # src/web/assets/garnish/dist/garnish.js.map
michaelrog · May 19, 2022 · 41cba59 · 41cba59
2 parents c057311 + 41e016e
commit 41cba59
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/web/assets/garnish/dist/garnish.js b/src/web/assets/garnish/dist/garnish.js
diff --git a/src/web/assets/garnish/dist/garnish.js.map b/src/web/assets/garnish/dist/garnish.js.map
diff --git a/src/web/assets/garnish/src/Base.js b/src/web/assets/garnish/src/Base.js
@@ -88,7 +88,12 @@ export default Base.extend({
     for (i = 0; i < Garnish._eventHandlers.length; i++) {
       handler = Garnish._eventHandlers[i];
 
-      if (this instanceof handler.target && handler.type === type) {
+      if (
+        handler &&
+        handler.target &&
+        this instanceof handler.target &&
+        handler.type === type
+      ) {
         _ev = $.extend({data: handler.data}, data, ev);
         handler.handler(_ev);
       }