Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JDK-8284367: JQuery UI upgrade from 1.12.1 to 1.13.1 #8702

Closed
wants to merge 4 commits into from

Conversation

hns
Copy link
Member

@hns hns commented May 13, 2022

This updates jQuery UI (which is used for the javadoc in-age search feature) to version 1.13.1.

Rendered documentation is available here:
http://cr.openjdk.java.net/~hannesw/8284367/api.00/

I noticed that we are carrying a lot of files from the jQuery UI distribution that we don't really need. this includes the jquery-ui.structure.css files (both minified and non-minified) as well as the icon image files. These files are not used or referenced anywhere in our generated documentation so I removed them instead of updating them.

I also decided to update to the unthemed jQuery UI version as wee don't really use the theme.

Some minor changes in our stylesheets were required to avoid unwanted layout changes:

  • Add a definition for 1px border around the selelcted list item in our jquery-ui.overrides CSS file. Without this, the the new jQuery UI would display a blue border or no border at all depending on the theme. The border is now orange so it is not distinguishable from the selected background, but it is necessary to keep the item in the same position when it is selected.
  • Remove the font-size: 13px property from the .result-item class. This was necessary because previously this class used font-family: Verdana from the jQuery UI theme which looks bigger and is also inconsistent with the fonts we use in the rest of the page. Now that the search result list uses the same fonts as the rest of the page we can go back to using the inherited font size. I left the font-size property and changed the value to inherit because our tests don't like CSS classes that are not present in the stylesheet.
  • Finally I had to add a property to the ul.ui-autocomplete list to explicitly set the background to white. The update made the background transparent. I'm not sure if this is a result of the missing theme but it was simple enough to fix.

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed (1 review required, with at least 1 reviewer)

Issue

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/8702/head:pull/8702
$ git checkout pull/8702

Update a local copy of the PR:
$ git checkout pull/8702
$ git pull https://git.openjdk.java.net/jdk pull/8702/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 8702

View PR using the GUI difftool:
$ git pr show -t 8702

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/8702.diff

@bridgekeeper
Copy link

bridgekeeper bot commented May 13, 2022

👋 Welcome back hannesw! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr Pull request is ready for review label May 13, 2022
@openjdk
Copy link

openjdk bot commented May 13, 2022

@hns The following label will be automatically applied to this pull request:

  • javadoc

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the javadoc javadoc-dev@openjdk.org label May 13, 2022
@mlbridge
Copy link

mlbridge bot commented May 13, 2022

Webrevs

Copy link
Contributor

@jonathan-gibbons jonathan-gibbons left a comment

Choose a reason for hiding this comment

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

nice to see unnecessary files removed.

@openjdk
Copy link

openjdk bot commented May 17, 2022

@hns This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8284367: JQuery UI upgrade from 1.12.1 to 1.13.1

Reviewed-by: jjg

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 67 new commits pushed to the master branch:

  • 5e5500c: 6782021: It is not possible to read local computer certificates with the SunMSCAPI provider
  • d65fba4: 8286452: The array length of testSmallConstArray should be small and const
  • 125efe6: 8286744: failure_handler: dmesg command on macos fails to collect data due to permission issues
  • 40f4dab: 8286756: Cleanup foreign API benchmarks
  • af2918f: 8286787: Expand use of @inheritdoc in AudioInputStream
  • 24cab0a: 8286740: JFR: Active Setting event emitted incorrectly
  • a31130f: 7131823: bug in GIFImageReader
  • 4bc7b7d: 8286760: Update citation of "Effective Java" second edition to third edition
  • c044cb8: 8286399: Address possibly lossy conversions in JDK Build Tools
  • b884db8: 8285844: TimeZone.getTimeZone(ZoneOffset) does not work for all ZoneOffsets and returns GMT unexpected
  • ... and 57 more: https://git.openjdk.java.net/jdk/compare/40f43c6b1ffc88d55dd3223f5d0259ae73cf0356...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label May 17, 2022
@hns
Copy link
Member Author

hns commented May 17, 2022

/integrate

@openjdk
Copy link

openjdk bot commented May 17, 2022

Going to push as commit ac41b78.
Since your change was applied there have been 70 commits pushed to the master branch:

  • 0948c09: 8272094: compiler/codecache/TestStressCodeBuffers.java crashes with "failed to allocate space for trampoline"
  • 8c97705: 8286475: Drop --enable-preview from instanceof pattern matching related tests
  • 63cace7: 8286660: codestrings gtest fails on AArch64: "udf" in padding
  • 5e5500c: 6782021: It is not possible to read local computer certificates with the SunMSCAPI provider
  • d65fba4: 8286452: The array length of testSmallConstArray should be small and const
  • 125efe6: 8286744: failure_handler: dmesg command on macos fails to collect data due to permission issues
  • 40f4dab: 8286756: Cleanup foreign API benchmarks
  • af2918f: 8286787: Expand use of @inheritdoc in AudioInputStream
  • 24cab0a: 8286740: JFR: Active Setting event emitted incorrectly
  • a31130f: 7131823: bug in GIFImageReader
  • ... and 60 more: https://git.openjdk.java.net/jdk/compare/40f43c6b1ffc88d55dd3223f5d0259ae73cf0356...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label May 17, 2022
@openjdk openjdk bot closed this May 17, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels May 17, 2022
@openjdk
Copy link

openjdk bot commented May 17, 2022

@hns Pushed as commit ac41b78.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated javadoc javadoc-dev@openjdk.org
2 participants