Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup CloseEvent. #5961

Merged
merged 4 commits into from May 6, 2015
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Next

Improve formatting in closeevent.rs.

  • Loading branch information
Ms2ger committed May 6, 2015
commit 31ebfff9bc3769615f583fd667ab25081b771465
@@ -9,26 +9,27 @@ use dom::bindings::codegen::Bindings::CloseEventBinding::CloseEventMethods;
use dom::bindings::codegen::InheritTypes::EventCast;
use dom::bindings::error::Fallible;
use dom::bindings::global::GlobalRef;
use dom::bindings::js::{JSRef,Temporary, Rootable};
use dom::bindings::js::{JSRef, Temporary, Rootable};
use dom::bindings::utils::reflect_dom_object;
use dom::event::{Event, EventTypeId, EventBubbles, EventCancelable};
use script_task::ScriptChan;
use std::borrow::ToOwned;
use std::cell::Cell;

use util::str::DOMString;

use std::borrow::ToOwned;
use std::cell::Cell;

#[dom_struct]
pub struct CloseEvent{
pub struct CloseEvent {
event: Event,
wasClean: Cell<bool>,
code: Cell<u16>,
reason: DOMRefCell<DOMString>
}

impl CloseEvent{
pub fn new_inherited(type_id: EventTypeId) -> CloseEvent{
CloseEvent{
impl CloseEvent {
pub fn new_inherited(type_id: EventTypeId) -> CloseEvent {
CloseEvent {
event: Event::new_inherited(type_id),
wasClean: Cell::new(true),
code: Cell::new(0),
@@ -60,7 +61,8 @@ impl CloseEvent{

pub fn Constructor(global: GlobalRef,
type_: DOMString,
init: &CloseEventBinding::CloseEventInit) -> Fallible<Temporary<CloseEvent>> {
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() {
@@ -73,7 +75,7 @@ impl CloseEvent{
}
}

impl<'a> CloseEventMethods for JSRef<'a, CloseEvent>{
impl<'a> CloseEventMethods for JSRef<'a, CloseEvent> {
fn WasClean(self) -> bool {
self.wasClean.get()
}
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.