diff options
author | bors-servo <metajack+bors@gmail.com> | 2015-02-21 08:42:46 -0700 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2015-02-21 08:42:46 -0700 |
commit | 0be6389158799a58a46564524004e827c5884296 (patch) | |
tree | a0f18198d6b0b1c869c7ac17929887a780dce12a /components/script/dom/htmlscriptelement.rs | |
parent | 1ad9c678f7fbfaffe86a0f76904aaf5f5a3bbee2 (diff) | |
parent | 52f8b0ceb73f343594795e3604ebdffb6fc74a16 (diff) | |
download | servo-0be6389158799a58a46564524004e827c5884296.tar.gz servo-0be6389158799a58a46564524004e827c5884296.zip |
auto merge of #4939 : KiChjang/servo/script-element-error-events, r=jdm
Fixes #4506
Diffstat (limited to 'components/script/dom/htmlscriptelement.rs')
-rw-r--r-- | components/script/dom/htmlscriptelement.rs | 40 |
1 files changed, 37 insertions, 3 deletions
diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs index aec5422fd07..ee3e85f6ed1 100644 --- a/components/script/dom/htmlscriptelement.rs +++ b/components/script/dom/htmlscriptelement.rs @@ -40,6 +40,8 @@ use url::UrlParser; pub struct HTMLScriptElement { htmlelement: HTMLElement, + error_occurred: Cell<bool>, + /// https://html.spec.whatwg.org/multipage/scripting.html#already-started already_started: Cell<bool>, @@ -68,6 +70,7 @@ impl HTMLScriptElement { creator: ElementCreator) -> HTMLScriptElement { HTMLScriptElement { htmlelement: HTMLElement::new_inherited(HTMLElementTypeId::HTMLScriptElement, localName, prefix, document), + error_occurred: Cell::new(false), already_started: Cell::new(false), parser_inserted: Cell::new(creator == ElementCreator::ParserCreated), non_blocking: Cell::new(creator != ElementCreator::ParserCreated), @@ -93,8 +96,14 @@ pub trait HTMLScriptElementHelpers { /// Set the "already started" flag (<https://whatwg.org/html/#already-started>) fn mark_already_started(self); + // Queues error event + fn queue_error_event(self); + /// Dispatch load event. fn dispatch_load_event(self); + + /// Dispatch error event. + fn dispatch_error_event(self); } /// Supported script types as defined by @@ -205,7 +214,7 @@ impl<'a> HTMLScriptElementHelpers for JSRef<'a, HTMLScriptElement> { let (origin, source, url) = match element.get_attribute(ns!(""), &atom!("src")).root() { Some(src) => { if src.r().Value().is_empty() { - // TODO: queue a task to fire a simple event named `error` at the element + self.queue_error_event(); return; } match UrlParser::new().base_url(&base_url).parse(src.r().Value().as_slice()) { @@ -222,13 +231,14 @@ impl<'a> HTMLScriptElementHelpers for JSRef<'a, HTMLScriptElement> { } Err(_) => { error!("error loading script {}", src.r().Value()); + self.queue_error_event(); return; } } } Err(_) => { - // TODO: queue a task to fire a simple event named `error` at the element error!("error parsing URL for script {}", src.r().Value()); + self.queue_error_event(); return; } } @@ -252,6 +262,15 @@ impl<'a> HTMLScriptElementHelpers for JSRef<'a, HTMLScriptElement> { } } + fn queue_error_event(self) { + self.error_occurred.set(true); + let window = window_from_node(self).root(); + let window = window.r(); + let chan = window.script_chan(); + let handler = Trusted::new(window.get_cx(), self, chan.clone()); + chan.send(ScriptMsg::RunnableMsg(box handler)); + } + fn dispatch_load_event(self) { let window = window_from_node(self).root(); let window = window.r(); @@ -263,6 +282,17 @@ impl<'a> HTMLScriptElementHelpers for JSRef<'a, HTMLScriptElement> { event.r().fire(target); } + fn dispatch_error_event(self) { + let window = window_from_node(self).root(); + let window = window.r(); + let event = Event::new(GlobalRef::Window(window), + "error".to_owned(), + EventBubbles::DoesNotBubble, + EventCancelable::NotCancelable).root(); + let target: JSRef<EventTarget> = EventTargetCast::from_ref(self); + event.r().fire(target); + } + fn is_javascript(self) -> bool { let element: JSRef<Element> = ElementCast::from_ref(self); match element.get_attribute(ns!(""), &atom!("type")).root().map(|s| s.r().Value()) { @@ -377,6 +407,10 @@ impl<'a> HTMLScriptElementMethods for JSRef<'a, HTMLScriptElement> { impl Runnable for Trusted<HTMLScriptElement> { fn handler(self: Box<Trusted<HTMLScriptElement>>) { let target = self.to_temporary().root(); - target.r().dispatch_load_event(); + if target.r().error_occurred.get() { + target.r().dispatch_error_event(); + } else { + target.r().dispatch_load_event(); + } } } |