Skip to content

Commit

Permalink
8330063: Upgrade jQuery to 3.7.1
Browse files Browse the repository at this point in the history
Reviewed-by: prappo
  • Loading branch information
hns committed Apr 19, 2024
1 parent 252c62a commit 46a2ce4
Show file tree
Hide file tree
Showing 8 changed files with 877 additions and 1,110 deletions.

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public static DocPath indexN(int n) {
public static final DocPath JQUERY_DIR = DocPath.create("jquery");

/** The name of the default jQuery javascript file. */
public static final DocPath JQUERY_JS = DocPath.create("jquery-3.6.1.min.js");
public static final DocPath JQUERY_JS = DocPath.create("jquery-3.7.1.min.js");

/** The name of the default jQuery UI stylesheet file. */
public static final DocPath JQUERY_UI_CSS = DocPath.create("jquery-ui.min.css");
Expand Down
50 changes: 2 additions & 48 deletions src/jdk.javadoc/share/legal/jquery.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
## jQuery v3.6.1
## jQuery v3.7.1

### jQuery License
```
jQuery v 3.6.1
jQuery v 3.7.1
Copyright OpenJS Foundation and other contributors, https://openjsf.org/
Permission is hereby granted, free of charge, to any person obtaining
Expand All @@ -23,50 +23,4 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************
The jQuery JavaScript Library v3.6.1 also includes Sizzle.js
Sizzle.js includes the following license:
Copyright JS Foundation and other contributors, https://js.foundation/
This software consists of voluntary contributions made by many
individuals. For exact contribution history, see the revision history
available at https://github.com/jquery/sizzle
The following license applies to all parts of this software except as
documented below:
====
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
====
All files located in the node_modules and external directories are
externally maintained libraries used by this software which have their
own licenses; we recommend you read them, as their terms may differ from
the terms above.
*********************
```
4 changes: 2 additions & 2 deletions test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ void checkSearchOutput(String fileName, boolean expectedOutput) {
<link rel="stylesheet" type="text/css" href="resource-files/jquery-ui.min.css" title="Style">
""",
"""
<script type="text/javascript" src="script-files/jquery-3.6.1.min.js"></script>
<script type="text/javascript" src="script-files/jquery-3.7.1.min.js"></script>
""",
"""
<script type="text/javascript" src="script-files/jquery-ui.min.js"></script>""",
Expand Down Expand Up @@ -672,7 +672,7 @@ void checkInvalidUsageIndexTag() {
void checkJqueryAndImageFiles(boolean expectedOutput) {
checkFiles(expectedOutput,
"script-files/search.js",
"script-files/jquery-3.6.1.min.js",
"script-files/jquery-3.7.1.min.js",
"script-files/jquery-ui.min.js",
"resource-files/jquery-ui.min.css",
"resource-files/x.png",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -36,7 +36,7 @@ function loadIndexFiles(docsPath) {
tryLoad(docsPath, "type-search-index.js");
tryLoad(docsPath, "member-search-index.js");
tryLoad(docsPath, "tag-search-index.js");
load(docsPath + "/search.js");
load(docsPath + "/script-files/search.js");
}

function tryLoad(docsPath, file) {
Expand All @@ -63,6 +63,12 @@ var $ = function(f) {
f();
} else {
return {
attr: function() {
return this;
},
css: function() {
return this;
},
val: function() {
return this;
},
Expand Down
2 changes: 1 addition & 1 deletion test/langtools/jdk/javadoc/tool/api/basic/APITest.java
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ protected void error(String msg) {
"resource-files/fonts/DejaVuLGCSerif-Italic.woff2",
"resource-files/fonts/DejaVuLGCSerif.woff",
"resource-files/fonts/DejaVuLGCSerif.woff2",
"script-files/jquery-3.6.1.min.js",
"script-files/jquery-3.7.1.min.js",
"script-files/jquery-ui.min.js",
"script-files/script.js",
"script-files/search.js",
Expand Down

1 comment on commit 46a2ce4

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.