Skip to content

Commit

Permalink
Merge pull request #4076 from Osmose/upgrade-jquery
Browse files Browse the repository at this point in the history
Update to jQuery 3.2.1 and jQuery-UI 1.12.1.
  • Loading branch information
Osmose committed Nov 17, 2017
2 parents 97fee90 + da4e1a6 commit 7facee9
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 13 deletions.
13 changes: 8 additions & 5 deletions webapp-django/crashstats/settings/bundles.py
Original file line number Diff line number Diff line change
Expand Up @@ -221,12 +221,15 @@
},
'jquery_ui': {
'source_filenames': (
'jquery-ui/ui/core.js',
'jquery-ui/ui/version.js',
'jquery-ui/ui/widget.js',
'jquery-ui/ui/mouse.js',
'jquery-ui/ui/sortable.js',
'jquery-ui/ui/datepicker.js',
'jquery-ui/ui/tabs.js',
'jquery-ui/ui/safe-active-element.js',
'jquery-ui/ui/unique-id.js',
'jquery-ui/ui/keycode.js',
'jquery-ui/ui/widgets/mouse.js',
'jquery-ui/ui/widgets/sortable.js',
'jquery-ui/ui/widgets/datepicker.js',
'jquery-ui/ui/widgets/tabs.js',
),
'output_filename': 'js/jquery-ui.min.js',
},
Expand Down
14 changes: 8 additions & 6 deletions webapp-django/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions webapp-django/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
"filesize": "2.0.3",
"flatpickr": "4.0.3",
"font-awesome": "4.6.1",
"jquery": "2.1.0",
"jquery": "3.2.1",
"jquery-jsonview": "1.2.3",
"jquery-ui": "github:jquery/jquery-ui#1.11.1",
"jquery-ui": "1.12.1",
"jssha": "2.3.1",
"metrics-graphics": "2.8.0",
"moment": "2.15.0",
Expand Down

0 comments on commit 7facee9

Please sign in to comment.