Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Issue #561 - Execute inline JS.

Browse source 
This follows the approach of external scripts in executing tests all together after parsing finishes.
This commit is contained in:
Ms2ger 2013-09-04 21:38:35 +02:00
parent a567eb007d
commit 916d0253b3
1 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/components/script/html/hubbub_html_parser.rs
View file

@ -86,6 +86,7 @@ enum CSSMessage {
enum JSMessage { enum JSMessage {
JSTaskNewFile(Url), JSTaskNewFile(Url),
JSTaskNewInlineScript(~str, Url),
JSTaskExit JSTaskExit
} }
@ -193,6 +194,9 @@ fn js_script_listener(to_parent: SharedChan<HtmlDiscoveryMessage>,
result_vec.push(JSFile { data: bytes.unwrap(), url: url_clone }); result_vec.push(JSFile { data: bytes.unwrap(), url: url_clone });
} }
} }
JSTaskNewInlineScript(data, url) => {
result_vec.push(JSFile { data: data.into_bytes(), url: url });
}
JSTaskExit => { JSTaskExit => {
break; break;
} }
@ -511,15 +515,27 @@ pub fn parse_html(cx: *JSContext,
url: Url, url: Url,
js_chan: SharedChan<JSMessage>) { js_chan: SharedChan<JSMessage>) {
unsafe { unsafe {
let script: AbstractNode<ScriptView> = NodeWrapping::from_hubbub_node(script); let scriptnode: AbstractNode<ScriptView> = NodeWrapping::from_hubbub_node(script);
do script.with_imm_element |script| { do scriptnode.with_imm_element |script| {
match script.get_attr("src") { match script.get_attr("src") {
Some(src) => { Some(src) => {
debug!("found script: %s", src); debug!("found script: %s", src);
let new_url = make_url(src.to_str(), Some(url.clone())); let new_url = make_url(src.to_str(), Some(url.clone()));
js_chan.send(JSTaskNewFile(new_url)); js_chan.send(JSTaskNewFile(new_url));
} }
None => {} None => {
let mut data = ~[];
debug!("iterating over children %?", scriptnode.first_child());
for child in scriptnode.children() {
debug!("child = %?", child);
do child.with_imm_text() |text| {
data.push(text.parent.data.to_str()); // FIXME: Bad copy.
}
}
debug!("data = %?", data);
js_chan.send(JSTaskNewInlineScript(data.concat(), url.clone()));
}
} }
} }
} }