Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-14 19:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Handle the for and event attributes on a script element correctly when one of them is present (fixes #5258).

Browse source
This commit is contained in:
Keith Yeung 2015-03-19 16:25:09 +08:00 • committed by Ms2ger
parent 4846607e18
commit fdcf9618cb
2 changed files with 16 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

31
components/script/dom/htmlscriptelement.rs
View file

@ -202,25 +202,26 @@ impl<'a> HTMLScriptElementHelpers for JSRef<'a, HTMLScriptElement> {
} }
// Step 12. // Step 12.
match element.get_attribute(ns!(""), &atom!("for")).root() { let for_attribute = element.get_attribute(ns!(""), &atom!("for")).root();
Some(for_script) => { let event_attribute = element.get_attribute(ns!(""), &Atom::from_slice("event")).root();
if for_script.r().Value().to_ascii_lowercase().trim_matches(HTML_SPACE_CHARACTERS) != "window" { match (for_attribute.r(), event_attribute.r()) {
(Some(for_attribute), Some(event_attribute)) => {
let for_value = for_attribute.Value()
.to_ascii_lowercase();
let for_value = for_value.trim_matches(HTML_SPACE_CHARACTERS);
if for_value != "window" {
return; return;
} }
}
_ => { } let event_value = event_attribute.Value().to_ascii_lowercase();
let event_value = event_value.trim_matches(HTML_SPACE_CHARACTERS);
if event_value != "onload" && event_value != "onload()" {
return;
}
},
(_, _) => (),
} }
match element.get_attribute(ns!(""), &Atom::from_slice("event")).root() {
Some(event) => {
let event = event.r().Value().to_ascii_lowercase();
let event = event.trim_matches(HTML_SPACE_CHARACTERS);
if event != "onload" && event != "onload()" {
return;
}
}
_ => { }
}
// Step 13. // Step 13.
if let Some(charset) = element.get_attribute(ns!(""), &Atom::from_slice("charset")).root() { if let Some(charset) = element.get_attribute(ns!(""), &Atom::from_slice("charset")).root() {
if let Some(encodingRef) = encoding_from_whatwg_label(&charset.r().Value()) { if let Some(encodingRef) = encoding_from_whatwg_label(&charset.r().Value()) {

8
tests/wpt/metadata/html/semantics/scripting-1/the-script-element/script-for-event.html.ini
View file

@ -1,8 +0,0 @@
[script-for-event.html]
type: testharness
[Script 15]
expected: FAIL
[Script 16]
expected: FAIL