D3Public/tinymce-editor
8
0
Fork 0
Code Pull Requests Packages Projects Releases Activity

adjust to OXID eShop

Browse Source 
# Conflicts:
#	composer.json
This commit is contained in:
Daniel Seifert 2023-04-20 11:33:02 +02:00
parent 43b5bc0e74
commit c68852351f
Signed by: DanielS
GPG Key ID: 8A7C4C6ED1915C6F
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Application/Core/TinyMCE/Loader.php
View File

@ -83,6 +83,9 @@ class Loader
*/ */
protected function contentIsPlain(): bool protected function contentIsPlain(): bool
{ {
// D3 disabled, because isPlain method doesn't exist in OXID eShop
return false;
/** @var BaseModel|Content $oEditObject */ /** @var BaseModel|Content $oEditObject */
$oEditObject = $this->getShopConfig()->getActiveView()->getViewDataElement("edit"); $oEditObject = $this->getShopConfig()->getActiveView()->getViewDataElement("edit");
return $oEditObject instanceof Content && $oEditObject->isPlain(); return $oEditObject instanceof Content && $oEditObject->isPlain();

11
composer.json
View File

@ -1,6 +1,6 @@
{ {
"name": "o3-shop/tinymce-editor", "name": "d3/tinymce-editor",
"description": "TinyMCE 6 Integration for O3-Shop", "description": "TinyMCE 6 Integration for OXID-Shop",
"type": "oxideshop-module", "type": "oxideshop-module",
"homepage": "https://www.o3-shop.com/", "homepage": "https://www.o3-shop.com/",
"license": [ "license": [
@ -14,6 +14,10 @@
{ {
"name": "O3-Shop", "name": "O3-Shop",
"email": "info@o3-shop.com" "email": "info@o3-shop.com"
},
{
"name": "D3 Data Development (Inh. Thomas Dartsch)",
"email": "info@d3data.de"
} }
], ],
"extra": { "extra": {
@ -33,7 +37,8 @@
}, },
"require": { "require": {
"php": ">=7.4", "php": ">=7.4",
"o3-shop/shop-ce": "^1.2 || dev-dev_b-1.2" "oxid-esales/oxideshop-ce": "^6.3.0",
"d3/oxidservicebridges": "^1.2"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {