-
-
Notifications
You must be signed in to change notification settings - Fork 538
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
XWIKI-20616: Update jstree files and remove reference to throbber.gif #2913
Conversation
`jstree` less files included in `xwiki-platform-tree-webjar` were coming from version `3.3.5` (or earlier) whereas the version declared in `pom.xml` is `3.3.16`. This commit resynchronize files originated from `jstree` to match the ones provided in version `3.3.16`. This commit also comment out the reference to `throbber.gif` in `jstree` `mixins.less` file as the gif file is no part of `xwiki-platform-tree-webjar` and rule is override in `tree.less` to use `spinner.gif`.
@mflorea apparently you performed the upgrade from jstree 3.3.5 to 3.3.7 in ced2f2c did you forgot to update those files back then? Maybe we need some specific instructions for upgrading these? |
@surli I did upgrade jstree from 3.3.5 to 3.3.7 but in my commit ced2f2c I updated the jstree less files (
which have updated only the version in the POM. So @amottier I think the best approach is to:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You're removing customizations that we did on top of jstree. Unfortunately they are not marked so it's not easy to spot them unless you make a diff between our version of the jstree less files and the original jstree less files.
...-platform-core/xwiki-platform-tree/xwiki-platform-tree-webjar/src/main/less/jstree/main.less
Outdated
Show resolved
Hide resolved
...-platform-core/xwiki-platform-tree/xwiki-platform-tree-webjar/src/main/less/jstree/main.less
Outdated
Show resolved
Hide resolved
...latform-core/xwiki-platform-tree/xwiki-platform-tree-webjar/src/main/less/jstree/mixins.less
Show resolved
Hide resolved
...-platform-core/xwiki-platform-tree/xwiki-platform-tree-webjar/src/main/less/jstree/base.less
Show resolved
Hide resolved
...-platform-core/xwiki-platform-tree/xwiki-platform-tree-webjar/src/main/less/jstree/base.less
Outdated
Show resolved
Hide resolved
...-platform-core/xwiki-platform-tree/xwiki-platform-tree-webjar/src/main/less/jstree/base.less
Outdated
Show resolved
Hide resolved
Restore XWiki customization accidentally remove in the first attempt to update jsTree file to jsTree version `3.3.16`.
@mflorea hopefully I restored all customization that I accidentally removed. This pull request is again ready for review. Thanks for your help 👍 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me. Thanks a lot for your contribution and for your patience.
Jira URL
https://jira.xwiki.org/browse/XWIKI-20616
Changes
Description
jstree
to use the ones provided in version3.3.16
(version ofjstree
referenced in thepom.xml
).throbber.gif
injstree
mixins.less
file as the gif file is no part ofxwiki-platform-tree-webjar
and rule is override intree.less
to usespinner.gif
.Clarifications
xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-webjar/src/main/less/jstree/mixins.less
it appears they were part of version3.3.5
or earlier (see for example this diff ofsrc/themes/mixins.less
file between version3.3.5
and3.3.6
). Aspom.xml
specifies version3.3.16
this commit update files included inxwiki-platform-tree-webjar
that are coming fromjstree
project.throbber.gif
is a way to remove warning in the log that are probably triggered by search bot parsing the CSS. This doesn't seems to trigger any issue in XWiki with normal user interaction.Executed Tests
./mvnw -Psnapshot,dev clean install -f xwiki-platform-core/xwiki-platform-tree/pom.xml
(with Java 17 and Maven 3.9.6)