aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-05-24 10:27:41 -0500
committerbors-servo <metajack+bors@gmail.com>2015-05-24 10:27:41 -0500
commit16f19b628fa630aab8cfd275a90128da7b59723b (patch)
tree02d1cfbd496f9ec1f0aa29123522409f5c729b68
parent7561f7b83f27811683c1e724d75a935573a72813 (diff)
parent4e440a0ebb310d066014684ed1dd53d73f8c9d67 (diff)
downloadservo-16f19b628fa630aab8cfd275a90128da7b59723b.tar.gz
servo-16f19b628fa630aab8cfd275a90128da7b59723b.zip
Auto merge of #6170 - eleweek:fix-6111, r=Ms2ger
This fixes #6111 , @jdm said that I can work on this issue <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6170) <!-- Reviewable:end -->
-rw-r--r--components/script/dom/websocket.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs
index e902d1ac034..94a65fc611f 100644
--- a/components/script/dom/websocket.rs
+++ b/components/script/dom/websocket.rs
@@ -324,7 +324,7 @@ impl WebSocketTaskHandler {
let close_event = CloseEvent::new(global.r(),
"close".to_owned(),
EventBubbles::DoesNotBubble,
- EventCancelable::Cancelable,
+ EventCancelable::NotCancelable,
ws.clean_close.get(),
ws.code.get(),
rsn_clone).root();