Skip to content

Commit 512cbbf

Browse files
authored
Build: Update jQuery Simulate, jQuery Migrate & jQuery Color
The jQuery Simulate & jQuery Color updates are needed for compatibility with jQuery master, a future jQuery 4. Closes jquerygh-1914
1 parent 9bb366e commit 512cbbf

File tree

12 files changed

+1048
-770
lines changed

12 files changed

+1048
-770
lines changed

.jscsrc

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,11 @@
88
"es3": true,
99

1010
// We want to output all errors
11-
"maxErrors": 1000000
11+
"maxErrors": 1000000,
12+
13+
"excludeFiles": [
14+
"dist/**/*",
15+
"external/**/*",
16+
"ui/vendor/**/*"
17+
]
1218
}

.jshintignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
dist/**/*
2+
external/**/*
3+
ui/vendor/**/*

Gruntfile.js

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,17 @@ grunt.initConfig( {
252252
},
253253

254254
bowercopy: {
255+
inlineVendors: {
256+
options: {
257+
clean: true,
258+
destPrefix: "ui/vendor"
259+
},
260+
files: {
261+
"jquery-color/jquery.color.js": "jquery-color/dist/jquery.color.js",
262+
"jquery-color/LICENSE.txt": "jquery-color/LICENSE.txt"
263+
}
264+
},
265+
255266
all: {
256267
options: {
257268
clean: true,
@@ -422,8 +433,8 @@ grunt.initConfig( {
422433
"jquery-migrate-1.4.1/jquery-migrate.js": "jquery-migrate-1.4.1/dist/jquery-migrate.js",
423434
"jquery-migrate-1.4.1/LICENSE.txt": "jquery-migrate-1.4.1/LICENSE.txt",
424435

425-
"jquery-migrate-3.0.0/jquery-migrate.js": "jquery-migrate-3.0.0/dist/jquery-migrate.js",
426-
"jquery-migrate-3.0.0/LICENSE.txt": "jquery-migrate-3.0.0/LICENSE.txt"
436+
"jquery-migrate-3.3.0/jquery-migrate.js": "jquery-migrate-3.3.0/dist/jquery-migrate.js",
437+
"jquery-migrate-3.3.0/LICENSE.txt": "jquery-migrate-3.3.0/LICENSE.txt"
427438
}
428439
}
429440
},

bower.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
"jquery": ">=1.6"
1313
},
1414
"devDependencies": {
15+
"jquery-color": "2.2.0",
1516
"jquery-mousewheel": "3.1.12",
16-
"jquery-simulate": "1.0.0",
17+
"jquery-simulate": "1.1.1",
1718
"jshint": "2.4.4",
1819
"qunit": "1.18.0",
1920
"qunit-assert-classes": "1.0.2",
@@ -67,6 +68,6 @@
6768
"jquery-3.4.0": "jquery#3.4.0",
6869
"jquery-3.4.1": "jquery#3.4.1",
6970
"jquery-migrate-1.4.1": "https://registry.npmjs.org/jquery-migrate/-/jquery-migrate-1.4.1.tgz",
70-
"jquery-migrate-3.0.0": "https://registry.npmjs.org/jquery-migrate/-/jquery-migrate-3.0.0.tgz"
71+
"jquery-migrate-3.3.0": "https://registry.npmjs.org/jquery-migrate/-/jquery-migrate-3.3.0.tgz"
7172
}
7273
}

0 commit comments

Comments
 (0)