Skip to content

Commit

Permalink
Build: Update jQuery Simulate, jQuery Migrate & jQuery Color
Browse files Browse the repository at this point in the history
The jQuery Simulate & jQuery Color updates are needed for compatibility
with jQuery master, a future jQuery 4.

Closes gh-1914
  • Loading branch information
mgol committed May 16, 2020
1 parent 9bb366e commit 512cbbf
Show file tree
Hide file tree
Showing 12 changed files with 1,048 additions and 770 deletions.
8 changes: 7 additions & 1 deletion .jscsrc
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,11 @@
"es3": true,

// We want to output all errors
"maxErrors": 1000000
"maxErrors": 1000000,

"excludeFiles": [
"dist/**/*",
"external/**/*",
"ui/vendor/**/*"
]
}
3 changes: 3 additions & 0 deletions .jshintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
dist/**/*
external/**/*
ui/vendor/**/*
15 changes: 13 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,17 @@ grunt.initConfig( {
},

bowercopy: {
inlineVendors: {
options: {
clean: true,
destPrefix: "ui/vendor"
},
files: {
"jquery-color/jquery.color.js": "jquery-color/dist/jquery.color.js",
"jquery-color/LICENSE.txt": "jquery-color/LICENSE.txt"
}
},

all: {
options: {
clean: true,
Expand Down Expand Up @@ -422,8 +433,8 @@ grunt.initConfig( {
"jquery-migrate-1.4.1/jquery-migrate.js": "jquery-migrate-1.4.1/dist/jquery-migrate.js",
"jquery-migrate-1.4.1/LICENSE.txt": "jquery-migrate-1.4.1/LICENSE.txt",

"jquery-migrate-3.0.0/jquery-migrate.js": "jquery-migrate-3.0.0/dist/jquery-migrate.js",
"jquery-migrate-3.0.0/LICENSE.txt": "jquery-migrate-3.0.0/LICENSE.txt"
"jquery-migrate-3.3.0/jquery-migrate.js": "jquery-migrate-3.3.0/dist/jquery-migrate.js",
"jquery-migrate-3.3.0/LICENSE.txt": "jquery-migrate-3.3.0/LICENSE.txt"
}
}
},
Expand Down
5 changes: 3 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
"jquery": ">=1.6"
},
"devDependencies": {
"jquery-color": "2.2.0",
"jquery-mousewheel": "3.1.12",
"jquery-simulate": "1.0.0",
"jquery-simulate": "1.1.1",
"jshint": "2.4.4",
"qunit": "1.18.0",
"qunit-assert-classes": "1.0.2",
Expand Down Expand Up @@ -67,6 +68,6 @@
"jquery-3.4.0": "jquery#3.4.0",
"jquery-3.4.1": "jquery#3.4.1",
"jquery-migrate-1.4.1": "https://registry.npmjs.org/jquery-migrate/-/jquery-migrate-1.4.1.tgz",
"jquery-migrate-3.0.0": "https://registry.npmjs.org/jquery-migrate/-/jquery-migrate-3.0.0.tgz"
"jquery-migrate-3.3.0": "https://registry.npmjs.org/jquery-migrate/-/jquery-migrate-3.3.0.tgz"
}
}
File renamed without changes.
Loading

0 comments on commit 512cbbf

Please sign in to comment.