Auto merge of #15990 - vlisivka:master, r=emilio

Layout viewer now uses local copy of jquery. See #15964.

<!-- Please describe your changes on the following line: -->
Layout viewer now uses local copy of jquery as requested in ticket, so etc/layout_viewer/viewer.html can work without connection to the internet.

---
<!-- 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 #15964(github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because changes are tested manually by unplugging the internet connection.

<!-- 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/15990)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-03-16 18:23:53 -07:00 committed by GitHub
commit 99f5edbefb
2 changed files with 5 additions and 1 deletions

4
etc/layout_viewer/js/jquery.min.js vendored Normal file

File diff suppressed because one or more lines are too long

View file

@ -80,7 +80,7 @@
</div>
<!-- jQuery -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
<script src="js/jquery.min.js"></script>
<!-- Bootstrap -->
<script src="js/bootstrap.min.js"></script>
<!-- Treeview -->