aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/eventdispatcher.rs
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-04-26 05:30:28 -0500
committerbors-servo <metajack+bors@gmail.com>2015-04-26 05:30:28 -0500
commit1389be37823fccf4108f4e79d0a3a793f0bbe93e (patch)
tree30b2dc45c0aad707848dab7bfc53a3c11e1bdfe8 /components/script/dom/eventdispatcher.rs
parentaef48baeb4a67d003c8a88d91d01d3a33ac3620d (diff)
parent9185c3de7984fa46b71a62b2902a707c9d4134c3 (diff)
downloadservo-1389be37823fccf4108f4e79d0a3a793f0bbe93e.tar.gz
servo-1389be37823fccf4108f4e79d0a3a793f0bbe93e.zip
Auto merge of #5847 - Ms2ger:slice, r=SimonSapin
<!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5847) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/eventdispatcher.rs')
-rw-r--r--components/script/dom/eventdispatcher.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/components/script/dom/eventdispatcher.rs b/components/script/dom/eventdispatcher.rs
index 1ec656b3428..001d6ce7ace 100644
--- a/components/script/dom/eventdispatcher.rs
+++ b/components/script/dom/eventdispatcher.rs
@@ -42,9 +42,9 @@ pub fn dispatch_event<'a, 'b>(target: JSRef<'a, EventTarget>,
//FIXME: The "callback this value" should be currentTarget
/* capturing */
- for cur_target in chain.as_slice().iter().rev() {
+ for cur_target in chain.iter().rev() {
let cur_target = cur_target.root();
- let stopped = match cur_target.r().get_listeners_for(type_.as_slice(), ListenerPhase::Capturing) {
+ let stopped = match cur_target.r().get_listeners_for(&type_, ListenerPhase::Capturing) {
Some(listeners) => {
event.set_current_target(cur_target.r());
for listener in listeners.iter() {
@@ -71,7 +71,7 @@ pub fn dispatch_event<'a, 'b>(target: JSRef<'a, EventTarget>,
event.set_phase(EventPhase::AtTarget);
event.set_current_target(target.clone());
- let opt_listeners = target.get_listeners(type_.as_slice());
+ let opt_listeners = target.get_listeners(&type_);
for listeners in opt_listeners.iter() {
for listener in listeners.iter() {
// Explicitly drop any exception on the floor.
@@ -90,7 +90,7 @@ pub fn dispatch_event<'a, 'b>(target: JSRef<'a, EventTarget>,
for cur_target in chain.iter() {
let cur_target = cur_target.root();
- let stopped = match cur_target.r().get_listeners_for(type_.as_slice(), ListenerPhase::Bubbling) {
+ let stopped = match cur_target.r().get_listeners_for(&type_, ListenerPhase::Bubbling) {
Some(listeners) => {
event.set_current_target(cur_target.r());
for listener in listeners.iter() {