Explorar o código

Load jquery ui after the boostrap js to fix tooltip conflict

Admin LTE enables the bootstrap tooltip by default. But if the jquery ui is loaded after the bootstrap js, the bootstrap tooltip plugin is replaced by jquery's tooltip plugin. Because of different parameters it's wrongly enabled on all items with `title` attribute.
This commit fixes the tooltip conflict, the bootstrap tooltip plugin is prefered.
Andrej Hudec %!s(int64=9) %!d(string=hai) anos
pai
achega
2b696dac18
Modificáronse 1 ficheiros con 3 adicións e 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',