Feat toc fixing visual issues plus merge main #7305
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
[skip ci]
[skip ci]
Co-authored-by: SeaLife <[email protected]>
… actual permissions
[skip ci]
[skip ci]
* fix: search results not displaying on first page * fix: page cursor position stays the same between page selection
Co-authored-by: Pam Selle <[email protected]>
Co-authored-by: Nicolas Giard <[email protected]>
* feat: added implementation for group mapping in SAML strategies --------- Co-authored-by: Abderraouf El Gasser <[email protected]> Co-authored-by: Nicolas Giard <[email protected]>
* Fix: email toLowerCase * Fix python issue for node18 in Dockerfile
…6901) * feat: update comment module "Artalk" * fix: update code.yml --------- Co-authored-by: Nicolas Giard <[email protected]>
* Update render.js
# Improved handling of mustache expressions and v-pre attribute assignment
## Changes Made:
- Ensured that the parent tag of such text nodes is explicitly set to a `<p>` tag with the `v-pre` attribute.
- Added debug messages for better understanding of the script execution flow [THIS SHOULD REMOVED WHEN PUSHING TO PRODUCTION].
## Why it Works:
- When a mustache expression is found, the script either wraps it in a new `<p>` tag with the `v-pre` attribute or adds the `v-pre` attribute to the existing parent `<p>` tag.
- This approach ensures that the template code is not removed but encapsulated within `<p>` tags with the `v-pre` attribute, as required.
## Test Cases Passed:
1. `<xyz>{{ constructor.constructor('alert(1)')() }}</xyz>`
2. `<xyz>{{ constructor.constructor('alert(1)')() }}</xyz>`
3. `<p><xyz>{{ constructor.constructor('alert(1)')() }}</p>`
4. `<p><xyz>{{ constructor.constructor('alert(1)')() }}</xyz></p>`
5. `<p><xyz>{{constructor.constructor('alert("Test Case 8")')()}}<xyz>{{constructor.constructor('alert("Test Case 9")')()}}</xyz></p>`
This commit enhances the robustness and reliability of handling mustache expressions and ensures proper assignment of the `v-pre` attribute, to ensure that there is no room for the weaponization of the template code later in the rendering process.
* fix: move template expressions after dom-purify + handle text nodes without parent
---------
Co-authored-by: NGPixel <[email protected]>
…on; deleting duplicate toc in page
… fixed open ones to be like opened collapsable ones; try to make the template a little cleaner
|
Use rebase, your PR contains a ton of unrelated file changes |
Would it help to merge it into main instead of the outdated feat-toc branch? third option just inspect the last three Commits from me since they are the only changed files that are not already in main. |
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.
Hi,
regarding PR #5101 and PR #5367 I saw you found issues with my branch I thought I try my best to fix them.
I merged the main. Tried to resolve all conflicts prefering code from main.
I fixed a duplicate ToC on the site and a wrong default selection. I fixed icons to be consistent and padding as well. I tested it with Firefox, Chrome and Safari on a M1 Mac.
I hope this helps. If you have any further notes what should be corrected please feel free to answer.
Best regards