| Index: LayoutTests/dom/xhtml/level2/events/dispatchEvent13.js
|
| diff --git a/LayoutTests/dom/xhtml/level2/events/dispatchEvent13.js b/LayoutTests/dom/xhtml/level2/events/dispatchEvent13.js
|
| index c6483d8e70196a4926a951e7461a08b8275f8b7b..7d38114bc4233265243c9055fd54642e063de27a 100644
|
| --- a/LayoutTests/dom/xhtml/level2/events/dispatchEvent13.js
|
| +++ b/LayoutTests/dom/xhtml/level2/events/dispatchEvent13.js
|
| @@ -1,17 +1,14 @@
|
| -
|
| /*
|
| -Copyright © 2001-2004 World Wide Web Consortium,
|
| -(Massachusetts Institute of Technology, European Research Consortium
|
| -for Informatics and Mathematics, Keio University). All
|
| -Rights Reserved. This work is distributed under the W3C® Software License [1] in the
|
| -hope that it will be useful, but WITHOUT ANY WARRANTY; without even
|
| -the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
| +Copyright © 2001-2004 World Wide Web Consortium,
|
| +(Massachusetts Institute of Technology, European Research Consortium
|
| +for Informatics and Mathematics, Keio University). All
|
| +Rights Reserved. This work is distributed under the W3C® Software License [1] in the
|
| +hope that it will be useful, but WITHOUT ANY WARRANTY; without even
|
| +the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
|
| [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
|
| */
|
|
|
| -
|
| -
|
| /**
|
| * Gets URI that identifies the test.
|
| * @return uri identifier of test
|
| @@ -41,26 +38,24 @@ function setUpPage() {
|
| builder = createConfiguredBuilder();
|
|
|
| docsLoaded = 0;
|
| -
|
| +
|
| var docRef = null;
|
| if (typeof(this.doc) != 'undefined') {
|
| docRef = this.doc;
|
| }
|
| docsLoaded += preload(docRef, "doc", "hc_staff");
|
| -
|
| +
|
| if (docsLoaded == 1) {
|
| setUpPageStatus = 'complete';
|
| }
|
| } catch(ex) {
|
| - catchInitializationError(builder, ex);
|
| + catchInitializationError(builder, ex);
|
| setUpPageStatus = 'complete';
|
| }
|
| }
|
|
|
| -
|
| -
|
| //
|
| -// This method is called on the completion of
|
| +// This method is called on the completion of
|
| // each asychronous load started in setUpTests.
|
| //
|
| // When every synchronous loaded document has completed,
|
| @@ -72,9 +67,8 @@ function loadComplete() {
|
| }
|
| }
|
|
|
| -
|
| /**
|
| - * Inner class implementation for variable listener1
|
| + * Inner class implementation for variable listener1
|
| */
|
| var listener1;
|
|
|
| @@ -84,17 +78,17 @@ var listener1;
|
| * @param events Value from value attribute of nested var element
|
| * @param listeners Value from value attribute of nested var element
|
| */
|
| -
|
| -function EventListenerN1003B(events, listeners) {
|
| +
|
| +function EventListenerN1003B(events, listeners) {
|
| this.events = events;
|
| this.listeners = listeners;
|
| }
|
| -
|
| +
|
| /**
|
| - *
|
| + *
|
| This method is called whenever an event occurs of the type for which theEventListenerinterface was registered.
|
|
|
| - * @param evt
|
| + * @param evt
|
| TheEventcontains contextual information about the event. It also contains thestopPropagationand preventDefaultmethods which are used in determining the event's flow and default action.
|
|
|
| */
|
| @@ -112,12 +106,12 @@ target = evt.currentTarget;
|
| for(var indexN10065 = 0;indexN10065 < listeners.length; indexN10065++) {
|
| listener = listeners[indexN10065];
|
| target.removeEventListener("foo", listener.handleEvent, false);
|
| -
|
| - }
|
| +
|
| + }
|
| }
|
|
|
| /**
|
| - * Inner class implementation for variable listener2
|
| + * Inner class implementation for variable listener2
|
| */
|
| var listener2;
|
|
|
| @@ -127,17 +121,17 @@ var listener2;
|
| * @param events Value from value attribute of nested var element
|
| * @param listeners Value from value attribute of nested var element
|
| */
|
| -
|
| -function EventListenerN10074(events, listeners) {
|
| +
|
| +function EventListenerN10074(events, listeners) {
|
| this.events = events;
|
| this.listeners = listeners;
|
| }
|
| -
|
| +
|
| /**
|
| - *
|
| + *
|
| This method is called whenever an event occurs of the type for which theEventListenerinterface was registered.
|
|
|
| - * @param evt
|
| + * @param evt
|
| TheEventcontains contextual information about the event. It also contains thestopPropagationand preventDefaultmethods which are used in determining the event's flow and default action.
|
|
|
| */
|
| @@ -155,13 +149,13 @@ target = evt.currentTarget;
|
| for(var indexN10098 = 0;indexN10098 < listeners.length; indexN10098++) {
|
| listener = listeners[indexN10098];
|
| target.removeEventListener("foo", listener.handleEvent, false);
|
| -
|
| - }
|
| +
|
| + }
|
| }
|
|
|
| /**
|
| -*
|
| -Two listeners are registered on the same target, each of which will remove both itself and
|
| +*
|
| +Two listeners are registered on the same target, each of which will remove both itself and
|
| the other on the first event. Only one should see the event since event listeners
|
| can never be invoked after being removed.
|
|
|
| @@ -181,10 +175,9 @@ function dispatchEvent13() {
|
| var events = new Array();
|
|
|
| listener1 = new EventListenerN1003B(events, listeners);
|
| -
|
| +
|
| listener2 = new EventListenerN10074(events, listeners);
|
| -
|
| -
|
| +
|
| var docRef = null;
|
| if (typeof(this.doc) != 'undefined') {
|
| docRef = this.doc;
|
| @@ -193,17 +186,14 @@ function dispatchEvent13() {
|
| listeners[listeners.length] = listener1;
|
| listeners[listeners.length] = listener2;
|
| doc.addEventListener("foo", listener1.handleEvent, false);
|
| - doc.addEventListener("foo", listener2.handleEvent, false);
|
| - evt = doc.createEvent("Events");
|
| + doc.addEventListener("foo", listener2.handleEvent, false);
|
| + evt = doc.createEvent("Events");
|
| evt.initEvent("foo",true,false);
|
| preventDefault = doc.dispatchEvent(evt);
|
| assertSize("eventCount",1,events);
|
|
|
| }
|
|
|
| -
|
| -
|
| -
|
| function runTest() {
|
| dispatchEvent13();
|
| }
|
|
|