8
0

adjust to OXID eShop

# Conflicts:
#	composer.json
Dieser Commit ist enthalten in:
Daniel Seifert 2023-04-20 11:33:02 +02:00
Ursprung 43b5bc0e74
Commit c68852351f
Signiert von: DanielS
GPG-Schlüssel-ID: 8A7C4C6ED1915C6F
2 geänderte Dateien mit 11 neuen und 3 gelöschten Zeilen

Datei anzeigen

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

Datei anzeigen

@ -1,6 +1,6 @@
{
"name": "o3-shop/tinymce-editor",
"description": "TinyMCE 6 Integration for O3-Shop",
"name": "d3/tinymce-editor",
"description": "TinyMCE 6 Integration for OXID-Shop",
"type": "oxideshop-module",
"homepage": "https://www.o3-shop.com/",
"license": [
@ -14,6 +14,10 @@
{
"name": "O3-Shop",
"email": "info@o3-shop.com"
},
{
"name": "D3 Data Development (Inh. Thomas Dartsch)",
"email": "info@d3data.de"
}
],
"extra": {
@ -33,7 +37,8 @@
},
"require": {
"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": {
"psr-4": {