Skip to content
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.

Sign up for GitHub

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

[4.1] TinyMCE option to initially paste text without formatting #36328

Merged
merged 10 commits into from
Jan 10, 2022
Merged

[4.1] TinyMCE option to initially paste text without formatting #36328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
95e04ba
TinyMCE option to initially paste text without formatting
laoneo Dec 16, 2021
2e735fa
default is false
laoneo Dec 16, 2021
c78ceee
Merge branch '4.1-dev' into j4/mce/paste
laoneo Jan 3, 2022
8edf1b2
cs
laoneo Jan 3, 2022
2c00ed6
Merge branch '4.1-dev' into j4/mce/paste
laoneo Jan 6, 2022
65c2d39
Merge remote-tracking branch 'upstream/4.1-dev' into j4/mce/paste
laoneo Jan 6, 2022
db16d2d
Adapt to traits
laoneo Jan 6, 2022
8685942
Merge branch '4.1-dev' into j4/mce/paste
laoneo Jan 8, 2022
c91670b
Merge branch '4.1-dev' into j4/mce/paste
bembelimen Jan 9, 2022
381cc9f
Merge branch '4.1-dev' into j4/mce/paste
bembelimen Jan 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions administrator/language/en-GB/plg_editors_tinymce.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ PLG_TINY_FIELD_LANGCODE_LABEL="Language Code"
PLG_TINY_FIELD_LANGSELECT_LABEL="Automatic Language Selection"
PLG_TINY_FIELD_NEWLINES_LABEL="New Lines"
PLG_TINY_FIELD_NUMBER_OF_SETS_LABEL="Number of Sets"
PLG_TINY_FIELD_PASTE_AS_TEXT_LABEL="Paste As Text"
PLG_TINY_FIELD_PATH_LABEL="Element Path"
PLG_TINY_FIELD_PROHIBITED_LABEL="Prohibited Elements"
PLG_TINY_FIELD_RESIZE_HORIZONTAL_LABEL="Horizontal Resizing"
Expand Down
11 changes: 11 additions & 0 deletions plugins/editors/tinymce/forms/setoptions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,17 @@
<option value="1">JON</option>
</field>

<field
name="paste_as_text"
type="radio"
label="PLG_TINY_FIELD_PASTE_AS_TEXT_LABEL"
layout="joomla.form.field.radio.switcher"
default="0"
>
<option value="0">JOFF</option>
<option value="1">JON</option>
</field>

<field
name="sourcecode"
type="radio"
Expand Down
16 changes: 9 additions & 7 deletions plugins/editors/tinymce/src/PluginTraits/DisplayTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* @copyright (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

namespace Joomla\Plugin\Editors\TinyMCE\PluginTraits;

\defined('_JEXEC') or die();
Expand All @@ -27,11 +28,11 @@
*/
trait DisplayTrait
{
use GlobalFilters;
use KnownButtons;
use ResolveFiles;
use ToolbarPresets;
use XTDButtons;
use GlobalFilters;
use KnownButtons;
use ResolveFiles;
use ToolbarPresets;
use XTDButtons;

/**
* Display the editor area.
Expand Down Expand Up @@ -454,8 +455,9 @@ public function onDisplay(

// Cleanup/Output
'browser_spellcheck' => true,
'entity_encoding' => $levelParams->get('entity_encoding', 'raw'),
'verify_html' => !$ignore_filter,
'entity_encoding' => $levelParams->get('entity_encoding', 'raw'),
'verify_html' => !$ignore_filter,
'paste_as_text' => (bool) $levelParams->get('paste_as_text', false),

'valid_elements' => $valid_elements,
'extended_valid_elements' => implode(',', $elements),
Expand Down
1 change: 1 addition & 0 deletions plugins/editors/tinymce/tinymce.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
class PlgEditorTinymce extends CMSPlugin
{
use DisplayTrait;

/**
* Base path for editor files
*
Expand Down