Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
auto merge of #2374 : Manishearth/servo/customevent, r=jdm
This was previously PR'd on #2218
- Loading branch information
Showing
6 changed files
with
121 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,86 @@ | ||
/* This Source Code Form is subject to the terms of the Mozilla Public | ||
* License, v. 2.0. If a copy of the MPL was not distributed with this | ||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ | ||
|
||
use dom::bindings::codegen::BindingDeclarations::CustomEventBinding; | ||
use dom::bindings::codegen::InheritTypes::{EventCast, CustomEventDerived}; | ||
use dom::bindings::js::{JSRef, Temporary}; | ||
use dom::bindings::error::Fallible; | ||
use dom::bindings::trace::Traceable; | ||
use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; | ||
use dom::event::{Event, EventMethods, EventTypeId, CustomEventTypeId}; | ||
use dom::window::Window; | ||
use js::jsapi::JSContext; | ||
use js::jsval::{JSVal, NullValue}; | ||
use servo_util::str::DOMString; | ||
|
||
#[deriving(Encodable)] | ||
pub struct CustomEvent { | ||
event: Event, | ||
detail: Traceable<JSVal> | ||
} | ||
|
||
impl CustomEventDerived for Event { | ||
fn is_customevent(&self) -> bool { | ||
self.type_id == CustomEventTypeId | ||
} | ||
} | ||
|
||
pub trait CustomEventMethods { | ||
fn Detail(&self, _cx: *JSContext) -> JSVal; | ||
fn InitCustomEvent(&mut self, _cx: *JSContext, | ||
type_: DOMString, can_bubble: bool, | ||
cancelable: bool, detail: JSVal); | ||
} | ||
|
||
impl CustomEvent { | ||
pub fn new_inherited(type_id: EventTypeId) -> CustomEvent { | ||
CustomEvent { | ||
event: Event::new_inherited(type_id), | ||
detail: Traceable::new(NullValue()) | ||
} | ||
} | ||
|
||
pub fn new_uninitialized(window: &JSRef<Window>) -> Temporary<CustomEvent> { | ||
reflect_dom_object(box CustomEvent::new_inherited(CustomEventTypeId), | ||
window, | ||
CustomEventBinding::Wrap) | ||
} | ||
pub fn new(window: &JSRef<Window>, type_: DOMString, bubbles: bool, cancelable: bool, detail: JSVal) -> Temporary<CustomEvent> { | ||
let mut ev = CustomEvent::new_uninitialized(window).root(); | ||
ev.InitCustomEvent(window.deref().get_cx(), type_, bubbles, cancelable, detail); | ||
Temporary::from_rooted(&*ev) | ||
} | ||
pub fn Constructor(owner: &JSRef<Window>, | ||
type_: DOMString, | ||
init: &CustomEventBinding::CustomEventInit) -> Fallible<Temporary<CustomEvent>>{ | ||
Ok(CustomEvent::new(owner, type_, init.parent.bubbles, init.parent.cancelable, init.detail)) | ||
} | ||
} | ||
|
||
impl<'a> CustomEventMethods for JSRef<'a, CustomEvent> { | ||
fn Detail(&self, _cx: *JSContext) -> JSVal { | ||
self.detail.deref().clone() | ||
} | ||
|
||
fn InitCustomEvent(&mut self, | ||
_cx: *JSContext, | ||
type_: DOMString, | ||
can_bubble: bool, | ||
cancelable: bool, | ||
detail: JSVal) { | ||
self.detail = Traceable::new(detail); | ||
let event: &mut JSRef<Event> = EventCast::from_mut_ref(self); | ||
event.InitEvent(type_, can_bubble, cancelable); | ||
} | ||
} | ||
|
||
impl Reflectable for CustomEvent { | ||
fn reflector<'a>(&'a self) -> &'a Reflector { | ||
self.event.reflector() | ||
} | ||
|
||
fn mut_reflector<'a>(&'a mut self) -> &'a mut Reflector { | ||
self.event.mut_reflector() | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ | ||
/* This Source Code Form is subject to the terms of the Mozilla Public | ||
* License, v. 2.0. If a copy of the MPL was not distributed with this | ||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
* | ||
* For more information on this interface please see | ||
* http://dom.spec.whatwg.org/#interface-customevent | ||
* | ||
* To the extent possible under law, the editors have waived | ||
* all copyright and related or neighboring rights to this work. | ||
* In addition, as of 1 May 2014, the editors have made this specification | ||
* available under the Open Web Foundation Agreement Version 1.0, | ||
* which is available at | ||
* http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0. | ||
*/ | ||
|
||
[Constructor(DOMString type, optional CustomEventInit eventInitDict), | ||
Exposed=Window,Worker] | ||
interface CustomEvent : Event { | ||
readonly attribute any detail; | ||
|
||
void initCustomEvent(DOMString type, boolean bubbles, boolean cancelable, any detail); | ||
}; | ||
|
||
dictionary CustomEventInit : EventInit { | ||
any detail = null; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters