Skip to content

Commit 8fdfea5

Browse files
committed
Build: Upgrade to jQuery 1.11.2
Adds jQuery 1.11.0, 1.11.1, 1.11.2, 2.1.0, 2.1.1, 2.1.2, 2.1.3
1 parent fac8e51 commit 8fdfea5

File tree

23 files changed

+74119
-5642
lines changed

23 files changed

+74119
-5642
lines changed

Gruntfile.js

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ grunt.initConfig({
227227
files: {
228228
"qunit/qunit.js": "qunit/qunit/qunit.js",
229229
"qunit/qunit.css": "qunit/qunit/qunit.css",
230-
"qunit/MIT-LICENSE.txt": "qunit/MIT-LICENSE.txt",
230+
"qunit/LICENSE.txt": "qunit/LICENSE.txt",
231231

232232
"jquery-mousewheel/jquery.mousewheel.js": "jquery-mousewheel/jquery.mousewheel.js",
233233
"jquery-mousewheel/LICENSE.txt": "jquery-mousewheel/LICENSE.txt",
@@ -238,7 +238,7 @@ grunt.initConfig({
238238
"jshint/jshint.js": "jshint/dist/jshint.js",
239239
"jshint/LICENSE": "jshint/LICENSE",
240240

241-
"jquery/jquery.js": "jquery-1.x/jquery.js",
241+
"jquery/jquery.js": "jquery-1.x/dist/jquery.js",
242242
"jquery/MIT-LICENSE.txt": "jquery-1.x/MIT-LICENSE.txt",
243243

244244
"jquery-1.7.0/jquery.js": "jquery-1.7.0/jquery.js",
@@ -277,6 +277,15 @@ grunt.initConfig({
277277
"jquery-1.10.2/jquery.js": "jquery-1.10.2/jquery.js",
278278
"jquery-1.10.2/MIT-LICENSE.txt": "jquery-1.10.2/MIT-LICENSE.txt",
279279

280+
"jquery-1.11.0/jquery.js": "jquery-1.11.0/dist/jquery.js",
281+
"jquery-1.11.0/MIT-LICENSE.txt": "jquery-1.11.0/MIT-LICENSE.txt",
282+
283+
"jquery-1.11.1/jquery.js": "jquery-1.11.1/dist/jquery.js",
284+
"jquery-1.11.1/MIT-LICENSE.txt": "jquery-1.11.1/MIT-LICENSE.txt",
285+
286+
"jquery-1.11.2/jquery.js": "jquery-1.11.2/dist/jquery.js",
287+
"jquery-1.11.2/MIT-LICENSE.txt": "jquery-1.11.2/MIT-LICENSE.txt",
288+
280289
"jquery-2.0.0/jquery.js": "jquery-2.0.0/jquery.js",
281290
"jquery-2.0.0/MIT-LICENSE.txt": "jquery-2.0.0/MIT-LICENSE.txt",
282291

@@ -287,7 +296,19 @@ grunt.initConfig({
287296
"jquery-2.0.2/MIT-LICENSE.txt": "jquery-2.0.2/MIT-LICENSE.txt",
288297

289298
"jquery-2.0.3/jquery.js": "jquery-2.0.3/jquery.js",
290-
"jquery-2.0.3/MIT-LICENSE.txt": "jquery-2.0.3/MIT-LICENSE.txt"
299+
"jquery-2.0.3/MIT-LICENSE.txt": "jquery-2.0.3/MIT-LICENSE.txt",
300+
301+
"jquery-2.1.0/jquery.js": "jquery-2.1.0/dist/jquery.js",
302+
"jquery-2.1.0/MIT-LICENSE.txt": "jquery-2.1.0/MIT-LICENSE.txt",
303+
304+
"jquery-2.1.1/jquery.js": "jquery-2.1.1/dist/jquery.js",
305+
"jquery-2.1.1/MIT-LICENSE.txt": "jquery-2.1.1/MIT-LICENSE.txt",
306+
307+
"jquery-2.1.2/jquery.js": "jquery-2.1.2/dist/jquery.js",
308+
"jquery-2.1.2/MIT-LICENSE.txt": "jquery-2.1.2/MIT-LICENSE.txt",
309+
310+
"jquery-2.1.3/jquery.js": "jquery-2.1.3/dist/jquery.js",
311+
"jquery-2.1.3/MIT-LICENSE.txt": "jquery-2.1.3/MIT-LICENSE.txt"
291312
}
292313
}
293314
},

bower.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,17 @@
2828
"jquery-1.10.0": "jquery#1.10.0",
2929
"jquery-1.10.1": "jquery#1.10.1",
3030
"jquery-1.10.2": "jquery#1.10.2",
31-
"jquery-1.x": "jquery#1.10.2",
31+
"jquery-1.11.0": "jquery#1.11.0",
32+
"jquery-1.11.1": "jquery#1.11.1",
33+
"jquery-1.11.2": "jquery#1.11.2",
34+
"jquery-1.x": "jquery#1.11.2",
3235
"jquery-2.0.0": "jquery#2.0.0",
3336
"jquery-2.0.1": "jquery#2.0.1",
3437
"jquery-2.0.2": "jquery#2.0.2",
35-
"jquery-2.0.3": "jquery#2.0.3"
38+
"jquery-2.0.3": "jquery#2.0.3",
39+
"jquery-2.1.0": "jquery#2.1.0",
40+
"jquery-2.1.1": "jquery#2.1.1",
41+
"jquery-2.1.2": "jquery#2.1.2",
42+
"jquery-2.1.3": "jquery#2.1.3"
3643
}
3744
}

build/tasks/testswarm.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ module.exports = function( grunt ) {
44

55
var versions = {
66
"git": "git",
7+
"1.11": "1.11.0 1.11.1 1.11.2",
78
"1.10": "1.10.0 1.10.1 1.10.2",
89
"1.9": "1.9.0 1.9.1",
910
"1.8": "1.8.0 1.8.1 1.8.2 1.8.3",
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
Copyright 2014 jQuery Foundation and other contributors
2+
http://jquery.com/
3+
4+
Permission is hereby granted, free of charge, to any person obtaining
5+
a copy of this software and associated documentation files (the
6+
"Software"), to deal in the Software without restriction, including
7+
without limitation the rights to use, copy, modify, merge, publish,
8+
distribute, sublicense, and/or sell copies of the Software, and to
9+
permit persons to whom the Software is furnished to do so, subject to
10+
the following conditions:
11+
12+
The above copyright notice and this permission notice shall be
13+
included in all copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
16+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
17+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
18+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
19+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
20+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
21+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

0 commit comments

Comments
 (0)