Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 0 additions & 22 deletions source/php/App.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ class App
public function __construct(
private EnqueueManager $wpEnqueue,
) {
//Register scripts
add_action('wp_enqueue_scripts', [$this, 'registerFrontendAssets']);
add_action('admin_enqueue_scripts', [$this, 'registerAdminAssets']);

//Init module
add_action('init', [$this, 'registerModule']);

Expand All @@ -34,24 +30,6 @@ public function registerModule()
}
}

/**
* Register required frontend scripts
* @return void
*/
public function registerFrontendAssets()
{
$this->wpEnqueue->add('css/modularity-json-render-front.css')->add('js/Front/IndexFront.js', ['jquery', 'react', 'react-dom']);
}

/**
* Register required admin scripts & styles
* @return void
*/
public function registerAdminAssets()
{
$this->wpEnqueue->add('css/modularity-json-render-admin.css')->add('js/Admin/IndexAdmin.js', ['jquery', 'react', 'react-dom'], false, true);
}

/**
* Register meta boxes
* @return void
Expand Down
13 changes: 11 additions & 2 deletions source/php/Module/JsonRender.php
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public function script()
class_exists('\Modularity\Helper\React') ? \Modularity\Helper\React::enqueue() : \ModularityJsonRender\Helper\React::enqueue();

$this->wpEnqueue
?->add('js/empty.js')
?->add('js/Front/IndexFront.js', $this->getAssetDependencies())
->with()
->translation('modJsonRender', [
'translation' => [
Expand All @@ -121,6 +121,7 @@ class_exists('\Modularity\Helper\React') ? \Modularity\Helper\React::enqueue() :

public function style()
{
$this->wpEnqueue?->add('css/modularity-json-render-front.css');
}

public function adminEnqueue()
Expand All @@ -130,13 +131,16 @@ public function adminEnqueue()
return;
}

$version = false;
$loadInFooter = true;

// Enqueue React
class_exists('\Modularity\Helper\React') ? \Modularity\Helper\React::enqueue() : \ModularityJsonRender\Helper\React::enqueue();

$options = $this->getOptions($post->ID);

$this->wpEnqueue
?->add('js/empty.js')
?->add('js/Admin/IndexAdmin.js', $this->getAssetDependencies(), $version, $loadInFooter)
->with()
->translation('modJsonRender', [
'options' => $options,
Expand Down Expand Up @@ -182,6 +186,11 @@ public function getOptions($postId)
return $options;
}

private function getAssetDependencies(): array
{
return ['jquery', 'react', 'react-dom'];
}

/**
* Available "magic" methods for modules:
* init() What to do on initialization
Expand Down