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

Refactor renderStyles method from static to instance method

Browse Source 
[MAILPOET-2665]
This commit is contained in:
Rostislav Wolny
2020-01-29 15:14:36 +01:00
committed by Jack Kitterhing
parent 8e9c41145d
commit b8dd243ec1
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Form/Renderer.php
View File

@@ -7,7 +7,7 @@ use MailPoet\Subscription\Captcha;
use MailPoet\WP\Functions as WPFunctions; use MailPoet\WP\Functions as WPFunctions;
class Renderer { class Renderer {
public static function renderStyles($form = [], $prefix = null) { public function renderStyles($form = [], $prefix = null) {
$styles = new Util\Styles(); $styles = new Util\Styles();
$html = '<style type="text/css">'; $html = '<style type="text/css">';

6
lib/Form/Widget.php
View File

@@ -17,6 +17,9 @@ class Widget extends \WP_Widget {
/** @var AssetsController */ /** @var AssetsController */
private $assetsController; private $assetsController;
/** @var FormRenderer */
private $formRenderer;
public function __construct() { public function __construct() {
parent::__construct( parent::__construct(
'mailpoet_form', 'mailpoet_form',
@@ -26,6 +29,7 @@ class Widget extends \WP_Widget {
$this->wp = new WPFunctions; $this->wp = new WPFunctions;
$this->renderer = new \MailPoet\Config\Renderer(!WP_DEBUG, !WP_DEBUG); $this->renderer = new \MailPoet\Config\Renderer(!WP_DEBUG, !WP_DEBUG);
$this->assetsController = new AssetsController($this->wp, $this->renderer, SettingsController::getInstance()); $this->assetsController = new AssetsController($this->wp, $this->renderer, SettingsController::getInstance());
$this->formRenderer = new FormRenderer();
if (!is_admin()) { if (!is_admin()) {
$this->setupIframe(); $this->setupIframe();
} else { } else {
@@ -214,7 +218,7 @@ class Widget extends \WP_Widget {
'form_type' => $formType, 'form_type' => $formType,
'form' => $form, 'form' => $form,
'title' => $title, 'title' => $title,
'styles' => FormRenderer::renderStyles($form, '#' . $formId), 'styles' => $this->formRenderer->renderStyles($form, '#' . $formId),
'html' => FormRenderer::renderHTML($form), 'html' => FormRenderer::renderHTML($form),
'before_widget' => $beforeWidget, 'before_widget' => $beforeWidget,
'after_widget' => $afterWidget, 'after_widget' => $afterWidget,