Prevent using document.domain by Firefox in the preview plugin
#5439
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
Comandeer
requested changes
Mar 21, 2023
plugins/preview/plugin.js
Outdated
| nativePreviewWindow, | ||
| previewUrl = '', |
There was a problem hiding this comment.
Do we need this variable at all? We could skip it altogether and just inline an empty string in the window.open() call.
plugins/preview/plugin.js
Outdated
Comment on lines
137
to
142
| function generateBaseTag() { | ||
| var template = '<base href="{HREF}">', | ||
| origin = location.origin, | ||
| pathname = location.pathname; | ||
|
|
||
| if ( !config.baseHref && !CKEDITOR.env.gecko ) { | ||
| return ''; | ||
| } | ||
| var template = '<base href="{HREF}">'; | ||
|
|
||
| if ( config.baseHref ) { | ||
| return template.replace( '{HREF}', config.baseHref ); | ||
| } | ||
|
|
||
| // As we use HTML file in Gecko, we must fix the incorrect base for | ||
| // relative paths. | ||
| pathname = pathname.split( '/' ); | ||
| pathname.pop(); | ||
| pathname = pathname.join( '/' ); | ||
|
|
||
| return template.replace( '{HREF}', origin + pathname + '/' ); | ||
| return ''; | ||
| } |
There was a problem hiding this comment.
I'm wondering if we can't simplify it even further, e.g. do we need the template at all?
Suggested change
| function generateBaseTag() { | |
| var template = '<base href="{HREF}">', | |
| origin = location.origin, | |
| pathname = location.pathname; | |
| if ( !config.baseHref && !CKEDITOR.env.gecko ) { | |
| return ''; | |
| } | |
| var template = '<base href="{HREF}">'; | |
| if ( config.baseHref ) { | |
| return template.replace( '{HREF}', config.baseHref ); | |
| } | |
| // As we use HTML file in Gecko, we must fix the incorrect base for | |
| // relative paths. | |
| pathname = pathname.split( '/' ); | |
| pathname.pop(); | |
| pathname = pathname.join( '/' ); | |
| return template.replace( '{HREF}', origin + pathname + '/' ); | |
| return ''; | |
| } | |
| function generateBaseTag() { | |
| if ( !config.baseHref ) { | |
| return ''; | |
| } | |
| return '<base href="' + config.baseHref + '">'; | |
| } |
| } | ||
|
|
||
| // With Firefox only, we need to open a special preview page, so | ||
| // anchors will work properly on it (https://dev.ckeditor.com/ticket/9047). |
There was a problem hiding this comment.
Could you add a manual test that will allow verifying if this issue is really not-reproducible anymore?
| @@ -212,8 +200,7 @@ | |||
| } | |||
|
|
|||
| function getPreviewLocation() { | |||
| // #(4444) | |||
|
Thanks, @Comandeer for your input. I've applied changes mentioned in your comments and PR is ready for another review. |
|
It's been a while since we last heard from you. We are marking this pull request as stale due to inactivity. Please provide the requested feedback or the pull request will be closed after next 7 days. |
github-actions
bot
added
the
stale
KarolDawidziuk
removed
the
stale
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.
What is the purpose of this pull request?
Task
Does your PR contain necessary tests?
All patches that change the editor code must include tests. You can always read more
on PR testing,
how to set the testing environment and
how to create tests
in the official CKEditor documentation.
This PR contains
Did you follow the CKEditor 4 code style guide?
Your code should follow the guidelines from the CKEditor 4 code style guide which helps keep the entire codebase consistent.
What is the proposed changelog entry for this pull request?
What changes did you make?
In the previous PR with fixing print on Firefox, we allowed using document.domain to properly open the preview before print while using the editor from CDN. Looks like FF fixed this and we can remove it.
Additionally, we could simplify the code more by removing fix for creating links to anchor.
Which issues does your PR resolve?
Closes #5412.