leviathonbeast/php-flasher
1
0
Fork 0
mirror of https://github.com/php-flasher/php-flasher.git synced 2026-03-31 15:07:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix options and show multiple sweet alert at the same time

Browse Source
This commit is contained in:
KHOUBZA Younes
2021-08-22 01:27:46 +01:00
parent f3e4dae78f
commit 179b7bf620
6 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Laravel/Resources/config/config.php
+5 -5
View File
@@ -4,7 +4,7 @@ return array(
'default' => 'template',
'root_scripts' => array(
'https://cdn.jsdelivr.net/npm/@flasher/flasher@0.1.3/dist/flasher.min.js',
'https://cdn.jsdelivr.net/npm/@flasher/flasher@0.1.6/dist/flasher.min.js',
),
'template_factory' => array(
@@ -13,15 +13,15 @@ return array(
'tailwindcss' => array(
'view' => 'flasher::tailwindcss',
'styles' => array(
'https://cdnjs.cloudflare.com/ajax/libs/tailwindcss/2.1.1/base.min.css',
'https://cdnjs.cloudflare.com/ajax/libs/tailwindcss/2.1.1/utilities.css',
'https://cdnjs.cloudflare.com/ajax/libs/tailwindcss/2.2.7/base.min.css',
'https://cdnjs.cloudflare.com/ajax/libs/tailwindcss/2.2.7/utilities.css',
),
),
'tailwindcss_bg' => array(
'view' => 'flasher::tailwindcss_bg',
'styles' => array(
'https://cdnjs.cloudflare.com/ajax/libs/tailwindcss/2.1.1/base.min.css',
'https://cdnjs.cloudflare.com/ajax/libs/tailwindcss/2.1.1/utilities.css',
'https://cdnjs.cloudflare.com/ajax/libs/tailwindcss/2.2.7/base.min.css',
'https://cdnjs.cloudflare.com/ajax/libs/tailwindcss/2.2.7/utilities.css',
),
),
'bootstrap' => array(
src/Prime/Notification/Notification.php
+1 -1
View File
@@ -46,7 +46,7 @@ class Notification implements NotificationInterface
public function setOptions(array $options)
{
$this->options = $options;
$this->options = array_replace($this->options, $options);
}
public function getOption($name, $default = null)
src/Prime/Response/Presenter/HtmlPresenter.php
+3 -1
View File
@@ -18,7 +18,9 @@ final class HtmlPresenter implements PresenterInterface
return <<<CODE_SAMPLE
{$scripts}
<script type="text/javascript">
Flasher.getInstance().render({$options});
document.addEventListener('DOMContentLoaded', function(event) {
Flasher.getInstance().render({$options});
})
</script>
CODE_SAMPLE;
}
src/SweetAlert/Laravel/Resources/config/config.php
+1 -1
View File
@@ -3,7 +3,7 @@
return array(
'scripts' => array(
'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js',
'https://cdn.jsdelivr.net/npm/@flasher/flasher-sweet-alert@0.1.3/dist/flasher-sweet-alert.min.js',
'https://cdn.jsdelivr.net/npm/@flasher/flasher-sweet-alert@0.1.6/dist/flasher-sweet-alert.min.js',
),
'styles' => array(),
'options' => array(
src/SweetAlert/Symfony/DependencyInjection/Configuration.php
+1 -1
View File
@@ -24,7 +24,7 @@ final class Configuration implements ConfigurationInterface
->prototype('scalar')->end()
->defaultValue(array(
'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js',
'https://cdn.jsdelivr.net/npm/@flasher/flasher-sweet-alert@0.1.3/dist/flasher-sweet-alert.min.js',
'https://cdn.jsdelivr.net/npm/@flasher/flasher-sweet-alert@0.1.6/dist/flasher-sweet-alert.min.js',
))
->end()
->arrayNode('styles')
src/Symfony/DependencyInjection/Configuration.php
+5 -5
View File
@@ -27,7 +27,7 @@ final class Configuration implements ConfigurationInterface
->arrayNode('root_scripts')
->prototype('scalar')->end()
->defaultValue(array(
'https://cdn.jsdelivr.net/npm/@flasher/flasher@0.1.3/dist/flasher.min.js',
'https://cdn.jsdelivr.net/npm/@flasher/flasher@0.1.6/dist/flasher.min.js',
))
->end()
->arrayNode('template_factory')
@@ -54,15 +54,15 @@ final class Configuration implements ConfigurationInterface
'tailwindcss' => array(
'view' => '@FlasherSymfony/tailwindcss.html.twig',
'styles' => array(
'https://cdnjs.cloudflare.com/ajax/libs/tailwindcss/2.1.1/base.min.css',
'https://cdnjs.cloudflare.com/ajax/libs/tailwindcss/2.1.1/utilities.css',
'https://cdnjs.cloudflare.com/ajax/libs/tailwindcss/2.2.7/base.min.css',
'https://cdnjs.cloudflare.com/ajax/libs/tailwindcss/2.2.7/utilities.css',
),
),
'tailwindcss_bg' => array(
'view' => '@FlasherSymfony/tailwindcss_bg.html.twig',
'styles' => array(
'https://cdnjs.cloudflare.com/ajax/libs/tailwindcss/2.1.1/base.min.css',
'https://cdnjs.cloudflare.com/ajax/libs/tailwindcss/2.1.1/utilities.css',
'https://cdnjs.cloudflare.com/ajax/libs/tailwindcss/2.2.7/base.min.css',
'https://cdnjs.cloudflare.com/ajax/libs/tailwindcss/2.2.7/utilities.css',
),
),
'bootstrap' => array(