Skip to content

Commit 683f9b7

Browse files
committed
Package can add script mixes
1 parent 0aa1a6e commit 683f9b7

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

‎ProcessMaker/Traits/HasControllerAddons.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ protected function getPluginAddons($method, array $data)
3030
$addon['content'] = isset($addon['view']) && !isset($addon['content'])
3131
? view($addon['view'], $data)->render() : (isset($addon['content'])
3232
? $addon['content'] : '');
33-
if (isset($addon['script']) && is_array($addon['script'])) {
34-
$addon['script_mixin'] = $addon['script'];
33+
if (isset($addon['script_mix'])) {
34+
$addon['script_mix'] = $addon['script_mix'];
3535
}
3636
$addon['script'] = isset($addon['script']) && is_string($addon['script']) ? view($addon['script'], $data)->render() : '';
3737
$addons[] = $addon;

‎resources/views/layouts/layout.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@
139139
@endforeach
140140
@isset($addons)
141141
@foreach ($addons as $addon)
142-
@if (!empty($addon['script_mixin']))
143-
<script type="text/javascript" src="{{ mix($addon['script_mixin'][0], $addon['script_mixin'][1]) }}"></script>
142+
@if (!empty($addon['script_mix']))
143+
<script type="text/javascript" src="{{ mix($addon['script_mix'][0], $addon['script_mix'][1]) }}"></script>
144144
@endif
145145
@endforeach
146146
@endisset

0 commit comments

Comments
 (0)