Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Split transform tags code to multiple methods

Browse Source 
[MAILPOET-1684]
This commit is contained in:
Jan Jakeš
2019-01-08 14:40:49 +01:00
parent 0d80d7492a
commit 08a2fa8f8f
1 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
lib/Newsletter/Editor/StructureTransformer.php
View File

@ -2,6 +2,7 @@
namespace MailPoet\Newsletter\Editor; namespace MailPoet\Newsletter\Editor;
use pQuery; use pQuery;
use pQuery\DomNode;
use MailPoet\Util\DOM as DOMUtil; use MailPoet\Util\DOM as DOMUtil;
if(!defined('ABSPATH')) exit; if(!defined('ABSPATH')) exit;
@ -39,29 +40,10 @@ class StructureTransformer {
* turns other root children into text blocks * turns other root children into text blocks
*/ */
private function transformTagsToBlocks($root, $image_full_width) { private function transformTagsToBlocks($root, $image_full_width) {
$children = array_filter($root->children, function ($item) { $children = $this->filterOutFiguresWithoutImages($root->children);
if($item->tag === 'figure' && !$item->query('img')) {
return false; // filter out figures without images
}
return true;
});
return array_map(function($item) use ($image_full_width) { return array_map(function($item) use ($image_full_width) {
if($item->tag === 'img' || in_array($item->tag, ['a', 'figure'], true) && $item->query('img')) { if($this->isImageElement($item)) {
$image = $item->tag === 'img' ? $item : $item->query('img')[0]; $image = $item->tag === 'img' ? $item : $item->query('img')[0];
// when <figure> exist, it carries align class, otherwise it's on <img>
$alignItem = $item->tag === 'figure' ? $item : $image;
if($alignItem->hasClass('aligncenter')) {
$align = 'center';
} elseif($alignItem->hasClass('alignleft')) {
$align = 'left';
} elseif($alignItem->hasClass('alignright')) {
$align = 'right';
} else {
$align = 'left';
}
$width = $image->getAttribute('width'); $width = $image->getAttribute('width');
$height = $image->getAttribute('height'); $height = $image->getAttribute('height');
return array( return array(
@ -74,7 +56,7 @@ class StructureTransformer {
'height' => $height === null ? 'auto' : $height, 'height' => $height === null ? 'auto' : $height,
'styles' => array( 'styles' => array(
'block' => array( 'block' => array(
'textAlign' => $align, 'textAlign' => $this->getImageAlignment($image),
), ),
), ),
); );
@ -88,6 +70,34 @@ class StructureTransformer {
}, $children); }, $children);
} }
private function filterOutFiguresWithoutImages(array $items) {
$items = array_filter($items, function (DomNode $item) {
if($item->tag === 'figure' && !$item->query('img')) {
return false;
}
return true;
});
return array_values($items);
}
private function isImageElement(DomNode $item) {
return $item->tag === 'img' || (in_array($item->tag, ['a', 'figure'], true) && $item->query('img'));
}
private function getImageAlignment(DomNode $image) {
$alignItem = $image->hasParent('figure') ? $image->parent : $image;
if($alignItem->hasClass('aligncenter')) {
$align = 'center';
} elseif($alignItem->hasClass('alignleft')) {
$align = 'left';
} elseif($alignItem->hasClass('alignright')) {
$align = 'right';
} else {
$align = 'left';
}
return $align;
}
/** /**
* Merges neighboring blocks when possible. * Merges neighboring blocks when possible.
* E.g. 2 adjacent text blocks may be combined into one. * E.g. 2 adjacent text blocks may be combined into one.