From 359ce81fb967004ba8026dd3776171fa9aa7a26b Mon Sep 17 00:00:00 2001 From: Koen Verheyen Date: Fri, 30 Mar 2018 14:02:35 +0200 Subject: [PATCH] Moved bootstrap dependency up to fix jQuery UI dialog close button issue (#4511) --- docs/reference/configuration.rst | 2 +- src/DependencyInjection/Configuration.php | 4 ++-- tests/DependencyInjection/SonataAdminExtensionTest.php | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/reference/configuration.rst b/docs/reference/configuration.rst index 374862e51b..b430960a16 100644 --- a/docs/reference/configuration.rst +++ b/docs/reference/configuration.rst @@ -202,9 +202,9 @@ Full Configuration Options - bundles/sonatacore/vendor/jquery/dist/jquery.min.js - bundles/sonataadmin/vendor/jquery.scrollTo/jquery.scrollTo.min.js - bundles/sonatacore/vendor/moment/min/moment.min.js + - bundles/sonatacore/vendor/bootstrap/dist/js/bootstrap.min.js - bundles/sonataadmin/vendor/jqueryui/ui/minified/jquery-ui.min.js - bundles/sonataadmin/vendor/jqueryui/ui/minified/i18n/jquery-ui-i18n.min.js - - bundles/sonatacore/vendor/bootstrap/dist/js/bootstrap.min.js - bundles/sonatacore/vendor/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js - bundles/sonataadmin/vendor/jquery-form/jquery.form.js - bundles/sonataadmin/jquery/jquery.confirmExit.js diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php index 0097d5d92e..e7f8cb05d1 100644 --- a/src/DependencyInjection/Configuration.php +++ b/src/DependencyInjection/Configuration.php @@ -378,11 +378,11 @@ public function getConfigTreeBuilder() 'bundles/sonatacore/vendor/moment/min/moment.min.js', + 'bundles/sonatacore/vendor/bootstrap/dist/js/bootstrap.min.js', + 'bundles/sonataadmin/vendor/jqueryui/ui/minified/jquery-ui.min.js', 'bundles/sonataadmin/vendor/jqueryui/ui/minified/i18n/jquery-ui-i18n.min.js', - 'bundles/sonatacore/vendor/bootstrap/dist/js/bootstrap.min.js', - 'bundles/sonatacore/vendor/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js', 'bundles/sonataadmin/vendor/jquery-form/jquery.form.js', diff --git a/tests/DependencyInjection/SonataAdminExtensionTest.php b/tests/DependencyInjection/SonataAdminExtensionTest.php index bf4d46ce58..53b32ec925 100644 --- a/tests/DependencyInjection/SonataAdminExtensionTest.php +++ b/tests/DependencyInjection/SonataAdminExtensionTest.php @@ -142,9 +142,9 @@ public function testExtraJavascriptsGetAdded() 'bundles/sonatacore/vendor/jquery/dist/jquery.min.js', 'bundles/sonataadmin/vendor/jquery.scrollTo/jquery.scrollTo.min.js', 'bundles/sonatacore/vendor/moment/min/moment.min.js', + 'bundles/sonatacore/vendor/bootstrap/dist/js/bootstrap.min.js', 'bundles/sonataadmin/vendor/jqueryui/ui/minified/jquery-ui.min.js', 'bundles/sonataadmin/vendor/jqueryui/ui/minified/i18n/jquery-ui-i18n.min.js', - 'bundles/sonatacore/vendor/bootstrap/dist/js/bootstrap.min.js', 'bundles/sonatacore/vendor/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js', 'bundles/sonataadmin/vendor/jquery-form/jquery.form.js', 'bundles/sonataadmin/jquery/jquery.confirmExit.js', @@ -182,9 +182,9 @@ public function testRemoveJavascriptsGetRemoved() 'bundles/sonatacore/vendor/jquery/dist/jquery.min.js', 'bundles/sonataadmin/vendor/jquery.scrollTo/jquery.scrollTo.min.js', 'bundles/sonatacore/vendor/moment/min/moment.min.js', + 'bundles/sonatacore/vendor/bootstrap/dist/js/bootstrap.min.js', 'bundles/sonataadmin/vendor/jqueryui/ui/minified/jquery-ui.min.js', 'bundles/sonataadmin/vendor/jqueryui/ui/minified/i18n/jquery-ui-i18n.min.js', - 'bundles/sonatacore/vendor/bootstrap/dist/js/bootstrap.min.js', 'bundles/sonatacore/vendor/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js', 'bundles/sonataadmin/vendor/jquery-form/jquery.form.js', 'bundles/sonataadmin/vendor/x-editable/dist/bootstrap3-editable/js/bootstrap-editable.min.js', @@ -248,9 +248,9 @@ public function testAssetsCanBeAddedAndRemoved() 'bundles/sonatacore/vendor/jquery/dist/jquery.min.js', 'bundles/sonataadmin/vendor/jquery.scrollTo/jquery.scrollTo.min.js', 'bundles/sonatacore/vendor/moment/min/moment.min.js', + 'bundles/sonatacore/vendor/bootstrap/dist/js/bootstrap.min.js', 'bundles/sonataadmin/vendor/jqueryui/ui/minified/jquery-ui.min.js', 'bundles/sonataadmin/vendor/jqueryui/ui/minified/i18n/jquery-ui-i18n.min.js', - 'bundles/sonatacore/vendor/bootstrap/dist/js/bootstrap.min.js', 'bundles/sonatacore/vendor/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js', 'bundles/sonataadmin/vendor/jquery-form/jquery.form.js', 'bundles/sonataadmin/vendor/x-editable/dist/bootstrap3-editable/js/bootstrap-editable.min.js',