Skip to content

Commit

Permalink
fix ''event.preventDefault()' call does not change the 'event.default…
Browse files Browse the repository at this point in the history 
…Prevented' property value ' (close #1588) (#1589)

* fix ''event.preventDefault()' call does not change the 'event.defaultPrevented' property value ' (close #1588)

* remove unnecessary new line

* remove unused code

* remark
  • Loading branch information
@miherlosev @helen-dikareva
miherlosev authored and helen-dikareva committed May 3, 2018
1 parent a312c34 commit 940615b
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 43 deletions.
69 changes: 26 additions & 43 deletions src/client/sandbox/event/simulator.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ export default class EventSimulator {
// the click is handled. (B237144)
this.savedWindowEvents = [];
this.savedNativeClickCount = 0;

this.browserWithNewEventsStyle = !browserUtils.isIE11;
}

static _dispatchStorageEvent (el, args) {
Expand Down Expand Up @@ -315,23 +317,11 @@ export default class EventSimulator {
const curWindow = domUtils.isElementInIframe(el) ? domUtils.getIframeByElement(el).contentWindow : window;
const prevWindowEvent = curWindow.event;

if (browserUtils.isIE && browserUtils.version <= 11)
if (browserUtils.isIE11)
delete curWindow.event;

originClick.call(el);

if (browserUtils.isIE && browserUtils.version < 11) {
if (this.savedNativeClickCount--)
this.savedWindowEvents.shift();

if (this.savedWindowEvents.length) {
nativeMethods.objectDefineProperty.call(window.Object, curWindow, 'event', {
get: () => this.savedWindowEvents[0],
configurable: true
});
}
}

// NOTE: Window.event becomes empty when the click event handler
// triggers the click event for a different element in IE11.(GH-226).
if (browserUtils.isIE11 && prevWindowEvent) {
Expand All @@ -343,10 +333,9 @@ export default class EventSimulator {
}

_dispatchKeyEvent (el, args) {
let ev = null;
const browserWithNewEventsStyle = !browserUtils.isIE || browserUtils.version > 11;
let ev = null;

if (browserWithNewEventsStyle && nativeMethods.WindowKeyboardEvent) {
if (this.browserWithNewEventsStyle && nativeMethods.WindowKeyboardEvent) {
const eventArgs = {
bubbles: args.canBubble,
cancelable: args.cancelable,
Expand Down Expand Up @@ -414,21 +403,18 @@ export default class EventSimulator {
});
}

let prevented = false;
let returnValue = true;
let defaultPrevented = false;
let returnValue = true;

// NOTE: the dispatchEvent method does not return false in the case when preventDefault
// was raised for events that were created with the KeyboardEvent constructor
if (browserWithNewEventsStyle) {
nativeMethods.objectDefineProperty.call(window.Object, ev, 'preventDefault', {
get: () => () => {
prevented = true;
// NOTE: the dispatchEvent method does not return false in the case when preventDefault method
// was called for events that were created with the KeyboardEvent constructor
if (this.browserWithNewEventsStyle) {
ev.preventDefault = function () {
defaultPrevented = true;
nativeMethods.preventDefault.call(ev);

return false;
},

set: () => void 0
});
return false;
};
}

// NOTE: the dispatchEvent method does not return false when returnValue was set to false (only in MSEdge)
Expand All @@ -447,11 +433,11 @@ export default class EventSimulator {
const res = this._raiseDispatchEvent(el, ev, args);

if (browserUtils.isMSEdge)
return returnValue && !prevented;
return returnValue && !defaultPrevented;
else if (browserUtils.isIE)
return res;

return !prevented;
return !defaultPrevented;
}

return null;
Expand Down Expand Up @@ -577,11 +563,10 @@ export default class EventSimulator {
}

_dispatchFocusEvent (el, name, relatedTarget = null) {
const browserWithNewEventsStyle = !browserUtils.isIE || browserUtils.version > 11;
let event = null;
const bubbles = FOCUS_IN_OUT_EVENT_NAME_RE.test(name);
let event = null;
const bubbles = FOCUS_IN_OUT_EVENT_NAME_RE.test(name);

if (browserWithNewEventsStyle && nativeMethods.WindowFocusEvent) {
if (this.browserWithNewEventsStyle && nativeMethods.WindowFocusEvent) {
event = new nativeMethods.WindowFocusEvent(name, {
bubbles: bubbles,
cancelable: false,
Expand All @@ -607,7 +592,7 @@ export default class EventSimulator {

_dispatchTextEvent (el, text) {
if (nativeMethods.WindowTextEvent && nativeMethods.documentCreateEvent) {
const event = nativeMethods.documentCreateEvent.call(document, 'TextEvent');
const event = nativeMethods.documentCreateEvent.call(document, 'TextEvent');

const args = {
eventType: browserUtils.isIE ? 'textinput' : 'textInput',
Expand Down Expand Up @@ -651,7 +636,7 @@ export default class EventSimulator {
const iframe = isElementInIframe ? domUtils.getIframeByElement(el) : null;
const curWindow = iframe ? iframe.contentWindow : window;

if (browserUtils.isIE) {
if (browserUtils.isIE11 && iframe) {
// NOTE: In IE, when we raise an event by using the dispatchEvent function, the window.event object is null.
// If a real event happens, there is a window.event object, but it is not identical with the first argument
// of the event handler. The window.Event object is identical with the object that is created when we raise
Expand All @@ -662,12 +647,10 @@ export default class EventSimulator {
// to false.
// NOTE: In IE11, iframe's window.event object is null. We need to set
// iframe's window.event object manually by using window.event (B254199).
if (browserUtils.version === 11 && iframe) {
nativeMethods.objectDefineProperty.call(window.Object, iframe.contentWindow, 'event', {
get: () => window.event,
configurable: true
});
}
nativeMethods.objectDefineProperty.call(window.Object, iframe.contentWindow, 'event', {
get: () => window.event,
configurable: true
});
}

const res = el.dispatchEvent(ev);
Expand Down
16 changes: 16 additions & 0 deletions test/client/fixtures/sandbox/event/event-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,3 +266,19 @@ test('should not wrap invalid event handlers (GH-1251)', function () {
testHandlers(document);
testHandlers(document.body);
});

test('event.preventDefault call should change the event.defaultPrevented property value (GH-1588)', function () {
var input = document.createElement('input');

document.body.appendChild(input);

input.addEventListener('keydown', function (e) {
e.preventDefault();

ok(e.defaultPrevented);

input.parentNode.removeChild(input);
});

eventSimulator.keydown(input);
});

0 comments on commit 940615b

Please sign in to comment.