From ef30e3cc47ab780789f1f611bc3fcee14412168e Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Wed, 30 Oct 2013 23:12:02 +1100 Subject: [PATCH] Replace usage of getPreventDefault with defaultPrevented. The former is now deprecated #726933. --- common/content/events.js | 2 +- common/content/key-processors.js | 4 ++-- common/content/mow.js | 2 +- common/modules/dom.jsm | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/content/events.js b/common/content/events.js index 09ea44ec..8006c4cd 100644 --- a/common/content/events.js +++ b/common/content/events.js @@ -660,7 +660,7 @@ var Events = Module("events", { // the command-line has focus // TODO: ...help me...please... keypress: function onKeyPress(event) { - event.dactylDefaultPrevented = event.getPreventDefault(); + event.dactylDefaultPrevented = event.defaultPrevented; let duringFeed = this.duringFeed || []; this.duringFeed = []; diff --git a/common/content/key-processors.js b/common/content/key-processors.js index 21875f65..30596439 100644 --- a/common/content/key-processors.js +++ b/common/content/key-processors.js @@ -139,7 +139,7 @@ var ProcessorStack = Class("ProcessorStack", { if (result === Events.PASS_THROUGH) events.feedevents(null, this.keyEvents, { skipmap: true, isMacro: true, isReplay: true }); else { - let list = this.events.filter(e => e.getPreventDefault() && !e.dactylDefaultPrevented); + let list = this.events.filter(e => e.defaultPrevented && !e.dactylDefaultPrevented); if (result === Events.PASS) events.dbg("PASS THROUGH: " + list.slice(0, length).filter(e => e.type === "keypress").map(DOM.Event.closure.stringify)); @@ -190,7 +190,7 @@ var ProcessorStack = Class("ProcessorStack", { processors.push(res); } - events.dbg("RESULT: " + event.getPreventDefault() + " " + this._result(result)); + events.dbg("RESULT: " + event.defaultPrevented + " " + this._result(result)); events.dbg("ACTIONS: " + actions.length + " " + this.actions.length); events.dbg("PROCESSORS:", processors, "\n"); diff --git a/common/content/mow.js b/common/content/mow.js index ae67ab42..7149f9cb 100644 --- a/common/content/mow.js +++ b/common/content/mow.js @@ -149,7 +149,7 @@ var MOW = Module("mow", { events: { click: function onClick(event) { - if (event.getPreventDefault()) + if (event.defaultPrevented) return; const openLink = function openLink(where) { diff --git a/common/modules/dom.jsm b/common/modules/dom.jsm index 0e1daa26..6831bd3e 100644 --- a/common/modules/dom.jsm +++ b/common/modules/dom.jsm @@ -1367,7 +1367,7 @@ var DOM = Class("DOM", { .dispatchDOMEventViaPresShell(target, event, true); else { target.dispatchEvent(event); - return !event.getPreventDefault(); + return !event.defaultPrevented; } } catch (e) {