aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/htmlscriptelement.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2015-11-26 00:10:39 +0530
committerbors-servo <lbergstrom+bors@mozilla.com>2015-11-26 00:10:39 +0530
commit188fa9378c103093f1f8dac24bff0d9d237fd2bc (patch)
tree9ef42584eb3b543904524248ad11c1dff84082a5 /components/script/dom/htmlscriptelement.rs
parente7b19249489eff7a7fd49bf458ee7bd681f8ad13 (diff)
parent3dec6edd10ec800de50a04c105a75fb98e0411ca (diff)
downloadservo-188fa9378c103093f1f8dac24bff0d9d237fd2bc.tar.gz
servo-188fa9378c103093f1f8dac24bff0d9d237fd2bc.zip
Auto merge of #8667 - asajeffrey:update-string-cache, r=SimonSapin
Update string cache Updated string_cache to 0.2, and updated the dependencies that depend on string_cache. Removed references to string_cache_plugin. Import atom! and ns! from string_cache. Replaced ns!("") by ns!(). Replaced ns!(XML) and co by ns!(xml) and co. Replaced Atom::from_slice by Atom::from. Replaced atom.as_slice() by &*atom. r? @SimonSapin <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8667) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/htmlscriptelement.rs')
-rw-r--r--components/script/dom/htmlscriptelement.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs
index 1a37926772e..62c850c9942 100644
--- a/components/script/dom/htmlscriptelement.rs
+++ b/components/script/dom/htmlscriptelement.rs
@@ -216,8 +216,8 @@ impl HTMLScriptElement {
}
// Step 12.
- let for_attribute = element.get_attribute(&ns!(""), &atom!("for"));
- let event_attribute = element.get_attribute(&ns!(""), &atom!("event"));
+ let for_attribute = element.get_attribute(&ns!(), &atom!("for"));
+ let event_attribute = element.get_attribute(&ns!(), &atom!("event"));
match (for_attribute.r(), event_attribute.r()) {
(Some(for_attribute), Some(event_attribute)) => {
let for_value = for_attribute.value().to_ascii_lowercase();
@@ -236,7 +236,7 @@ impl HTMLScriptElement {
}
// Step 13.
- if let Some(ref charset) = element.get_attribute(&ns!(""), &atom!("charset")) {
+ if let Some(ref charset) = element.get_attribute(&ns!(), &atom!("charset")) {
if let Some(encodingRef) = encoding_from_whatwg_label(&charset.Value()) {
*self.block_character_encoding.borrow_mut() = encodingRef;
}
@@ -248,7 +248,7 @@ impl HTMLScriptElement {
let base_url = window.get_url();
let deferred = element.has_attribute(&atom!("defer"));
- let is_external = match element.get_attribute(&ns!(""), &atom!("src")) {
+ let is_external = match element.get_attribute(&ns!(), &atom!("src")) {
// Step 14.
Some(ref src) => {
// Step 14.1
@@ -500,7 +500,7 @@ impl HTMLScriptElement {
pub fn is_javascript(&self) -> bool {
let element = self.upcast::<Element>();
- let type_attr = element.get_attribute(&ns!(""), &atom!("type"));
+ let type_attr = element.get_attribute(&ns!(), &atom!("type"));
let is_js = match type_attr.as_ref().map(|s| s.value()) {
Some(ref s) if s.is_empty() => {
// type attr exists, but empty means js
@@ -513,7 +513,7 @@ impl HTMLScriptElement {
},
None => {
debug!("no script type");
- let language_attr = element.get_attribute(&ns!(""), &atom!("language"));
+ let language_attr = element.get_attribute(&ns!(), &atom!("language"));
let is_js = match language_attr.as_ref().map(|s| s.value()) {
Some(ref s) if s.is_empty() => {
debug!("script language empty, inferring js");