diff --git a/Application/Core/TinyMCE/Configuration.php b/Application/Core/TinyMCE/Configuration.php index 2268e15..fc87b58 100644 --- a/Application/Core/TinyMCE/Configuration.php +++ b/Application/Core/TinyMCE/Configuration.php @@ -39,10 +39,12 @@ use O3\TinyMCE\Application\Core\TinyMCE\Options\Menubar; use O3\TinyMCE\Application\Core\TinyMCE\Options\MinHeight; use O3\TinyMCE\Application\Core\TinyMCE\Options\OptionInterface; use O3\TinyMCE\Application\Core\TinyMCE\Options\Plugins; +use O3\TinyMCE\Application\Core\TinyMCE\Options\Promotion; use O3\TinyMCE\Application\Core\TinyMCE\Options\Protect; use O3\TinyMCE\Application\Core\TinyMCE\Options\QuickbarsInsertToolbar; use O3\TinyMCE\Application\Core\TinyMCE\Options\RelativeUrls; use O3\TinyMCE\Application\Core\TinyMCE\Options\Selector; +use O3\TinyMCE\Application\Core\TinyMCE\Options\Setup; use O3\TinyMCE\Application\Core\TinyMCE\Options\Toolbar; use O3\TinyMCE\Application\Core\TinyMCE\Options\ToolbarMode; use O3\TinyMCE\Application\Core\TinyMCE\Options\ToolbarSticky; @@ -84,24 +86,6 @@ class Configuration public function getConfig() { -/* - return implode(', ', array_map( - function ($v, $k) { - if (is_array($v)) { - return $k.'[]='.implode('&'.$k.'[]=', $v); - } else { - return $k.': '.$v; - } - }, - $this->options, - array_keys($this->options) - )); - - - http_build_query($this->options,'',', ') -*/ -// $config = json_encode($this->options); - foreach ($this->options as $param => $value) { $sConfig .= "$param: $value, "; } @@ -114,6 +98,7 @@ class Configuration */ protected function addIntegrateOptions(): void { + $this->addOption(oxNew( Setup::class, $this->loader)); $this->addOption(oxNew( BaseUrl::class, $this->loader)); $this->addOption(oxNew( CacheSuffix::class, $this->loader)); $this->addOption(oxNew( Selector::class, $this->loader)); @@ -121,6 +106,7 @@ class Configuration protected function addGuiOptions(): void { + $this->addOption(oxNew(Promotion::class, $this->loader)); $this->addOption(oxNew(ContextMenu::class, $this->loader)); $this->addOption(oxNew(MinHeight::class, $this->loader)); $this->addOption(oxNew(MaxHeight::class, $this->loader)); diff --git a/Application/Core/TinyMCE/Options/ContextMenu.php b/Application/Core/TinyMCE/Options/ContextMenu.php index 7784af9..606ab73 100644 --- a/Application/Core/TinyMCE/Options/ContextMenu.php +++ b/Application/Core/TinyMCE/Options/ContextMenu.php @@ -29,7 +29,7 @@ class ContextMenu extends AbstractOption public function get(): string { - return 'link linkchecker image imagetools table'; + return 'link linkchecker image table'; } public function mustQuote(): bool diff --git a/Application/Core/TinyMCE/Plugins/Hr.php b/Application/Core/TinyMCE/Options/Promotion.php similarity index 77% rename from Application/Core/TinyMCE/Plugins/Hr.php rename to Application/Core/TinyMCE/Options/Promotion.php index dbeb162..98f8cbe 100644 --- a/Application/Core/TinyMCE/Plugins/Hr.php +++ b/Application/Core/TinyMCE/Options/Promotion.php @@ -21,19 +21,16 @@ declare(strict_types=1); -namespace O3\TinyMCE\Application\Core\TinyMCE\Plugins; +namespace O3\TinyMCE\Application\Core\TinyMCE\Options; -class Hr extends AbstractPlugin +use OxidEsales\Eshop\Core\Registry; + +class Promotion extends AbstractOption { - public function getPluginName(): string - { - return 'hr'; - } + protected string $key = 'promotion'; - public function getToolbarElements(): array + public function get(): string { - return [ - 'hr' - ]; + return 'false'; } -} \ No newline at end of file +} diff --git a/Application/Core/TinyMCE/Plugins/Paste.php b/Application/Core/TinyMCE/Options/Setup.php similarity index 62% rename from Application/Core/TinyMCE/Plugins/Paste.php rename to Application/Core/TinyMCE/Options/Setup.php index 70cd785..2c14661 100644 --- a/Application/Core/TinyMCE/Plugins/Paste.php +++ b/Application/Core/TinyMCE/Options/Setup.php @@ -21,19 +21,27 @@ declare(strict_types=1); -namespace O3\TinyMCE\Application\Core\TinyMCE\Plugins; +namespace O3\TinyMCE\Application\Core\TinyMCE\Options; -class Paste extends AbstractPlugin +class Setup extends AbstractOption { - public function getPluginName(): string + protected string $key = 'setup'; + + public function get(): string { - return 'paste'; + $js = << { + editor.options.register("filemanager_url", { processor: "string" }); + } +JS; + return trim(preg_replace('!\s+!', ' ', $js)); } - public function getToolbarElements(): array + /** + * @return bool + */ + public function requireRegistration(): bool { - return [ - 'pastetext' - ]; + return (bool) $this->loader->getShopConfig()->getConfigParam("blTinyMCE_filemanager"); } -} \ No newline at end of file +} diff --git a/Application/Core/TinyMCE/PluginList.php b/Application/Core/TinyMCE/PluginList.php index d41cee0..2091fad 100644 --- a/Application/Core/TinyMCE/PluginList.php +++ b/Application/Core/TinyMCE/PluginList.php @@ -58,7 +58,6 @@ class PluginList 'charmap' => oxNew(Charmap::class), 'code' => oxNew(Code::class), 'fullpage' => oxNew(FullPage::class), - 'hr' => oxNew(Hr::class), 'image' => oxNew(Image::class), 'legacyoutput' => oxNew(Legacyoutput::class), 'link' => oxNew(Link::class), @@ -66,7 +65,6 @@ class PluginList 'media' => oxNew(Media::class), 'nonbreaking' => oxNew(Nonbreaking::class), 'pagebreak' => oxNew(Pagebreak::class), - 'paste' => oxNew(Paste::class), 'preview' => oxNew(Preview::class), 'quickbars' => oxNew(Quickbars::class), 'searchreplace' => oxNew(SearchReplace::class), diff --git a/Application/Core/TinyMCE/Toolbar/Formatselect.php b/Application/Core/TinyMCE/Toolbar/Blocks.php similarity index 93% rename from Application/Core/TinyMCE/Toolbar/Formatselect.php rename to Application/Core/TinyMCE/Toolbar/Blocks.php index 2314057..7190997 100644 --- a/Application/Core/TinyMCE/Toolbar/Formatselect.php +++ b/Application/Core/TinyMCE/Toolbar/Blocks.php @@ -23,12 +23,12 @@ declare(strict_types=1); namespace O3\TinyMCE\Application\Core\TinyMCE\Toolbar; -class Formatselect extends AbstractToolbar +class Blocks extends AbstractToolbar { public function getButtons(): array { return [ - 'formatselect', + 'blocks', ]; } } \ No newline at end of file diff --git a/Application/Core/TinyMCE/Toolbar/Font.php b/Application/Core/TinyMCE/Toolbar/Font.php index 324bfc1..b9a58a4 100644 --- a/Application/Core/TinyMCE/Toolbar/Font.php +++ b/Application/Core/TinyMCE/Toolbar/Font.php @@ -28,8 +28,8 @@ class Font extends AbstractToolbar public function getButtons(): array { return [ - // 'fontselect', - //'fontsizeselect', + // 'fontfamily', + //'fontsize', // '|', 'bold', 'italic', diff --git a/Application/Core/TinyMCE/ToolbarList.php b/Application/Core/TinyMCE/ToolbarList.php index b2a6d12..200df71 100644 --- a/Application/Core/TinyMCE/ToolbarList.php +++ b/Application/Core/TinyMCE/ToolbarList.php @@ -28,7 +28,7 @@ use O3\TinyMCE\Application\Core\TinyMCE\Toolbar\Blockquote; use O3\TinyMCE\Application\Core\TinyMCE\Toolbar\Color; use O3\TinyMCE\Application\Core\TinyMCE\Toolbar\CopyPaste; use O3\TinyMCE\Application\Core\TinyMCE\Toolbar\Font; -use O3\TinyMCE\Application\Core\TinyMCE\Toolbar\Formatselect; +use O3\TinyMCE\Application\Core\TinyMCE\Toolbar\Blocks; use O3\TinyMCE\Application\Core\TinyMCE\Toolbar\Indent; use O3\TinyMCE\Application\Core\TinyMCE\Toolbar\Lists; use O3\TinyMCE\Application\Core\TinyMCE\Toolbar\RemoveFormat; @@ -42,7 +42,7 @@ class ToolbarList { return [ [ - 'formatselect' => oxNew(Formatselect::class), + 'blocks' => oxNew(Blocks::class), 'font' => oxNew(Font::class), 'color' => oxNew(Color::class), 'align' => oxNew(Align::class), @@ -59,4 +59,4 @@ class ToolbarList ] ]; } -} \ No newline at end of file +} diff --git a/Application/views/admin/editorswitch.tpl b/Application/views/admin/editorswitch.tpl index f160899..0e0b0fa 100644 --- a/Application/views/admin/editorswitch.tpl +++ b/Application/views/admin/editorswitch.tpl @@ -1,6 +1,6 @@