aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <release+servo@mozilla.com>2013-10-22 16:07:34 -0700
committerbors-servo <release+servo@mozilla.com>2013-10-22 16:07:34 -0700
commitf3f6e62f7fda50d77742f9527f8dc7171d7b8624 (patch)
treeafa472247f798a3a5d5a7aa32d8e3299e01e1a04
parentf4df246f9d70c23dca293510207041c03c388c47 (diff)
parent0e94eb5720ed821adf77e921ea0fcf1bc0662f2e (diff)
downloadservo-f3f6e62f7fda50d77742f9527f8dc7171d7b8624.tar.gz
servo-f3f6e62f7fda50d77742f9527f8dc7171d7b8624.zip
auto merge of #1104 : ibnc/servo/script_dev, r=jdm
Fixes #845
-rw-r--r--src/components/script/dom/htmlscriptelement.rs3
-rw-r--r--src/test/html/content/test_script_src_attribute.html18
2 files changed, 20 insertions, 1 deletions
diff --git a/src/components/script/dom/htmlscriptelement.rs b/src/components/script/dom/htmlscriptelement.rs
index fa40ff7214c..f3de42eae26 100644
--- a/src/components/script/dom/htmlscriptelement.rs
+++ b/src/components/script/dom/htmlscriptelement.rs
@@ -4,6 +4,7 @@
use dom::bindings::utils::{DOMString, ErrorResult};
use dom::htmlelement::HTMLElement;
+use servo_util::tree::ElementLike;
pub struct HTMLScriptElement {
htmlelement: HTMLElement,
@@ -11,7 +12,7 @@ pub struct HTMLScriptElement {
impl HTMLScriptElement {
pub fn Src(&self) -> DOMString {
- None
+ self.htmlelement.element.get_attr("src").map(|s| s.to_str())
}
pub fn SetSrc(&mut self, _src: &DOMString) -> ErrorResult {
diff --git a/src/test/html/content/test_script_src_attribute.html b/src/test/html/content/test_script_src_attribute.html
new file mode 100644
index 00000000000..7f3b298990c
--- /dev/null
+++ b/src/test/html/content/test_script_src_attribute.html
@@ -0,0 +1,18 @@
+<html>
+<head id="foo">
+ <title></title>
+ <script src="harness.js"></script>
+</head>
+ <script>
+ let script = document.getElementById("test");
+
+ {
+ is(script.src, "/x.js");
+ }
+
+ finish();
+ </script>
+<body>
+ <script src="/x.js" id="test"/>
+</body>
+</html>