diff --git a/browser/actors/ContextMenuChild.jsm b/browser/actors/ContextMenuChild.jsm index 8f1c1838d191..75e50d6a356e 100644 --- a/browser/actors/ContextMenuChild.jsm +++ b/browser/actors/ContextMenuChild.jsm @@ -924,17 +924,6 @@ class ContextMenuChild extends JSWindowActorChild { context.shouldInitInlineSpellCheckerUINoChildren = false; context.shouldInitInlineSpellCheckerUIWithChildren = false; - context.hasPasteEventListeners = (function() { - let els = Services.els; - const composed = false; // Paste event listener is not composed. - for (let item of els.getEventTargetChainFor(context.target, composed)) { - if (els.hasListenersFor(item, "paste")) { - return true; - } - } - return false; - })(); - this._setContextForNodesNoChildren(editFlags); this._setContextForNodesWithChildren(editFlags); diff --git a/browser/base/content/nsContextMenu.js b/browser/base/content/nsContextMenu.js index 6ad076e9bc1b..15c78d8a8462 100644 --- a/browser/base/content/nsContextMenu.js +++ b/browser/base/content/nsContextMenu.js @@ -228,7 +228,6 @@ class nsContextMenu { this.onSpellcheckable = context.onSpellcheckable; this.onTextInput = context.onTextInput; this.onVideo = context.onVideo; - this.hasPasteEventListeners = context.hasPasteEventListeners; this.target = context.target; this.targetIdentifier = context.targetIdentifier; @@ -446,7 +445,6 @@ class nsContextMenu { this.onTextInput || this.onLink || this.isContentSelected || - this.hasPasteEventListeners || this.onImage || this.onCanvas || this.onVideo || @@ -758,15 +756,9 @@ class nsContextMenu { this.showItem("context-sep-undo", this.onTextInput); this.showItem("context-cut", this.onTextInput); this.showItem("context-copy", this.isContentSelected || this.onTextInput); - this.showItem( - "context-paste", - this.hasPasteEventListeners || this.onTextInput - ); + this.showItem("context-paste", this.onTextInput); this.showItem("context-delete", this.onTextInput); - this.showItem( - "context-sep-paste", - this.hasPasteEventListeners || this.onTextInput - ); + this.showItem("context-sep-paste", this.onTextInput); this.showItem( "context-selectall", !( diff --git a/browser/base/content/test/contextMenu/browser_contextmenu.js b/browser/base/content/test/contextMenu/browser_contextmenu.js index 43dbeae90ebc..a0e63c75ef46 100644 --- a/browser/base/content/test/contextMenu/browser_contextmenu.js +++ b/browser/base/content/test/contextMenu/browser_contextmenu.js @@ -271,51 +271,6 @@ add_task(async function test_mailto() { ]); }); -add_task(async function test_paste_event_listener() { - const expected = [ - "context-navigation", - null, - [ - "context-back", - false, - "context-forward", - false, - "context-reload", - true, - "context-bookmarkpage", - true, - ], - null, - "---", - null, - ...(hasPocket ? ["context-pocket", true] : []), - "---", - null, - "context-sendpagetodevice", - true, - [], - null, - "---", - null, - "context-viewbgimage", - false, - "context-paste", - null, - "---", - null, - "context-selectall", - true, - "---", - null, - "context-viewsource", - true, - "context-viewinfo", - true, - ]; - await test_contextmenu("#test-paste-listener", expected); - await test_contextmenu("#test-paste-listener-child", expected); -}); - add_task(async function test_image() { for (let selector of ["#test-image", "#test-svg-image"]) { await test_contextmenu( diff --git a/browser/base/content/test/contextMenu/subtst_contextmenu.html b/browser/base/content/test/contextMenu/subtst_contextmenu.html index 86592291ad5b..68f2bf4faee6 100644 --- a/browser/base/content/test/contextMenu/subtst_contextmenu.html +++ b/browser/base/content/test/contextMenu/subtst_contextmenu.html @@ -17,10 +17,6 @@ if ("ShadowRoot" in this) { } Mail the monkey!
-
- ABCD -

EFGH

-