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

auto merge of #5319 : frewsxcv/servo/urlsearchparams, r=Ms2ger

Browse source
This commit is contained in:
bors-servo 2015-03-23 05:18:50 -06:00
commit ccac6a944e
1 changed files with 25 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

36
components/script/dom/urlsearchparams.rs
View file

@ -37,10 +37,12 @@ impl URLSearchParams {
} }
pub fn new(global: GlobalRef) -> Temporary<URLSearchParams> { pub fn new(global: GlobalRef) -> Temporary<URLSearchParams> {
reflect_dom_object(box URLSearchParams::new_inherited(), global, URLSearchParamsBinding::Wrap) reflect_dom_object(box URLSearchParams::new_inherited(), global,
URLSearchParamsBinding::Wrap)
} }
pub fn Constructor(global: GlobalRef, init: Option<StringOrURLSearchParams>) -> Fallible<Temporary<URLSearchParams>> { pub fn Constructor(global: GlobalRef, init: Option<StringOrURLSearchParams>) ->
Fallible<Temporary<URLSearchParams>> {
let usp = URLSearchParams::new(global).root(); let usp = URLSearchParams::new(global).root();
match init { match init {
Some(eString(_s)) => { Some(eString(_s)) => {
@ -115,15 +117,25 @@ impl URLSearchParamsHelpers for URLSearchParams {
let value = value.as_slice(); let value = value.as_slice();
// XXXManishearth should this be a strict encoding? Can unwrap()ing the result fail? // XXXManishearth should this be a strict encoding? Can unwrap()ing the result fail?
let value = encoding.encode(value, EncoderTrap::Replace).unwrap(); let value = encoding.encode(value, EncoderTrap::Replace).unwrap();
// Step 1.
let mut buf = vec!(); let mut buf = vec!();
for i in value.iter() {
// Step 2.
for i in &value {
let append = match *i { let append = match *i {
// Convert spaces:
// ' ' => '+'
0x20 => vec!(0x2B), 0x20 => vec!(0x2B),
0x2A | 0x2D | 0x2E |
0x30 ... 0x39 | 0x41 ... 0x5A | // Retain the following characters:
0x5F | 0x61...0x7A => vec!(*i), // '*', '-', '.', '0'...'9', 'A'...'Z', '_', 'a'...'z'
a => { 0x2A | 0x2D | 0x2E | 0x30...0x39 |
0x41...0x5A | 0x5F | 0x61...0x7A => vec!(*i),
// Encode everything else using 'percented-encoded bytes'
// http://url.spec.whatwg.org/#percent-encode // http://url.spec.whatwg.org/#percent-encode
a => {
let mut encoded = vec!(0x25); // % let mut encoded = vec!(0x25); // %
let s = format!("{}", radix(a, 16)).into_ascii_uppercase(); let s = format!("{}", radix(a, 16)).into_ascii_uppercase();
let bytes = s.as_bytes(); let bytes = s.as_bytes();
@ -131,8 +143,10 @@ impl URLSearchParamsHelpers for URLSearchParams {
encoded encoded
} }
}; };
buf.push_all(append.as_slice()); buf.push_all(&append);
} }
// Step 3.
buf buf
} }
let encoding = encoding.unwrap_or(UTF_8 as EncodingRef); let encoding = encoding.unwrap_or(UTF_8 as EncodingRef);
@ -140,16 +154,16 @@ impl URLSearchParamsHelpers for URLSearchParams {
let mut first_pair = true; let mut first_pair = true;
for (k, v) in self.data.borrow().iter() { for (k, v) in self.data.borrow().iter() {
let name = serialize_string(k, encoding); let name = serialize_string(k, encoding);
for val in v.iter() { for val in v {
let value = serialize_string(val, encoding); let value = serialize_string(val, encoding);
if first_pair { if first_pair {
first_pair = false; first_pair = false;
} else { } else {
buf.push(0x26); // & buf.push(0x26); // &
} }
buf.push_all(name.as_slice()); buf.push_all(&name);
buf.push(0x3D); // = buf.push(0x3D); // =
buf.push_all(value.as_slice()) buf.push_all(&value)
} }
} }
buf buf