update jquery, jquery-migrate, and jquery-ui #2482
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
plugins/javadoc/src/main/kotlin/org/jetbrains/dokka/javadoc/renderer/KorteJavadocRenderer.kt
Show resolved
Hide resolved
| @@ -5,8 +5,8 @@ | |||
| <link rel="stylesheet" type="text/css" href="{{ pathToRoot }}stylesheet.css" title="Style"> | |||
| <link rel="stylesheet" type="text/css" href="{{ pathToRoot }}dokka-javadoc-stylesheet.css" title="Style"> | |||
| <link rel="stylesheet" type="text/css" href="{{ pathToRoot }}jquery/jquery-ui.css" title="Style"> | |||
| <script type="text/javascript" src="{{ pathToRoot }}jquery/jquery-3.3.1.js"></script> | |||
| <script type="text/javascript" src="{{ pathToRoot }}jquery/jquery-migrate-3.0.1.js"></script> | |||
| <script type="text/javascript" src="{{ pathToRoot }}jquery/jquery-3.5.0.js"></script> | |||
There was a problem hiding this comment.
If you look inside jquery-3.5.0.js, you'll find that it's jquery 3.6.0. Can you please rename the file?
There was a problem hiding this comment.
I suppose {{ jQueryVersion() }} should be used here.
There was a problem hiding this comment.
It makes sense to add the values back in KorteJavadocRenderer.kt and use them here.
vmishenev
reviewed
May 12, 2022
| @@ -5,8 +5,8 @@ | |||
| <link rel="stylesheet" type="text/css" href="{{ pathToRoot }}stylesheet.css" title="Style"> | |||
| <link rel="stylesheet" type="text/css" href="{{ pathToRoot }}dokka-javadoc-stylesheet.css" title="Style"> | |||
| <link rel="stylesheet" type="text/css" href="{{ pathToRoot }}jquery/jquery-ui.css" title="Style"> | |||
| <script type="text/javascript" src="{{ pathToRoot }}jquery/jquery-3.3.1.js"></script> | |||
| <script type="text/javascript" src="{{ pathToRoot }}jquery/jquery-migrate-3.0.1.js"></script> | |||
| <script type="text/javascript" src="{{ pathToRoot }}jquery/jquery-3.5.0.js"></script> | |||
There was a problem hiding this comment.
I suppose {{ jQueryVersion() }} should be used here.
I can also make it a non-development version. |
update to jquery 3.5.0 update to jquery-migrate 3.4.0 update to jquery-ui 1.13.1 closes Kotlin#1938
update to jquery 3.6.0 re-add versions in KorteJavadocRenderer
IgnatBeresnev
approved these changes
May 18, 2022
vmishenev
approved these changes
May 19, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
update to jquery 3.5.0
update to jquery-migrate 3.4.0
update to jquery-ui 1.13.1
closes #1938