Explorar el Código

Merge pull request #3153 from sonata-project/pulzarraider-tooltip-patch

Load jquery ui before the boostrap js to fix tooltip conflict
Sullivan SENECHAL hace 9 años
padre
commit
652dd3f88c
Se han modificado 1 ficheros con 3 adiciones y 3 borrados
  1. 3 3
      DependencyInjection/Configuration.php

+ 3 - 3
DependencyInjection/Configuration.php

@@ -302,13 +302,13 @@ class Configuration implements ConfigurationInterface
 
                                 'bundles/sonatacore/vendor/moment/min/moment.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/jqueryui/ui/minified/jquery-ui.min.js',
-                                'bundles/sonataadmin/vendor/jqueryui/ui/minified/i18n/jquery-ui-i18n.min.js',
-
                                 'bundles/sonataadmin/vendor/jquery-form/jquery.form.js',
                                 'bundles/sonataadmin/jquery/jquery.confirmExit.js',