Skip to content

Commit

Permalink
Load jquery ui after the boostrap js to fix tooltip conflict
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
pulzarraider committed Aug 4, 2015
1 parent 65a726a commit 2b696da
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions DependencyInjection/Configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -302,13 +302,13 @@ public function getConfigTreeBuilder()

'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',

Expand Down

0 comments on commit 2b696da

Please sign in to comment.