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

Refactor in components/script/dom/htmlanchorelement.rs to #11349

Closed
wants to merge 1 commit into from
+29 −38
Closed

Refactor in components/script/dom/htmlanchorelement.rs to #11349

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

67 components/script/dom/htmlanchorelement.rs
View file
Open in desktop
@@ -80,8 +80,8 @@ impl HTMLAnchorElement {
}

// https://html.spec.whatwg.org/multipage/#update-href
fn update_href(&self, url: DOMString) {
self.upcast::<Element>().set_string_attribute(&atom!("href"), url);
fn update_href(&self, url: &Url) {
self.upcast::<Element>().set_string_attribute(&atom!("href"), DOMString::from(url.as_str()));
}
}

@@ -161,18 +161,17 @@ impl HTMLAnchorElementMethods for HTMLAnchorElement {
self.reinitialize_url();

// Step 2.
let url = match self.url.borrow_mut().as_mut() {
match self.url.borrow_mut().as_mut() {
// Step 3.
Some(ref url) if url.scheme() == "javascript" => return,
None => return,
// Steps 4-5.
Some(url) => {
UrlHelper::SetHash(url, value);
DOMString::from(url.as_str())
// Step 6.
self.update_href(url);
}
};
// Step 6.
self.update_href(url);
}

// https://html.spec.whatwg.org/multipage/#dom-hyperlink-host
@@ -200,18 +199,17 @@ impl HTMLAnchorElementMethods for HTMLAnchorElement {
self.reinitialize_url();

// Step 2.
let url = match self.url.borrow_mut().as_mut() {
match self.url.borrow_mut().as_mut() {
// Step 3.
Some(ref url) if url.cannot_be_a_base() => return,
None => return,
// Step 4.
Some(url) => {
UrlHelper::SetHost(url, value);
DOMString::from(url.as_str())
// Step 5.
self.update_href(url);
}
};
// Step 5.
self.update_href(url);
}

// https://html.spec.whatwg.org/multipage/#dom-hyperlink-hostname
@@ -235,18 +233,17 @@ impl HTMLAnchorElementMethods for HTMLAnchorElement {
self.reinitialize_url();

// Step 2.
let url = match self.url.borrow_mut().as_mut() {
match self.url.borrow_mut().as_mut() {
// Step 3.
Some(ref url) if url.cannot_be_a_base() => return,
None => return,
// Step 4.
Some(url) => {
UrlHelper::SetHostname(url, value);
DOMString::from(url.as_str())
// Step 5.
self.update_href(url);
}
};
// Step 5.
self.update_href(url);
}

// https://html.spec.whatwg.org/multipage/#dom-hyperlink-href
@@ -294,18 +291,17 @@ impl HTMLAnchorElementMethods for HTMLAnchorElement {
self.reinitialize_url();

// Step 2.
let url = match self.url.borrow_mut().as_mut() {
match self.url.borrow_mut().as_mut() {
// Step 3.
Some(ref url) if url.host().is_none() || url.cannot_be_a_base() => return,
None => return,
// Step 4.
Some(url) => {
UrlHelper::SetPassword(url, value);
DOMString::from(url.as_str())
// Step 5.
self.update_href(url);
}
};
// Step 5.
self.update_href(url);
}

// https://html.spec.whatwg.org/multipage/#dom-hyperlink-pathname
@@ -327,18 +323,17 @@ impl HTMLAnchorElementMethods for HTMLAnchorElement {
self.reinitialize_url();

// Step 2.
let url = match self.url.borrow_mut().as_mut() {
match self.url.borrow_mut().as_mut() {
// Step 3.
Some(ref url) if url.cannot_be_a_base() => return,
None => return,
// Step 5.
Some(url) => {
UrlHelper::SetPathname(url, value);
DOMString::from(url.as_str())
// Step 6.
self.update_href(url);
}
};
// Step 6.
self.update_href(url);
}

// https://html.spec.whatwg.org/multipage/#dom-hyperlink-port
@@ -360,19 +355,18 @@ impl HTMLAnchorElementMethods for HTMLAnchorElement {
self.reinitialize_url();

// Step 3.
let url = match self.url.borrow_mut().as_mut() {
match self.url.borrow_mut().as_mut() {
Some(ref url) if url.host().is_none() ||
url.cannot_be_a_base() ||
url.scheme() == "file" => return,
None => return,
// Step 4.
Some(url) => {
UrlHelper::SetPort(url, value);
DOMString::from(url.as_str())
// Step 5.
self.update_href(url);
}
};
// Step 5.
self.update_href(url);
}

// https://html.spec.whatwg.org/multipage/#dom-hyperlink-protocol
@@ -393,17 +387,16 @@ impl HTMLAnchorElementMethods for HTMLAnchorElement {
// Step 1.
self.reinitialize_url();

let url = match self.url.borrow_mut().as_mut() {
match self.url.borrow_mut().as_mut() {
// Step 2.
None => return,
// Step 3.
Some(url) => {
UrlHelper::SetProtocol(url, value);
DOMString::from(url.as_str())
// Step 4.
self.update_href(url);
}
};
// Step 4.
self.update_href(url);
}

// https://html.spec.whatwg.org/multipage/#dom-hyperlink-search
@@ -425,19 +418,18 @@ impl HTMLAnchorElementMethods for HTMLAnchorElement {
self.reinitialize_url();

// Step 2.
let url = match self.url.borrow_mut().as_mut() {
match self.url.borrow_mut().as_mut() {
// Step 3.
None => return,
// Steps 4-5.
// TODO add this element's node document character encoding as
// encoding override (as described in the spec)
Some(url) => {
UrlHelper::SetSearch(url, value);
DOMString::from(url.as_str())
// Step 6.
self.update_href(url);
}
};
// Step 6.
self.update_href(url);
}

// https://html.spec.whatwg.org/multipage/#dom-hyperlink-username
@@ -459,18 +451,17 @@ impl HTMLAnchorElementMethods for HTMLAnchorElement {
self.reinitialize_url();

// Step 2.
let url = match self.url.borrow_mut().as_mut() {
match self.url.borrow_mut().as_mut() {
// Step 3.
Some(ref url) if url.host().is_none() || url.cannot_be_a_base() => return,
None => return,
// Step 4.
Some(url) => {
UrlHelper::SetUsername(url, value);
DOMString::from(url.as_str())
// Step 5.
self.update_href(url);
}
};
// Step 5.
self.update_href(url);
}

// https://html.spec.whatwg.org/multipage/#dom-hyperlink-href
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.