aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/script_task.rs
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2014-10-13 19:12:38 -0600
committerbors-servo <metajack+bors@gmail.com>2014-10-13 19:12:38 -0600
commit293e06fd7cf3c79e377fc1ce619ee790c46f9858 (patch)
tree8486641ea2fe7244db3ea4ca0766fe939ba9144a /components/script/script_task.rs
parent799d0de0c09420a9657a6a7b5fb814374da31163 (diff)
parent5080c0d86e4f3388f78fff535d746c51a757b618 (diff)
downloadservo-293e06fd7cf3c79e377fc1ce619ee790c46f9858.tar.gz
servo-293e06fd7cf3c79e377fc1ce619ee790c46f9858.zip
auto merge of #3651 : ttaubert/servo/issue/3643-event-new-enums, r=Manishearth
r? @jdm
Diffstat (limited to 'components/script/script_task.rs')
-rw-r--r--components/script/script_task.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script/script_task.rs b/components/script/script_task.rs
index e62c818943c..4901a3e9e20 100644
--- a/components/script/script_task.rs
+++ b/components/script/script_task.rs
@@ -19,7 +19,7 @@ use dom::bindings::utils::{wrap_for_same_compartment, pre_wrap};
use dom::document::{Document, HTMLDocument, DocumentHelpers};
use dom::element::{Element, HTMLButtonElementTypeId, HTMLInputElementTypeId};
use dom::element::{HTMLSelectElementTypeId, HTMLTextAreaElementTypeId, HTMLOptionElementTypeId};
-use dom::event::Event;
+use dom::event::{Event, Bubbles, DoesNotBubble, Cancelable, NotCancelable};
use dom::uievent::UIEvent;
use dom::eventtarget::{EventTarget, EventTargetHelpers};
use dom::node;
@@ -851,7 +851,7 @@ impl ScriptTask {
// We have no concept of a document loader right now, so just dispatch the
// "load" event as soon as we've finished executing all scripts parsed during
// the initial load.
- let event = Event::new(&global::Window(*window), "load".to_string(), false, false).root();
+ let event = Event::new(&global::Window(*window), "load".to_string(), DoesNotBubble, NotCancelable).root();
let doctarget: JSRef<EventTarget> = EventTargetCast::from_ref(*document);
let wintarget: JSRef<EventTarget> = EventTargetCast::from_ref(*window);
let _ = wintarget.dispatch_event_with_target(Some(doctarget), *event);
@@ -981,7 +981,7 @@ impl ScriptTask {
let event =
Event::new(&global::Window(*window),
"click".to_string(),
- true, true).root();
+ Bubbles, Cancelable).root();
let eventtarget: JSRef<EventTarget> = EventTargetCast::from_ref(node);
let _ = eventtarget.dispatch_event_with_target(None, *event);