diff options
| -rw-r--r-- | components/script/dom/closeevent.rs | 11 | ||||
| -rw-r--r-- | components/script/dom/webidls/CloseEvent.webidl | 6 |
2 files changed, 5 insertions, 12 deletions
diff --git a/components/script/dom/closeevent.rs b/components/script/dom/closeevent.rs index 3492f9be0e8..08ed8a07aa9 100644 --- a/components/script/dom/closeevent.rs +++ b/components/script/dom/closeevent.rs @@ -15,8 +15,6 @@ use script_task::ScriptChan; use util::str::DOMString; -use std::borrow::ToOwned; - #[dom_struct] pub struct CloseEvent { event: Event, @@ -57,15 +55,10 @@ impl CloseEvent { type_: DOMString, init: &CloseEventBinding::CloseEventInit) -> Fallible<Temporary<CloseEvent>> { - let clean_status = init.wasClean.unwrap_or(true); - let cd = init.code.unwrap_or(0); - let rsn = match init.reason.as_ref() { - Some(reason) => reason.clone(), - None => "".to_owned(), - }; let bubbles = if init.parent.bubbles { EventBubbles::Bubbles } else { EventBubbles::DoesNotBubble }; let cancelable = if init.parent.cancelable { EventCancelable::Cancelable } else { EventCancelable::NotCancelable }; - Ok(CloseEvent::new(global, type_, bubbles, cancelable, clean_status, cd, rsn)) + Ok(CloseEvent::new(global, type_, bubbles, cancelable, init.wasClean, + init.code, init.reason.clone())) } } diff --git a/components/script/dom/webidls/CloseEvent.webidl b/components/script/dom/webidls/CloseEvent.webidl index edc2a43de19..c75b27e8184 100644 --- a/components/script/dom/webidls/CloseEvent.webidl +++ b/components/script/dom/webidls/CloseEvent.webidl @@ -11,7 +11,7 @@ interface CloseEvent : Event { }; dictionary CloseEventInit : EventInit { - boolean wasClean; - unsigned short code; - DOMString reason; + boolean wasClean = true; + unsigned short code = 0; + DOMString reason = ""; }; |