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.
This PR updates OMERO.figure to host jquery.js, jquery-ui.js and jquery-ui.css instead of loading them from
omero-web
since they are all updated in ome/omero-web#180 andbootstrap 3.0.0
is not compatible with latestjquery
. We load the exact same versions of jquery and jquery-ui, so there shouldn't be any issues. However, I haven't included all the jquery-ui.css since most of it shouldn't be needed.According to twbs/bootstrap#16834 (comment) "Bootstrap 3.3.7 now supports jQuery 3+." but this would require a lot of upgrade work on bootstrap in OMERO.figure, so this is a shorter-term fix to allow
omero-web
to upgrade jquery.To test: