Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump jquery-ui from 1.10 to 1.12.1 #11718

Merged
merged 1 commit into from
Dec 4, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"jcrop": "0.9.12",
"jquery": "2.1.4",
"jquery-migrate": "1.4.0",
"jquery-ui": "1.10.0",
"jquery-ui": "1.12.1",
"jsTimezoneDetect": "1.0.6",
"marked": "0.3.6",
"moment": "2.18.1",
Expand Down
2 changes: 1 addition & 1 deletion core/js/core.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"vendor": [
"jquery/dist/jquery.min.js",
"jquery-migrate/jquery-migrate.min.js",
"jquery-ui/ui/minified/jquery-ui.custom.min.js",
"jquery-ui/jquery-ui.min.js",
"underscore/underscore-min.js",
"moment/min/moment-with-locales.min.js",
"handlebars/handlebars.min.js",
Expand Down
38 changes: 3 additions & 35 deletions core/vendor/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,42 +41,10 @@ jquery/**
!jquery/MIT-LICENSE.txt

# jquery-ui
jquery-ui/themes/base/minified
jquery-ui/themes/base/images/**
!jquery-ui/themes/base/images/animated-overlay.gif
!jquery-ui/themes/base/images/ui-icons_222222_256x240.png
jquery-ui/themes/base/jquery.ui.*
jquery-ui/themes/black-tie
jquery-ui/themes/blitzer
jquery-ui/themes/cupertino
jquery-ui/themes/dark-hive
jquery-ui/themes/dot-luv
jquery-ui/themes/eggplant
jquery-ui/themes/excite-bike
jquery-ui/themes/flick
jquery-ui/themes/hot-sneaks
jquery-ui/themes/humanity
jquery-ui/themes/le-frog
jquery-ui/themes/mint-choc
jquery-ui/themes/overcast
jquery-ui/themes/pepper-grinder
jquery-ui/themes/redmond
jquery-ui/themes/smoothness
jquery-ui/themes/south-street
jquery-ui/themes/start
jquery-ui/themes/sunny
jquery-ui/themes/swanky-purse
jquery-ui/themes/trontastic
jquery-ui/themes/ui-darkness
jquery-ui/themes/ui-lightness
jquery-ui/themes/vader
jquery-ui/ui/**
!jquery-ui/ui/minified/jquery-ui.custom.min.js
jquery-ui/*.json
jquery-ui/**
!jquery-ui/themes/base/jquery-ui.css
!jquery-ui/jquery-ui.min.js
!jquery-ui/.bower.json
jquery-ui/AUTHORS.txt
jquery-ui/MANIFEST
jquery-ui/README.md

# jcrop
jcrop/index.html
Expand Down
18 changes: 11 additions & 7 deletions core/vendor/jquery-ui/.bower.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
{
"name": "jquery-ui",
"version": "1.10.0",
"main": "./ui/jquery-ui.js",
"version": "1.12.1",
"main": [
"jquery-ui.js"
],
"ignore": [],
"license": "MIT",
"dependencies": {
"jquery": ">= 1.8"
"jquery": ">=1.6"
},
"homepage": "https://github.com/components/jqueryui",
"_release": "1.10.0",
"_release": "1.12.1",
"_resolution": {
"type": "version",
"tag": "1.10.0",
"commit": "4c0bac635cc97c8cd5087bb244d497100429fea2"
"tag": "1.12.1",
"commit": "44ecf3794cc56b65954cc19737234a3119d036cc"
},
"_source": "https://github.com/components/jqueryui.git",
"_target": "1.10.0",
"_target": "1.12.1",
"_originalSource": "jquery-ui"
}
26 changes: 0 additions & 26 deletions core/vendor/jquery-ui/MIT-LICENSE.txt

This file was deleted.

13 changes: 13 additions & 0 deletions core/vendor/jquery-ui/jquery-ui.min.js

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Loading