-
-
Notifications
You must be signed in to change notification settings - Fork 3.8k
[6.1] Fix none/codemirror editor width and height #47305
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
Open
RickR2H
wants to merge
7
commits into
joomla:6.1-dev
Choose a base branch
from
RickR2H:fix-none-editor
base: 6.1-dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+22
−1
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
09153a2
Fix none / codemirror editor width and height
RickR2H 30f258a
Merge branch '6.1-dev' into fix-none-editor
RickR2H 075f2fa
Plugin specific implementation of the width and height fallback. Rese…
RickR2H 4a1d39d
Merge branch 'fix-none-editor' of github.com:RickR2H/joomla-cms into …
RickR2H a1b5370
Fix code style
RickR2H 1edd018
Fix code indetation
RickR2H e09f5be
Move logic for width and height. Added missing default value for width
RickR2H File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -76,6 +76,11 @@ public function display(string $name, string $content = '', array $attributes = | |
| $externalPlugins = []; | ||
| $theme = 'silver'; | ||
|
|
||
| // Reset the old default 750px width of the editor to 100% | ||
| if (!$width || $width === '750px' || $width === '750') { | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This should become obsolete if PR #47326 gets accepted. |
||
| $width = '100%'; | ||
| } | ||
|
|
||
| // Register assets | ||
| $wa->getRegistry()->addExtensionRegistryFile('plg_editors_tinymce'); | ||
|
|
||
|
|
@@ -531,7 +536,7 @@ public function prepareTinyMCEUploadPath(string $path): string | |
| 'image_caption' => true, | ||
| 'importcss_append' => true, | ||
| 'height' => $this->params->get('html_height', '550px'), | ||
| 'width' => $this->params->get('html_width', ''), | ||
| 'width' => $this->params->get('html_width', '100%'), | ||
| 'elementpath' => (bool) $levelParams->get('element_path', true), | ||
| 'resize' => $resizing, | ||
| 'external_plugins' => empty($externalPlugins) ? null : $externalPlugins, | ||
|
|
||
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.
Uh oh!
There was an error while loading. Please reload this page.