Merge branch 'MDL-75848' of https://github.com/paulholden/moodle

moodle · Nov 2, 2022 · b2368a4 · b2368a4
2 parents d18a89f + 3bf355e
commit b2368a4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-debug.js b/lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-debug.js
@@ -601,9 +601,9 @@ EditorPluginButtons.prototype = {
             return;
         }
 
+        // Ensure menu button was clicked, and isn't itself disabled.
         var menuButton = e.currentTarget.ancestor('button', true);
-        if (menuButton.hasAttribute(DISABLED)) {
-            // Exit early if the clicked button was disabled.
+        if (menuButton === null || menuButton.hasAttribute(DISABLED)) {
             return;
         }