Skip to content

Fixed 'entity_encoding' parameter that loaded wrong 'tiny.element_format' value from Settings, added Entities parameter #25

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

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Fixed 'entity_encoding' parameter that loaded wrong 'tiny.element_format' value from Settings, added Entities parameter #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
523a018
fixed wrong context parameter for entity_encoding
lumikcz Aug 23, 2017
fe9d287
added Entities setting to Settings
lumikcz Aug 23, 2017
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
7 changes: 7 additions & 0 deletions _build/data/properties.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,13 @@
),
'value' => '',
),
array(
'name' => 'entities',
'desc' => 'This option contains a comma separated list of entity names that is used instead of characters.',
'type' => 'textfield',
'options' => '',
'value' => '',
),
array(
'name' => 'force_p_newlines',
'desc' => 'This option enables you to disable/enable the creation of paragraphs on return/enter in Mozilla/Firefox. The default value of this option is true. ',
Expand Down
9 changes: 9 additions & 0 deletions _build/data/transport.settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,15 @@
'area' => 'cleanup-output',
),'',true,true);

$settings['tiny.entities']= $modx->newObject('modSystemSetting');
$settings['tiny.entities']->fromArray(array(
'key' => 'tiny.entities',
'value' => '',
'xtype' => 'textfield',
'namespace' => 'tinymce',
'area' => 'cleanup-output',
),'',true,true);

$settings['tiny.fix_nesting']= $modx->newObject('modSystemSetting');
$settings['tiny.fix_nesting']->fromArray(array(
'key' => 'tiny.fix_nesting',
Expand Down
3 changes: 2 additions & 1 deletion core/components/tinymce/tinymce.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ public function setProperties(array $properties = array()) {
'css_path' => $this->context->getOption('editor_css_path','',$this->properties),
'directionality' => $this->context->getOption('manager_direction','ltr',$this->properties),
'element_format' => $this->context->getOption('tiny.element_format','xhtml',$this->properties),
'entity_encoding' => $this->context->getOption('tiny.element_format','named',$this->properties),
'entity_encoding' => $this->context->getOption('tiny.entity_encoding','named',$this->properties),
'entities' => $this->context->getOption('tiny.entities','',$this->properties),
'fix_nesting' => $this->context->getOption('tiny.fix_nesting',false,$this->properties),
'fix_table_elements' => $this->context->getOption('tiny.fix_table_elements',false,$this->properties),
'font_size_classes' => $this->context->getOption('tiny.font_size_classes','',$this->properties),
Expand Down