Skip to content

/ servo

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

Add a sanitize_value implementation for the color input #19330

Merged
merged 1 commit into from Nov 23, 2017
+24 −188
Merged

Add a sanitize_value implementation for the color input #19330

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Loading status checks…

Add a sanitize_value implementation for the color input 

I had to change the test a little bit to avoid some failures due to
color and text both having a sanitizedValue which was making the test
use the first assertion instead of the second one in some cases.

The sanitize_value implementation is pretty simple, we iterate over the
content and checks that the content is 7 characters long, that the first
character is a `#` and then that all the following characters are
hexadecimal. If all those requirements are met, we lowercase the
content, otherwise we put `#000000` in it.
  • Loading branch information
@Eijebong
Eijebong committed Nov 22, 2017
commit 05c4e08d588af26f9550633362879d8c8153c5ea
3 components/atoms/static_atoms.txt
View file
Open in desktop
@@ -1,3 +1,4 @@
DOMContentLoaded
abort
activate
beforeunload
@@ -10,13 +11,13 @@ characteristicvaluechanged
checkbox
click
close
color
controllerchange
cursive
date
datetime
datetime-local
dir
DOMContentLoaded
email
emptied
error
20 components/script/dom/htmlinputelement.rs
View file
Open in desktop
@@ -875,6 +875,26 @@ impl HTMLInputElement {
content.strip_newlines();
content.strip_leading_and_trailing_ascii_whitespace();
}
atom!("color") => {
let mut textinput = self.textinput.borrow_mut();

let is_valid = {
let content = textinput.single_line_content();
let mut chars = content.chars();
if content.len() == 7 && chars.next() == Some('#') {
chars.all(|c| c.is_digit(16))
} else {
false
}
};

if is_valid {
let content = textinput.single_line_content_mut();
content.make_ascii_lowercase();
} else {
textinput.set_content("#000000".into());
}
}
// TODO: Implement more value sanitization algorithms for different types of inputs
_ => ()
}
2 tests/wpt/metadata/MANIFEST.json
View file
Open in desktop
"testharness"
],
"html/semantics/forms/the-input-element/type-change-state.html": [
"927c8f78d173edd6e82badf4a1584df3c50c5505",
"95e8bfd7d2f14068b0d3e41e3f017da3647bc382",
"testharness"
],
"html/semantics/forms/the-input-element/url.html": [
68 tests/wpt/metadata/html/semantics/forms/the-input-element/color.html.ini
View file
Open in desktop

This file was deleted.

111 tests/wpt/metadata/html/semantics/forms/the-input-element/type-change-state.html.ini
View file
Open in desktop
@@ -24,9 +24,6 @@
[change state from hidden to range]
expected: FAIL

[change state from hidden to color]
expected: FAIL

[change state from text to email]
expected: FAIL

@@ -51,9 +48,6 @@
[change state from text to range]
expected: FAIL

[change state from text to color]
expected: FAIL

[change state from search to email]
expected: FAIL

@@ -78,9 +72,6 @@
[change state from search to range]
expected: FAIL

[change state from search to color]
expected: FAIL

[change state from tel to email]
expected: FAIL

@@ -105,9 +96,6 @@
[change state from tel to range]
expected: FAIL

[change state from tel to color]
expected: FAIL

[change state from url to text]
expected: FAIL

@@ -141,9 +129,6 @@
[change state from url to range]
expected: FAIL

[change state from url to color]
expected: FAIL

[change state from email to hidden]
expected: FAIL

@@ -186,9 +171,6 @@
[change state from email to range]
expected: FAIL

[change state from email to color]
expected: FAIL

[change state from password to email]
expected: FAIL

@@ -213,9 +195,6 @@
[change state from password to range]
expected: FAIL

[change state from password to color]
expected: FAIL

[change state from datetime to text]
expected: FAIL

@@ -252,9 +231,6 @@
[change state from datetime to range]
expected: FAIL

[change state from datetime to color]
expected: FAIL

[change state from date to hidden]
expected: FAIL

@@ -297,9 +273,6 @@
[change state from date to range]
expected: FAIL

[change state from date to color]
expected: FAIL

[change state from month to hidden]
expected: FAIL

@@ -342,9 +315,6 @@
[change state from month to range]
expected: FAIL

[change state from month to color]
expected: FAIL

[change state from week to hidden]
expected: FAIL

@@ -387,9 +357,6 @@
[change state from week to range]
expected: FAIL

[change state from week to color]
expected: FAIL

[change state from time to hidden]
expected: FAIL

@@ -432,9 +399,6 @@
[change state from time to range]
expected: FAIL

[change state from time to color]
expected: FAIL

[change state from number to hidden]
expected: FAIL

@@ -477,9 +441,6 @@
[change state from number to range]
expected: FAIL

[change state from number to color]
expected: FAIL

[change state from range to hidden]
expected: FAIL

@@ -522,54 +483,6 @@
[change state from range to number]
expected: FAIL

[change state from range to color]
expected: FAIL

[change state from color to hidden]
expected: FAIL

[change state from color to checkbox]
expected: FAIL

[change state from color to radio]
expected: FAIL

[change state from color to submit]
expected: FAIL

[change state from color to image]
expected: FAIL

[change state from color to reset]
expected: FAIL

[change state from color to button]
expected: FAIL

[change state from color to email]
expected: FAIL

[change state from color to datetime]
expected: FAIL

[change state from color to date]
expected: FAIL

[change state from color to month]
expected: FAIL

[change state from color to week]
expected: FAIL

[change state from color to time]
expected: FAIL

[change state from color to number]
expected: FAIL

[change state from color to range]
expected: FAIL

[change state from checkbox to email]
expected: FAIL

@@ -594,9 +507,6 @@
[change state from checkbox to range]
expected: FAIL

[change state from checkbox to color]
expected: FAIL

[change state from radio to email]
expected: FAIL

@@ -621,9 +531,6 @@
[change state from radio to range]
expected: FAIL

[change state from radio to color]
expected: FAIL

[change state from submit to email]
expected: FAIL

@@ -648,9 +555,6 @@
[change state from submit to range]
expected: FAIL

[change state from submit to color]
expected: FAIL

[change state from image to email]
expected: FAIL

@@ -675,9 +579,6 @@
[change state from image to range]
expected: FAIL

[change state from image to color]
expected: FAIL

[change state from reset to email]
expected: FAIL

@@ -702,9 +603,6 @@
[change state from reset to range]
expected: FAIL

[change state from reset to color]
expected: FAIL

[change state from button to email]
expected: FAIL

@@ -729,9 +627,6 @@
[change state from button to range]
expected: FAIL

[change state from button to color]
expected: FAIL

[change state from hidden to datetime-local]
expected: FAIL

@@ -795,9 +690,6 @@
[change state from datetime-local to range]
expected: FAIL

[change state from datetime-local to color]
expected: FAIL

[change state from date to datetime-local]
expected: FAIL

@@ -816,9 +708,6 @@
[change state from range to datetime-local]
expected: FAIL

[change state from color to datetime-local]
expected: FAIL

[change state from checkbox to datetime-local]
expected: FAIL

ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.