mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 03:15:11 +00:00
Bug 707677 - Use defaultPrevented instead of the deprecated getPreventDefault() in front-end code. r=dao
This commit is contained in:
parent
8829baa8cc
commit
16da8f10c3
@ -127,7 +127,7 @@ var shell = {
|
||||
screen.mozEnabled = !screen.mozEnabled;
|
||||
break;
|
||||
case evt.DOM_VK_ESCAPE:
|
||||
if (evt.getPreventDefault())
|
||||
if (evt.defaultPrevented)
|
||||
return;
|
||||
this.doCommand('cmd_close');
|
||||
break;
|
||||
|
@ -173,7 +173,7 @@
|
||||
let target = eventTarget || this.target;
|
||||
if (target && type) {
|
||||
let touchEvent = this.sendTouchEvent(evt, target, type);
|
||||
if (touchEvent.getPreventDefault() && canPreventMouseEvents)
|
||||
if (touchEvent.defaultPrevented && canPreventMouseEvents)
|
||||
preventMouseEvents = true;
|
||||
}
|
||||
|
||||
@ -204,7 +204,7 @@
|
||||
debug('fire context-menu');
|
||||
|
||||
target.dispatchEvent(evt);
|
||||
if (!evt.getPreventDefault())
|
||||
if (!evt.defaultPrevented)
|
||||
return;
|
||||
|
||||
doc.releaseCapture();
|
||||
|
@ -127,7 +127,7 @@ var StarUI = {
|
||||
}
|
||||
break;
|
||||
case "keypress":
|
||||
if (aEvent.getPreventDefault()) {
|
||||
if (aEvent.defaultPrevented) {
|
||||
// The event has already been consumed inside of the panel.
|
||||
break;
|
||||
}
|
||||
@ -140,7 +140,7 @@ var StarUI = {
|
||||
if (aEvent.target.className == "expander-up" ||
|
||||
aEvent.target.className == "expander-down" ||
|
||||
aEvent.target.id == "editBMPanel_newFolderButton") {
|
||||
//XXX Why is this necessary? The getPreventDefault() check should
|
||||
//XXX Why is this necessary? The defaultPrevented check should
|
||||
// be enough.
|
||||
break;
|
||||
}
|
||||
|
@ -5765,7 +5765,7 @@ function hrefAndLinkNodeForClickEvent(event)
|
||||
*/
|
||||
function contentAreaClick(event, isPanelClick)
|
||||
{
|
||||
if (!event.isTrusted || event.getPreventDefault() || event.button == 2)
|
||||
if (!event.isTrusted || event.defaultPrevented || event.button == 2)
|
||||
return true;
|
||||
|
||||
let [href, linkNode] = hrefAndLinkNodeForClickEvent(event);
|
||||
|
@ -2414,7 +2414,7 @@
|
||||
// _shouldFastFind (see findbar.xml).
|
||||
if (!gFindBarInitialized &&
|
||||
!(aEvent.ctrlKey || aEvent.metaKey) &&
|
||||
!aEvent.getPreventDefault()) {
|
||||
!aEvent.defaultPrevented) {
|
||||
let charCode = aEvent.charCode;
|
||||
if (charCode) {
|
||||
let char = String.fromCharCode(charCode);
|
||||
|
@ -233,9 +233,9 @@ let gClickHandler = {
|
||||
|
||||
let isPanelClick = linkId == "panellink";
|
||||
let returnValue = gTestWin.contentAreaClick(event, isPanelClick);
|
||||
let prevent = event.getPreventDefault();
|
||||
let prevent = event.defaultPrevented;
|
||||
is(prevent, gCurrentTest.preventDefault,
|
||||
gCurrentTest.desc + ": event.getPreventDefault() is correct (" + prevent + ")")
|
||||
gCurrentTest.desc + ": event.defaultPrevented is correct (" + prevent + ")")
|
||||
|
||||
// Check that all required methods have been called.
|
||||
gCurrentTest.expectedInvokedMethods.forEach(function(aExpectedMethodName) {
|
||||
|
@ -74,7 +74,7 @@ function test() {
|
||||
let focusedWindow = document.commandDispatcher.focusedWindow;
|
||||
let eventConsumed = true;
|
||||
let detectKeyEvent = function (event) {
|
||||
eventConsumed = event.getPreventDefault();
|
||||
eventConsumed = event.defaultPrevented;
|
||||
};
|
||||
document.addEventListener("keypress", detectKeyEvent, false);
|
||||
pressCtrlTab();
|
||||
|
@ -83,7 +83,7 @@ function synthesizeDragWithDirection(aElement, aExpectedDragData, aDirection, aC
|
||||
}
|
||||
|
||||
if (!aExpectedDragData.length)
|
||||
ok(event.getPreventDefault(), "Drag has been canceled.");
|
||||
ok(event.defaultPrevented, "Drag has been canceled.");
|
||||
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
|
@ -60,8 +60,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=493251
|
||||
|
||||
function dumpEvent(aEvent) {
|
||||
var detail = "target=" + aEvent.target + ", originalTarget=" +
|
||||
aEvent.originalTarget + ", getPreventDefault()=" +
|
||||
aEvent.getPreventDefault() + ", isTrusted=" + aEvent.isTrusted;
|
||||
aEvent.originalTarget + ", defaultPrevented=" +
|
||||
aEvent.defaultPrevented + ", isTrusted=" + aEvent.isTrusted;
|
||||
switch (aEvent.type) {
|
||||
case "keydown":
|
||||
case "keypress":
|
||||
|
@ -130,7 +130,7 @@ function testPreventDefault() {
|
||||
|
||||
parent.addEventListener("MozTouchDown", function(ev) {
|
||||
parent.removeEventListener("MozTouchDown", arguments.callee, false);
|
||||
is(ev.getPreventDefault(), true, "preventDefault can be called");
|
||||
is(ev.defaultPrevented, true, "preventDefault can be called");
|
||||
nextTest();
|
||||
}, false);
|
||||
|
||||
@ -149,7 +149,7 @@ function testBlockPreventDefault() {
|
||||
|
||||
parent.addEventListener("MozTouchDown", function(ev) {
|
||||
parent.removeEventListener("MozTouchDown", arguments.callee, false);
|
||||
is(ev.getPreventDefault(), false, "aCancelableArg works");
|
||||
is(ev.defaultPrevented, false, "aCancelableArg works");
|
||||
nextTest();
|
||||
}, false);
|
||||
|
||||
|
@ -51,7 +51,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=486990
|
||||
|
||||
function fooListener(evt) {
|
||||
evt.preventDefault();
|
||||
prevented = evt.getPreventDefault();
|
||||
prevented = evt.defaultPrevented;
|
||||
++eventCount;
|
||||
};
|
||||
|
||||
|
@ -46,11 +46,11 @@ function runTests()
|
||||
switch (aEvent.eventPhase) {
|
||||
case aEvent.CAPTURING_PHASE:
|
||||
capturingPhase.fired = true;
|
||||
capturingPhase.prevented = aEvent.getPreventDefault();
|
||||
capturingPhase.prevented = aEvent.defaultPrevented;
|
||||
break;
|
||||
case aEvent.BUBBLING_PHASE:
|
||||
bubblingPhase.fired = true;
|
||||
bubblingPhase.prevented = aEvent.getPreventDefault();
|
||||
bubblingPhase.prevented = aEvent.defaultPrevented;
|
||||
aEvent.preventDefault(); // prevent the browser default behavior
|
||||
break;
|
||||
default:
|
||||
|
@ -62,7 +62,7 @@ function onPromptFocus() {
|
||||
var listener = {
|
||||
handleEvent: function _hv(aEvent)
|
||||
{
|
||||
var isPrevented = aEvent.getPreventDefault();
|
||||
var isPrevented = aEvent.defaultPrevented;
|
||||
ok(!isPrevented, "ESC key event is prevented by editor");
|
||||
SpecialPowers.removeSystemEventListener(gPromptInput, "keypress",
|
||||
listener, false);
|
||||
|
@ -50,11 +50,11 @@ function runTests()
|
||||
switch (aEvent.eventPhase) {
|
||||
case aEvent.CAPTURING_PHASE:
|
||||
capturingPhase.fired = true;
|
||||
capturingPhase.prevented = aEvent.getPreventDefault();
|
||||
capturingPhase.prevented = aEvent.defaultPrevented;
|
||||
break;
|
||||
case aEvent.BUBBLING_PHASE:
|
||||
bubblingPhase.fired = true;
|
||||
bubblingPhase.prevented = aEvent.getPreventDefault();
|
||||
bubblingPhase.prevented = aEvent.defaultPrevented;
|
||||
aEvent.preventDefault(); // prevent the browser default behavior
|
||||
break;
|
||||
default:
|
||||
|
@ -306,7 +306,7 @@ let Content = {
|
||||
metaKey: aEvent.metaKey,
|
||||
keyCode: aEvent.keyCode,
|
||||
charCode: aEvent.charCode,
|
||||
preventDefault: aEvent.getPreventDefault()
|
||||
preventDefault: aEvent.defaultPrevented
|
||||
};
|
||||
sendAsyncMessage("Browser:KeyPress", eventData);
|
||||
});
|
||||
@ -854,7 +854,7 @@ var ContextHandler = {
|
||||
},
|
||||
|
||||
onContextMenu: function ch_onContextMenu(aEvent) {
|
||||
if (aEvent.getPreventDefault())
|
||||
if (aEvent.defaultPrevented)
|
||||
return;
|
||||
|
||||
let state = {
|
||||
|
@ -268,7 +268,7 @@
|
||||
<parameter name="event"/>
|
||||
<body>
|
||||
<![CDATA[
|
||||
if (event.getPreventDefault())
|
||||
if (event.defaultPrevented)
|
||||
return;
|
||||
|
||||
event.stopPropagation();
|
||||
|
@ -56,7 +56,7 @@ WindowDraggingElement.prototype = {
|
||||
if (aEvent.button != 0 ||
|
||||
this._window.fullScreen ||
|
||||
!this.mouseDownCheck.call(this._elem, aEvent) ||
|
||||
aEvent.getPreventDefault())
|
||||
aEvent.defaultPrevented)
|
||||
return false;
|
||||
|
||||
let target = aEvent.originalTarget, parent = aEvent.originalTarget;
|
||||
|
@ -14,7 +14,7 @@
|
||||
onpopuphidden="testtag_finish()">
|
||||
<datepicker id="datepicker"/>
|
||||
<datepicker id="datepicker-popup" type="popup"/>
|
||||
<hbox onDOMMouseScroll="mouseScrolled = event.getPreventDefault();">
|
||||
<hbox onDOMMouseScroll="mouseScrolled = event.defaultPrevented;">
|
||||
<datepicker id="datepicker-grid" type="grid"/>
|
||||
</hbox>
|
||||
</hbox>
|
||||
|
@ -441,7 +441,7 @@
|
||||
return; // Let child buttons of autocomplete take input
|
||||
|
||||
//XXXpch this is so bogus...
|
||||
if (aEvent.getPreventDefault())
|
||||
if (aEvent.defaultPrevented)
|
||||
return false;
|
||||
|
||||
var cancel = false;
|
||||
|
@ -1214,7 +1214,7 @@
|
||||
<handlers>
|
||||
<handler event="keypress" keycode="VK_F7" group="system">
|
||||
<![CDATA[
|
||||
if (event.getPreventDefault() || !event.isTrusted)
|
||||
if (event.defaultPrevented || !event.isTrusted)
|
||||
return;
|
||||
|
||||
var isEnabled = this.mPrefs.getBoolPref("accessibility.browsewithcaret_shortcut.enabled");
|
||||
@ -1275,7 +1275,7 @@
|
||||
</handler>
|
||||
<handler event="dragover" group="system">
|
||||
<![CDATA[
|
||||
if (!this.droppedLinkHandler || event.getPreventDefault())
|
||||
if (!this.droppedLinkHandler || event.defaultPrevented)
|
||||
return;
|
||||
|
||||
// For drags that appear to be internal text (for example, tab drags),
|
||||
@ -1296,7 +1296,7 @@
|
||||
</handler>
|
||||
<handler event="drop" group="system">
|
||||
<![CDATA[
|
||||
if (!this.droppedLinkHandler || event.getPreventDefault())
|
||||
if (!this.droppedLinkHandler || event.defaultPrevented)
|
||||
return;
|
||||
|
||||
let name = { };
|
||||
|
@ -391,7 +391,7 @@
|
||||
<parameter name="evt"/>
|
||||
<body>
|
||||
<![CDATA[
|
||||
if (evt.getPreventDefault())
|
||||
if (evt.defaultPrevented)
|
||||
return;
|
||||
|
||||
var btn = this.getButton(this.defaultButton);
|
||||
@ -409,7 +409,7 @@
|
||||
<handler event="keypress" keycode="VK_RETURN"
|
||||
group="system" action="this._hitEnter(event);"/>
|
||||
<handler event="keypress" keycode="VK_ESCAPE" group="system">
|
||||
if (!event.getPreventDefault())
|
||||
if (!event.defaultPrevented)
|
||||
this.cancelDialog();
|
||||
</handler>
|
||||
#ifdef XP_MACOSX
|
||||
|
@ -1349,7 +1349,7 @@
|
||||
<parameter name="aEvent"/>
|
||||
<body><![CDATA[
|
||||
if (aEvent.ctrlKey || aEvent.altKey || aEvent.metaKey ||
|
||||
aEvent.getPreventDefault())
|
||||
aEvent.defaultPrevented)
|
||||
return false;
|
||||
|
||||
var elt = document.commandDispatcher.focusedElement;
|
||||
|
@ -547,7 +547,7 @@
|
||||
<parameter name="aEvent"/>
|
||||
<body>
|
||||
<![CDATA[
|
||||
if (!aEvent.getPreventDefault()) {
|
||||
if (!aEvent.defaultPrevented) {
|
||||
this._userSelecting = true;
|
||||
this._mayReverse = true;
|
||||
this.moveByOffset(aOffset, !aEvent.ctrlKey, aEvent.shiftKey);
|
||||
|
@ -42,7 +42,7 @@
|
||||
|
||||
<handler event="keypress" modifiers="shift any" group="system">
|
||||
<![CDATA[
|
||||
if (!event.getPreventDefault() &&
|
||||
if (!event.defaultPrevented &&
|
||||
(event.keyCode == KeyEvent.DOM_VK_UP ||
|
||||
event.keyCode == KeyEvent.DOM_VK_DOWN ||
|
||||
event.keyCode == KeyEvent.DOM_VK_PAGE_UP ||
|
||||
|
@ -299,7 +299,7 @@
|
||||
<body>
|
||||
<![CDATA[
|
||||
var href = this.href;
|
||||
if (!href || this.disabled || aEvent.getPreventDefault())
|
||||
if (!href || this.disabled || aEvent.defaultPrevented)
|
||||
return;
|
||||
|
||||
var uri = null;
|
||||
|
@ -408,7 +408,7 @@
|
||||
<parameter name="evt"/>
|
||||
<body>
|
||||
<![CDATA[
|
||||
if (!evt.getPreventDefault())
|
||||
if (!evt.defaultPrevented)
|
||||
this.advance();
|
||||
]]>
|
||||
</body>
|
||||
@ -447,7 +447,7 @@
|
||||
<handler event="keypress" keycode="VK_RETURN"
|
||||
group="system" action="this._hitEnter(event)"/>
|
||||
<handler event="keypress" keycode="VK_ESCAPE" group="system">
|
||||
if (!event.getPreventDefault())
|
||||
if (!event.defaultPrevented)
|
||||
this.cancel();
|
||||
</handler>
|
||||
</handlers>
|
||||
|
Loading…
Reference in New Issue
Block a user