Moved bootstrap dependency up to fix jQuery UI dialog close button is…

…sue (#4511)
sonata-project · Mar 30, 2018 · 359ce81 · 359ce81
1 parent fdc7ea1
commit 359ce81
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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',