Skip to content

Commit

Permalink
[bugfix] Prioritize jQuery UI scripts in "assets.javascripts" config …
Browse files Browse the repository at this point in the history
…in order to avoid initialization issues (#5087)
  • Loading branch information
phansys authored and OskarStark committed Jun 18, 2018
1 parent 6047667 commit 82a4d6e
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 22 deletions.
40 changes: 21 additions & 19 deletions docs/reference/configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -200,25 +200,27 @@ Full Configuration Options
javascripts:
# The default javascript list:
- 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/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js
- bundles/sonataadmin/vendor/jquery-form/jquery.form.js
- bundles/sonataadmin/jquery/jquery.confirmExit.js
- bundles/sonataadmin/vendor/x-editable/dist/bootstrap3-editable/js/bootstrap-editable.min.js
- bundles/sonatacore/vendor/select2/select2.min.js
- bundles/sonataadmin/vendor/admin-lte/dist/js/app.min.js
- bundles/sonataadmin/vendor/iCheck/icheck.min.js
- bundles/sonataadmin/vendor/slimScroll/jquery.slimscroll.min.js
- bundles/sonataadmin/vendor/waypoints/lib/jquery.waypoints.min.js
- bundles/sonataadmin/vendor/waypoints/lib/shortcuts/sticky.min.js
- bundles/sonataadmin/Admin.js
- bundles/sonataadmin/treeview.js
- bundles/sonataadmin/sidebar.js
- 'bundles/sonatacore/vendor/jquery/dist/jquery.min.js'
- 'bundles/sonataadmin/vendor/jquery.scrollTo/jquery.scrollTo.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/moment/min/moment.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'
- 'bundles/sonataadmin/vendor/x-editable/dist/bootstrap3-editable/js/bootstrap-editable.min.js'
- 'bundles/sonatacore/vendor/select2/select2.min.js'
- 'bundles/sonataadmin/vendor/admin-lte/dist/js/app.min.js'
- 'bundles/sonataadmin/vendor/iCheck/icheck.min.js'
- 'bundles/sonataadmin/vendor/slimScroll/jquery.slimscroll.min.js'
- 'bundles/sonataadmin/vendor/waypoints/lib/jquery.waypoints.min.js'
- 'bundles/sonataadmin/vendor/waypoints/lib/shortcuts/sticky.min.js'
- 'bundles/sonataadmin/vendor/readmore-js/readmore.min.js'
- 'bundles/sonataadmin/vendor/masonry/dist/masonry.pkgd.min.js'
- 'bundles/sonataadmin/Admin.js'
- 'bundles/sonataadmin/treeview.js'
- 'bundles/sonataadmin/sidebar.js'
# javascript paths to add to the page in addition to the list above
extra_javascripts: []
Expand Down
6 changes: 3 additions & 3 deletions src/DependencyInjection/Configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -377,13 +377,13 @@ public function getConfigTreeBuilder()
'bundles/sonatacore/vendor/jquery/dist/jquery.min.js',
'bundles/sonataadmin/vendor/jquery.scrollTo/jquery.scrollTo.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/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/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js',

'bundles/sonataadmin/vendor/jquery-form/jquery.form.js',
Expand Down

0 comments on commit 82a4d6e

Please sign in to comment.