aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/eventtarget.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-09-26 12:09:48 -0500
committerGitHub <noreply@github.com>2016-09-26 12:09:48 -0500
commit9b7708063aec5dbabc96cd93e16028e0ee6e14cd (patch)
tree686ae598128ea3e7cebde6d2b6243b08a42c8cda /components/script/dom/eventtarget.rs
parent6a0c70a22269cbec6b72cfa8db499838bb00a0c3 (diff)
parent6c8bfdb77467314d9b9cc77e16c7d938794a445f (diff)
downloadservo-9b7708063aec5dbabc96cd93e16028e0ee6e14cd.tar.gz
servo-9b7708063aec5dbabc96cd93e16028e0ee6e14cd.zip
Auto merge of #13397 - aochagavia:dispatch-event, r=Ms2ger
Return an enum instead of a boolean from dispatch_event Fixes #13196 --- - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #13196. - [X] These changes do not require tests because the functionality hasn't changed <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13397) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/eventtarget.rs')
-rw-r--r--components/script/dom/eventtarget.rs11
1 files changed, 7 insertions, 4 deletions
diff --git a/components/script/dom/eventtarget.rs b/components/script/dom/eventtarget.rs
index c941eb8e20e..1d3efd59b19 100644
--- a/components/script/dom/eventtarget.rs
+++ b/components/script/dom/eventtarget.rs
@@ -23,7 +23,7 @@ use dom::bindings::str::DOMString;
use dom::element::Element;
use dom::errorevent::ErrorEvent;
use dom::event::{Event, EventBubbles, EventCancelable};
-use dom::eventdispatcher::dispatch_event;
+use dom::eventdispatcher::{EventStatus, dispatch_event};
use dom::node::document_from_node;
use dom::virtualmethods::VirtualMethods;
use dom::window::Window;
@@ -300,11 +300,11 @@ impl EventTarget {
pub fn dispatch_event_with_target(&self,
target: &EventTarget,
- event: &Event) -> bool {
+ event: &Event) -> EventStatus {
dispatch_event(self, Some(target), event)
}
- pub fn dispatch_event(&self, event: &Event) -> bool {
+ pub fn dispatch_event(&self, event: &Event) -> EventStatus {
dispatch_event(self, None, event)
}
@@ -560,7 +560,10 @@ impl EventTargetMethods for EventTarget {
return Err(Error::InvalidState);
}
event.set_trusted(false);
- Ok(self.dispatch_event(event))
+ Ok(match self.dispatch_event(event) {
+ EventStatus::Canceled => false,
+ EventStatus::NotCanceled => true
+ })
}
}