aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/eventtarget.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-10-21 09:24:05 -0500
committerGitHub <noreply@github.com>2016-10-21 09:24:05 -0500
commit776a1d9cacdd929e9ef6189bfffc9513e57b76ce (patch)
tree57dca60d1101d3d7bb402014a1795549fff41fa8 /components/script/dom/eventtarget.rs
parente3ebbd0fcdc78901c214d00cd11743a8fcf2d320 (diff)
parent4f0ffbd1f6908818e06538797b30f86ffef13602 (diff)
downloadservo-776a1d9cacdd929e9ef6189bfffc9513e57b76ce.tar.gz
servo-776a1d9cacdd929e9ef6189bfffc9513e57b76ce.zip
Auto merge of #13784 - TooManyBees:13363-check-script-enabled, r=Ms2ger
Issue 13363 - Step 1.2 of compiling event handler <!-- Please describe your changes on the following line: --> Adds the conditional to test that scripting is enabled in `EventTarget#get_compiled_event_handler`, and return `None` early if not. Adds tests for "scripting enabled" and "scripting disabled" cases. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #13363 (github issue number if applicable). <!-- Either: --> - [x] There are tests for these changes <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13784) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/eventtarget.rs')
-rw-r--r--components/script/dom/eventtarget.rs5
1 files changed, 4 insertions, 1 deletions
diff --git a/components/script/dom/eventtarget.rs b/components/script/dom/eventtarget.rs
index 6d6ea81c7b6..a17bac4a35c 100644
--- a/components/script/dom/eventtarget.rs
+++ b/components/script/dom/eventtarget.rs
@@ -373,7 +373,10 @@ impl EventTarget {
None => self.downcast::<Window>().unwrap().Document(),
};
- // TODO step 1.2 (browsing context/scripting enabled)
+ // Step 1.2
+ if !document.is_scripting_enabled() {
+ return None;
+ }
// Step 1.3
let body: Vec<u16> = handler.source.encode_utf16().collect();